diff --git a/.golangci.yml b/.golangci.yml index 5688790f7..859df8139 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -11,6 +11,7 @@ linters: - errcheck - errname - errorlint + - gci - gocheckcompilerdirectives - gocritic - goprintffuncname @@ -79,6 +80,12 @@ linters-settings: - "(*hash/maphash.Hash).WriteString" - "(*github.com/influxdata/telegraf/plugins/outputs/postgresql/sqltemplate.Template).UnmarshalText" + gci: + sections: + - standard + - default + - localmodule + gocritic: # Disable all checks. # Default: false diff --git a/agent/agent.go b/agent/agent.go index 3a02cf643..76af7a375 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -11,6 +11,7 @@ import ( "time" "github.com/fatih/color" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/internal" diff --git a/cmd/telegraf/cmd_plugins.go b/cmd/telegraf/cmd_plugins.go index 4821adcaf..3b68ff506 100644 --- a/cmd/telegraf/cmd_plugins.go +++ b/cmd/telegraf/cmd_plugins.go @@ -7,6 +7,8 @@ import ( "sort" "strings" + "github.com/urfave/cli/v2" + "github.com/influxdata/telegraf/plugins/aggregators" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/outputs" @@ -14,7 +16,6 @@ import ( "github.com/influxdata/telegraf/plugins/processors" "github.com/influxdata/telegraf/plugins/secretstores" "github.com/influxdata/telegraf/plugins/serializers" - "github.com/urfave/cli/v2" ) func pluginNames[M ~map[string]V, V any](m M, prefix string) []byte { diff --git a/config/deprecation_test.go b/config/deprecation_test.go index 35cd0965a..23f73c5d6 100644 --- a/config/deprecation_test.go +++ b/config/deprecation_test.go @@ -9,8 +9,9 @@ import ( "time" "github.com/coreos/go-semver/semver" - "github.com/influxdata/telegraf" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf" ) func TestPluginDeprecation(t *testing.T) { diff --git a/internal/docker/docker_test.go b/internal/docker/docker_test.go index 14591ab87..f8a22acd3 100644 --- a/internal/docker/docker_test.go +++ b/internal/docker/docker_test.go @@ -3,8 +3,9 @@ package docker_test import ( "testing" - "github.com/influxdata/telegraf/internal/docker" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/internal/docker" ) func TestParseImage(t *testing.T) { diff --git a/internal/process/process_test.go b/internal/process/process_test.go index fec91fd28..7ab275c17 100644 --- a/internal/process/process_test.go +++ b/internal/process/process_test.go @@ -13,8 +13,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) // test that a restarting process resets pipes properly diff --git a/logger/event_logger.go b/logger/event_logger.go index 4df25f958..61255d6fd 100644 --- a/logger/event_logger.go +++ b/logger/event_logger.go @@ -8,8 +8,9 @@ import ( "os" "time" - "github.com/influxdata/telegraf" "golang.org/x/sys/windows/svc/eventlog" + + "github.com/influxdata/telegraf" ) const ( diff --git a/logger/logger_test.go b/logger/logger_test.go index 580cee8d3..543f3cbb6 100644 --- a/logger/logger_test.go +++ b/logger/logger_test.go @@ -4,8 +4,9 @@ import ( "os" "testing" - "github.com/influxdata/telegraf/selfstat" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/selfstat" ) func TestTextLogTargetDefault(t *testing.T) { diff --git a/logger/structured_logger_test.go b/logger/structured_logger_test.go index f83972c14..b3dce8533 100644 --- a/logger/structured_logger_test.go +++ b/logger/structured_logger_test.go @@ -10,8 +10,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf" ) func TestStructuredStderr(t *testing.T) { diff --git a/logger/text_logger_test.go b/logger/text_logger_test.go index e7aba75c3..f2f237b56 100644 --- a/logger/text_logger_test.go +++ b/logger/text_logger_test.go @@ -8,8 +8,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf" ) func TestTextStderr(t *testing.T) { diff --git a/metric/tracking_test.go b/metric/tracking_test.go index 4d89a32c1..5fc5aebd2 100644 --- a/metric/tracking_test.go +++ b/metric/tracking_test.go @@ -5,8 +5,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf" ) func mustMetric( diff --git a/models/buffer_mem_test.go b/models/buffer_mem_test.go index 8a473fcb5..4e2704227 100644 --- a/models/buffer_mem_test.go +++ b/models/buffer_mem_test.go @@ -4,8 +4,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/metric" ) func TestMemoryBufferAcceptCallsMetricAccept(t *testing.T) { diff --git a/plugins/aggregators/final/final_test.go b/plugins/aggregators/final/final_test.go index ebef41595..babc9c340 100644 --- a/plugins/aggregators/final/final_test.go +++ b/plugins/aggregators/final/final_test.go @@ -4,11 +4,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestSimple(t *testing.T) { diff --git a/plugins/aggregators/quantile/quantile_test.go b/plugins/aggregators/quantile/quantile_test.go index f2beef426..2b0d0589d 100644 --- a/plugins/aggregators/quantile/quantile_test.go +++ b/plugins/aggregators/quantile/quantile_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/stretchr/testify/require" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestConfigInvalidAlgorithm(t *testing.T) { diff --git a/plugins/aggregators/starlark/starlark_test.go b/plugins/aggregators/starlark/starlark_test.go index ebba6326e..720d064ad 100644 --- a/plugins/aggregators/starlark/starlark_test.go +++ b/plugins/aggregators/starlark/starlark_test.go @@ -4,11 +4,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" common "github.com/influxdata/telegraf/plugins/common/starlark" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) var m1 = metric.New("m1", diff --git a/plugins/common/kafka/sasl.go b/plugins/common/kafka/sasl.go index f82a34940..08c947994 100644 --- a/plugins/common/kafka/sasl.go +++ b/plugins/common/kafka/sasl.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/IBM/sarama" + "github.com/influxdata/telegraf/config" ) diff --git a/plugins/common/postgresql/config_test.go b/plugins/common/postgresql/config_test.go index 696b5361d..98f41e43a 100644 --- a/plugins/common/postgresql/config_test.go +++ b/plugins/common/postgresql/config_test.go @@ -4,8 +4,9 @@ import ( "strings" "testing" - "github.com/influxdata/telegraf/config" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/config" ) func TestURIParsing(t *testing.T) { diff --git a/plugins/common/ratelimiter/limiters_test.go b/plugins/common/ratelimiter/limiters_test.go index 28b53159c..653fd3a83 100644 --- a/plugins/common/ratelimiter/limiters_test.go +++ b/plugins/common/ratelimiter/limiters_test.go @@ -5,8 +5,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/config" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/config" ) func TestInvalidPeriod(t *testing.T) { diff --git a/plugins/common/ratelimiter/serializers_test.go b/plugins/common/ratelimiter/serializers_test.go index 06cc88a39..19c7cbab6 100644 --- a/plugins/common/ratelimiter/serializers_test.go +++ b/plugins/common/ratelimiter/serializers_test.go @@ -5,11 +5,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/plugins/serializers/influx" - "github.com/stretchr/testify/require" ) func TestIndividualSerializer(t *testing.T) { diff --git a/plugins/common/shim/example/cmd/main.go b/plugins/common/shim/example/cmd/main.go index 4a7381239..e9211c10b 100644 --- a/plugins/common/shim/example/cmd/main.go +++ b/plugins/common/shim/example/cmd/main.go @@ -7,7 +7,7 @@ import ( "time" // TODO: import your plugins - // _ "github.com/my_github_user/my_plugin_repo/plugins/inputs/mypluginname" + _ "github.com/influxdata/tail" // Example external package for showing where you can import your plugins "github.com/influxdata/telegraf/plugins/common/shim" ) diff --git a/plugins/inputs/amd_rocm_smi/amd_rocm_smi_test.go b/plugins/inputs/amd_rocm_smi/amd_rocm_smi_test.go index f82ff0dfa..8e7b15deb 100644 --- a/plugins/inputs/amd_rocm_smi/amd_rocm_smi_test.go +++ b/plugins/inputs/amd_rocm_smi/amd_rocm_smi_test.go @@ -7,11 +7,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/models" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestErrorBehaviorDefault(t *testing.T) { diff --git a/plugins/inputs/azure_monitor/azure_monitor.go b/plugins/inputs/azure_monitor/azure_monitor.go index a53c8710e..900df9b3d 100644 --- a/plugins/inputs/azure_monitor/azure_monitor.go +++ b/plugins/inputs/azure_monitor/azure_monitor.go @@ -9,10 +9,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" + receiver "github.com/logzio/azure-monitor-metrics-receiver" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" - receiver "github.com/logzio/azure-monitor-metrics-receiver" ) type AzureMonitor struct { diff --git a/plugins/inputs/beanstalkd/beanstalkd_test.go b/plugins/inputs/beanstalkd/beanstalkd_test.go index 3c65b12ae..be976c910 100644 --- a/plugins/inputs/beanstalkd/beanstalkd_test.go +++ b/plugins/inputs/beanstalkd/beanstalkd_test.go @@ -7,9 +7,10 @@ import ( "net/textproto" "testing" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf/plugins/inputs/beanstalkd" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestBeanstalkd(t *testing.T) { diff --git a/plugins/inputs/cgroup/cgroup_test.go b/plugins/inputs/cgroup/cgroup_test.go index d30cebd83..003944693 100644 --- a/plugins/inputs/cgroup/cgroup_test.go +++ b/plugins/inputs/cgroup/cgroup_test.go @@ -6,10 +6,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestCgroupStatistics_1(t *testing.T) { diff --git a/plugins/inputs/cgroup/cgroupv2_test.go b/plugins/inputs/cgroup/cgroupv2_test.go index 78e1c530f..4dd37ce73 100644 --- a/plugins/inputs/cgroup/cgroupv2_test.go +++ b/plugins/inputs/cgroup/cgroupv2_test.go @@ -7,10 +7,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestCgroupV2Cpu(t *testing.T) { diff --git a/plugins/inputs/consul/consul_test.go b/plugins/inputs/consul/consul_test.go index 0a0eced15..9de1db4b4 100644 --- a/plugins/inputs/consul/consul_test.go +++ b/plugins/inputs/consul/consul_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/hashicorp/consul/api" + "github.com/influxdata/telegraf/testutil" ) diff --git a/plugins/inputs/consul_agent/consul_agent_test.go b/plugins/inputs/consul_agent/consul_agent_test.go index ce20aee4d..e429ef9f2 100644 --- a/plugins/inputs/consul_agent/consul_agent_test.go +++ b/plugins/inputs/consul_agent/consul_agent_test.go @@ -8,9 +8,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestConsulStats(t *testing.T) { diff --git a/plugins/inputs/couchdb/couchdb_test.go b/plugins/inputs/couchdb/couchdb_test.go index 2e7c5af79..3b2b70b8d 100644 --- a/plugins/inputs/couchdb/couchdb_test.go +++ b/plugins/inputs/couchdb/couchdb_test.go @@ -5,9 +5,10 @@ import ( "net/http/httptest" "testing" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf/plugins/inputs/couchdb" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestBasic(t *testing.T) { diff --git a/plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_subscription_test.go b/plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_subscription_test.go index 904338889..14590c940 100644 --- a/plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_subscription_test.go +++ b/plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_subscription_test.go @@ -4,8 +4,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/config" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/config" ) func TestSubscription_createRequest(t *testing.T) { diff --git a/plugins/inputs/dpdk/mocks/conn.go b/plugins/inputs/dpdk/mocks/conn.go index 4f8d231e2..e8d2b3a1b 100644 --- a/plugins/inputs/dpdk/mocks/conn.go +++ b/plugins/inputs/dpdk/mocks/conn.go @@ -4,10 +4,9 @@ package mocks import ( net "net" + time "time" mock "github.com/stretchr/testify/mock" - - time "time" ) // Conn is an autogenerated mock type for the Conn type diff --git a/plugins/inputs/elasticsearch_query/aggregation_parser.go b/plugins/inputs/elasticsearch_query/aggregation_parser.go index 7529defa6..172e49d50 100644 --- a/plugins/inputs/elasticsearch_query/aggregation_parser.go +++ b/plugins/inputs/elasticsearch_query/aggregation_parser.go @@ -3,8 +3,9 @@ package elasticsearch_query import ( "fmt" - "github.com/influxdata/telegraf" elastic5 "gopkg.in/olivere/elastic.v5" + + "github.com/influxdata/telegraf" ) type resultMetric struct { diff --git a/plugins/inputs/firehose/firehose_request_test.go b/plugins/inputs/firehose/firehose_request_test.go index e954c2be8..83360d147 100644 --- a/plugins/inputs/firehose/firehose_request_test.go +++ b/plugins/inputs/firehose/firehose_request_test.go @@ -11,12 +11,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers/influx" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestInvalidRequests(t *testing.T) { diff --git a/plugins/inputs/gnmi/extensions/jnpr_gnmi_extention/GnmiJuniperTelemetryHeaderExtension.pb.go b/plugins/inputs/gnmi/extensions/jnpr_gnmi_extention/GnmiJuniperTelemetryHeaderExtension.pb.go index 850654c21..4586d6ecf 100644 --- a/plugins/inputs/gnmi/extensions/jnpr_gnmi_extention/GnmiJuniperTelemetryHeaderExtension.pb.go +++ b/plugins/inputs/gnmi/extensions/jnpr_gnmi_extention/GnmiJuniperTelemetryHeaderExtension.pb.go @@ -7,10 +7,11 @@ package jnpr_gnmi_extention import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/plugins/inputs/intel_baseband/mocks/conn.go b/plugins/inputs/intel_baseband/mocks/conn.go index 4f8d231e2..032ed3a0e 100644 --- a/plugins/inputs/intel_baseband/mocks/conn.go +++ b/plugins/inputs/intel_baseband/mocks/conn.go @@ -3,11 +3,10 @@ package mocks import ( - net "net" + "net" + "time" - mock "github.com/stretchr/testify/mock" - - time "time" + "github.com/stretchr/testify/mock" ) // Conn is an autogenerated mock type for the Conn type diff --git a/plugins/inputs/intel_pmt/filtering_test.go b/plugins/inputs/intel_pmt/filtering_test.go index 744d02e25..fbd5fcccb 100644 --- a/plugins/inputs/intel_pmt/filtering_test.go +++ b/plugins/inputs/intel_pmt/filtering_test.go @@ -5,8 +5,9 @@ package intel_pmt import ( "testing" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func TestFilterAggregatorByDatatype(t *testing.T) { diff --git a/plugins/inputs/intel_pmt/intel_pmt_test.go b/plugins/inputs/intel_pmt/intel_pmt_test.go index 112761637..4f37dc522 100644 --- a/plugins/inputs/intel_pmt/intel_pmt_test.go +++ b/plugins/inputs/intel_pmt/intel_pmt_test.go @@ -8,9 +8,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func createTempFile(t *testing.T, dir, pattern string, data []byte) (*os.File, os.FileInfo) { diff --git a/plugins/inputs/intel_pmu/resolver_test.go b/plugins/inputs/intel_pmu/resolver_test.go index 671c4ff01..57f01d4a2 100644 --- a/plugins/inputs/intel_pmu/resolver_test.go +++ b/plugins/inputs/intel_pmu/resolver_test.go @@ -7,9 +7,10 @@ import ( "fmt" "testing" - "github.com/influxdata/telegraf/testutil" ia "github.com/intel/iaevents" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func TestResolveEntities(t *testing.T) { diff --git a/plugins/inputs/intel_powerstat/options_test.go b/plugins/inputs/intel_powerstat/options_test.go index 0ba6e36ff..e11094406 100644 --- a/plugins/inputs/intel_powerstat/options_test.go +++ b/plugins/inputs/intel_powerstat/options_test.go @@ -9,8 +9,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func TestGenerate(t *testing.T) { diff --git a/plugins/inputs/internet_speed/internet_speed_test.go b/plugins/inputs/internet_speed/internet_speed_test.go index 2549a3c0b..425cfd726 100644 --- a/plugins/inputs/internet_speed/internet_speed_test.go +++ b/plugins/inputs/internet_speed/internet_speed_test.go @@ -3,8 +3,9 @@ package internet_speed import ( "testing" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func TestGathering(t *testing.T) { diff --git a/plugins/inputs/ipset/ipset_entries_test.go b/plugins/inputs/ipset/ipset_entries_test.go index 3f0348e71..85b84849c 100644 --- a/plugins/inputs/ipset/ipset_entries_test.go +++ b/plugins/inputs/ipset/ipset_entries_test.go @@ -4,9 +4,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestIpsetEntries(t *testing.T) { diff --git a/plugins/inputs/jenkins/jenkins_test.go b/plugins/inputs/jenkins/jenkins_test.go index 8e249f65f..4d9e0244a 100644 --- a/plugins/inputs/jenkins/jenkins_test.go +++ b/plugins/inputs/jenkins/jenkins_test.go @@ -10,10 +10,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestJobRequest(t *testing.T) { diff --git a/plugins/inputs/jolokia2_agent/jolokia2_agent.go b/plugins/inputs/jolokia2_agent/jolokia2_agent.go index 4bcdbd017..7b567556d 100644 --- a/plugins/inputs/jolokia2_agent/jolokia2_agent.go +++ b/plugins/inputs/jolokia2_agent/jolokia2_agent.go @@ -3,7 +3,6 @@ package jolokia2_agent import ( _ "embed" - "fmt" "sync" "time" diff --git a/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.pb.go b/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.pb.go index 54d990103..2206683dd 100644 --- a/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.pb.go +++ b/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service.pb.go @@ -7,10 +7,11 @@ package authentication import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service_grpc.pb.go b/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service_grpc.pb.go index bbbf200ec..464ded1ef 100644 --- a/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service_grpc.pb.go +++ b/plugins/inputs/jti_openconfig_telemetry/auth/authentication_service_grpc.pb.go @@ -4,6 +4,7 @@ package authentication import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/plugins/inputs/jti_openconfig_telemetry/oc/oc.pb.go b/plugins/inputs/jti_openconfig_telemetry/oc/oc.pb.go index 9e07a21c5..a8d4f1537 100644 --- a/plugins/inputs/jti_openconfig_telemetry/oc/oc.pb.go +++ b/plugins/inputs/jti_openconfig_telemetry/oc/oc.pb.go @@ -7,10 +7,11 @@ package telemetry import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/plugins/inputs/jti_openconfig_telemetry/oc/oc_grpc.pb.go b/plugins/inputs/jti_openconfig_telemetry/oc/oc_grpc.pb.go index 593e5a1e1..387521943 100644 --- a/plugins/inputs/jti_openconfig_telemetry/oc/oc_grpc.pb.go +++ b/plugins/inputs/jti_openconfig_telemetry/oc/oc_grpc.pb.go @@ -4,6 +4,7 @@ package telemetry import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go b/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go index 6691b9f2b..b8c8a04a2 100644 --- a/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go +++ b/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func TestFullVmStatProcFile(t *testing.T) { diff --git a/plugins/inputs/kube_inventory/client_test.go b/plugins/inputs/kube_inventory/client_test.go index a90686b46..8444ef072 100644 --- a/plugins/inputs/kube_inventory/client_test.go +++ b/plugins/inputs/kube_inventory/client_test.go @@ -4,8 +4,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/plugins/common/tls" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/plugins/common/tls" ) type mockHandler struct { diff --git a/plugins/inputs/kube_inventory/endpoint.go b/plugins/inputs/kube_inventory/endpoint.go index 742512f68..c6fdecd8e 100644 --- a/plugins/inputs/kube_inventory/endpoint.go +++ b/plugins/inputs/kube_inventory/endpoint.go @@ -4,8 +4,9 @@ import ( "context" "strings" - "github.com/influxdata/telegraf" corev1 "k8s.io/api/core/v1" + + "github.com/influxdata/telegraf" ) func collectEndpoints(ctx context.Context, acc telegraf.Accumulator, ki *KubernetesInventory) { diff --git a/plugins/inputs/kube_inventory/endpoint_test.go b/plugins/inputs/kube_inventory/endpoint_test.go index c5a8a7509..97bf85077 100644 --- a/plugins/inputs/kube_inventory/endpoint_test.go +++ b/plugins/inputs/kube_inventory/endpoint_test.go @@ -4,12 +4,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestEndpoint(t *testing.T) { diff --git a/plugins/inputs/kube_inventory/ingress_test.go b/plugins/inputs/kube_inventory/ingress_test.go index 0ba519b69..8044fd703 100644 --- a/plugins/inputs/kube_inventory/ingress_test.go +++ b/plugins/inputs/kube_inventory/ingress_test.go @@ -4,12 +4,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestIngress(t *testing.T) { diff --git a/plugins/inputs/kube_inventory/persistentvolumeclaim_test.go b/plugins/inputs/kube_inventory/persistentvolumeclaim_test.go index 7e930b2ef..8e91b3383 100644 --- a/plugins/inputs/kube_inventory/persistentvolumeclaim_test.go +++ b/plugins/inputs/kube_inventory/persistentvolumeclaim_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestPersistentVolumeClaim(t *testing.T) { diff --git a/plugins/inputs/kube_inventory/resourcequotas_test.go b/plugins/inputs/kube_inventory/resourcequotas_test.go index 1366bccc2..d431545df 100644 --- a/plugins/inputs/kube_inventory/resourcequotas_test.go +++ b/plugins/inputs/kube_inventory/resourcequotas_test.go @@ -4,13 +4,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestResourceQuota(t *testing.T) { diff --git a/plugins/inputs/kubernetes/kubernetes_test.go b/plugins/inputs/kubernetes/kubernetes_test.go index e28a24c5b..647017850 100644 --- a/plugins/inputs/kubernetes/kubernetes_test.go +++ b/plugins/inputs/kubernetes/kubernetes_test.go @@ -6,9 +6,10 @@ import ( "net/http/httptest" "testing" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf/filter" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestKubernetesStats(t *testing.T) { diff --git a/plugins/inputs/ldap/389ds.go b/plugins/inputs/ldap/389ds.go index 7371637fa..95d9b91da 100644 --- a/plugins/inputs/ldap/389ds.go +++ b/plugins/inputs/ldap/389ds.go @@ -6,6 +6,7 @@ import ( "time" "github.com/go-ldap/ldap/v3" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" ) diff --git a/plugins/inputs/ldap/openldap.go b/plugins/inputs/ldap/openldap.go index f8176c122..6b3930ad9 100644 --- a/plugins/inputs/ldap/openldap.go +++ b/plugins/inputs/ldap/openldap.go @@ -6,6 +6,7 @@ import ( "time" "github.com/go-ldap/ldap/v3" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" ) diff --git a/plugins/inputs/minecraft/minecraft_test.go b/plugins/inputs/minecraft/minecraft_test.go index eed0c5b6b..9b68d3a55 100644 --- a/plugins/inputs/minecraft/minecraft_test.go +++ b/plugins/inputs/minecraft/minecraft_test.go @@ -4,9 +4,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) type mockClient struct { diff --git a/plugins/inputs/modbus/configuration_metric_test.go b/plugins/inputs/modbus/configuration_metric_test.go index 541098cb4..39ff759d1 100644 --- a/plugins/inputs/modbus/configuration_metric_test.go +++ b/plugins/inputs/modbus/configuration_metric_test.go @@ -5,11 +5,12 @@ import ( "time" mb "github.com/grid-x/modbus" + "github.com/stretchr/testify/require" + "github.com/tbrandon/mbserver" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" - "github.com/tbrandon/mbserver" ) func TestMetric(t *testing.T) { diff --git a/plugins/inputs/modbus/configuration_register_test.go b/plugins/inputs/modbus/configuration_register_test.go index c2f260fef..18f3dc16e 100644 --- a/plugins/inputs/modbus/configuration_register_test.go +++ b/plugins/inputs/modbus/configuration_register_test.go @@ -7,10 +7,11 @@ import ( "time" mb "github.com/grid-x/modbus" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" "github.com/tbrandon/mbserver" + + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/testutil" ) func TestRegister(t *testing.T) { diff --git a/plugins/inputs/net/net_test.go b/plugins/inputs/net/net_test.go index 537943d38..d52e789ff 100644 --- a/plugins/inputs/net/net_test.go +++ b/plugins/inputs/net/net_test.go @@ -5,12 +5,13 @@ import ( "testing" "time" + "github.com/shirou/gopsutil/v4/net" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/plugins/inputs/system" "github.com/influxdata/telegraf/testutil" - "github.com/shirou/gopsutil/v4/net" - "github.com/stretchr/testify/require" ) func TestNetIOStats(t *testing.T) { diff --git a/plugins/inputs/net_response/net_response_test.go b/plugins/inputs/net_response/net_response_test.go index 8621d2ca6..5eabf1e44 100644 --- a/plugins/inputs/net_response/net_response_test.go +++ b/plugins/inputs/net_response/net_response_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/testutil" - - "github.com/stretchr/testify/require" ) func TestBadProtocol(t *testing.T) { diff --git a/plugins/inputs/netstat/netstat_test.go b/plugins/inputs/netstat/netstat_test.go index 5ae6e4815..51e731daf 100644 --- a/plugins/inputs/netstat/netstat_test.go +++ b/plugins/inputs/netstat/netstat_test.go @@ -5,12 +5,13 @@ import ( "testing" "time" + "github.com/shirou/gopsutil/v4/net" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/plugins/inputs/system" "github.com/influxdata/telegraf/testutil" - "github.com/shirou/gopsutil/v4/net" - "github.com/stretchr/testify/require" ) func TestNetStats(t *testing.T) { diff --git a/plugins/inputs/nfsclient/nfsclient_test.go b/plugins/inputs/nfsclient/nfsclient_test.go index 0f101d3f8..72bea94d3 100644 --- a/plugins/inputs/nfsclient/nfsclient_test.go +++ b/plugins/inputs/nfsclient/nfsclient_test.go @@ -6,8 +6,9 @@ import ( "strings" "testing" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func getMountStatsPath() string { diff --git a/plugins/inputs/nomad/nomad_test.go b/plugins/inputs/nomad/nomad_test.go index 0c195c120..d0ee611a0 100644 --- a/plugins/inputs/nomad/nomad_test.go +++ b/plugins/inputs/nomad/nomad_test.go @@ -8,9 +8,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestNomadStats(t *testing.T) { diff --git a/plugins/inputs/nsq/nsq_test.go b/plugins/inputs/nsq/nsq_test.go index 713585208..92a9ff8cb 100644 --- a/plugins/inputs/nsq/nsq_test.go +++ b/plugins/inputs/nsq/nsq_test.go @@ -7,9 +7,9 @@ import ( "net/url" "testing" - "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func TestNSQStatsV1(t *testing.T) { diff --git a/plugins/inputs/nvidia_smi/nvidia_smi_test.go b/plugins/inputs/nvidia_smi/nvidia_smi_test.go index 6cd0ff7f7..94510c3e7 100644 --- a/plugins/inputs/nvidia_smi/nvidia_smi_test.go +++ b/plugins/inputs/nvidia_smi/nvidia_smi_test.go @@ -8,12 +8,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/models" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestProbe(t *testing.T) { diff --git a/plugins/inputs/opentelemetry/opentelemetry.go b/plugins/inputs/opentelemetry/opentelemetry.go index 332356993..11fa65bf5 100644 --- a/plugins/inputs/opentelemetry/opentelemetry.go +++ b/plugins/inputs/opentelemetry/opentelemetry.go @@ -8,6 +8,7 @@ import ( "sync" "time" + "github.com/influxdata/influxdb-observability/otel2influx" "go.opentelemetry.io/collector/pdata/plog/plogotlp" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" @@ -15,7 +16,6 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/influxdata/influxdb-observability/otel2influx" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/plugins/common/tls" diff --git a/plugins/inputs/openweathermap/openweathermap_test.go b/plugins/inputs/openweathermap/openweathermap_test.go index 59650c7cc..3fc008c8c 100644 --- a/plugins/inputs/openweathermap/openweathermap_test.go +++ b/plugins/inputs/openweathermap/openweathermap_test.go @@ -10,12 +10,13 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers/influx" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestFormatURL(t *testing.T) { diff --git a/plugins/inputs/powerdns/powerdns_linux_test.go b/plugins/inputs/powerdns/powerdns_linux_test.go index 5bb576759..e7784faf5 100644 --- a/plugins/inputs/powerdns/powerdns_linux_test.go +++ b/plugins/inputs/powerdns/powerdns_linux_test.go @@ -9,8 +9,9 @@ import ( "path/filepath" "testing" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func serverSocket(l net.Listener) { diff --git a/plugins/inputs/prometheus/kubernetes.go b/plugins/inputs/prometheus/kubernetes.go index f1b303ecd..19976d500 100644 --- a/plugins/inputs/prometheus/kubernetes.go +++ b/plugins/inputs/prometheus/kubernetes.go @@ -14,9 +14,6 @@ import ( "strconv" "time" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/models" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" @@ -26,6 +23,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/clientcmd" + + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/models" ) type podMetadata struct { diff --git a/plugins/inputs/puppetagent/puppetagent_test.go b/plugins/inputs/puppetagent/puppetagent_test.go index 754fb3978..d1a35d699 100644 --- a/plugins/inputs/puppetagent/puppetagent_test.go +++ b/plugins/inputs/puppetagent/puppetagent_test.go @@ -3,8 +3,9 @@ package puppetagent import ( "testing" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func TestGather(t *testing.T) { diff --git a/plugins/inputs/ravendb/ravendb_test.go b/plugins/inputs/ravendb/ravendb_test.go index 64f87c3e5..7a7a0cd8d 100644 --- a/plugins/inputs/ravendb/ravendb_test.go +++ b/plugins/inputs/ravendb/ravendb_test.go @@ -7,8 +7,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) // Test against fully filled data diff --git a/plugins/inputs/redis/redis_test.go b/plugins/inputs/redis/redis_test.go index b103c34a4..36e1b2f75 100644 --- a/plugins/inputs/redis/redis_test.go +++ b/plugins/inputs/redis/redis_test.go @@ -2,7 +2,6 @@ package redis import ( "bufio" - "fmt" "strings" "testing" diff --git a/plugins/inputs/slurm/slurm.go b/plugins/inputs/slurm/slurm.go index 4de4b1cc4..896f45309 100644 --- a/plugins/inputs/slurm/slurm.go +++ b/plugins/inputs/slurm/slurm.go @@ -13,13 +13,13 @@ import ( "strings" "time" + goslurm "github.com/pcolladosoto/goslurm/v0038" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/plugins/common/tls" "github.com/influxdata/telegraf/plugins/inputs" - - goslurm "github.com/pcolladosoto/goslurm/v0038" ) //go:embed sample.conf diff --git a/plugins/inputs/slurm/slurm_test.go b/plugins/inputs/slurm/slurm_test.go index 526851a00..74e56891b 100644 --- a/plugins/inputs/slurm/slurm_test.go +++ b/plugins/inputs/slurm/slurm_test.go @@ -8,11 +8,12 @@ import ( "strings" "testing" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/plugins/parsers/influx" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestGoodURLs(t *testing.T) { diff --git a/plugins/inputs/smartctl/smartctl_test.go b/plugins/inputs/smartctl/smartctl_test.go index 6545158f8..65227baf3 100644 --- a/plugins/inputs/smartctl/smartctl_test.go +++ b/plugins/inputs/smartctl/smartctl_test.go @@ -10,12 +10,13 @@ import ( "strings" "testing" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers/influx" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestCasesScan(t *testing.T) { diff --git a/plugins/inputs/solr/solr.go b/plugins/inputs/solr/solr.go index 5accd0d33..6f848376e 100644 --- a/plugins/inputs/solr/solr.go +++ b/plugins/inputs/solr/solr.go @@ -10,6 +10,7 @@ import ( "time" "github.com/coreos/go-semver/semver" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/filter" diff --git a/plugins/inputs/statsd/datadog_test.go b/plugins/inputs/statsd/datadog_test.go index 265c6ac43..cacdefa3d 100644 --- a/plugins/inputs/statsd/datadog_test.go +++ b/plugins/inputs/statsd/datadog_test.go @@ -4,8 +4,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func TestEventGather(t *testing.T) { diff --git a/plugins/inputs/swap/swap_test.go b/plugins/inputs/swap/swap_test.go index 680adb498..8ed0402f5 100644 --- a/plugins/inputs/swap/swap_test.go +++ b/plugins/inputs/swap/swap_test.go @@ -3,10 +3,11 @@ package swap import ( "testing" - "github.com/influxdata/telegraf/plugins/inputs/system" - "github.com/influxdata/telegraf/testutil" "github.com/shirou/gopsutil/v4/mem" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/plugins/inputs/system" + "github.com/influxdata/telegraf/testutil" ) func TestSwapStats(t *testing.T) { diff --git a/plugins/inputs/syslog/syslog_test.go b/plugins/inputs/syslog/syslog_test.go index 22a781f56..ca498e790 100644 --- a/plugins/inputs/syslog/syslog_test.go +++ b/plugins/inputs/syslog/syslog_test.go @@ -11,6 +11,7 @@ import ( "testing" "time" + "github.com/leodido/go-syslog/v4/nontransparent" "github.com/stretchr/testify/require" "github.com/influxdata/telegraf" @@ -20,7 +21,6 @@ import ( "github.com/influxdata/telegraf/plugins/inputs" parsers_influx_upstream "github.com/influxdata/telegraf/plugins/parsers/influx/influx_upstream" "github.com/influxdata/telegraf/testutil" - "github.com/leodido/go-syslog/v4/nontransparent" ) var pki = testutil.NewPKI("../../../testutil/pki") diff --git a/plugins/inputs/sysstat/sysstat_interval_test.go b/plugins/inputs/sysstat/sysstat_interval_test.go index 6bd3438ea..5d6b638ac 100644 --- a/plugins/inputs/sysstat/sysstat_interval_test.go +++ b/plugins/inputs/sysstat/sysstat_interval_test.go @@ -7,8 +7,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) // TestInterval verifies that the correct interval is created. It is not diff --git a/plugins/inputs/system/mock_PS.go b/plugins/inputs/system/mock_PS.go index 51f766ab1..0df68326f 100644 --- a/plugins/inputs/system/mock_PS.go +++ b/plugins/inputs/system/mock_PS.go @@ -3,15 +3,13 @@ package system import ( "os" - "github.com/stretchr/testify/mock" - "github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/disk" - "github.com/shirou/gopsutil/v4/sensors" - "github.com/shirou/gopsutil/v4/load" "github.com/shirou/gopsutil/v4/mem" "github.com/shirou/gopsutil/v4/net" + "github.com/shirou/gopsutil/v4/sensors" + "github.com/stretchr/testify/mock" ) type MockPS struct { diff --git a/plugins/inputs/systemd_units/systemd_units.go b/plugins/inputs/systemd_units/systemd_units.go index bc2fbe4d8..7c9cc910b 100644 --- a/plugins/inputs/systemd_units/systemd_units.go +++ b/plugins/inputs/systemd_units/systemd_units.go @@ -7,16 +7,17 @@ import ( "context" _ "embed" "fmt" - "github.com/coreos/go-systemd/v22/dbus" - "github.com/influxdata/telegraf/filter" "math" "os/user" "path" "strings" "time" + "github.com/coreos/go-systemd/v22/dbus" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" + "github.com/influxdata/telegraf/filter" "github.com/influxdata/telegraf/plugins/inputs" ) diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go index a99efd556..59203098b 100644 --- a/plugins/inputs/tail/tail_test.go +++ b/plugins/inputs/tail/tail_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/google/go-cmp/cmp" + "github.com/influxdata/tail" "github.com/stretchr/testify/require" - "github.com/influxdata/tail" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/metric" diff --git a/plugins/inputs/trig/trig_test.go b/plugins/inputs/trig/trig_test.go index de4fa0788..71fe3dbd6 100644 --- a/plugins/inputs/trig/trig_test.go +++ b/plugins/inputs/trig/trig_test.go @@ -4,8 +4,9 @@ import ( "math" "testing" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func TestTrig(t *testing.T) { diff --git a/plugins/inputs/vault/vault_test.go b/plugins/inputs/vault/vault_test.go index 813e2bce6..55c9b6490 100644 --- a/plugins/inputs/vault/vault_test.go +++ b/plugins/inputs/vault/vault_test.go @@ -10,11 +10,11 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" + "github.com/stretchr/testify/require" + "github.com/testcontainers/testcontainers-go/wait" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" - "github.com/testcontainers/testcontainers-go/wait" ) func TestVaultStats(t *testing.T) { diff --git a/plugins/inputs/webhooks/artifactory/artifactory_webhook.go b/plugins/inputs/webhooks/artifactory/artifactory_webhook.go index e99b233c5..c07ffaf68 100644 --- a/plugins/inputs/webhooks/artifactory/artifactory_webhook.go +++ b/plugins/inputs/webhooks/artifactory/artifactory_webhook.go @@ -10,6 +10,7 @@ import ( "net/http" "github.com/gorilla/mux" + "github.com/influxdata/telegraf" ) diff --git a/plugins/inputs/webhooks/papertrail/papertrail_test.go b/plugins/inputs/webhooks/papertrail/papertrail_test.go index 6f1e94e53..ec165b8bc 100644 --- a/plugins/inputs/webhooks/papertrail/papertrail_test.go +++ b/plugins/inputs/webhooks/papertrail/papertrail_test.go @@ -7,8 +7,9 @@ import ( "strings" "testing" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) const ( diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go index 9ee031a9b..7358eeb82 100644 --- a/plugins/inputs/win_perf_counters/pdh.go +++ b/plugins/inputs/win_perf_counters/pdh.go @@ -35,9 +35,8 @@ package win_perf_counters import ( "fmt" "syscall" - "unsafe" - "time" + "unsafe" "golang.org/x/sys/windows" ) diff --git a/plugins/inputs/win_services/win_services_integration_test.go b/plugins/inputs/win_services/win_services_integration_test.go index 8ab995126..b80eb0f6c 100644 --- a/plugins/inputs/win_services/win_services_integration_test.go +++ b/plugins/inputs/win_services/win_services_integration_test.go @@ -6,8 +6,9 @@ package win_services import ( "testing" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) var invalidServices = []string{"XYZ1@", "ZYZ@", "SDF_@#"} diff --git a/plugins/inputs/win_wmi/method.go b/plugins/inputs/win_wmi/method.go index b716568b7..a8cf33e97 100644 --- a/plugins/inputs/win_wmi/method.go +++ b/plugins/inputs/win_wmi/method.go @@ -9,6 +9,7 @@ import ( "github.com/go-ole/go-ole" "github.com/go-ole/go-ole/oleutil" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/filter" diff --git a/plugins/inputs/win_wmi/win_wmi_test.go b/plugins/inputs/win_wmi/win_wmi_test.go index 56469bf0e..b601772d3 100644 --- a/plugins/inputs/win_wmi/win_wmi_test.go +++ b/plugins/inputs/win_wmi/win_wmi_test.go @@ -9,10 +9,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) var sysDrive = os.Getenv("SystemDrive") + `\` // C:\ diff --git a/plugins/inputs/zfs/zfs_freebsd.go b/plugins/inputs/zfs/zfs_freebsd.go index 4d684aca3..2366c3906 100644 --- a/plugins/inputs/zfs/zfs_freebsd.go +++ b/plugins/inputs/zfs/zfs_freebsd.go @@ -9,9 +9,10 @@ import ( "strconv" "strings" + "golang.org/x/sys/unix" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" - "golang.org/x/sys/unix" ) func (z *Zfs) Init() error { diff --git a/plugins/inputs/zipkin/convert_test.go b/plugins/inputs/zipkin/convert_test.go index f13570bf7..4dc0d2baf 100644 --- a/plugins/inputs/zipkin/convert_test.go +++ b/plugins/inputs/zipkin/convert_test.go @@ -5,6 +5,7 @@ import ( "time" "github.com/google/go-cmp/cmp" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs/zipkin/trace" "github.com/influxdata/telegraf/testutil" diff --git a/plugins/inputs/zipkin/handler.go b/plugins/inputs/zipkin/handler.go index 50e6a53c4..1094b2588 100644 --- a/plugins/inputs/zipkin/handler.go +++ b/plugins/inputs/zipkin/handler.go @@ -9,6 +9,7 @@ import ( "strings" "github.com/gorilla/mux" + "github.com/influxdata/telegraf/plugins/inputs/zipkin/codec" json_v1 "github.com/influxdata/telegraf/plugins/inputs/zipkin/codec/jsonV1" "github.com/influxdata/telegraf/plugins/inputs/zipkin/codec/thrift" diff --git a/plugins/inputs/zipkin/handler_test.go b/plugins/inputs/zipkin/handler_test.go index 6eacbdb0c..455fa7896 100644 --- a/plugins/inputs/zipkin/handler_test.go +++ b/plugins/inputs/zipkin/handler_test.go @@ -11,6 +11,7 @@ import ( "time" "github.com/google/go-cmp/cmp" + "github.com/influxdata/telegraf/plugins/inputs/zipkin/trace" ) diff --git a/plugins/outputs/application_insights/mocks/diagnostics_message_subscriber.go b/plugins/outputs/application_insights/mocks/diagnostics_message_subscriber.go index d360a29e5..9876fb596 100644 --- a/plugins/outputs/application_insights/mocks/diagnostics_message_subscriber.go +++ b/plugins/outputs/application_insights/mocks/diagnostics_message_subscriber.go @@ -1,9 +1,10 @@ // Code generated by mockery v1.0.0. DO NOT EDIT. package mocks -import appinsights "github.com/microsoft/ApplicationInsights-Go/appinsights" - -import mock "github.com/stretchr/testify/mock" +import ( + "github.com/microsoft/ApplicationInsights-Go/appinsights" + "github.com/stretchr/testify/mock" +) // DiagnosticsMessageSubscriber is an autogenerated mock type for the DiagnosticsMessageSubscriber type type DiagnosticsMessageSubscriber struct { diff --git a/plugins/outputs/application_insights/mocks/transmitter.go b/plugins/outputs/application_insights/mocks/transmitter.go index 6b26f84da..f2f04eab0 100644 --- a/plugins/outputs/application_insights/mocks/transmitter.go +++ b/plugins/outputs/application_insights/mocks/transmitter.go @@ -1,9 +1,10 @@ // Code generated by mockery v1.0.0. DO NOT EDIT. package mocks -import appinsights "github.com/microsoft/ApplicationInsights-Go/appinsights" - -import mock "github.com/stretchr/testify/mock" +import ( + "github.com/microsoft/ApplicationInsights-Go/appinsights" + "github.com/stretchr/testify/mock" +) // Transmitter is an autogenerated mock type for the Transmitter type type Transmitter struct { diff --git a/plugins/outputs/clarify/clarify.go b/plugins/outputs/clarify/clarify.go index b2c28c8bc..085b09fca 100644 --- a/plugins/outputs/clarify/clarify.go +++ b/plugins/outputs/clarify/clarify.go @@ -13,6 +13,7 @@ import ( "github.com/clarify/clarify-go" "github.com/clarify/clarify-go/fields" "github.com/clarify/clarify-go/views" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/internal" diff --git a/plugins/outputs/health/compares_test.go b/plugins/outputs/health/compares_test.go index 26f0dc1e1..7e6a6fdd7 100644 --- a/plugins/outputs/health/compares_test.go +++ b/plugins/outputs/health/compares_test.go @@ -4,10 +4,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/outputs/health" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func addr(v float64) *float64 { diff --git a/plugins/outputs/health/contains_test.go b/plugins/outputs/health/contains_test.go index 2337dd867..e86ffa523 100644 --- a/plugins/outputs/health/contains_test.go +++ b/plugins/outputs/health/contains_test.go @@ -4,10 +4,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/outputs/health" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestFieldFound(t *testing.T) { diff --git a/plugins/outputs/opensearch/opensearch_test.go b/plugins/outputs/opensearch/opensearch_test.go index ad83178ab..353255e96 100644 --- a/plugins/outputs/opensearch/opensearch_test.go +++ b/plugins/outputs/opensearch/opensearch_test.go @@ -8,10 +8,11 @@ import ( "time" "github.com/docker/go-connections/nat" - "github.com/influxdata/telegraf/config" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go/wait" + + "github.com/influxdata/telegraf/config" + "github.com/influxdata/telegraf/testutil" ) const servicePort = "9200" diff --git a/plugins/outputs/opensearch/opensearch_v1_test.go b/plugins/outputs/opensearch/opensearch_v1_test.go index b8ea74f6f..58a791cf3 100644 --- a/plugins/outputs/opensearch/opensearch_v1_test.go +++ b/plugins/outputs/opensearch/opensearch_v1_test.go @@ -8,10 +8,11 @@ import ( "text/template" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestConnectAndWriteIntegration(t *testing.T) { diff --git a/plugins/outputs/opensearch/opensearch_v2_test.go b/plugins/outputs/opensearch/opensearch_v2_test.go index 122328ed7..fcf88df4b 100644 --- a/plugins/outputs/opensearch/opensearch_v2_test.go +++ b/plugins/outputs/opensearch/opensearch_v2_test.go @@ -8,10 +8,11 @@ import ( "text/template" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestConnectAndWriteIntegrationV2(t *testing.T) { diff --git a/plugins/outputs/parquet/parquet.go b/plugins/outputs/parquet/parquet.go index 9c9c7c9bb..ebf9c7ca3 100644 --- a/plugins/outputs/parquet/parquet.go +++ b/plugins/outputs/parquet/parquet.go @@ -14,6 +14,7 @@ import ( "github.com/apache/arrow-go/v18/arrow/memory" "github.com/apache/arrow-go/v18/parquet" "github.com/apache/arrow-go/v18/parquet/pqarrow" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/plugins/outputs" diff --git a/plugins/outputs/parquet/parquet_test.go b/plugins/outputs/parquet/parquet_test.go index 43119172c..f5ab34e35 100644 --- a/plugins/outputs/parquet/parquet_test.go +++ b/plugins/outputs/parquet/parquet_test.go @@ -7,10 +7,11 @@ import ( "time" "github.com/apache/arrow-go/v18/parquet/file" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestCases(t *testing.T) { diff --git a/plugins/outputs/postgresql/postgresql_bench_test.go b/plugins/outputs/postgresql/postgresql_bench_test.go index 0e9a5255f..0a364b2a0 100644 --- a/plugins/outputs/postgresql/postgresql_bench_test.go +++ b/plugins/outputs/postgresql/postgresql_bench_test.go @@ -8,10 +8,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/metric" - "github.com/stretchr/testify/require" ) func BenchmarkPostgresql_sequential(b *testing.B) { diff --git a/plugins/outputs/prometheus_client/v1/collector.go b/plugins/outputs/prometheus_client/v1/collector.go index 9a02b40f1..cbe2529aa 100644 --- a/plugins/outputs/prometheus_client/v1/collector.go +++ b/plugins/outputs/prometheus_client/v1/collector.go @@ -9,9 +9,10 @@ import ( "sync" "time" + "github.com/prometheus/client_golang/prometheus" + "github.com/influxdata/telegraf" serializers_prometheus "github.com/influxdata/telegraf/plugins/serializers/prometheus" - "github.com/prometheus/client_golang/prometheus" ) var ( diff --git a/plugins/outputs/prometheus_client/v2/collector.go b/plugins/outputs/prometheus_client/v2/collector.go index a0d190019..e1a5bc3a6 100644 --- a/plugins/outputs/prometheus_client/v2/collector.go +++ b/plugins/outputs/prometheus_client/v2/collector.go @@ -4,10 +4,11 @@ import ( "sync" "time" - "github.com/influxdata/telegraf" - serializers_prometheus "github.com/influxdata/telegraf/plugins/serializers/prometheus" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" + + "github.com/influxdata/telegraf" + serializers_prometheus "github.com/influxdata/telegraf/plugins/serializers/prometheus" ) type Metric struct { diff --git a/plugins/outputs/sql/sql.go b/plugins/outputs/sql/sql.go index d6b88641b..3b6a728c0 100644 --- a/plugins/outputs/sql/sql.go +++ b/plugins/outputs/sql/sql.go @@ -10,15 +10,12 @@ import ( "strings" "time" - // Register sql drivers - _ "github.com/ClickHouse/clickhouse-go/v2" // clickhouse - _ "github.com/go-sql-driver/mysql" // mysql - _ "github.com/jackc/pgx/v4/stdlib" // pgx (postgres) - _ "github.com/microsoft/go-mssqldb" // mssql (sql server) - _ "github.com/snowflakedb/gosnowflake" // snowflake - - // Register integrated auth for mssql - _ "github.com/microsoft/go-mssqldb/integratedauth/krb5" + _ "github.com/ClickHouse/clickhouse-go/v2" // clickhouse + _ "github.com/go-sql-driver/mysql" // mysql + _ "github.com/jackc/pgx/v4/stdlib" // pgx (postgres) + _ "github.com/microsoft/go-mssqldb" // mssql (sql server) + _ "github.com/microsoft/go-mssqldb/integratedauth/krb5" // integrated auth for mssql + _ "github.com/snowflakedb/gosnowflake" // snowflake "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" diff --git a/plugins/outputs/syslog/syslog_test.go b/plugins/outputs/syslog/syslog_test.go index 58741c484..6e416d522 100644 --- a/plugins/outputs/syslog/syslog_test.go +++ b/plugins/outputs/syslog/syslog_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" + "github.com/leodido/go-syslog/v4/nontransparent" "github.com/stretchr/testify/require" "github.com/influxdata/telegraf" @@ -19,7 +20,6 @@ import ( "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/parsers/influx" "github.com/influxdata/telegraf/testutil" - "github.com/leodido/go-syslog/v4/nontransparent" ) func TestGetSyslogMessageWithFramingOctetCounting(t *testing.T) { diff --git a/plugins/outputs/warp10/warp10_test.go b/plugins/outputs/warp10/warp10_test.go index d23d1e901..d6b866a97 100644 --- a/plugins/outputs/warp10/warp10_test.go +++ b/plugins/outputs/warp10/warp10_test.go @@ -4,9 +4,10 @@ import ( "math" "testing" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) type ErrorTest struct { diff --git a/plugins/parsers/binary/entry_test.go b/plugins/parsers/binary/entry_test.go index d60e673f1..b33ceb629 100644 --- a/plugins/parsers/binary/entry_test.go +++ b/plugins/parsers/binary/entry_test.go @@ -4,8 +4,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/internal" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/internal" ) func TestEntryExtract(t *testing.T) { diff --git a/plugins/parsers/csv/parser.go b/plugins/parsers/csv/parser.go index 2eb6a13a0..d44c38ccc 100644 --- a/plugins/parsers/csv/parser.go +++ b/plugins/parsers/csv/parser.go @@ -11,9 +11,8 @@ import ( "strconv" "strings" "time" - "unicode/utf8" - _ "time/tzdata" // needed to bundle timezone info into the binary for Windows + "unicode/utf8" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" diff --git a/plugins/parsers/form_urlencoded/parser_test.go b/plugins/parsers/form_urlencoded/parser_test.go index dce227e12..05a975664 100644 --- a/plugins/parsers/form_urlencoded/parser_test.go +++ b/plugins/parsers/form_urlencoded/parser_test.go @@ -4,10 +4,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) const ( diff --git a/plugins/parsers/openmetrics/openmetrics_data_model.pb.go b/plugins/parsers/openmetrics/openmetrics_data_model.pb.go index 096df5969..736ac21f1 100644 --- a/plugins/parsers/openmetrics/openmetrics_data_model.pb.go +++ b/plugins/parsers/openmetrics/openmetrics_data_model.pb.go @@ -11,11 +11,12 @@ package openmetrics import ( + reflect "reflect" + sync "sync" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" - reflect "reflect" - sync "sync" ) const ( diff --git a/plugins/parsers/opentsdb/parser_test.go b/plugins/parsers/opentsdb/parser_test.go index e9b6869e3..4c5d4949c 100644 --- a/plugins/parsers/opentsdb/parser_test.go +++ b/plugins/parsers/opentsdb/parser_test.go @@ -5,10 +5,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestParseLine(t *testing.T) { diff --git a/plugins/parsers/parquet/parser_test.go b/plugins/parsers/parquet/parser_test.go index a554e8748..b9b4635c9 100644 --- a/plugins/parsers/parquet/parser_test.go +++ b/plugins/parsers/parquet/parser_test.go @@ -7,10 +7,11 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/testutil" test "github.com/influxdata/telegraf/testutil/plugin_input" - "github.com/stretchr/testify/require" ) func TestCases(t *testing.T) { diff --git a/plugins/parsers/prometheus/common.go b/plugins/parsers/prometheus/common.go index 56beef661..7c2751179 100644 --- a/plugins/parsers/prometheus/common.go +++ b/plugins/parsers/prometheus/common.go @@ -1,8 +1,9 @@ package prometheus import ( - "github.com/influxdata/telegraf" dto "github.com/prometheus/client_model/go" + + "github.com/influxdata/telegraf" ) func mapValueType(mt dto.MetricType) telegraf.ValueType { diff --git a/plugins/parsers/value/parser_test.go b/plugins/parsers/value/parser_test.go index 649a14a9d..afdf6a416 100644 --- a/plugins/parsers/value/parser_test.go +++ b/plugins/parsers/value/parser_test.go @@ -4,10 +4,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestParseValidValues(t *testing.T) { diff --git a/plugins/processors/batch/batch.go b/plugins/processors/batch/batch.go index 49215d26f..5239b9118 100644 --- a/plugins/processors/batch/batch.go +++ b/plugins/processors/batch/batch.go @@ -2,10 +2,11 @@ package batch import ( _ "embed" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/processors" "strconv" "sync/atomic" + + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/processors" ) //go:embed sample.conf diff --git a/plugins/processors/batch/batch_test.go b/plugins/processors/batch/batch_test.go index a3b6f9705..59f584f9f 100644 --- a/plugins/processors/batch/batch_test.go +++ b/plugins/processors/batch/batch_test.go @@ -1,10 +1,12 @@ package batch import ( + "testing" + + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" - "testing" ) const batchTag = "?internal_batch_idx" diff --git a/plugins/processors/filter/filter_test.go b/plugins/processors/filter/filter_test.go index a0aeaf736..4c2ee3854 100644 --- a/plugins/processors/filter/filter_test.go +++ b/plugins/processors/filter/filter_test.go @@ -5,10 +5,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) var testmetrics = []telegraf.Metric{ diff --git a/plugins/processors/lookup/lookup_test.go b/plugins/processors/lookup/lookup_test.go index a353e7bc1..5eecbe10b 100644 --- a/plugins/processors/lookup/lookup_test.go +++ b/plugins/processors/lookup/lookup_test.go @@ -7,13 +7,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/plugins/parsers/influx" "github.com/influxdata/telegraf/plugins/processors" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestInit(t *testing.T) { diff --git a/plugins/processors/noise/noise_test.go b/plugins/processors/noise/noise_test.go index e40bc0e2f..884d4f5a1 100644 --- a/plugins/processors/noise/noise_test.go +++ b/plugins/processors/noise/noise_test.go @@ -6,11 +6,12 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "gonum.org/v1/gonum/stat/distuv" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" - "gonum.org/v1/gonum/stat/distuv" ) type testDistribution struct { diff --git a/plugins/processors/pivot/pivot_test.go b/plugins/processors/pivot/pivot_test.go index 5c4c8e68c..ad34c4934 100644 --- a/plugins/processors/pivot/pivot_test.go +++ b/plugins/processors/pivot/pivot_test.go @@ -5,10 +5,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestPivot(t *testing.T) { diff --git a/plugins/processors/port_name/port_name_test.go b/plugins/processors/port_name/port_name_test.go index fae740101..c62d046e8 100644 --- a/plugins/processors/port_name/port_name_test.go +++ b/plugins/processors/port_name/port_name_test.go @@ -6,10 +6,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) var fakeServices = ` diff --git a/plugins/processors/printer/printer_test.go b/plugins/processors/printer/printer_test.go index b5ecf01a5..f52acf5e0 100644 --- a/plugins/processors/printer/printer_test.go +++ b/plugins/processors/printer/printer_test.go @@ -5,10 +5,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestTracking(t *testing.T) { diff --git a/plugins/processors/s2geo/s2geo_test.go b/plugins/processors/s2geo/s2geo_test.go index 35f14b5c0..419dd64ec 100644 --- a/plugins/processors/s2geo/s2geo_test.go +++ b/plugins/processors/s2geo/s2geo_test.go @@ -5,10 +5,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestGeo(t *testing.T) { diff --git a/plugins/processors/scale/scale_test.go b/plugins/processors/scale/scale_test.go index 490c5700a..828460148 100644 --- a/plugins/processors/scale/scale_test.go +++ b/plugins/processors/scale/scale_test.go @@ -6,10 +6,11 @@ import ( "time" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) type scalingValuesMinMax struct { diff --git a/plugins/processors/snmp_lookup/store.go b/plugins/processors/snmp_lookup/store.go index ff07cd9c2..375628198 100644 --- a/plugins/processors/snmp_lookup/store.go +++ b/plugins/processors/snmp_lookup/store.go @@ -7,6 +7,7 @@ import ( "github.com/alitto/pond" "github.com/hashicorp/golang-lru/v2/expirable" + "github.com/influxdata/telegraf/config" ) diff --git a/plugins/processors/snmp_lookup/store_test.go b/plugins/processors/snmp_lookup/store_test.go index 513116aaa..81160bb2d 100644 --- a/plugins/processors/snmp_lookup/store_test.go +++ b/plugins/processors/snmp_lookup/store_test.go @@ -5,8 +5,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/config" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/config" ) func TestAddBacklog(t *testing.T) { diff --git a/plugins/processors/strings/strings.go b/plugins/processors/strings/strings.go index 0b1971703..4751f1cdb 100644 --- a/plugins/processors/strings/strings.go +++ b/plugins/processors/strings/strings.go @@ -8,10 +8,11 @@ import ( "unicode" "unicode/utf8" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/processors" "golang.org/x/text/cases" "golang.org/x/text/language" + + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/processors" ) //go:embed sample.conf diff --git a/plugins/processors/template/template.go b/plugins/processors/template/template.go index 4ae8b0af4..41914f823 100644 --- a/plugins/processors/template/template.go +++ b/plugins/processors/template/template.go @@ -8,6 +8,7 @@ import ( "text/template" "github.com/Masterminds/sprig/v3" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/processors" ) diff --git a/plugins/processors/timestamp/timestamp_test.go b/plugins/processors/timestamp/timestamp_test.go index 3132ab31f..c098eca88 100644 --- a/plugins/processors/timestamp/timestamp_test.go +++ b/plugins/processors/timestamp/timestamp_test.go @@ -4,10 +4,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestCases(t *testing.T) { diff --git a/plugins/processors/unpivot/unpivot_test.go b/plugins/processors/unpivot/unpivot_test.go index b44632db3..403b40666 100644 --- a/plugins/processors/unpivot/unpivot_test.go +++ b/plugins/processors/unpivot/unpivot_test.go @@ -6,10 +6,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" ) func TestDefaults(t *testing.T) { diff --git a/plugins/secretstores/http/aes.go b/plugins/secretstores/http/aes.go index 3d0f4618b..f14c03393 100644 --- a/plugins/secretstores/http/aes.go +++ b/plugins/secretstores/http/aes.go @@ -9,6 +9,7 @@ import ( "strings" "github.com/awnumar/memguard" + "github.com/influxdata/telegraf/config" ) diff --git a/plugins/secretstores/http/key_derivation_test.go b/plugins/secretstores/http/key_derivation_test.go index c46702bd7..06080b6af 100644 --- a/plugins/secretstores/http/key_derivation_test.go +++ b/plugins/secretstores/http/key_derivation_test.go @@ -3,8 +3,9 @@ package http import ( "testing" - "github.com/influxdata/telegraf/config" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/config" ) func TestKDF(t *testing.T) { diff --git a/plugins/secretstores/jose/jose_test.go b/plugins/secretstores/jose/jose_test.go index 290b4028d..898483f8c 100644 --- a/plugins/secretstores/jose/jose_test.go +++ b/plugins/secretstores/jose/jose_test.go @@ -4,8 +4,9 @@ import ( "os" "testing" - "github.com/influxdata/telegraf/config" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/config" ) func TestSampleConfig(t *testing.T) { diff --git a/plugins/secretstores/os/os_test.go b/plugins/secretstores/os/os_test.go index 9e9d59c1a..2f2c7c86e 100644 --- a/plugins/secretstores/os/os_test.go +++ b/plugins/secretstores/os/os_test.go @@ -5,8 +5,9 @@ package os import ( "testing" - "github.com/influxdata/telegraf/internal/choice" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/internal/choice" ) // In docker, access to the keyring is disabled by default see diff --git a/plugins/secretstores/systemd/systemd.go b/plugins/secretstores/systemd/systemd.go index eb4b7c57d..a5f74893b 100644 --- a/plugins/secretstores/systemd/systemd.go +++ b/plugins/secretstores/systemd/systemd.go @@ -14,6 +14,7 @@ import ( "strings" "github.com/coreos/go-systemd/v22/dbus" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/secretstores" ) diff --git a/plugins/secretstores/systemd/systemd_test.go b/plugins/secretstores/systemd/systemd_test.go index a8ccc9487..cf333e068 100644 --- a/plugins/secretstores/systemd/systemd_test.go +++ b/plugins/secretstores/systemd/systemd_test.go @@ -5,8 +5,9 @@ package systemd import ( "testing" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/testutil" ) func getSystemdVersionMin() (int, error) { diff --git a/plugins/serializers/binary/binary_test.go b/plugins/serializers/binary/binary_test.go index 974769961..d522d530a 100644 --- a/plugins/serializers/binary/binary_test.go +++ b/plugins/serializers/binary/binary_test.go @@ -5,8 +5,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/metric" ) func TestMetricSerialization(t *testing.T) { diff --git a/plugins/serializers/binary/entry_test.go b/plugins/serializers/binary/entry_test.go index 60922bbbb..9f8cefca9 100644 --- a/plugins/serializers/binary/entry_test.go +++ b/plugins/serializers/binary/entry_test.go @@ -5,8 +5,9 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/internal" "github.com/stretchr/testify/require" + + "github.com/influxdata/telegraf/internal" ) func TestSerialization(t *testing.T) { diff --git a/plugins/serializers/prometheus/collection_test.go b/plugins/serializers/prometheus/collection_test.go index 9145a5255..72d81b4e1 100644 --- a/plugins/serializers/prometheus/collection_test.go +++ b/plugins/serializers/prometheus/collection_test.go @@ -5,11 +5,12 @@ import ( "testing" "time" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/testutil" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" + + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/testutil" ) type Input struct { diff --git a/testutil/metric_test.go b/testutil/metric_test.go index c0cb45801..14744fbf1 100644 --- a/testutil/metric_test.go +++ b/testutil/metric_test.go @@ -5,6 +5,7 @@ import ( "time" "github.com/google/go-cmp/cmp" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" ) diff --git a/testutil/testutil.go b/testutil/testutil.go index 67f7f2796..7925a17d3 100644 --- a/testutil/testutil.go +++ b/testutil/testutil.go @@ -9,6 +9,7 @@ import ( "time" "github.com/google/go-cmp/cmp" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/plugins/serializers/influx"