From fce1dfb1c3a95fae4d1096b24936dfdf9c5ca54d Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Wed, 4 Sep 2024 06:51:10 +0000 Subject: [PATCH] [chore]: enable expected-actual rule from testifylint Signed-off-by: Matthieu MOREL --- .golangci.yml | 1 - Makefile.Common | 2 +- cmd/telemetrygen/internal/logs/worker_test.go | 2 +- .../internal/metrics/worker_test.go | 4 +- .../internal/traces/worker_test.go | 2 +- connector/failoverconnector/failover_test.go | 6 +- .../internal/state/pipeline_selector_test.go | 6 +- connector/routingconnector/logs_test.go | 18 +-- connector/routingconnector/metrics_test.go | 14 +- connector/routingconnector/traces_test.go | 14 +- .../spanmetricsconnector/connector_test.go | 6 +- .../internal/cache/cache_test.go | 2 +- .../metricsdata_to_logservice_test.go | 12 +- .../tracedata_to_logservice_test.go | 18 +-- exporter/awsemfexporter/config_test.go | 4 +- exporter/awsemfexporter/emf_exporter_test.go | 4 +- exporter/awskinesisexporter/exporter_test.go | 4 +- exporter/awss3exporter/config_test.go | 125 +++++++++--------- exporter/awss3exporter/marshaler_test.go | 8 +- exporter/awss3exporter/s3_writer_test.go | 4 +- exporter/awsxrayexporter/factory_test.go | 8 +- .../metricexporter_test.go | 66 ++++----- exporter/coralogixexporter/factory_test.go | 4 +- exporter/datadogexporter/examples_test.go | 2 +- exporter/datadogexporter/factory_test.go | 2 +- .../integrationtest/integration_test.go | 4 +- .../internal/clientutil/http_test.go | 4 +- .../internal/clientutil/retrier_test.go | 4 +- .../internal/hostmetadata/host_test.go | 2 +- .../hostmetadata/internal/system/host_test.go | 6 +- .../internal/hostmetadata/metadata_test.go | 22 +-- .../internal/metrics/series_test.go | 4 +- .../datadogexporter/metrics_exporter_test.go | 4 +- .../datadogexporter/traces_exporter_test.go | 2 +- .../logs_exporter_stress_test.go | 2 +- .../datasetexporter/logs_exporter_test.go | 2 +- exporter/elasticsearchexporter/utils_test.go | 8 +- .../config_test.go | 87 ++++++------ exporter/kafkaexporter/config_test.go | 4 +- .../trace_exporter_test.go | 8 +- exporter/logzioexporter/factory_test.go | 2 +- exporter/logzioexporter/jsonlog_test.go | 2 +- exporter/logzioexporter/logger_test.go | 2 +- exporter/mezmoexporter/exporter_test.go | 20 +-- exporter/mezmoexporter/factory_test.go | 4 +- exporter/mezmoexporter/utils_test.go | 6 +- exporter/otelarrowexporter/factory_test.go | 8 +- .../internal/arrow/exporter_test.go | 6 +- .../internal/arrow/stream_test.go | 2 +- exporter/otelarrowexporter/otelarrow_test.go | 2 +- .../prometheusexporter/accumulator_test.go | 4 +- .../helper_test.go | 2 +- exporter/pulsarexporter/factory_test.go | 6 +- .../sentryexporter/sentry_exporter_test.go | 8 +- exporter/signalfxexporter/exporter_test.go | 2 +- .../internal/correlation/logshims_test.go | 2 +- .../internal/dimensions/dimclient_test.go | 20 +-- exporter/splunkhecexporter/client_test.go | 6 +- exporter/sumologicexporter/factory_test.go | 4 +- exporter/syslogexporter/exporter_test.go | 2 +- exporter/syslogexporter/factory_test.go | 4 +- .../basicauthextension/extension_test.go | 2 +- .../bearertokenauth_test.go | 8 +- .../jsonlogencodingextension/json_test.go | 2 +- .../healthcheckv2extension/extension_test.go | 2 +- .../internal/http/responders_test.go | 2 +- .../observer/ecsobserver/matcher_test.go | 2 +- .../observer/k8sobserver/factory_test.go | 2 +- .../signingroundtripper_test.go | 2 +- .../factory_test.go | 4 +- .../credentialsstore_localfs_test.go | 2 +- .../sumologicextension/extension_test.go | 18 +-- internal/aws/awsutil/conn_test.go | 4 +- internal/aws/k8s/k8sclient/node_test.go | 4 +- internal/aws/proxy/conn_test.go | 17 ++- internal/common/ttlmap/ttl_map_test.go | 4 +- internal/filter/filterspan/filterspan_test.go | 4 +- internal/kubelet/client_test.go | 4 +- .../contexts/ottldatapoint/datapoint_test.go | 2 +- pkg/ottl/contexts/ottllog/log_test.go | 2 +- pkg/ottl/contexts/ottlmetric/metrics_test.go | 2 +- pkg/ottl/contexts/ottlspan/span_test.go | 2 +- .../ottlspanevent/span_events_test.go | 2 +- pkg/stanza/entry/nil_field_test.go | 4 +- pkg/stanza/errors/error_test.go | 8 +- pkg/stanza/fileconsumer/config_test.go | 4 +- .../internal/fileset/fileset_test.go | 2 +- pkg/stanza/operator/helper/input_test.go | 2 +- .../operator/parser/container/parser_test.go | 2 +- .../operator/parser/regex/parser_test.go | 2 +- pkg/stanza/pipeline/config_test.go | 2 +- .../jaeger/jaegerproto_to_traces_test.go | 4 +- .../prometheusremotewrite/helper_test.go | 2 +- pkg/translator/signalfx/to_metrics_test.go | 2 +- processor/attributesprocessor/factory_test.go | 2 +- .../factory_test.go | 2 +- .../deltatorateprocessor/factory_test.go | 2 +- processor/filterprocessor/factory_test.go | 4 +- .../groupbyattrsprocessor/processor_test.go | 4 +- processor/groupbytraceprocessor/event_test.go | 2 +- .../internal/kube/client_test.go | 20 +-- .../factory_test.go | 2 +- .../metricstransformprocessor/factory_test.go | 2 +- .../resourcedetectionprocessor/config_test.go | 2 +- .../internal/aws/ec2/ec2_test.go | 2 +- .../internal/resourcedetection_test.go | 2 +- processor/routingprocessor/logs_test.go | 6 +- processor/routingprocessor/metrics_test.go | 4 +- processor/routingprocessor/traces_test.go | 4 +- .../aggregate_attributes_processor_test.go | 12 +- ...translate_docker_metrics_processor_test.go | 2 +- .../tailsamplingprocessor/config_test.go | 3 +- .../internal/sampling/always_sample_test.go | 2 +- .../internal/sampling/and_test.go | 8 +- .../internal/sampling/composite_test.go | 26 ++-- .../internal/sampling/rate_limiting_test.go | 8 +- processor/transformprocessor/factory_test.go | 4 +- receiver/awscloudwatchreceiver/config_test.go | 2 +- receiver/awscloudwatchreceiver/logs_test.go | 4 +- .../internal/stores/podstore_test.go | 4 +- .../internal/translator/cause_test.go | 10 +- .../internal/translator/translator_test.go | 4 +- receiver/azureblobreceiver/receiver_test.go | 4 +- .../internal/metadata/metrics_test.go | 2 +- receiver/couchdbreceiver/scraper_test.go | 2 +- receiver/datadogreceiver/receiver_test.go | 6 +- .../elasticsearchreceiver/scraper_test.go | 4 +- receiver/flinkmetricsreceiver/client_test.go | 2 +- .../internal/metadata/metricdatatype_test.go | 8 +- .../metadata/metricsdatapoint_test.go | 2 +- .../networkscraper/network_scraper_test.go | 2 +- .../pagingscraper/pagefile_linux_test.go | 8 +- .../processes_scraper_test.go | 4 +- .../handlecount/handles_windows_test.go | 4 +- receiver/iisreceiver/scraper_test.go | 4 +- .../internal/subprocess/subprocess_test.go | 4 +- .../k8s_event_to_logdata_test.go | 12 +- receiver/k8seventsreceiver/receiver_test.go | 4 +- .../unstructured_to_logdata_test.go | 32 ++--- .../broker_scraper_test.go | 2 +- .../consumer_scraper_test.go | 2 +- .../topic_scraper_test.go | 2 +- receiver/kafkareceiver/kafka_receiver_test.go | 2 +- .../alerts_integration_test.go | 4 +- receiver/mongodbatlasreceiver/alerts_test.go | 4 +- .../mongodb_event_to_logdata_test.go | 20 +-- .../mongodbatlasreceiver/receiver_test.go | 2 +- receiver/mongodbreceiver/client_test.go | 2 +- receiver/mysqlreceiver/scraper_test.go | 2 +- receiver/oracledbreceiver/factory_test.go | 2 +- .../podmanreceiver/record_metrics_test.go | 10 +- receiver/prometheusreceiver/config_test.go | 6 +- .../prometheusreceiver/internal/util_test.go | 4 +- .../metrics_receiver_helper_test.go | 4 +- .../metrics_receiver_labels_test.go | 20 +-- receiver/redisreceiver/latencystats_test.go | 8 +- receiver/snmpreceiver/scraper_test.go | 18 +-- receiver/splunkhecreceiver/receiver_test.go | 2 +- .../protocol/metric_translator_test.go | 4 +- receiver/vcenterreceiver/scraper_test.go | 4 +- .../windowsperfcounters_scraper_test.go | 2 +- receiver/zipkinreceiver/proto_parse_test.go | 2 +- testbed/tests/syslog_integration_test.go | 4 +- testbed/tests/trace_test.go | 12 +- 164 files changed, 564 insertions(+), 575 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 9fa06db90729..5df2fc92ed10 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -135,7 +135,6 @@ linters-settings: testifylint: disable: - error-is-as - - expected-actual - float-compare - formatter - go-require diff --git a/Makefile.Common b/Makefile.Common index 7f5ce2dff66e..146888aa2c5a 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -75,7 +75,7 @@ GOTESTSUM := $(TOOLS_BIN_DIR)/gotestsum TESTIFYLINT := $(TOOLS_BIN_DIR)/testifylint GOTESTSUM_OPT?= --rerun-fails=1 -TESTIFYLINT_OPT?= --enable-all --disable=error-is-as,expected-actual,float-compare,formatter,go-require,negative-positive,require-error,suite-dont-use-pkg,suite-subtest-run,useless-assert +TESTIFYLINT_OPT?= --enable-all --disable=error-is-as,float-compare,formatter,go-require,negative-positive,require-error,suite-dont-use-pkg,suite-subtest-run,useless-assert # BUILD_TYPE should be one of (dev, release). BUILD_TYPE?=release diff --git a/cmd/telemetrygen/internal/logs/worker_test.go b/cmd/telemetrygen/internal/logs/worker_test.go index ccfd5728f6fd..3e759b606154 100644 --- a/cmd/telemetrygen/internal/logs/worker_test.go +++ b/cmd/telemetrygen/internal/logs/worker_test.go @@ -177,7 +177,7 @@ func TestLogsWithOneTelemetryAttributes(t *testing.T) { l.WalkAttributes(func(attr log.KeyValue) bool { if attr.Key == telemetryAttrKeyOne { - assert.EqualValues(t, attr.Value.AsString(), telemetryAttrValueOne) + assert.EqualValues(t, telemetryAttrValueOne, attr.Value.AsString()) } return true }) diff --git a/cmd/telemetrygen/internal/metrics/worker_test.go b/cmd/telemetrygen/internal/metrics/worker_test.go index 6e450db04758..67539d5f009a 100644 --- a/cmd/telemetrygen/internal/metrics/worker_test.go +++ b/cmd/telemetrygen/internal/metrics/worker_test.go @@ -202,7 +202,7 @@ func TestSumSingleTelemetryAttr(t *testing.T) { attr := ms.Data.(metricdata.Sum[int64]).DataPoints[0].Attributes assert.Equal(t, 1, attr.Len(), "it must have a single attribute here") actualValue, _ := attr.Value(telemetryAttrKeyOne) - assert.Equal(t, actualValue.AsString(), telemetryAttrValueOne, "it should be "+telemetryAttrValueOne) + assert.Equal(t, telemetryAttrValueOne, actualValue.AsString(), "it should be "+telemetryAttrValueOne) } } @@ -232,7 +232,7 @@ func TestGaugeSingleTelemetryAttr(t *testing.T) { attr := ms.Data.(metricdata.Gauge[int64]).DataPoints[0].Attributes assert.Equal(t, 1, attr.Len(), "it must have a single attribute here") actualValue, _ := attr.Value(telemetryAttrKeyOne) - assert.Equal(t, actualValue.AsString(), telemetryAttrValueOne, "it should be "+telemetryAttrValueOne) + assert.Equal(t, telemetryAttrValueOne, actualValue.AsString(), "it should be "+telemetryAttrValueOne) } } diff --git a/cmd/telemetrygen/internal/traces/worker_test.go b/cmd/telemetrygen/internal/traces/worker_test.go index c3aff22a8803..33c921febfe5 100644 --- a/cmd/telemetrygen/internal/traces/worker_test.go +++ b/cmd/telemetrygen/internal/traces/worker_test.go @@ -185,7 +185,7 @@ func TestSpanKind(t *testing.T) { // verify that the default Span Kind is being overridden for _, span := range syncer.spans { - assert.NotEqual(t, span.SpanKind(), trace.SpanKindInternal) + assert.NotEqual(t, trace.SpanKindInternal, span.SpanKind()) } } diff --git a/connector/failoverconnector/failover_test.go b/connector/failoverconnector/failover_test.go index 9b21d58ccec3..ddee5aaaf653 100644 --- a/connector/failoverconnector/failover_test.go +++ b/connector/failoverconnector/failover_test.go @@ -58,7 +58,7 @@ func TestFailoverRecovery(t *testing.T) { require.NoError(t, conn.ConsumeTraces(context.Background(), tr)) idx := failoverConnector.failover.pS.TestStableIndex() - require.Equal(t, idx, 1) + require.Equal(t, 1, idx) failoverConnector.failover.ModifyConsumerAtIndex(0, &sinkFirst) @@ -75,7 +75,7 @@ func TestFailoverRecovery(t *testing.T) { require.NoError(t, conn.ConsumeTraces(context.Background(), tr)) idx := failoverConnector.failover.pS.TestStableIndex() - require.Equal(t, idx, 1) + require.Equal(t, 1, idx) failoverConnector.failover.ModifyConsumerAtIndex(0, &sinkFirst) @@ -97,7 +97,7 @@ func TestFailoverRecovery(t *testing.T) { require.NoError(t, conn.ConsumeTraces(context.Background(), tr)) idx := failoverConnector.failover.pS.TestStableIndex() - require.Equal(t, idx, 2) + require.Equal(t, 2, idx) // Simulate recovery of exporter failoverConnector.failover.ModifyConsumerAtIndex(1, &sinkSecond) diff --git a/connector/failoverconnector/internal/state/pipeline_selector_test.go b/connector/failoverconnector/internal/state/pipeline_selector_test.go index 7123b3b70496..13e7d06f5364 100644 --- a/connector/failoverconnector/internal/state/pipeline_selector_test.go +++ b/connector/failoverconnector/internal/state/pipeline_selector_test.go @@ -22,8 +22,8 @@ func TestSelectPipeline(t *testing.T) { idx, ch := pS.SelectedPipeline() - require.Equal(t, idx, 0) - require.Equal(t, pS.ChannelIndex(ch), 0) + require.Equal(t, 0, idx) + require.Equal(t, 0, pS.ChannelIndex(ch)) } func TestHandlePipelineError(t *testing.T) { @@ -44,7 +44,7 @@ func TestHandlePipelineError(t *testing.T) { }() idx, ch := pS.SelectedPipeline() - require.Equal(t, idx, 0) + require.Equal(t, 0, idx) ch <- false require.Eventually(t, func() bool { diff --git a/connector/routingconnector/logs_test.go b/connector/routingconnector/logs_test.go index f303bf65ccd8..6b291c7d6005 100644 --- a/connector/routingconnector/logs_test.go +++ b/connector/routingconnector/logs_test.go @@ -177,8 +177,8 @@ func TestLogsAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { assert.Len(t, sink0.AllLogs(), 1) assert.Len(t, sink1.AllLogs(), 1) - assert.Equal(t, sink0.AllLogs()[0].LogRecordCount(), 2) - assert.Equal(t, sink1.AllLogs()[0].LogRecordCount(), 2) + assert.Equal(t, 2, sink0.AllLogs()[0].LogRecordCount()) + assert.Equal(t, 2, sink1.AllLogs()[0].LogRecordCount()) assert.Equal(t, sink0.AllLogs(), sink1.AllLogs()) }) @@ -206,7 +206,7 @@ func TestLogsAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { rlog := defaultSink.AllLogs()[0].ResourceLogs().At(0) attr, ok := rlog.Resource().Attributes().Get("X-Tenant") assert.True(t, ok, "routing attribute must exists") - assert.Equal(t, attr.AsString(), "something-else") + assert.Equal(t, "something-else", attr.AsString()) }) t.Run("logs matched by one expression, multiple pipelines", func(t *testing.T) { @@ -224,8 +224,8 @@ func TestLogsAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { assert.Len(t, sink0.AllLogs(), 1) assert.Empty(t, sink1.AllLogs()) - assert.Equal(t, defaultSink.AllLogs()[0].LogRecordCount(), 1) - assert.Equal(t, sink0.AllLogs()[0].LogRecordCount(), 1) + assert.Equal(t, 1, defaultSink.AllLogs()[0].LogRecordCount()) + assert.Equal(t, 1, sink0.AllLogs()[0].LogRecordCount()) assert.Equal(t, defaultSink.AllLogs(), sink0.AllLogs()) }) } @@ -333,7 +333,7 @@ func TestLogsAreCorrectlyMatchOnceWithOTTL(t *testing.T) { assert.Len(t, sink0.AllLogs(), 1) assert.Empty(t, sink1.AllLogs()) - assert.Equal(t, sink0.AllLogs()[0].LogRecordCount(), 2) + assert.Equal(t, 2, sink0.AllLogs()[0].LogRecordCount()) }) t.Run("one log matched by multiple expressions, other matched none", func(t *testing.T) { @@ -358,7 +358,7 @@ func TestLogsAreCorrectlyMatchOnceWithOTTL(t *testing.T) { rlog := defaultSink.AllLogs()[0].ResourceLogs().At(0) attr, ok := rlog.Resource().Attributes().Get("X-Tenant") assert.True(t, ok, "routing attribute must exists") - assert.Equal(t, attr.AsString(), "something-else") + assert.Equal(t, "something-else", attr.AsString()) }) t.Run("logs matched by one expression, multiple pipelines", func(t *testing.T) { @@ -376,8 +376,8 @@ func TestLogsAreCorrectlyMatchOnceWithOTTL(t *testing.T) { assert.Len(t, sink0.AllLogs(), 1) assert.Empty(t, sink1.AllLogs()) - assert.Equal(t, defaultSink.AllLogs()[0].LogRecordCount(), 1) - assert.Equal(t, sink0.AllLogs()[0].LogRecordCount(), 1) + assert.Equal(t, 1, defaultSink.AllLogs()[0].LogRecordCount()) + assert.Equal(t, 1, sink0.AllLogs()[0].LogRecordCount()) assert.Equal(t, defaultSink.AllLogs(), sink0.AllLogs()) }) } diff --git a/connector/routingconnector/metrics_test.go b/connector/routingconnector/metrics_test.go index e1add4559fb3..82fe74855bc9 100644 --- a/connector/routingconnector/metrics_test.go +++ b/connector/routingconnector/metrics_test.go @@ -186,8 +186,8 @@ func TestMetricsAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { assert.Len(t, sink0.AllMetrics(), 1) assert.Len(t, sink1.AllMetrics(), 1) - assert.Equal(t, sink0.AllMetrics()[0].MetricCount(), 2) - assert.Equal(t, sink1.AllMetrics()[0].MetricCount(), 2) + assert.Equal(t, 2, sink0.AllMetrics()[0].MetricCount()) + assert.Equal(t, 2, sink1.AllMetrics()[0].MetricCount()) assert.Equal(t, sink0.AllMetrics(), sink1.AllMetrics()) }) @@ -239,8 +239,8 @@ func TestMetricsAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { assert.Len(t, sink0.AllMetrics(), 1) assert.Empty(t, sink1.AllMetrics()) - assert.Equal(t, defaultSink.AllMetrics()[0].MetricCount(), 1) - assert.Equal(t, sink0.AllMetrics()[0].MetricCount(), 1) + assert.Equal(t, 1, defaultSink.AllMetrics()[0].MetricCount()) + assert.Equal(t, 1, sink0.AllMetrics()[0].MetricCount()) assert.Equal(t, defaultSink.AllMetrics(), sink0.AllMetrics()) }) } @@ -357,7 +357,7 @@ func TestMetricsAreCorrectlyMatchOnceWithOTTL(t *testing.T) { assert.Len(t, sink0.AllMetrics(), 1) assert.Empty(t, sink1.AllMetrics()) - assert.Equal(t, sink0.AllMetrics()[0].MetricCount(), 2) + assert.Equal(t, 2, sink0.AllMetrics()[0].MetricCount()) }) t.Run("one metric matched by 2 expressions, others matched by none", func(t *testing.T) { @@ -406,8 +406,8 @@ func TestMetricsAreCorrectlyMatchOnceWithOTTL(t *testing.T) { assert.Len(t, sink0.AllMetrics(), 1) assert.Empty(t, sink1.AllMetrics()) - assert.Equal(t, defaultSink.AllMetrics()[0].MetricCount(), 1) - assert.Equal(t, sink0.AllMetrics()[0].MetricCount(), 1) + assert.Equal(t, 1, defaultSink.AllMetrics()[0].MetricCount()) + assert.Equal(t, 1, sink0.AllMetrics()[0].MetricCount()) assert.Equal(t, defaultSink.AllMetrics(), sink0.AllMetrics()) }) } diff --git a/connector/routingconnector/traces_test.go b/connector/routingconnector/traces_test.go index 61f515461d4f..33f39cd270c1 100644 --- a/connector/routingconnector/traces_test.go +++ b/connector/routingconnector/traces_test.go @@ -179,8 +179,8 @@ func TestTracesCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { assert.Len(t, sink0.AllTraces(), 1) assert.Len(t, sink1.AllTraces(), 1) - assert.Equal(t, sink0.AllTraces()[0].SpanCount(), 2) - assert.Equal(t, sink1.AllTraces()[0].SpanCount(), 2) + assert.Equal(t, 2, sink0.AllTraces()[0].SpanCount()) + assert.Equal(t, 2, sink1.AllTraces()[0].SpanCount()) assert.Equal(t, sink0.AllTraces(), sink1.AllTraces()) }) @@ -199,8 +199,8 @@ func TestTracesCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { assert.Len(t, sink0.AllTraces(), 1) assert.Empty(t, sink1.AllTraces()) - assert.Equal(t, defaultSink.AllTraces()[0].SpanCount(), 1) - assert.Equal(t, sink0.AllTraces()[0].SpanCount(), 1) + assert.Equal(t, 1, defaultSink.AllTraces()[0].SpanCount()) + assert.Equal(t, 1, sink0.AllTraces()[0].SpanCount()) assert.Equal(t, defaultSink.AllTraces(), sink0.AllTraces()) }) } @@ -310,7 +310,7 @@ func TestTracesCorrectlyMatchOnceWithOTTL(t *testing.T) { assert.Len(t, sink0.AllTraces(), 1) assert.Empty(t, sink1.AllTraces()) - assert.Equal(t, sink0.AllTraces()[0].SpanCount(), 2) + assert.Equal(t, 2, sink0.AllTraces()[0].SpanCount()) }) t.Run("span matched by one expression, multiple pipelines", func(t *testing.T) { @@ -328,8 +328,8 @@ func TestTracesCorrectlyMatchOnceWithOTTL(t *testing.T) { assert.Len(t, sink0.AllTraces(), 1) assert.Empty(t, sink1.AllTraces()) - assert.Equal(t, defaultSink.AllTraces()[0].SpanCount(), 1) - assert.Equal(t, sink0.AllTraces()[0].SpanCount(), 1) + assert.Equal(t, 1, defaultSink.AllTraces()[0].SpanCount()) + assert.Equal(t, 1, sink0.AllTraces()[0].SpanCount()) assert.Equal(t, defaultSink.AllTraces(), sink0.AllTraces()) }) } diff --git a/connector/spanmetricsconnector/connector_test.go b/connector/spanmetricsconnector/connector_test.go index 47758797235f..2a2cf445455d 100644 --- a/connector/spanmetricsconnector/connector_test.go +++ b/connector/spanmetricsconnector/connector_test.go @@ -1647,7 +1647,7 @@ func assertDataPointsHaveExactlyOneExemplarForTrace(t *testing.T, metrics pmetri assert.Greater(t, dps.Len(), 0) for dpi := 0; dpi < dps.Len(); dpi++ { dp := dps.At(dpi) - assert.Equal(t, dp.Exemplars().Len(), 1) + assert.Equal(t, 1, dp.Exemplars().Len()) assert.Equal(t, dp.Exemplars().At(0).TraceID(), traceID) } case pmetric.MetricTypeHistogram: @@ -1655,7 +1655,7 @@ func assertDataPointsHaveExactlyOneExemplarForTrace(t *testing.T, metrics pmetri assert.Greater(t, dps.Len(), 0) for dpi := 0; dpi < dps.Len(); dpi++ { dp := dps.At(dpi) - assert.Equal(t, dp.Exemplars().Len(), 1) + assert.Equal(t, 1, dp.Exemplars().Len()) assert.Equal(t, dp.Exemplars().At(0).TraceID(), traceID) } case pmetric.MetricTypeExponentialHistogram: @@ -1663,7 +1663,7 @@ func assertDataPointsHaveExactlyOneExemplarForTrace(t *testing.T, metrics pmetri assert.Greater(t, dps.Len(), 0) for dpi := 0; dpi < dps.Len(); dpi++ { dp := dps.At(dpi) - assert.Equal(t, dp.Exemplars().Len(), 1) + assert.Equal(t, 1, dp.Exemplars().Len()) assert.Equal(t, dp.Exemplars().At(0).TraceID(), traceID) } default: diff --git a/connector/spanmetricsconnector/internal/cache/cache_test.go b/connector/spanmetricsconnector/internal/cache/cache_test.go index 374e8e2f9ba8..83e9b16333d1 100644 --- a/connector/spanmetricsconnector/internal/cache/cache_test.go +++ b/connector/spanmetricsconnector/internal/cache/cache_test.go @@ -127,7 +127,7 @@ func TestCache_Get(t *testing.T) { t.Parallel() c := tt.lruCache() gotValue, gotOk := c.Get(tt.key) - if !assert.Equal(t, gotValue, tt.wantValue) { + if !assert.Equal(t, tt.wantValue, gotValue) { t.Errorf("Get() gotValue = %v, want %v", gotValue, tt.wantValue) } if gotOk != tt.wantOk { diff --git a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go index 400cd5736949..981e7be2dc59 100644 --- a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go +++ b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go @@ -130,12 +130,12 @@ func TestMetricDataToLogService(t *testing.T) { } func TestMetricCornerCases(t *testing.T) { - assert.Equal(t, min(1, 2), 1) - assert.Equal(t, min(2, 1), 1) - assert.Equal(t, min(1, 1), 1) + assert.Equal(t, 1, min(1, 2)) + assert.Equal(t, 1, min(2, 1)) + assert.Equal(t, 1, min(1, 1)) var label KeyValues label.Append("a", "b") - assert.Equal(t, label.String(), "a#$#b") + assert.Equal(t, "a#$#b", label.String()) } func TestMetricLabelSanitize(t *testing.T) { @@ -144,7 +144,7 @@ func TestMetricLabelSanitize(t *testing.T) { label.Append("0test", "key_0test") label.Append("test_normal", "test_normal") label.Append("0test", "key_0test") - assert.Equal(t, label.String(), "key_test#$#key_test|key_0test#$#key_0test|test_normal#$#test_normal|key_0test#$#key_0test") + assert.Equal(t, "key_test#$#key_test|key_0test#$#key_0test|test_normal#$#test_normal|key_0test#$#key_0test", label.String()) label.Sort() - assert.Equal(t, label.String(), "key_0test#$#key_0test|key_0test#$#key_0test|key_test#$#key_test|test_normal#$#test_normal") + assert.Equal(t, "key_0test#$#key_0test|key_0test#$#key_0test|key_test#$#key_test|test_normal#$#test_normal", label.String()) } diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go index 8cf82da88c4a..276cee9252cc 100644 --- a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go +++ b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go @@ -176,16 +176,16 @@ func newSegmentID() pcommon.SpanID { } func TestSpanKindToShortString(t *testing.T) { - assert.Equal(t, spanKindToShortString(ptrace.SpanKindConsumer), "consumer") - assert.Equal(t, spanKindToShortString(ptrace.SpanKindProducer), "producer") - assert.Equal(t, spanKindToShortString(ptrace.SpanKindClient), "client") - assert.Equal(t, spanKindToShortString(ptrace.SpanKindServer), "server") - assert.Equal(t, spanKindToShortString(ptrace.SpanKindInternal), "internal") - assert.Equal(t, spanKindToShortString(ptrace.SpanKindUnspecified), "") + assert.Equal(t, "consumer", spanKindToShortString(ptrace.SpanKindConsumer)) + assert.Equal(t, "producer", spanKindToShortString(ptrace.SpanKindProducer)) + assert.Equal(t, "client", spanKindToShortString(ptrace.SpanKindClient)) + assert.Equal(t, "server", spanKindToShortString(ptrace.SpanKindServer)) + assert.Equal(t, "internal", spanKindToShortString(ptrace.SpanKindInternal)) + assert.Equal(t, "", spanKindToShortString(ptrace.SpanKindUnspecified)) } func TestStatusCodeToShortString(t *testing.T) { - assert.Equal(t, statusCodeToShortString(ptrace.StatusCodeOk), "OK") - assert.Equal(t, statusCodeToShortString(ptrace.StatusCodeError), "ERROR") - assert.Equal(t, statusCodeToShortString(ptrace.StatusCodeUnset), "UNSET") + assert.Equal(t, "OK", statusCodeToShortString(ptrace.StatusCodeOk)) + assert.Equal(t, "ERROR", statusCodeToShortString(ptrace.StatusCodeError)) + assert.Equal(t, "UNSET", statusCodeToShortString(ptrace.StatusCodeUnset)) } diff --git a/exporter/awsemfexporter/config_test.go b/exporter/awsemfexporter/config_test.go index b160ccc8e2d6..249e86ee1d80 100644 --- a/exporter/awsemfexporter/config_test.go +++ b/exporter/awsemfexporter/config_test.go @@ -267,7 +267,7 @@ func TestNoDimensionRollupFeatureGate(t *testing.T) { require.NoError(t, err) cfg := createDefaultConfig() - assert.Equal(t, cfg.(*Config).DimensionRollupOption, "NoDimensionRollup") + assert.Equal(t, "NoDimensionRollup", cfg.(*Config).DimensionRollupOption) _ = featuregate.GlobalRegistry().Set("awsemf.nodimrollupdefault", false) } @@ -320,7 +320,7 @@ func TestIsApplicationSignalsEnabled(t *testing.T) { cfg.LogGroupName = tc.logGroupName } - assert.Equal(t, cfg.isAppSignalsEnabled(), tc.expectedResult) + assert.Equal(t, tc.expectedResult, cfg.isAppSignalsEnabled()) }) } } diff --git a/exporter/awsemfexporter/emf_exporter_test.go b/exporter/awsemfexporter/emf_exporter_test.go index 6ed83acd3ddb..b27c756ef8d0 100644 --- a/exporter/awsemfexporter/emf_exporter_test.go +++ b/exporter/awsemfexporter/emf_exporter_test.go @@ -329,7 +329,7 @@ func TestNewExporterWithoutConfig(t *testing.T) { exp, err := newEmfExporter(expCfg, settings) assert.Error(t, err) assert.Nil(t, exp) - assert.Equal(t, settings.Logger, expCfg.logger) + assert.Equal(t, expCfg.logger, settings.Logger) } func TestNewExporterWithMetricDeclarations(t *testing.T) { @@ -421,5 +421,5 @@ func TestNewEmfExporterWithoutConfig(t *testing.T) { exp, err := newEmfExporter(expCfg, settings) assert.Error(t, err) assert.Nil(t, exp) - assert.Equal(t, settings.Logger, expCfg.logger) + assert.Equal(t, expCfg.logger, settings.Logger) } diff --git a/exporter/awskinesisexporter/exporter_test.go b/exporter/awskinesisexporter/exporter_test.go index 59d2f5fe4084..ffab5b0c58c3 100644 --- a/exporter/awskinesisexporter/exporter_test.go +++ b/exporter/awskinesisexporter/exporter_test.go @@ -35,7 +35,7 @@ func TestCreatingExporter(t *testing.T) { }), validateNew: func(tb testing.TB) func(conf aws.Config, opts ...func(*kinesis.Options)) *kinesis.Client { return func(conf aws.Config, opts ...func(*kinesis.Options)) *kinesis.Client { - assert.Equal(tb, conf.Region, "us-west-2", "Must match the expected region") + assert.Equal(tb, "us-west-2", conf.Region, "Must match the expected region") k := kinesis.NewFromConfig(conf, opts...) return k } @@ -50,7 +50,7 @@ func TestCreatingExporter(t *testing.T) { }), validateNew: func(tb testing.TB) func(conf aws.Config, opts ...func(*kinesis.Options)) *kinesis.Client { return func(conf aws.Config, opts ...func(*kinesis.Options)) *kinesis.Client { - assert.Equal(tb, conf.Region, "us-east-1", "Must match the expected region") + assert.Equal(tb, "us-east-1", conf.Region, "Must match the expected region") k := kinesis.NewFromConfig(conf, opts...) return k } diff --git a/exporter/awss3exporter/config_test.go b/exporter/awss3exporter/config_test.go index 11ba3298ce2c..3fe0561772b6 100644 --- a/exporter/awss3exporter/config_test.go +++ b/exporter/awss3exporter/config_test.go @@ -32,17 +32,16 @@ func TestLoadConfig(t *testing.T) { e := cfg.Exporters[component.MustNewID("awss3")].(*Config) encoding := component.MustNewIDWithName("foo", "bar") - assert.Equal(t, e, - &Config{ - Encoding: &encoding, - EncodingFileExtension: "baz", - S3Uploader: S3UploaderConfig{ - Region: "us-east-1", - S3Bucket: "foo", - S3Partition: "minute", - }, - MarshalerName: "otlp_json", + assert.Equal(t, &Config{ + Encoding: &encoding, + EncodingFileExtension: "baz", + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "foo", + S3Partition: "minute", }, + MarshalerName: "otlp_json", + }, e, ) } @@ -62,17 +61,16 @@ func TestConfig(t *testing.T) { e := cfg.Exporters[component.MustNewID("awss3")].(*Config) - assert.Equal(t, e, - &Config{ - S3Uploader: S3UploaderConfig{ - Region: "us-east-1", - S3Bucket: "foo", - S3Prefix: "bar", - S3Partition: "minute", - Endpoint: "http://endpoint.com", - }, - MarshalerName: "otlp_json", + assert.Equal(t, &Config{ + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "foo", + S3Prefix: "bar", + S3Partition: "minute", + Endpoint: "http://endpoint.com", }, + MarshalerName: "otlp_json", + }, e, ) } @@ -92,19 +90,18 @@ func TestConfigForS3CompatibleSystems(t *testing.T) { e := cfg.Exporters[component.MustNewID("awss3")].(*Config) - assert.Equal(t, e, - &Config{ - S3Uploader: S3UploaderConfig{ - Region: "us-east-1", - S3Bucket: "foo", - S3Prefix: "bar", - S3Partition: "minute", - Endpoint: "alternative-s3-system.example.com", - S3ForcePathStyle: true, - DisableSSL: true, - }, - MarshalerName: "otlp_json", + assert.Equal(t, &Config{ + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "foo", + S3Prefix: "bar", + S3Partition: "minute", + Endpoint: "alternative-s3-system.example.com", + S3ForcePathStyle: true, + DisableSSL: true, }, + MarshalerName: "otlp_json", + }, e, ) } @@ -205,28 +202,26 @@ func TestMarshallerName(t *testing.T) { e := cfg.Exporters[component.MustNewID("awss3")].(*Config) - assert.Equal(t, e, - &Config{ - S3Uploader: S3UploaderConfig{ - Region: "us-east-1", - S3Bucket: "foo", - S3Partition: "minute", - }, - MarshalerName: "sumo_ic", + assert.Equal(t, &Config{ + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "foo", + S3Partition: "minute", }, + MarshalerName: "sumo_ic", + }, e, ) e = cfg.Exporters[component.MustNewIDWithName("awss3", "proto")].(*Config) - assert.Equal(t, e, - &Config{ - S3Uploader: S3UploaderConfig{ - Region: "us-east-1", - S3Bucket: "bar", - S3Partition: "minute", - }, - MarshalerName: "otlp_proto", + assert.Equal(t, &Config{ + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "bar", + S3Partition: "minute", }, + MarshalerName: "otlp_proto", + }, e, ) } @@ -247,30 +242,28 @@ func TestCompressionName(t *testing.T) { e := cfg.Exporters[component.MustNewID("awss3")].(*Config) - assert.Equal(t, e, - &Config{ - S3Uploader: S3UploaderConfig{ - Region: "us-east-1", - S3Bucket: "foo", - S3Partition: "minute", - Compression: "gzip", - }, - MarshalerName: "otlp_json", + assert.Equal(t, &Config{ + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "foo", + S3Partition: "minute", + Compression: "gzip", }, + MarshalerName: "otlp_json", + }, e, ) e = cfg.Exporters[component.MustNewIDWithName("awss3", "proto")].(*Config) - assert.Equal(t, e, - &Config{ - S3Uploader: S3UploaderConfig{ - Region: "us-east-1", - S3Bucket: "bar", - S3Partition: "minute", - Compression: "none", - }, - MarshalerName: "otlp_proto", + assert.Equal(t, &Config{ + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "bar", + S3Partition: "minute", + Compression: "none", }, + MarshalerName: "otlp_proto", + }, e, ) } diff --git a/exporter/awss3exporter/marshaler_test.go b/exporter/awss3exporter/marshaler_test.go index 9a56d83d1f6f..bfa39d6914c3 100644 --- a/exporter/awss3exporter/marshaler_test.go +++ b/exporter/awss3exporter/marshaler_test.go @@ -19,19 +19,19 @@ func TestMarshaler(t *testing.T) { m, err := newMarshaler("otlp_json", zap.NewNop()) assert.NoError(t, err) require.NotNil(t, m) - assert.Equal(t, m.format(), "json") + assert.Equal(t, "json", m.format()) } { m, err := newMarshaler("otlp_proto", zap.NewNop()) assert.NoError(t, err) require.NotNil(t, m) - assert.Equal(t, m.format(), "binpb") + assert.Equal(t, "binpb", m.format()) } { m, err := newMarshaler("sumo_ic", zap.NewNop()) assert.NoError(t, err) require.NotNil(t, m) - assert.Equal(t, m.format(), "json.gz") + assert.Equal(t, "json.gz", m.format()) } { m, err := newMarshaler("unknown", zap.NewNop()) @@ -42,7 +42,7 @@ func TestMarshaler(t *testing.T) { m, err := newMarshaler("body", zap.NewNop()) assert.NoError(t, err) require.NotNil(t, m) - assert.Equal(t, m.format(), "txt") + assert.Equal(t, "txt", m.format()) } } diff --git a/exporter/awss3exporter/s3_writer_test.go b/exporter/awss3exporter/s3_writer_test.go index 350e3284f7d9..cdd5e1f025e3 100644 --- a/exporter/awss3exporter/s3_writer_test.go +++ b/exporter/awss3exporter/s3_writer_test.go @@ -126,7 +126,7 @@ func TestGetSessionConfigWithRoleArn(t *testing.T) { assert.NoError(t, err) assert.Equal(t, sessionConfig.Region, aws.String(region)) - assert.Equal(t, creds.ProviderName, "AssumeRoleProvider") + assert.Equal(t, "AssumeRoleProvider", creds.ProviderName) } func TestGetSessionConfigWithoutRoleArn(t *testing.T) { @@ -144,5 +144,5 @@ func TestGetSessionConfigWithoutRoleArn(t *testing.T) { assert.NoError(t, err) assert.Equal(t, sessionConfig.Region, aws.String(region)) - assert.NotEqual(t, creds.ProviderName, "AssumeRoleProvider") + assert.NotEqual(t, "AssumeRoleProvider", creds.ProviderName) } diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go index 9ed5509c9b19..a80873e5ac85 100644 --- a/exporter/awsxrayexporter/factory_test.go +++ b/exporter/awsxrayexporter/factory_test.go @@ -23,7 +23,7 @@ import ( func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{ + assert.Equal(t, &Config{ AWSSessionSettings: awsutil.AWSSessionSettings{ NumberOfWorkers: 8, Endpoint: "", @@ -37,7 +37,7 @@ func TestCreateDefaultConfig(t *testing.T) { RoleARN: "", }, skipTimestampValidation: true, - }, "failed to create default config") + }, cfg, "failed to create default config") assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } @@ -48,7 +48,7 @@ func TestCreateDefaultConfigWithSkipTimestampValidation(t *testing.T) { assert.NoError(t, err) cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{ + assert.Equal(t, &Config{ AWSSessionSettings: awsutil.AWSSessionSettings{ NumberOfWorkers: 8, Endpoint: "", @@ -62,7 +62,7 @@ func TestCreateDefaultConfigWithSkipTimestampValidation(t *testing.T) { RoleARN: "", }, skipTimestampValidation: true, - }, "failed to create default config") + }, cfg, "failed to create default config") assert.NoError(t, componenttest.CheckConfigStruct(cfg)) err = featuregate.GlobalRegistry().Set("exporter.awsxray.skiptimestampvalidation", false) diff --git a/exporter/azuremonitorexporter/metricexporter_test.go b/exporter/azuremonitorexporter/metricexporter_test.go index 0be8c6c86a73..520f3e627aef 100644 --- a/exporter/azuremonitorexporter/metricexporter_test.go +++ b/exporter/azuremonitorexporter/metricexporter_test.go @@ -35,74 +35,74 @@ func TestDoubleGaugeEnvelopes(t *testing.T) { gaugeMetric := getDoubleTestGaugeMetric() dataPoint := getDataPoint(t, gaugeMetric) - assert.Equal(t, dataPoint.Name, "Gauge") - assert.Equal(t, dataPoint.Value, float64(1)) - assert.Equal(t, dataPoint.Count, 1) - assert.Equal(t, dataPoint.Kind, contracts.Measurement) + assert.Equal(t, "Gauge", dataPoint.Name) + assert.Equal(t, float64(1), dataPoint.Value) + assert.Equal(t, 1, dataPoint.Count) + assert.Equal(t, contracts.Measurement, dataPoint.Kind) } func TestIntGaugeEnvelopes(t *testing.T) { gaugeMetric := getIntTestGaugeMetric() dataPoint := getDataPoint(t, gaugeMetric) - assert.Equal(t, dataPoint.Name, "Gauge") - assert.Equal(t, dataPoint.Value, float64(1)) - assert.Equal(t, dataPoint.Count, 1) - assert.Equal(t, dataPoint.Kind, contracts.Measurement) + assert.Equal(t, "Gauge", dataPoint.Name) + assert.Equal(t, float64(1), dataPoint.Value) + assert.Equal(t, 1, dataPoint.Count) + assert.Equal(t, contracts.Measurement, dataPoint.Kind) } func TestDoubleSumEnvelopes(t *testing.T) { sumMetric := getDoubleTestSumMetric() dataPoint := getDataPoint(t, sumMetric) - assert.Equal(t, dataPoint.Name, "Sum") - assert.Equal(t, dataPoint.Value, float64(2)) - assert.Equal(t, dataPoint.Count, 1) - assert.Equal(t, dataPoint.Kind, contracts.Measurement) + assert.Equal(t, "Sum", dataPoint.Name) + assert.Equal(t, float64(2), dataPoint.Value) + assert.Equal(t, 1, dataPoint.Count) + assert.Equal(t, contracts.Measurement, dataPoint.Kind) } func TestIntSumEnvelopes(t *testing.T) { sumMetric := getIntTestSumMetric() dataPoint := getDataPoint(t, sumMetric) - assert.Equal(t, dataPoint.Name, "Sum") - assert.Equal(t, dataPoint.Value, float64(2)) - assert.Equal(t, dataPoint.Count, 1) - assert.Equal(t, dataPoint.Kind, contracts.Measurement) + assert.Equal(t, "Sum", dataPoint.Name) + assert.Equal(t, float64(2), dataPoint.Value) + assert.Equal(t, 1, dataPoint.Count) + assert.Equal(t, contracts.Measurement, dataPoint.Kind) } func TestHistogramEnvelopes(t *testing.T) { histogramMetric := getTestHistogramMetric() dataPoint := getDataPoint(t, histogramMetric) - assert.Equal(t, dataPoint.Name, "Histogram") - assert.Equal(t, dataPoint.Value, float64(3)) - assert.Equal(t, dataPoint.Count, 3) - assert.Equal(t, dataPoint.Min, float64(0)) - assert.Equal(t, dataPoint.Max, float64(2)) - assert.Equal(t, dataPoint.Kind, contracts.Aggregation) + assert.Equal(t, "Histogram", dataPoint.Name) + assert.Equal(t, float64(3), dataPoint.Value) + assert.Equal(t, 3, dataPoint.Count) + assert.Equal(t, float64(0), dataPoint.Min) + assert.Equal(t, float64(2), dataPoint.Max) + assert.Equal(t, contracts.Aggregation, dataPoint.Kind) } func TestExponentialHistogramEnvelopes(t *testing.T) { exponentialHistogramMetric := getTestExponentialHistogramMetric() dataPoint := getDataPoint(t, exponentialHistogramMetric) - assert.Equal(t, dataPoint.Name, "ExponentialHistogram") - assert.Equal(t, dataPoint.Value, float64(4)) - assert.Equal(t, dataPoint.Count, 4) - assert.Equal(t, dataPoint.Min, float64(1)) - assert.Equal(t, dataPoint.Max, float64(3)) - assert.Equal(t, dataPoint.Kind, contracts.Aggregation) + assert.Equal(t, "ExponentialHistogram", dataPoint.Name) + assert.Equal(t, float64(4), dataPoint.Value) + assert.Equal(t, 4, dataPoint.Count) + assert.Equal(t, float64(1), dataPoint.Min) + assert.Equal(t, float64(3), dataPoint.Max) + assert.Equal(t, contracts.Aggregation, dataPoint.Kind) } func TestSummaryEnvelopes(t *testing.T) { summaryMetric := getTestSummaryMetric() dataPoint := getDataPoint(t, summaryMetric) - assert.Equal(t, dataPoint.Name, "Summary") - assert.Equal(t, dataPoint.Value, float64(5)) - assert.Equal(t, dataPoint.Count, 5) - assert.Equal(t, dataPoint.Kind, contracts.Aggregation) + assert.Equal(t, "Summary", dataPoint.Name) + assert.Equal(t, float64(5), dataPoint.Value) + assert.Equal(t, 5, dataPoint.Count) + assert.Equal(t, contracts.Aggregation, dataPoint.Kind) } func getDataPoint(t testing.TB, metric pmetric.Metric) *contracts.DataPoint { @@ -117,7 +117,7 @@ func getDataPoint(t testing.TB, metric pmetric.Metric) *contracts.DataPoint { require.NotNil(t, envelope.Data) envelopeData := envelope.Data.(*contracts.Data) - assert.Equal(t, envelopeData.BaseType, "MetricData") + assert.Equal(t, "MetricData", envelopeData.BaseType) require.NotNil(t, envelopeData.BaseData) diff --git a/exporter/coralogixexporter/factory_test.go b/exporter/coralogixexporter/factory_test.go index 9bc2f9e85506..66966c68bcaf 100644 --- a/exporter/coralogixexporter/factory_test.go +++ b/exporter/coralogixexporter/factory_test.go @@ -215,7 +215,7 @@ func TestCreateTracesExporter(t *testing.T) { if err != nil { // Since the endpoint of OTLP exporter doesn't actually exist, // exporter may already stop because it cannot connect. - assert.Equal(t, err.Error(), "rpc error: code = Canceled desc = grpc: the client connection is closing") + assert.Equal(t, "rpc error: code = Canceled desc = grpc: the client connection is closing", err.Error()) } }) } @@ -240,7 +240,7 @@ func TestCreateLogsExporterWithDomainAndEndpoint(t *testing.T) { if err != nil { // Since the endpoint of OTLP exporter doesn't actually exist, // exporter may already stop because it cannot connect. - assert.Equal(t, err.Error(), "rpc error: code = Canceled desc = grpc: the client connection is closing") + assert.Equal(t, "rpc error: code = Canceled desc = grpc: the client connection is closing", err.Error()) } } diff --git a/exporter/datadogexporter/examples_test.go b/exporter/datadogexporter/examples_test.go index e13f354406f7..64484e953f78 100644 --- a/exporter/datadogexporter/examples_test.go +++ b/exporter/datadogexporter/examples_test.go @@ -74,7 +74,7 @@ func TestExamples(t *testing.T) { require.NoError(t, err) err = yaml.Unmarshal(slurp, &out) require.NoError(t, err) - require.Equal(t, out.Kind, "ConfigMap") + require.Equal(t, "ConfigMap", out.Kind) require.NotEmpty(t, out.Data.YAML) data := []byte(out.Data.YAML) diff --git a/exporter/datadogexporter/factory_test.go b/exporter/datadogexporter/factory_test.go index c0fa7d9f2251..29da32051e91 100644 --- a/exporter/datadogexporter/factory_test.go +++ b/exporter/datadogexporter/factory_test.go @@ -685,7 +685,7 @@ func TestOnlyMetadata(t *testing.T) { require.NoError(t, err) recvMetadata := <-server.MetadataChan - assert.Equal(t, recvMetadata.InternalHostname, "custom-hostname") + assert.Equal(t, "custom-hostname", recvMetadata.InternalHostname) } func TestStopExporters(t *testing.T) { diff --git a/exporter/datadogexporter/integrationtest/integration_test.go b/exporter/datadogexporter/integrationtest/integration_test.go index d80ef5f51b28..b7b48eebfcfe 100644 --- a/exporter/datadogexporter/integrationtest/integration_test.go +++ b/exporter/datadogexporter/integrationtest/integration_test.go @@ -509,12 +509,12 @@ func TestIntegrationLogs(t *testing.T) { if s.Metric == "otelcol_receiver_accepted_log_records" { numAcceptedLogRecords++ assert.Len(t, s.Points, 1) - assert.Equal(t, s.Points[0].Value, 5.0) + assert.Equal(t, 5.0, s.Points[0].Value) } if s.Metric == "otelcol_exporter_sent_log_records" { numSentLogRecords++ assert.Len(t, s.Points, 1) - assert.Equal(t, s.Points[0].Value, 5.0) + assert.Equal(t, 5.0, s.Points[0].Value) } } assert.Equal(t, 2, numAcceptedLogRecords) diff --git a/exporter/datadogexporter/internal/clientutil/http_test.go b/exporter/datadogexporter/internal/clientutil/http_test.go index 6a09dc2ba1b0..73420c1f1863 100644 --- a/exporter/datadogexporter/internal/clientutil/http_test.go +++ b/exporter/datadogexporter/internal/clientutil/http_test.go @@ -161,7 +161,7 @@ func TestNewHTTPClient(t *testing.T) { func TestUserAgent(t *testing.T) { - assert.Equal(t, UserAgent(buildInfo), "otelcontribcol/1.0") + assert.Equal(t, "otelcontribcol/1.0", UserAgent(buildInfo)) } func TestDDHeaders(t *testing.T) { @@ -169,6 +169,6 @@ func TestDDHeaders(t *testing.T) { apiKey := "apikey" SetDDHeaders(header, buildInfo, apiKey) assert.Equal(t, header.Get("DD-Api-Key"), apiKey) - assert.Equal(t, header.Get("USer-Agent"), "otelcontribcol/1.0") + assert.Equal(t, "otelcontribcol/1.0", header.Get("USer-Agent")) } diff --git a/exporter/datadogexporter/internal/clientutil/retrier_test.go b/exporter/datadogexporter/internal/clientutil/retrier_test.go index a52ec759d56b..c919e4553245 100644 --- a/exporter/datadogexporter/internal/clientutil/retrier_test.go +++ b/exporter/datadogexporter/internal/clientutil/retrier_test.go @@ -26,7 +26,7 @@ func TestDoWithRetries(t *testing.T) { retryNum, err := retrier.DoWithRetries(ctx, func(context.Context) error { return nil }) require.NoError(t, err) - assert.Equal(t, retryNum, int64(0)) + assert.Equal(t, int64(0), retryNum) retrier = NewRetrier(zap.NewNop(), configretry.BackOffConfig{ @@ -52,5 +52,5 @@ func TestNoRetriesOnPermanentError(t *testing.T) { return WrapError(fmt.Errorf("test"), &respNonRetriable) }) require.Error(t, err) - assert.Equal(t, retryNum, int64(0)) + assert.Equal(t, int64(0), retryNum) } diff --git a/exporter/datadogexporter/internal/hostmetadata/host_test.go b/exporter/datadogexporter/internal/hostmetadata/host_test.go index f4a45c947124..f58b2fbea4b7 100644 --- a/exporter/datadogexporter/internal/hostmetadata/host_test.go +++ b/exporter/datadogexporter/internal/hostmetadata/host_test.go @@ -18,5 +18,5 @@ func TestHost(t *testing.T) { require.NoError(t, err) src, err := p.Source(context.Background()) require.NoError(t, err) - assert.Equal(t, src.Identifier, "test-host") + assert.Equal(t, "test-host", src.Identifier) } diff --git a/exporter/datadogexporter/internal/hostmetadata/internal/system/host_test.go b/exporter/datadogexporter/internal/hostmetadata/internal/system/host_test.go index 9939324eb5d4..9e1dceae16d1 100644 --- a/exporter/datadogexporter/internal/hostmetadata/internal/system/host_test.go +++ b/exporter/datadogexporter/internal/hostmetadata/internal/system/host_test.go @@ -30,17 +30,17 @@ func TestGetHostname(t *testing.T) { FQDN: "fqdn", OS: "os", } - assert.Equal(t, hostInfoAll.GetHostname(logger), "fqdn") + assert.Equal(t, "fqdn", hostInfoAll.GetHostname(logger)) hostInfoInvalid := &HostInfo{ FQDN: "fqdn_invalid", OS: "os", } - assert.Equal(t, hostInfoInvalid.GetHostname(logger), "os") + assert.Equal(t, "os", hostInfoInvalid.GetHostname(logger)) hostInfoMissingFQDN := &HostInfo{ OS: "os", } - assert.Equal(t, hostInfoMissingFQDN.GetHostname(logger), "os") + assert.Equal(t, "os", hostInfoMissingFQDN.GetHostname(logger)) } diff --git a/exporter/datadogexporter/internal/hostmetadata/metadata_test.go b/exporter/datadogexporter/internal/hostmetadata/metadata_test.go index c2588fabd818..4d2100046e80 100644 --- a/exporter/datadogexporter/internal/hostmetadata/metadata_test.go +++ b/exporter/datadogexporter/internal/hostmetadata/metadata_test.go @@ -71,10 +71,10 @@ func TestFillHostMetadata(t *testing.T) { metadata := payload.NewEmpty() fillHostMetadata(params, pcfg, hostProvider, &metadata) - assert.Equal(t, metadata.InternalHostname, "hostname") - assert.Equal(t, metadata.Flavor, "otelcontribcol") - assert.Equal(t, metadata.Version, "1.0") - assert.Equal(t, metadata.Meta.Hostname, "hostname") + assert.Equal(t, "hostname", metadata.InternalHostname) + assert.Equal(t, "otelcontribcol", metadata.Flavor) + assert.Equal(t, "1.0", metadata.Version) + assert.Equal(t, "hostname", metadata.Meta.Hostname) assert.ElementsMatch(t, metadata.Tags.OTel, []string{"key1:tag1", "key2:tag2", "env:prod"}) metadataWithVals := payload.HostMetadata{ @@ -84,10 +84,10 @@ func TestFillHostMetadata(t *testing.T) { } fillHostMetadata(params, pcfg, hostProvider, &metadataWithVals) - assert.Equal(t, metadataWithVals.InternalHostname, "my-custom-hostname") - assert.Equal(t, metadataWithVals.Flavor, "otelcontribcol") - assert.Equal(t, metadataWithVals.Version, "1.0") - assert.Equal(t, metadataWithVals.Meta.Hostname, "my-custom-hostname") + assert.Equal(t, "my-custom-hostname", metadataWithVals.InternalHostname) + assert.Equal(t, "otelcontribcol", metadataWithVals.Flavor) + assert.Equal(t, "1.0", metadataWithVals.Version) + assert.Equal(t, "my-custom-hostname", metadataWithVals.Meta.Hostname) assert.ElementsMatch(t, metadataWithVals.Tags.OTel, []string{"key1:tag1", "key2:tag2", "env:prod"}) } @@ -187,8 +187,8 @@ func TestPushMetadata(t *testing.T) { handler := http.NewServeMux() handler.HandleFunc("/intake", func(_ http.ResponseWriter, r *http.Request) { - assert.Equal(t, r.Header.Get("DD-Api-Key"), "apikey") - assert.Equal(t, r.Header.Get("User-Agent"), "otelcontribcol/1.0") + assert.Equal(t, "apikey", r.Header.Get("DD-Api-Key")) + assert.Equal(t, "otelcontribcol/1.0", r.Header.Get("User-Agent")) reader, err := gzip.NewReader(r.Body) require.NoError(t, err) body, err := io.ReadAll(reader) @@ -253,7 +253,7 @@ func TestPusher(t *testing.T) { go RunPusher(ctx, params, pcfg, hostProvider, attrs, reporter) recvMetadata := <-server.MetadataChan - assert.Equal(t, recvMetadata.InternalHostname, "datadog-hostname") + assert.Equal(t, "datadog-hostname", recvMetadata.InternalHostname) assert.Equal(t, recvMetadata.Version, mockBuildInfo.Version) assert.Equal(t, recvMetadata.Flavor, mockBuildInfo.Command) require.NotNil(t, recvMetadata.Meta) diff --git a/exporter/datadogexporter/internal/metrics/series_test.go b/exporter/datadogexporter/internal/metrics/series_test.go index e195fc271bfc..7df7e9b258d1 100644 --- a/exporter/datadogexporter/internal/metrics/series_test.go +++ b/exporter/datadogexporter/internal/metrics/series_test.go @@ -35,10 +35,10 @@ func TestNewType(t *testing.T) { tags := []string{"tag:value"} gauge := NewGauge(name, ts, value, tags) - assert.Equal(t, gauge.GetType(), datadogV2.METRICINTAKETYPE_GAUGE) + assert.Equal(t, datadogV2.METRICINTAKETYPE_GAUGE, gauge.GetType()) count := NewCount(name, ts, value, tags) - assert.Equal(t, count.GetType(), datadogV2.METRICINTAKETYPE_COUNT) + assert.Equal(t, datadogV2.METRICINTAKETYPE_COUNT, count.GetType()) } func TestDefaultMetrics(t *testing.T) { diff --git a/exporter/datadogexporter/metrics_exporter_test.go b/exporter/datadogexporter/metrics_exporter_test.go index 891da576c415..f92293240261 100644 --- a/exporter/datadogexporter/metrics_exporter_test.go +++ b/exporter/datadogexporter/metrics_exporter_test.go @@ -81,7 +81,7 @@ func TestNewExporter(t *testing.T) { err = exp.ConsumeMetrics(context.Background(), testMetrics) require.NoError(t, err) recvMetadata := <-server.MetadataChan - assert.Equal(t, recvMetadata.InternalHostname, "custom-hostname") + assert.Equal(t, "custom-hostname", recvMetadata.InternalHostname) } func Test_metricsExporter_PushMetricsData(t *testing.T) { @@ -402,7 +402,7 @@ func TestNewExporter_Zorkian(t *testing.T) { err = exp.ConsumeMetrics(context.Background(), testMetrics) require.NoError(t, err) recvMetadata := <-server.MetadataChan - assert.Equal(t, recvMetadata.InternalHostname, "custom-hostname") + assert.Equal(t, "custom-hostname", recvMetadata.InternalHostname) } func Test_metricsExporter_PushMetricsData_Zorkian(t *testing.T) { diff --git a/exporter/datadogexporter/traces_exporter_test.go b/exporter/datadogexporter/traces_exporter_test.go index fa5174155ec1..64ae87375141 100644 --- a/exporter/datadogexporter/traces_exporter_test.go +++ b/exporter/datadogexporter/traces_exporter_test.go @@ -328,7 +328,7 @@ func TestPushTraceData(t *testing.T) { assert.NoError(t, err) recvMetadata := <-server.MetadataChan - assert.Equal(t, recvMetadata.InternalHostname, "custom-hostname") + assert.Equal(t, "custom-hostname", recvMetadata.InternalHostname) } func simpleTraces() ptrace.Traces { diff --git a/exporter/datasetexporter/logs_exporter_stress_test.go b/exporter/datasetexporter/logs_exporter_stress_test.go index 5f1a37f693a5..4f8a66e07ac3 100644 --- a/exporter/datasetexporter/logs_exporter_stress_test.go +++ b/exporter/datasetexporter/logs_exporter_stress_test.go @@ -144,7 +144,7 @@ func TestConsumeLogsManyLogsShouldSucceed(t *testing.T) { assert.True(t, wasSuccessful.Load()) - assert.Equal(t, seenKeys, expectedKeys) + assert.Equal(t, expectedKeys, seenKeys) assert.Equal(t, expectedLogs, processedEvents.Load(), "processed items") assert.Equal(t, expectedLogs, uint64(len(seenKeys)), "unique items") } diff --git a/exporter/datasetexporter/logs_exporter_test.go b/exporter/datasetexporter/logs_exporter_test.go index f350f070eeae..2a75855b10a2 100644 --- a/exporter/datasetexporter/logs_exporter_test.go +++ b/exporter/datasetexporter/logs_exporter_test.go @@ -712,7 +712,7 @@ func TestBuildEventFromLogEventWithoutTimestampWithOutObservedTimestampUseCurren now = func() time.Time { return time.Unix(123456789, 0) } currentTime := now() assert.Equal(t, currentTime, time.Unix(123456789, 0)) - assert.Equal(t, strconv.FormatInt(currentTime.UnixNano(), 10), "123456789000000000") + assert.Equal(t, "123456789000000000", strconv.FormatInt(currentTime.UnixNano(), 10)) lr := testdata.GenerateLogsOneLogRecord() ld := lr.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0) diff --git a/exporter/elasticsearchexporter/utils_test.go b/exporter/elasticsearchexporter/utils_test.go index ca73aaddf844..09403a24271b 100644 --- a/exporter/elasticsearchexporter/utils_test.go +++ b/exporter/elasticsearchexporter/utils_test.go @@ -300,21 +300,21 @@ func TestGetSuffixTime(t *testing.T) { testTime := time.Date(2023, 12, 2, 10, 10, 10, 1, time.UTC) index, err := generateIndexWithLogstashFormat(defaultCfg.LogsIndex, &defaultCfg.LogstashFormat, testTime) assert.NoError(t, err) - assert.Equal(t, index, "logs-generic-default-2023.12.02") + assert.Equal(t, "logs-generic-default-2023.12.02", index) defaultCfg.LogsIndex = "logstash" defaultCfg.LogstashFormat.PrefixSeparator = "." otelLogsIndex, err := generateIndexWithLogstashFormat(defaultCfg.LogsIndex, &defaultCfg.LogstashFormat, testTime) assert.NoError(t, err) - assert.Equal(t, otelLogsIndex, "logstash.2023.12.02") + assert.Equal(t, "logstash.2023.12.02", otelLogsIndex) defaultCfg.LogstashFormat.DateFormat = "%Y-%m-%d" newOtelLogsIndex, err := generateIndexWithLogstashFormat(defaultCfg.LogsIndex, &defaultCfg.LogstashFormat, testTime) assert.NoError(t, err) - assert.Equal(t, newOtelLogsIndex, "logstash.2023-12-02") + assert.Equal(t, "logstash.2023-12-02", newOtelLogsIndex) defaultCfg.LogstashFormat.DateFormat = "%d/%m/%Y" newOtelLogsIndexWithSpecDataFormat, err := generateIndexWithLogstashFormat(defaultCfg.LogsIndex, &defaultCfg.LogstashFormat, testTime) assert.NoError(t, err) - assert.Equal(t, newOtelLogsIndexWithSpecDataFormat, "logstash.02/12/2023") + assert.Equal(t, "logstash.02/12/2023", newOtelLogsIndexWithSpecDataFormat) } diff --git a/exporter/googlemanagedprometheusexporter/config_test.go b/exporter/googlemanagedprometheusexporter/config_test.go index 5f9c118eed5c..70c1a405961d 100644 --- a/exporter/googlemanagedprometheusexporter/config_test.go +++ b/exporter/googlemanagedprometheusexporter/config_test.go @@ -38,52 +38,51 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, r0, factory.CreateDefaultConfig().(*Config)) r1 := cfg.Exporters[component.NewIDWithName(metadata.Type, "customname")].(*Config) - assert.Equal(t, r1, - &Config{ - TimeoutSettings: exporterhelper.TimeoutSettings{ - Timeout: 20 * time.Second, - }, - GMPConfig: GMPConfig{ - ProjectID: "my-project", - UserAgent: "opentelemetry-collector-contrib {{version}}", - MetricConfig: MetricConfig{ - Config: googlemanagedprometheus.Config{ - AddMetricSuffixes: false, - ExtraMetricsConfig: googlemanagedprometheus.ExtraMetricsConfig{ - EnableTargetInfo: false, - EnableScopeInfo: false, - }, + assert.Equal(t, &Config{ + TimeoutSettings: exporterhelper.TimeoutSettings{ + Timeout: 20 * time.Second, + }, + GMPConfig: GMPConfig{ + ProjectID: "my-project", + UserAgent: "opentelemetry-collector-contrib {{version}}", + MetricConfig: MetricConfig{ + Config: googlemanagedprometheus.Config{ + AddMetricSuffixes: false, + ExtraMetricsConfig: googlemanagedprometheus.ExtraMetricsConfig{ + EnableTargetInfo: false, + EnableScopeInfo: false, + }, + }, + Prefix: "my-metric-domain.com", + ResourceFilters: []collector.ResourceFilter{ + { + Prefix: "cloud", + }, + { + Prefix: "k8s", + }, + { + Prefix: "faas", }, - Prefix: "my-metric-domain.com", - ResourceFilters: []collector.ResourceFilter{ - { - Prefix: "cloud", - }, - { - Prefix: "k8s", - }, - { - Prefix: "faas", - }, - { - Regex: "container.id", - }, - { - Regex: "process.pid", - }, - { - Regex: "host.name", - }, - { - Regex: "host.id", - }, + { + Regex: "container.id", + }, + { + Regex: "process.pid", + }, + { + Regex: "host.name", + }, + { + Regex: "host.id", }, }, }, - QueueSettings: exporterhelper.QueueSettings{ - Enabled: true, - NumConsumers: 2, - QueueSize: 10, - }, - }) + }, + QueueSettings: exporterhelper.QueueSettings{ + Enabled: true, + NumConsumers: 2, + QueueSize: 10, + }, + }, r1) } diff --git a/exporter/kafkaexporter/config_test.go b/exporter/kafkaexporter/config_test.go index b3542d236438..da2cebf8e808 100644 --- a/exporter/kafkaexporter/config_test.go +++ b/exporter/kafkaexporter/config_test.go @@ -335,8 +335,8 @@ func Test_saramaProducerCompressionCodec(t *testing.T) { for name, test := range tests { t.Run(name, func(t *testing.T) { c, err := saramaProducerCompressionCodec(test.compression) - assert.Equal(t, c, test.expectedCompression) - assert.Equal(t, err, test.expectedError) + assert.Equal(t, test.expectedCompression, c) + assert.Equal(t, test.expectedError, err) }) } } diff --git a/exporter/loadbalancingexporter/trace_exporter_test.go b/exporter/loadbalancingexporter/trace_exporter_test.go index 49a9cff2048d..370b0a5ddb72 100644 --- a/exporter/loadbalancingexporter/trace_exporter_test.go +++ b/exporter/loadbalancingexporter/trace_exporter_test.go @@ -131,7 +131,7 @@ func TestConsumeTraces(t *testing.T) { p, err := newTracesExporter(ts, simpleConfig()) require.NotNil(t, p) require.NoError(t, err) - assert.Equal(t, p.routingKey, traceIDRouting) + assert.Equal(t, traceIDRouting, p.routingKey) // pre-load an exporter here, so that we don't use the actual OTLP exporter lb.addMissingExporters(context.Background(), []string{"endpoint-1"}) @@ -179,7 +179,7 @@ func TestConsumeTraces_ConcurrentResolverChange(t *testing.T) { p, err := newTracesExporter(ts, simpleConfig()) require.NotNil(t, p) require.NoError(t, err) - assert.Equal(t, p.routingKey, traceIDRouting) + assert.Equal(t, traceIDRouting, p.routingKey) endpoints := []string{"endpoint-1"} lb.res = &mockResolver{ @@ -222,7 +222,7 @@ func TestConsumeTracesServiceBased(t *testing.T) { p, err := newTracesExporter(ts, serviceBasedRoutingConfig()) require.NotNil(t, p) require.NoError(t, err) - assert.Equal(t, p.routingKey, svcRouting) + assert.Equal(t, svcRouting, p.routingKey) // pre-load an exporter here, so that we don't use the actual OTLP exporter lb.addMissingExporters(context.Background(), []string{"endpoint-1"}) @@ -407,7 +407,7 @@ func TestBatchWithTwoTraces(t *testing.T) { // verify assert.NoError(t, err) assert.Len(t, sink.AllTraces(), 1) - assert.Equal(t, sink.AllTraces()[0].SpanCount(), 2) + assert.Equal(t, 2, sink.AllTraces()[0].SpanCount()) } func TestNoTracesInBatch(t *testing.T) { diff --git a/exporter/logzioexporter/factory_test.go b/exporter/logzioexporter/factory_test.go index bbf1b0d1ca44..bdfd78833d2a 100644 --- a/exporter/logzioexporter/factory_test.go +++ b/exporter/logzioexporter/factory_test.go @@ -92,6 +92,6 @@ func TestGetListenerURL(t *testing.T) { } for _, test := range getListenerURLTests { output := getListenerURL(test.arg1) - require.Equal(t, output, test.expected) + require.Equal(t, test.expected, output) } } diff --git a/exporter/logzioexporter/jsonlog_test.go b/exporter/logzioexporter/jsonlog_test.go index 8241553dcfd3..a3643a5dc81a 100644 --- a/exporter/logzioexporter/jsonlog_test.go +++ b/exporter/logzioexporter/jsonlog_test.go @@ -71,7 +71,7 @@ func TestConvertLogRecordToJSON(t *testing.T) { } for _, test := range convertLogRecordToJSONTests { output := convertLogRecordToJSON(test.log, test.log.Attributes()) - require.Equal(t, output, test.expected) + require.Equal(t, test.expected, output) } } diff --git a/exporter/logzioexporter/logger_test.go b/exporter/logzioexporter/logger_test.go index 8821f7f76c0b..3c74dbf60723 100644 --- a/exporter/logzioexporter/logger_test.go +++ b/exporter/logzioexporter/logger_test.go @@ -17,7 +17,7 @@ func TestLoggerConfigs(tester *testing.T) { name: loggerName, } - assert.Equal(tester, exporterLogger.Name(), loggerName) + assert.Equal(tester, loggerName, exporterLogger.Name()) assert.NotNil(tester, exporterLogger.Named("logger")) assert.NotNil(tester, exporterLogger.With("key", "val")) assert.NotNil(tester, exporterLogger.ResetNamed(loggerName)) diff --git a/exporter/mezmoexporter/exporter_test.go b/exporter/mezmoexporter/exporter_test.go index 5d90592f471b..a6299ec0f689 100644 --- a/exporter/mezmoexporter/exporter_test.go +++ b/exporter/mezmoexporter/exporter_test.go @@ -213,9 +213,9 @@ func TestAddsRequiredAttributes(t *testing.T) { lines := body.Lines for _, line := range lines { assert.Greater(t, line.Timestamp, int64(0)) - assert.Equal(t, line.Level, "info") - assert.Equal(t, line.App, "") - assert.Equal(t, line.Line, "minimal attribute log") + assert.Equal(t, "info", line.Level) + assert.Equal(t, "", line.App) + assert.Equal(t, "minimal attribute log", line.Line) } return http.StatusOK, "" @@ -256,17 +256,17 @@ func Test404IngestError(t *testing.T) { err := exporter.pushLogData(context.Background(), logs) require.NoError(t, err) - assert.Equal(t, logObserver.Len(), 2) + assert.Equal(t, 2, logObserver.Len()) logLine := logObserver.All()[0] - assert.Equal(t, logLine.Message, "got http status (/foobar): 404 Not Found") - assert.Equal(t, logLine.Level, zapcore.ErrorLevel) + assert.Equal(t, "got http status (/foobar): 404 Not Found", logLine.Message) + assert.Equal(t, zapcore.ErrorLevel, logLine.Level) logLine = logObserver.All()[1] - assert.Equal(t, logLine.Message, "http response") - assert.Equal(t, logLine.Level, zapcore.DebugLevel) + assert.Equal(t, "http response", logLine.Message) + assert.Equal(t, zapcore.DebugLevel, logLine.Level) responseField := logLine.Context[0] - assert.Equal(t, responseField.Key, "response") - assert.Equal(t, responseField.String, `{"foo":"bar"}`) + assert.Equal(t, "response", responseField.Key) + assert.Equal(t, `{"foo":"bar"}`, responseField.String) } diff --git a/exporter/mezmoexporter/factory_test.go b/exporter/mezmoexporter/factory_test.go index b97a978e4dec..2d86751b4831 100644 --- a/exporter/mezmoexporter/factory_test.go +++ b/exporter/mezmoexporter/factory_test.go @@ -28,7 +28,7 @@ func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{ + assert.Equal(t, &Config{ IngestURL: defaultIngestURL, IngestKey: "", @@ -37,7 +37,7 @@ func TestCreateDefaultConfig(t *testing.T) { }, BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - }) + }, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/exporter/mezmoexporter/utils_test.go b/exporter/mezmoexporter/utils_test.go index c8441c2e43f8..c8d6b860334f 100644 --- a/exporter/mezmoexporter/utils_test.go +++ b/exporter/mezmoexporter/utils_test.go @@ -20,21 +20,21 @@ func TestTruncateString(t *testing.T) { t.Run("Test shorter string", func(t *testing.T) { s := truncateString("short", 10) require.Len(t, s, 5) - require.Equal(t, s, "short") + require.Equal(t, "short", s) }) // Test string is equal to the maximum length t.Run("Test equal string", func(t *testing.T) { s := truncateString("short", 5) require.Len(t, s, 5) - require.Equal(t, s, "short") + require.Equal(t, "short", s) }) // Test string is longer than the maximum length t.Run("Test longer string", func(t *testing.T) { s := truncateString("longstring", 4) require.Len(t, s, 4) - require.Equal(t, s, "long") + require.Equal(t, "long", s) }) } diff --git a/exporter/otelarrowexporter/factory_test.go b/exporter/otelarrowexporter/factory_test.go index 9d0e212090fc..66ece922ef06 100644 --- a/exporter/otelarrowexporter/factory_test.go +++ b/exporter/otelarrowexporter/factory_test.go @@ -36,15 +36,15 @@ func TestCreateDefaultConfig(t *testing.T) { assert.Equal(t, ocfg.RetryConfig, configretry.NewDefaultBackOffConfig()) assert.Equal(t, ocfg.QueueSettings, exporterhelper.NewDefaultQueueSettings()) assert.Equal(t, ocfg.TimeoutSettings, exporterhelper.NewDefaultTimeoutSettings()) - assert.Equal(t, ocfg.Compression, configcompression.TypeZstd) - assert.Equal(t, ocfg.Arrow, ArrowConfig{ + assert.Equal(t, configcompression.TypeZstd, ocfg.Compression) + assert.Equal(t, ArrowConfig{ Disabled: false, NumStreams: runtime.NumCPU(), MaxStreamLifetime: time.Hour, PayloadCompression: "", Zstd: zstd.DefaultEncoderConfig(), Prioritizer: arrow.DefaultPrioritizer, - }) + }, ocfg.Arrow) } func TestCreateMetricsExporter(t *testing.T) { @@ -207,7 +207,7 @@ func TestCreateTracesExporter(t *testing.T) { if err != nil { // Since the endpoint of OTLP exporter doesn't actually exist, // exporter may already stop because it cannot connect. - assert.Equal(t, err.Error(), "rpc error: code = Canceled desc = grpc: the client connection is closing") + assert.Equal(t, "rpc error: code = Canceled desc = grpc: the client connection is closing", err.Error()) } }) } diff --git a/exporter/otelarrowexporter/internal/arrow/exporter_test.go b/exporter/otelarrowexporter/internal/arrow/exporter_test.go index 4f488af53e87..4c4b14c44faf 100644 --- a/exporter/otelarrowexporter/internal/arrow/exporter_test.go +++ b/exporter/otelarrowexporter/internal/arrow/exporter_test.go @@ -318,7 +318,7 @@ func TestArrowExporterStreamConnectError(t *testing.T) { require.NoError(t, tc.exporter.Shutdown(bg)) require.NotEmpty(t, tc.observedLogs.All(), "should have at least one log: %v", tc.observedLogs.All()) - require.Equal(t, tc.observedLogs.All()[0].Message, "cannot start arrow stream") + require.Equal(t, "cannot start arrow stream", tc.observedLogs.All()[0].Message) }) } } @@ -344,7 +344,7 @@ func TestArrowExporterDowngrade(t *testing.T) { require.NoError(t, tc.exporter.Shutdown(bg)) require.Less(t, 1, len(tc.observedLogs.All()), "should have at least two logs: %v", tc.observedLogs.All()) - require.Equal(t, tc.observedLogs.All()[0].Message, "arrow is not supported") + require.Equal(t, "arrow is not supported", tc.observedLogs.All()[0].Message) require.Contains(t, tc.observedLogs.All()[1].Message, "downgrading") }) } @@ -393,7 +393,7 @@ func TestArrowExporterDisableDowngrade(t *testing.T) { require.NoError(t, tc.exporter.Shutdown(bg)) require.Less(t, 1, len(tc.observedLogs.All()), "should have at least two logs: %v", tc.observedLogs.All()) - require.Equal(t, tc.observedLogs.All()[0].Message, "arrow is not supported") + require.Equal(t, "arrow is not supported", tc.observedLogs.All()[0].Message) require.NotContains(t, tc.observedLogs.All()[1].Message, "downgrading") }) } diff --git a/exporter/otelarrowexporter/internal/arrow/stream_test.go b/exporter/otelarrowexporter/internal/arrow/stream_test.go index 100e6f131c9f..83cde4586377 100644 --- a/exporter/otelarrowexporter/internal/arrow/stream_test.go +++ b/exporter/otelarrowexporter/internal/arrow/stream_test.go @@ -322,7 +322,7 @@ func TestStreamUnsupported(t *testing.T) { tc.waitForShutdown() require.NotEmpty(t, tc.observedLogs.All(), "should have at least one log: %v", tc.observedLogs.All()) - require.Equal(t, tc.observedLogs.All()[0].Message, "arrow is not supported") + require.Equal(t, "arrow is not supported", tc.observedLogs.All()[0].Message) }) } } diff --git a/exporter/otelarrowexporter/otelarrow_test.go b/exporter/otelarrowexporter/otelarrow_test.go index 1be964b98401..dfa73f7417cc 100644 --- a/exporter/otelarrowexporter/otelarrow_test.go +++ b/exporter/otelarrowexporter/otelarrow_test.go @@ -566,7 +566,7 @@ func TestSendMetrics(t *testing.T) { assert.EqualValues(t, md, rcv.getLastRequest()) mdata := rcv.getMetadata() - require.EqualValues(t, mdata.Get("header"), expectedHeader) + require.EqualValues(t, expectedHeader, mdata.Get("header")) require.Len(t, mdata.Get("User-Agent"), 1) require.Contains(t, mdata.Get("User-Agent")[0], "Collector/1.2.3test") diff --git a/exporter/prometheusexporter/accumulator_test.go b/exporter/prometheusexporter/accumulator_test.go index 49b39c4412bb..d8858c569c9c 100644 --- a/exporter/prometheusexporter/accumulator_test.go +++ b/exporter/prometheusexporter/accumulator_test.go @@ -248,7 +248,7 @@ func TestAccumulateMetrics(t *testing.T) { v := m.(*accumulatedValue) vLabels, vTS, vValue, vTemporality, vIsMonotonic := getMetricProperties(ilm2.Metrics().At(0)) - require.Equal(t, v.scope.Name(), "test") + require.Equal(t, "test", v.scope.Name()) require.Equal(t, v.value.Type(), ilm2.Metrics().At(0).Type()) vLabels.Range(func(k string, v pcommon.Value) bool { r, _ := m2Labels.Get(k) @@ -360,7 +360,7 @@ func TestAccumulateDeltaToCumulative(t *testing.T) { v := m.(*accumulatedValue) vLabels, vTS, vValue, vTemporality, vIsMonotonic := getMetricProperties(v.value) - require.Equal(t, v.scope.Name(), "test") + require.Equal(t, "test", v.scope.Name()) require.Equal(t, v.value.Type(), ilm.Metrics().At(0).Type()) require.Equal(t, v.value.Type(), ilm.Metrics().At(1).Type()) diff --git a/exporter/prometheusremotewriteexporter/helper_test.go b/exporter/prometheusremotewriteexporter/helper_test.go index d0454d4cb98b..f464c25071b0 100644 --- a/exporter/prometheusremotewriteexporter/helper_test.go +++ b/exporter/prometheusremotewriteexporter/helper_test.go @@ -233,7 +233,7 @@ func TestEnsureTimeseriesPointsAreSortedByTimestamp(t *testing.T) { }, }, } - assert.Equal(t, got, want) + assert.Equal(t, want, got) // For a full sanity/logical check, assert that EVERY // Sample has a Timestamp bigger than its prior values. diff --git a/exporter/pulsarexporter/factory_test.go b/exporter/pulsarexporter/factory_test.go index 1cd6cc0f6432..05338c7d5823 100644 --- a/exporter/pulsarexporter/factory_test.go +++ b/exporter/pulsarexporter/factory_test.go @@ -18,19 +18,19 @@ import ( func Test_createDefaultConfig(t *testing.T) { cfg := createDefaultConfig() - assert.Equal(t, cfg, &Config{ + assert.Equal(t, &Config{ TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), Endpoint: defaultBroker, - // using an empty topic to track when it has not been set by user, default is based on traces or metrics. + Topic: "", Encoding: defaultEncoding, Authentication: Authentication{}, MaxConnectionsPerBroker: 1, ConnectionTimeout: 5 * time.Second, OperationTimeout: 30 * time.Second, - }) + }, cfg) } func TestWithTracesMarshalers_err(t *testing.T) { diff --git a/exporter/sentryexporter/sentry_exporter_test.go b/exporter/sentryexporter/sentry_exporter_test.go index 7e1a8f95ed90..8b44d63bccf8 100644 --- a/exporter/sentryexporter/sentry_exporter_test.go +++ b/exporter/sentryexporter/sentry_exporter_test.go @@ -461,13 +461,13 @@ func TestGenerateTagsFromAttributes(t *testing.T) { tags := generateTagsFromAttributes(attrs) stringVal := tags["string-key"] - assert.Equal(t, stringVal, "string-value") + assert.Equal(t, "string-value", stringVal) boolVal := tags["bool-key"] - assert.Equal(t, boolVal, "true") + assert.Equal(t, "true", boolVal) doubleVal := tags["double-key"] - assert.Equal(t, doubleVal, "123.123") + assert.Equal(t, "123.123", doubleVal) intVal := tags["int-key"] - assert.Equal(t, intVal, "321") + assert.Equal(t, "321", intVal) } type SpanStatusCase struct { diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index ef55bea36865..88ec35ba2904 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -807,7 +807,7 @@ func TestConsumeLogsDataWithAccessTokenPassthrough(t *testing.T) { defer receivedTokens.Unlock() return len(receivedTokens.tokens) == 1 }, 1*time.Second, 10*time.Millisecond) - assert.Equal(t, receivedTokens.tokens[0], tt.expectedToken) + assert.Equal(t, tt.expectedToken, receivedTokens.tokens[0]) }) } } diff --git a/exporter/signalfxexporter/internal/correlation/logshims_test.go b/exporter/signalfxexporter/internal/correlation/logshims_test.go index bc421d0bd59c..3e337dc0dcd9 100644 --- a/exporter/signalfxexporter/internal/correlation/logshims_test.go +++ b/exporter/signalfxexporter/internal/correlation/logshims_test.go @@ -102,5 +102,5 @@ func TestZapShim_Fields(t *testing.T) { c := e.Context[0] assert.Equal(t, "field", c.Key) require.Equal(t, zapcore.StringType, c.Type) - assert.Equal(t, c.String, "field value") + assert.Equal(t, "field value", c.String) } diff --git a/exporter/signalfxexporter/internal/dimensions/dimclient_test.go b/exporter/signalfxexporter/internal/dimensions/dimclient_test.go index 17b618a1fe6f..12b180e8e1fb 100644 --- a/exporter/signalfxexporter/internal/dimensions/dimclient_test.go +++ b/exporter/signalfxexporter/internal/dimensions/dimclient_test.go @@ -136,7 +136,7 @@ func TestDimensionClient(t *testing.T) { })) dims := waitForDims(dimCh, 1, 3) - require.Equal(t, dims, []dim{ + require.Equal(t, []dim{ { Key: "host", Value: "test-box", @@ -148,7 +148,7 @@ func TestDimensionClient(t *testing.T) { Tags: []string{"active"}, TagsToRemove: []string{"terminated"}, }, - }) + }, dims) }) t.Run("same dimension with different values", func(t *testing.T) { @@ -164,7 +164,7 @@ func TestDimensionClient(t *testing.T) { })) dims := waitForDims(dimCh, 1, 3) - require.Equal(t, dims, []dim{ + require.Equal(t, []dim{ { Key: "host", Value: "test-box", @@ -173,7 +173,7 @@ func TestDimensionClient(t *testing.T) { }, TagsToRemove: []string{"active"}, }, - }) + }, dims) }) t.Run("send a distinct prop/tag set for existing dim with server error", func(t *testing.T) { @@ -197,7 +197,7 @@ func TestDimensionClient(t *testing.T) { dims = waitForDims(dimCh, 1, 3) // After the server recovers the dim should be resent. - require.Equal(t, dims, []dim{ + require.Equal(t, []dim{ { Key: "AWSUniqueID", Value: "abcd", @@ -206,7 +206,7 @@ func TestDimensionClient(t *testing.T) { }, Tags: []string{"running"}, }, - }) + }, dims) }) t.Run("does not retry 4xx responses", func(t *testing.T) { @@ -245,7 +245,7 @@ func TestDimensionClient(t *testing.T) { forcedResp.Store(200) dims = waitForDims(dimCh, 1, 3) - require.Equal(t, dims, []dim{ + require.Equal(t, []dim{ { Key: "AWSUniqueID", Value: "id404", @@ -253,7 +253,7 @@ func TestDimensionClient(t *testing.T) { "z": newString("x"), }, }, - }) + }, dims) }) t.Run("send successive quick updates to same dim", func(t *testing.T) { @@ -294,7 +294,7 @@ func TestDimensionClient(t *testing.T) { dims := waitForDims(dimCh, 1, 3) - require.Equal(t, dims, []dim{ + require.Equal(t, []dim{ { Key: "AWSUniqueID", Value: "abcd", @@ -305,7 +305,7 @@ func TestDimensionClient(t *testing.T) { Tags: []string{"dev"}, TagsToRemove: []string{"running"}, }, - }) + }, dims) }) } diff --git a/exporter/splunkhecexporter/client_test.go b/exporter/splunkhecexporter/client_test.go index 767e9fbd004e..595eb89bf9c7 100644 --- a/exporter/splunkhecexporter/client_test.go +++ b/exporter/splunkhecexporter/client_test.go @@ -1509,7 +1509,7 @@ func Test_pushLogData_nil_Logs(t *testing.T) { return logs }(), requires: func(t *testing.T, logs plog.Logs) { - require.Equal(t, logs.ResourceLogs().Len(), 1) + require.Equal(t, 1, logs.ResourceLogs().Len()) require.Zero(t, logs.ResourceLogs().At(0).ScopeLogs().Len()) }, }, @@ -1523,8 +1523,8 @@ func Test_pushLogData_nil_Logs(t *testing.T) { return logs }(), requires: func(t *testing.T, logs plog.Logs) { - require.Equal(t, logs.ResourceLogs().Len(), 1) - require.Equal(t, logs.ResourceLogs().At(0).ScopeLogs().Len(), 1) + require.Equal(t, 1, logs.ResourceLogs().Len()) + require.Equal(t, 1, logs.ResourceLogs().At(0).ScopeLogs().Len()) require.Zero(t, logs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().Len()) }, }, diff --git a/exporter/sumologicexporter/factory_test.go b/exporter/sumologicexporter/factory_test.go index 53bfac1b4241..ff646f3561e3 100644 --- a/exporter/sumologicexporter/factory_test.go +++ b/exporter/sumologicexporter/factory_test.go @@ -29,7 +29,7 @@ func TestCreateDefaultConfig(t *testing.T) { qs := exporterhelper.NewDefaultQueueSettings() qs.Enabled = false - assert.Equal(t, cfg, &Config{ + assert.Equal(t, &Config{ MaxRequestBodySize: 1_048_576, LogFormat: "otlp", MetricFormat: "otlp", @@ -44,7 +44,7 @@ func TestCreateDefaultConfig(t *testing.T) { }, BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: qs, - }) + }, cfg) assert.NoError(t, component.ValidateConfig(cfg)) } diff --git a/exporter/syslogexporter/exporter_test.go b/exporter/syslogexporter/exporter_test.go index 212ea99d687c..db643caf4bb4 100644 --- a/exporter/syslogexporter/exporter_test.go +++ b/exporter/syslogexporter/exporter_test.go @@ -157,7 +157,7 @@ func TestSyslogExportSuccess(t *testing.T) { defer conn.Close() b, err := io.ReadAll(conn) require.NoError(t, err, "could not read all") - assert.Equal(t, string(b), expectedForm) + assert.Equal(t, expectedForm, string(b)) } func TestSyslogExportFail(t *testing.T) { diff --git a/exporter/syslogexporter/factory_test.go b/exporter/syslogexporter/factory_test.go index 47cfc42a35d2..a4cebc3bcf7a 100644 --- a/exporter/syslogexporter/factory_test.go +++ b/exporter/syslogexporter/factory_test.go @@ -24,7 +24,7 @@ func TestType(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() - assert.Equal(t, cfg, &Config{ + assert.Equal(t, &Config{ Port: 514, Network: "tcp", Protocol: "rfc5424", @@ -44,5 +44,5 @@ func TestCreateDefaultConfig(t *testing.T) { TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: 5 * time.Second, }, - }) + }, cfg) } diff --git a/extension/basicauthextension/extension_test.go b/extension/basicauthextension/extension_test.go index 265689d0b6c6..56c0857a070c 100644 --- a/extension/basicauthextension/extension_test.go +++ b/extension/basicauthextension/extension_test.go @@ -265,7 +265,7 @@ func TestBasicAuth_ClientValid(t *testing.T) { expectedMd := map[string]string{ "authorization": fmt.Sprintf("Basic %s", authCreds), } - assert.Equal(t, md, expectedMd) + assert.Equal(t, expectedMd, md) assert.NoError(t, err) assert.True(t, credential.RequireTransportSecurity()) diff --git a/extension/bearertokenauthextension/bearertokenauth_test.go b/extension/bearertokenauthextension/bearertokenauth_test.go index 2d921e117ab3..4bdec8b461e6 100644 --- a/extension/bearertokenauthextension/bearertokenauth_test.go +++ b/extension/bearertokenauthextension/bearertokenauth_test.go @@ -82,7 +82,7 @@ func TestBearerAuthenticator(t *testing.T) { expectedMd := map[string]string{ "authorization": fmt.Sprintf("Bearer %s", string(cfg.BearerToken)), } - assert.Equal(t, md, expectedMd) + assert.Equal(t, expectedMd, md) assert.NoError(t, err) assert.True(t, credential.RequireTransportSecurity()) @@ -123,7 +123,7 @@ func TestBearerStartWatchStop(t *testing.T) { expectedMd := map[string]string{ "authorization": tokenStr, } - assert.Equal(t, md, expectedMd) + assert.Equal(t, expectedMd, md) assert.NoError(t, err) assert.True(t, credential.RequireTransportSecurity()) @@ -133,7 +133,7 @@ func TestBearerStartWatchStop(t *testing.T) { credential, _ = bauth.PerRPCCredentials() md, err = credential.GetRequestMetadata(context.Background()) expectedMd["authorization"] = tokenStr + "test" - assert.Equal(t, md, expectedMd) + assert.Equal(t, expectedMd, md) assert.NoError(t, err) // change file content back @@ -143,7 +143,7 @@ func TestBearerStartWatchStop(t *testing.T) { md, err = credential.GetRequestMetadata(context.Background()) expectedMd["authorization"] = tokenStr time.Sleep(5 * time.Second) - assert.Equal(t, md, expectedMd) + assert.Equal(t, expectedMd, md) assert.NoError(t, err) assert.NoError(t, bauth.Shutdown(context.Background())) diff --git a/extension/encoding/jsonlogencodingextension/json_test.go b/extension/encoding/jsonlogencodingextension/json_test.go index ba2a9800182b..2fcfa3d13129 100644 --- a/extension/encoding/jsonlogencodingextension/json_test.go +++ b/extension/encoding/jsonlogencodingextension/json_test.go @@ -59,7 +59,7 @@ func TestPrettyLogProcessor(t *testing.T) { lp, err := j.logProcessor(sampleLog()) assert.NoError(t, err) assert.NotNil(t, lp) - assert.Equal(t, string(lp), `[{"body":{"log":"test"},"logAttributes":{"foo":"bar"},"resourceAttributes":{"test":"logs-test"}},{"body":"log testing","resourceAttributes":{"test":"logs-test"}}]`) + assert.Equal(t, `[{"body":{"log":"test"},"logAttributes":{"foo":"bar"},"resourceAttributes":{"test":"logs-test"}},{"body":"log testing","resourceAttributes":{"test":"logs-test"}}]`, string(lp)) } func sampleLog() plog.Logs { diff --git a/extension/healthcheckv2extension/extension_test.go b/extension/healthcheckv2extension/extension_test.go index 662a7d3576ba..bb15441a1aae 100644 --- a/extension/healthcheckv2extension/extension_test.go +++ b/extension/healthcheckv2extension/extension_test.go @@ -35,7 +35,7 @@ func TestComponentStatus(t *testing.T) { // Status before Start will be StatusNone st, ok := ext.aggregator.AggregateStatus(status.ScopeAll, status.Concise) require.True(t, ok) - assert.Equal(t, st.Status(), componentstatus.StatusNone) + assert.Equal(t, componentstatus.StatusNone, st.Status()) require.NoError(t, ext.Start(context.Background(), componenttest.NewNopHost())) diff --git a/extension/healthcheckv2extension/internal/http/responders_test.go b/extension/healthcheckv2extension/internal/http/responders_test.go index b01624fb78ed..c2bef14a1706 100644 --- a/extension/healthcheckv2extension/internal/http/responders_test.go +++ b/extension/healthcheckv2extension/internal/http/responders_test.go @@ -29,7 +29,7 @@ func TestRespondWithJSON(t *testing.T) { require.NoError(t, respondWithJSON(http.StatusOK, content, w)) resp := w.Result() assert.Equal(t, http.StatusOK, resp.StatusCode) - assert.Equal(t, resp.Header.Get("Content-Type"), "application/json") + assert.Equal(t, "application/json", resp.Header.Get("Content-Type")) body, err := io.ReadAll(resp.Body) require.NoError(t, err) diff --git a/extension/observer/ecsobserver/matcher_test.go b/extension/observer/ecsobserver/matcher_test.go index bcfdeed717f5..11ab05d56401 100644 --- a/extension/observer/ecsobserver/matcher_test.go +++ b/extension/observer/ecsobserver/matcher_test.go @@ -92,7 +92,7 @@ func TestMatchedContainer_MergeTargets(t *testing.T) { } m.MergeTargets(newTargets) assert.Len(t, m.Targets, 4) - assert.Equal(t, m.Targets[3].MetricsPath, "/m1") // order is append + assert.Equal(t, "/m1", m.Targets[3].MetricsPath) // order is append }) t.Run("respect existing targets", func(t *testing.T) { diff --git a/extension/observer/k8sobserver/factory_test.go b/extension/observer/k8sobserver/factory_test.go index 02f59947d7fe..1c1ee208d152 100644 --- a/extension/observer/k8sobserver/factory_test.go +++ b/extension/observer/k8sobserver/factory_test.go @@ -18,7 +18,7 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - assert.Equal(t, cfg.APIConfig, k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}) + assert.Equal(t, k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, cfg.APIConfig) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/extension/sigv4authextension/signingroundtripper_test.go b/extension/sigv4authextension/signingroundtripper_test.go index 4195faa297e3..fb1f074b1a1f 100644 --- a/extension/sigv4authextension/signingroundtripper_test.go +++ b/extension/sigv4authextension/signingroundtripper_test.go @@ -89,7 +89,7 @@ func TestRoundTrip(t *testing.T) { return } assert.NoError(t, err) - assert.Equal(t, res.StatusCode, 200) + assert.Equal(t, 200, res.StatusCode) }) } } diff --git a/extension/solarwindsapmsettingsextension/factory_test.go b/extension/solarwindsapmsettingsextension/factory_test.go index d30f14fbaa44..d328af08ef4d 100644 --- a/extension/solarwindsapmsettingsextension/factory_test.go +++ b/extension/solarwindsapmsettingsextension/factory_test.go @@ -17,7 +17,7 @@ func TestCreateDefaultConfig(t *testing.T) { assert.NoError(t, componenttest.CheckConfigStruct(cfg)) ocfg, ok := factory.CreateDefaultConfig().(*Config) assert.True(t, ok) - assert.Equal(t, ocfg.ClientConfig.Endpoint, DefaultEndpoint, "Wrong default endpoint") + assert.Equal(t, DefaultEndpoint, ocfg.ClientConfig.Endpoint, "Wrong default endpoint") assert.Empty(t, ocfg.Key, "There is no default key") - assert.Equal(t, ocfg.Interval, DefaultInterval, "Wrong default interval") + assert.Equal(t, DefaultInterval, ocfg.Interval, "Wrong default interval") } diff --git a/extension/sumologicextension/credentials/credentialsstore_localfs_test.go b/extension/sumologicextension/credentials/credentialsstore_localfs_test.go index c64599df7591..e367b9a0586b 100644 --- a/extension/sumologicextension/credentials/credentialsstore_localfs_test.go +++ b/extension/sumologicextension/credentials/credentialsstore_localfs_test.go @@ -62,7 +62,7 @@ func TestCredentialsStoreLocalFs(t *testing.T) { }, ), ) - require.EqualValues(t, fileCounter, 0) + require.EqualValues(t, 0, fileCounter) } func TestCredentialsStoreValidate(t *testing.T) { diff --git a/extension/sumologicextension/extension_test.go b/extension/sumologicextension/extension_test.go index 2e22649d5f7d..fd09a1b64f0b 100644 --- a/extension/sumologicextension/extension_test.go +++ b/extension/sumologicextension/extension_test.go @@ -387,7 +387,7 @@ func TestStoreCredentials_PreexistingCredentialsAreUsed(t *testing.T) { require.NoError(t, se.Shutdown(context.Background())) require.FileExists(t, credsPath) - require.EqualValues(t, atomic.LoadInt32(&reqCount), 2) + require.EqualValues(t, 2, atomic.LoadInt32(&reqCount)) } func TestLocalFSCredentialsStore_WorkCorrectlyForMultipleExtensions(t *testing.T) { @@ -1476,10 +1476,10 @@ func TestWatchCredentialKey(t *testing.T) { ctxc, cancel := context.WithCancel(ctx) cancel() v := se.WatchCredentialKey(ctxc, "") - require.Equal(t, v, "") + require.Equal(t, "", v) v = se.WatchCredentialKey(context.Background(), "foobar") - require.Equal(t, v, "") + require.Equal(t, "", v) go func() { time.Sleep(time.Millisecond * 100) @@ -1490,7 +1490,7 @@ func TestWatchCredentialKey(t *testing.T) { }() v = se.WatchCredentialKey(context.Background(), "") - require.Equal(t, v, "test-credential-key") + require.Equal(t, "test-credential-key", v) } func TestCreateCredentialsHeader(t *testing.T) { @@ -1535,11 +1535,11 @@ func TestUpdateMetadataRequestPayload(t *testing.T) { // @sumo-drosiek: It happened to be empty OsVersion on my machine // require.NotEmpty(t, reqPayload.HostDetails.OsVersion) require.NotEmpty(t, reqPayload.NetworkDetails.HostIPAddress) - require.EqualValues(t, reqPayload.HostDetails.Environment, "EKS-1.20.2") - require.EqualValues(t, reqPayload.CollectorDetails.RunningVersion, "1.0.0") - require.EqualValues(t, reqPayload.TagDetails["team"], "A") - require.EqualValues(t, reqPayload.TagDetails["app"], "linux") - require.EqualValues(t, reqPayload.TagDetails["sumo.disco.enabled"], "true") + require.EqualValues(t, "EKS-1.20.2", reqPayload.HostDetails.Environment) + require.EqualValues(t, "1.0.0", reqPayload.CollectorDetails.RunningVersion) + require.EqualValues(t, "A", reqPayload.TagDetails["team"]) + require.EqualValues(t, "linux", reqPayload.TagDetails["app"]) + require.EqualValues(t, "true", reqPayload.TagDetails["sumo.disco.enabled"]) _, err := w.Write([]byte(``)) diff --git a/internal/aws/awsutil/conn_test.go b/internal/aws/awsutil/conn_test.go index 56d6228e38d4..363b5ac5ec49 100644 --- a/internal/aws/awsutil/conn_test.go +++ b/internal/aws/awsutil/conn_test.go @@ -46,7 +46,7 @@ func TestEC2Session(t *testing.T) { expectedSession, _ = session.NewSession() m.sn = expectedSession cfg, s, err := GetAWSConfigSession(logger, m, &sessionCfg) - assert.Equal(t, s, expectedSession, "Expect the session object is not overridden") + assert.Equal(t, expectedSession, s, "Expect the session object is not overridden") assert.Equal(t, *cfg.Region, ec2Region, "Region value fetched from ec2-metadata service") assert.NoError(t, err) } @@ -63,7 +63,7 @@ func TestRegionEnv(t *testing.T) { expectedSession, _ = session.NewSession() m.sn = expectedSession cfg, s, err := GetAWSConfigSession(logger, m, &sessionCfg) - assert.Equal(t, s, expectedSession, "Expect the session object is not overridden") + assert.Equal(t, expectedSession, s, "Expect the session object is not overridden") assert.Equal(t, *cfg.Region, region, "Region value fetched from environment") assert.NoError(t, err) } diff --git a/internal/aws/k8s/k8sclient/node_test.go b/internal/aws/k8s/k8sclient/node_test.go index 6ffbaa363992..b10a32e32184 100644 --- a/internal/aws/k8s/k8sclient/node_test.go +++ b/internal/aws/k8s/k8sclient/node_test.go @@ -302,8 +302,8 @@ func TestNodeClient(t *testing.T) { clusterFailedNodeCount := client.ClusterFailedNodeCount() log.Printf("clusterNodeCount: %v, clusterFailedNodeCount: %v", clusterNodeCount, clusterFailedNodeCount) - assert.Equal(t, clusterNodeCount, expectedClusterNodeCount) - assert.Equal(t, clusterFailedNodeCount, expectedClusterFailedNodeCount) + assert.Equal(t, expectedClusterNodeCount, clusterNodeCount) + assert.Equal(t, expectedClusterFailedNodeCount, clusterFailedNodeCount) client.shutdown() assert.True(t, client.stopped) } diff --git a/internal/aws/proxy/conn_test.go b/internal/aws/proxy/conn_test.go index fec2f9328573..77b3ddc8d0c8 100644 --- a/internal/aws/proxy/conn_test.go +++ b/internal/aws/proxy/conn_test.go @@ -174,7 +174,7 @@ func TestRegionFromEC2(t *testing.T) { logs := recordedLogs.All() lastEntry := logs[len(logs)-1] assert.Contains(t, lastEntry.Message, "Fetched region from EC2 metadata", "expected log message") - assert.Equal(t, lastEntry.Context[0].Key, "region", "expected log key") + assert.Equal(t, "region", lastEntry.Context[0].Key, "expected log key") assert.Equal(t, lastEntry.Context[0].String, ec2Region) } @@ -356,8 +356,8 @@ func TestGetSTSCredsFromPrimaryRegionEndpoint(t *testing.T) { fake := &stsCalls{ log: zap.NewNop(), getSTSCredsFromRegionEndpoint: func(_ *zap.Logger, _ *session.Session, region, roleArn string) *credentials.Credentials { - assert.Equal(t, region, endpoints.UsEast1RegionID, "expected region differs") - assert.Equal(t, roleArn, expectedRoleARN, "expected role ARN differs") + assert.Equal(t, endpoints.UsEast1RegionID, region, "expected region differs") + assert.Equal(t, expectedRoleARN, roleArn, "expected role ARN differs") called = true return nil }, @@ -368,8 +368,8 @@ func TestGetSTSCredsFromPrimaryRegionEndpoint(t *testing.T) { called = false fake.getSTSCredsFromRegionEndpoint = func(_ *zap.Logger, _ *session.Session, region, roleArn string) *credentials.Credentials { - assert.Equal(t, region, endpoints.CnNorth1RegionID, "expected region differs") - assert.Equal(t, roleArn, expectedRoleARN, "expected role ARN differs") + assert.Equal(t, endpoints.CnNorth1RegionID, region, "expected region differs") + assert.Equal(t, expectedRoleARN, roleArn, "expected role ARN differs") called = true return nil } @@ -379,8 +379,8 @@ func TestGetSTSCredsFromPrimaryRegionEndpoint(t *testing.T) { called = false fake.getSTSCredsFromRegionEndpoint = func(_ *zap.Logger, _ *session.Session, region, roleArn string) *credentials.Credentials { - assert.Equal(t, region, endpoints.UsGovWest1RegionID, "expected region differs") - assert.Equal(t, roleArn, expectedRoleARN, "expected role ARN differs") + assert.Equal(t, endpoints.UsGovWest1RegionID, region, "expected region differs") + assert.Equal(t, expectedRoleARN, roleArn, "expected role ARN differs") called = true return nil } @@ -461,8 +461,7 @@ func TestSTSRegionalEndpointDisabled(t *testing.T) { "STS regional endpoint disabled. Credentials for provided RoleARN will be fetched from STS primary region endpoint instead", "expected log message") assert.Equal(t, - lastEntry.Context[0].String, - expectedRegion, "expected error") + expectedRegion, lastEntry.Context[0].String, "expected error") assert.EqualError(t, lastEntry.Context[1].Interface.(error), expectedErr.Error(), "expected error") diff --git a/internal/common/ttlmap/ttl_map_test.go b/internal/common/ttlmap/ttl_map_test.go index c5bc890e5a46..d8a98db8a0a5 100644 --- a/internal/common/ttlmap/ttl_map_test.go +++ b/internal/common/ttlmap/ttl_map_test.go @@ -22,8 +22,8 @@ func TestTTLMapData(t *testing.T) { func TestTTLMapSimple(t *testing.T) { m := New(5, 10, make(chan struct{})) - require.EqualValues(t, m.sweepInterval, 5) - require.EqualValues(t, m.md.maxAge, 10) + require.EqualValues(t, 5, m.sweepInterval) + require.EqualValues(t, 10, m.md.maxAge) m.Put("foo", "bar") s := m.Get("foo").(string) require.Equal(t, "bar", s) diff --git a/internal/filter/filterspan/filterspan_test.go b/internal/filter/filterspan/filterspan_test.go index 5a71facf3a17..4b407eb77d71 100644 --- a/internal/filter/filterspan/filterspan_test.go +++ b/internal/filter/filterspan/filterspan_test.go @@ -298,12 +298,12 @@ func TestSpan_Matching_True(t *testing.T) { func TestServiceNameForResource(t *testing.T) { td := testdata.GenerateTracesOneSpanNoResource() name := serviceNameForResource(td.ResourceSpans().At(0).Resource()) - require.Equal(t, name, "") + require.Equal(t, "", name) td = testdata.GenerateTracesOneSpan() resource := td.ResourceSpans().At(0).Resource() name = serviceNameForResource(resource) - require.Equal(t, name, "") + require.Equal(t, "", name) } diff --git a/internal/kubelet/client_test.go b/internal/kubelet/client_test.go index 5c7aa63d6681..938bad01a176 100644 --- a/internal/kubelet/client_test.go +++ b/internal/kubelet/client_test.go @@ -105,7 +105,7 @@ func TestDefaultTLSClient(t *testing.T) { func TestSvcAcctClient(t *testing.T) { server := httptest.NewUnstartedServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { // Check if call is authenticated using token from test file - require.Equal(t, req.Header.Get("Authorization"), "Bearer s3cr3t") + require.Equal(t, "Bearer s3cr3t", req.Header.Get("Authorization")) _, err := rw.Write([]byte(`OK`)) require.NoError(t, err) })) @@ -174,7 +174,7 @@ func TestNewKubeConfigClient(t *testing.T) { t.Run(tt.name, func(t *testing.T) { server := httptest.NewUnstartedServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { // Check if call is authenticated using provided kubeconfig - require.Equal(t, req.Header.Get("Authorization"), "Bearer my-token") + require.Equal(t, "Bearer my-token", req.Header.Get("Authorization")) require.Equal(t, "/api/v1/nodes/nodename/proxy/", req.URL.EscapedPath()) // Send response to be tested _, err := rw.Write([]byte(`OK`)) diff --git a/pkg/ottl/contexts/ottldatapoint/datapoint_test.go b/pkg/ottl/contexts/ottldatapoint/datapoint_test.go index e8d837fddaa5..73e7d697b03a 100644 --- a/pkg/ottl/contexts/ottldatapoint/datapoint_test.go +++ b/pkg/ottl/contexts/ottldatapoint/datapoint_test.go @@ -2130,7 +2130,7 @@ func Test_ParseEnum(t *testing.T) { t.Run(tt.name, func(t *testing.T) { actual, err := parseEnum((*ottl.EnumSymbol)(ottltest.Strp(tt.name))) assert.NoError(t, err) - assert.Equal(t, *actual, tt.want) + assert.Equal(t, tt.want, *actual) }) } } diff --git a/pkg/ottl/contexts/ottllog/log_test.go b/pkg/ottl/contexts/ottllog/log_test.go index e84cf74d21dd..5beda9fe137f 100644 --- a/pkg/ottl/contexts/ottllog/log_test.go +++ b/pkg/ottl/contexts/ottllog/log_test.go @@ -855,7 +855,7 @@ func Test_ParseEnum(t *testing.T) { t.Run(tt.name, func(t *testing.T) { actual, err := parseEnum((*ottl.EnumSymbol)(ottltest.Strp(tt.name))) assert.NoError(t, err) - assert.Equal(t, *actual, tt.want) + assert.Equal(t, tt.want, *actual) }) } } diff --git a/pkg/ottl/contexts/ottlmetric/metrics_test.go b/pkg/ottl/contexts/ottlmetric/metrics_test.go index 3ab79f61e295..d81458f76e1f 100644 --- a/pkg/ottl/contexts/ottlmetric/metrics_test.go +++ b/pkg/ottl/contexts/ottlmetric/metrics_test.go @@ -224,7 +224,7 @@ func Test_ParseEnum(t *testing.T) { t.Run(tt.name, func(t *testing.T) { actual, err := parseEnum((*ottl.EnumSymbol)(ottltest.Strp(tt.name))) assert.NoError(t, err) - assert.Equal(t, *actual, tt.want) + assert.Equal(t, tt.want, *actual) }) } } diff --git a/pkg/ottl/contexts/ottlspan/span_test.go b/pkg/ottl/contexts/ottlspan/span_test.go index 041d64f80a36..05782cb543ba 100644 --- a/pkg/ottl/contexts/ottlspan/span_test.go +++ b/pkg/ottl/contexts/ottlspan/span_test.go @@ -832,7 +832,7 @@ func Test_ParseEnum(t *testing.T) { t.Run(tt.name, func(t *testing.T) { actual, err := parseEnum((*ottl.EnumSymbol)(ottltest.Strp(tt.name))) assert.NoError(t, err) - assert.Equal(t, *actual, tt.want) + assert.Equal(t, tt.want, *actual) }) } } diff --git a/pkg/ottl/contexts/ottlspanevent/span_events_test.go b/pkg/ottl/contexts/ottlspanevent/span_events_test.go index 57e87ced6636..15b53aed0ad1 100644 --- a/pkg/ottl/contexts/ottlspanevent/span_events_test.go +++ b/pkg/ottl/contexts/ottlspanevent/span_events_test.go @@ -571,7 +571,7 @@ func Test_ParseEnum(t *testing.T) { t.Run(tt.name, func(t *testing.T) { actual, err := parseEnum((*ottl.EnumSymbol)(ottltest.Strp(tt.name))) assert.NoError(t, err) - assert.Equal(t, *actual, tt.want) + assert.Equal(t, tt.want, *actual) }) } } diff --git a/pkg/stanza/entry/nil_field_test.go b/pkg/stanza/entry/nil_field_test.go index 754af8d97d49..1193b9d3410f 100644 --- a/pkg/stanza/entry/nil_field_test.go +++ b/pkg/stanza/entry/nil_field_test.go @@ -22,7 +22,7 @@ func TestNilFieldSet(t *testing.T) { nilField := NewNilField() err := nilField.Set(entry, "value") require.NoError(t, err) - require.Equal(t, *entry, Entry{}) + require.Equal(t, Entry{}, *entry) } func TestNilFieldDelete(t *testing.T) { @@ -31,7 +31,7 @@ func TestNilFieldDelete(t *testing.T) { value, ok := nilField.Delete(entry) require.True(t, ok) require.Nil(t, value) - require.Equal(t, *entry, Entry{}) + require.Equal(t, Entry{}, *entry) } func TestNilFieldString(t *testing.T) { diff --git a/pkg/stanza/errors/error_test.go b/pkg/stanza/errors/error_test.go index b8b270d7e3c8..650303dbe874 100644 --- a/pkg/stanza/errors/error_test.go +++ b/pkg/stanza/errors/error_test.go @@ -18,26 +18,26 @@ func TestWithDetails(t *testing.T) { err := NewError("Test error", "") err2 := WithDetails(err, "foo", "bar") - require.Equal(t, err2.Details, ErrorDetails{"foo": "bar"}) + require.Equal(t, ErrorDetails{"foo": "bar"}, err2.Details) }) t.Run("AgentErrorWithExistingDetails", func(t *testing.T) { err := NewError("Test error", "", "foo1", "bar1") err2 := WithDetails(err, "foo2", "bar2") - require.Equal(t, err2.Details, ErrorDetails{"foo1": "bar1", "foo2": "bar2"}) + require.Equal(t, ErrorDetails{"foo1": "bar1", "foo2": "bar2"}, err2.Details) }) t.Run("StandardError", func(t *testing.T) { err := fmt.Errorf("Test error") err2 := WithDetails(err, "foo", "bar") - require.Equal(t, err2.Details, ErrorDetails{"foo": "bar"}) + require.Equal(t, ErrorDetails{"foo": "bar"}, err2.Details) }) t.Run("AgentMethod", func(t *testing.T) { err := NewError("Test error", "").WithDetails("foo", "bar") - require.Equal(t, err.Details, ErrorDetails{"foo": "bar"}) + require.Equal(t, ErrorDetails{"foo": "bar"}, err.Details) }) } diff --git a/pkg/stanza/fileconsumer/config_test.go b/pkg/stanza/fileconsumer/config_test.go index eeb43c67cd83..145c43491266 100644 --- a/pkg/stanza/fileconsumer/config_test.go +++ b/pkg/stanza/fileconsumer/config_test.go @@ -456,7 +456,7 @@ func TestBuild(t *testing.T) { func(_ *Config) {}, require.NoError, func(t *testing.T, m *Manager) { - require.Equal(t, m.pollInterval, 10*time.Millisecond) + require.Equal(t, 10*time.Millisecond, m.pollInterval) }, }, { @@ -665,7 +665,7 @@ func TestBuildWithSplitFunc(t *testing.T) { func(_ *Config) {}, require.NoError, func(t *testing.T, m *Manager) { - require.Equal(t, m.pollInterval, 10*time.Millisecond) + require.Equal(t, 10*time.Millisecond, m.pollInterval) }, }, { diff --git a/pkg/stanza/fileconsumer/internal/fileset/fileset_test.go b/pkg/stanza/fileconsumer/internal/fileset/fileset_test.go index 0d83ef8d5db6..0c1de5c8a8e6 100644 --- a/pkg/stanza/fileconsumer/internal/fileset/fileset_test.go +++ b/pkg/stanza/fileconsumer/internal/fileset/fileset_test.go @@ -36,7 +36,7 @@ func pop[T Matchable](expectedErr error, expectedElemet T) func(t *testing.T, fi el, err := fileset.Pop() if expectedErr == nil { require.NoError(t, err) - require.Equal(t, el, expectedElemet) + require.Equal(t, expectedElemet, el) require.Equal(t, pr-1, fileset.Len()) } else { require.ErrorIs(t, err, expectedErr) diff --git a/pkg/stanza/operator/helper/input_test.go b/pkg/stanza/operator/helper/input_test.go index bf077071e1f3..8d3e16a704c7 100644 --- a/pkg/stanza/operator/helper/input_test.go +++ b/pkg/stanza/operator/helper/input_test.go @@ -89,7 +89,7 @@ func TestInputOperatorProcess(t *testing.T) { ctx := context.Background() err := input.Process(ctx, entry) require.Error(t, err) - require.Equal(t, err.Error(), "Operator can not process logs.") + require.Equal(t, "Operator can not process logs.", err.Error()) } func TestInputOperatorNewEntry(t *testing.T) { diff --git a/pkg/stanza/operator/parser/container/parser_test.go b/pkg/stanza/operator/parser/container/parser_test.go index 2a204ae82ca7..6e7f410ef388 100644 --- a/pkg/stanza/operator/parser/container/parser_test.go +++ b/pkg/stanza/operator/parser/container/parser_test.go @@ -91,7 +91,7 @@ func TestInternalRecombineCfg(t *testing.T) { expected.CombineWith = "" expected.SourceIdentifier = entry.NewAttributeField("log.file.path") expected.MaxLogSize = 102400 - require.Equal(t, cfg, expected) + require.Equal(t, expected, cfg) } func TestProcess(t *testing.T) { diff --git a/pkg/stanza/operator/parser/regex/parser_test.go b/pkg/stanza/operator/parser/regex/parser_test.go index b6eb97079bc9..8a44342e69ec 100644 --- a/pkg/stanza/operator/parser/regex/parser_test.go +++ b/pkg/stanza/operator/parser/regex/parser_test.go @@ -70,7 +70,7 @@ func TestParserCache(t *testing.T) { require.Error(t, err) require.Contains(t, err.Error(), "type '[]int' cannot be parsed as regex") require.NotNil(t, parser.cache, "expected cache to be configured") - require.Equal(t, parser.cache.maxSize(), uint16(200)) + require.Equal(t, uint16(200), parser.cache.maxSize()) } func TestParserRegex(t *testing.T) { diff --git a/pkg/stanza/pipeline/config_test.go b/pkg/stanza/pipeline/config_test.go index 64f10b92e171..b2d916680e7a 100644 --- a/pkg/stanza/pipeline/config_test.go +++ b/pkg/stanza/pipeline/config_test.go @@ -243,7 +243,7 @@ func TestDeduplicateIDs(t *testing.T) { t.Run("Deduplicate/"+tc.name, func(t *testing.T) { ops := tc.ops() dedeplucateIDs(ops) - require.Equal(t, ops, tc.expectedOps) + require.Equal(t, tc.expectedOps, ops) }) } } diff --git a/pkg/translator/jaeger/jaegerproto_to_traces_test.go b/pkg/translator/jaeger/jaegerproto_to_traces_test.go index 56d3b2d95550..96eb84d64a54 100644 --- a/pkg/translator/jaeger/jaegerproto_to_traces_test.go +++ b/pkg/translator/jaeger/jaegerproto_to_traces_test.go @@ -363,8 +363,8 @@ func TestProtoBatchToInternalTracesWithTwoLibraries(t *testing.T) { actual, err := ProtoToTraces([]*model.Batch{jb}) assert.NoError(t, err) - assert.Equal(t, actual.ResourceSpans().Len(), 1) - assert.Equal(t, actual.ResourceSpans().At(0).ScopeSpans().Len(), 2) + assert.Equal(t, 1, actual.ResourceSpans().Len()) + assert.Equal(t, 2, actual.ResourceSpans().At(0).ScopeSpans().Len()) ils0 := actual.ResourceSpans().At(0).ScopeSpans().At(0) ils1 := actual.ResourceSpans().At(0).ScopeSpans().At(1) diff --git a/pkg/translator/prometheusremotewrite/helper_test.go b/pkg/translator/prometheusremotewrite/helper_test.go index 6c1942af0282..8894c0f7a27d 100644 --- a/pkg/translator/prometheusremotewrite/helper_test.go +++ b/pkg/translator/prometheusremotewrite/helper_test.go @@ -1050,7 +1050,7 @@ func TestCreateLabels(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { lbls := createLabels(tc.metricName, tc.baseLabels, tc.extras...) - assert.Equal(t, lbls, tc.expected) + assert.Equal(t, tc.expected, lbls) }) } } diff --git a/pkg/translator/signalfx/to_metrics_test.go b/pkg/translator/signalfx/to_metrics_test.go index 8c644e1b293a..f6f61cfb332d 100644 --- a/pkg/translator/signalfx/to_metrics_test.go +++ b/pkg/translator/signalfx/to_metrics_test.go @@ -19,7 +19,7 @@ import ( func TestNumMetricTypes(t *testing.T) { // Assert that all values for the metric types are less than numMetricTypes. - assert.Equal(t, len(sfxpb.MetricType_value), numMetricTypes) + assert.Len(t, sfxpb.MetricType_value, numMetricTypes) for _, v := range sfxpb.MetricType_value { assert.Less(t, v, int32(numMetricTypes)) } diff --git a/processor/attributesprocessor/factory_test.go b/processor/attributesprocessor/factory_test.go index 3c10a03bc88a..ea4e3dd3b756 100644 --- a/processor/attributesprocessor/factory_test.go +++ b/processor/attributesprocessor/factory_test.go @@ -26,7 +26,7 @@ func TestFactory_Type(t *testing.T) { func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{}) + assert.Equal(t, &Config{}, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/processor/cumulativetodeltaprocessor/factory_test.go b/processor/cumulativetodeltaprocessor/factory_test.go index bb3b4358edc5..6e25b2cc35ed 100644 --- a/processor/cumulativetodeltaprocessor/factory_test.go +++ b/processor/cumulativetodeltaprocessor/factory_test.go @@ -27,7 +27,7 @@ func TestType(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{}) + assert.Equal(t, &Config{}, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/processor/deltatorateprocessor/factory_test.go b/processor/deltatorateprocessor/factory_test.go index b566f8da17ee..073f14743467 100644 --- a/processor/deltatorateprocessor/factory_test.go +++ b/processor/deltatorateprocessor/factory_test.go @@ -27,7 +27,7 @@ func TestType(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{}) + assert.Equal(t, &Config{}, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/processor/filterprocessor/factory_test.go b/processor/filterprocessor/factory_test.go index b0772fbfba45..516cd7e42eaf 100644 --- a/processor/filterprocessor/factory_test.go +++ b/processor/filterprocessor/factory_test.go @@ -30,9 +30,9 @@ func TestType(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{ + assert.Equal(t, &Config{ ErrorMode: ottl.PropagateError, - }) + }, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/processor/groupbyattrsprocessor/processor_test.go b/processor/groupbyattrsprocessor/processor_test.go index a6722ddb6f97..9f9fb1e09c87 100644 --- a/processor/groupbyattrsprocessor/processor_test.go +++ b/processor/groupbyattrsprocessor/processor_test.go @@ -366,7 +366,7 @@ func TestComplexAttributeGrouping(t *testing.T) { metrics := rm.ScopeMetrics().At(j).Metrics() for k := 0; k < metrics.Len(); k++ { metric := metrics.At(k) - assert.Equal(t, metric.Histogram().AggregationTemporality(), pmetric.AggregationTemporalityCumulative) + assert.Equal(t, pmetric.AggregationTemporalityCumulative, metric.Histogram().AggregationTemporality()) for l := 0; l < metric.Histogram().DataPoints().Len(); l++ { assert.EqualValues(t, outputRecordAttrs, metric.Histogram().DataPoints().At(l).Attributes()) } @@ -1109,7 +1109,7 @@ func Test_GetMetricInInstrumentationLibrary(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - require.Equal(t, getMetricInInstrumentationLibrary(tt.ilm, tt.searched), tt.want) + require.Equal(t, tt.want, getMetricInInstrumentationLibrary(tt.ilm, tt.searched)) }) } } diff --git a/processor/groupbytraceprocessor/event_test.go b/processor/groupbytraceprocessor/event_test.go index b820508e470c..eb7fd5065745 100644 --- a/processor/groupbytraceprocessor/event_test.go +++ b/processor/groupbytraceprocessor/event_test.go @@ -541,5 +541,5 @@ func assertGaugeNotCreated(t *testing.T, name string, tt componentTestTelemetry) var md metricdata.ResourceMetrics require.NoError(t, tt.reader.Collect(context.Background(), &md)) got := tt.getMetric(name, md) - assert.Equal(t, got, metricdata.Metrics{}, "gauge exists already but shouldn't") + assert.Equal(t, metricdata.Metrics{}, got, "gauge exists already but shouldn't") } diff --git a/processor/k8sattributesprocessor/internal/kube/client_test.go b/processor/k8sattributesprocessor/internal/kube/client_test.go index 4fc4802aa35e..97b0cdc06b16 100644 --- a/processor/k8sattributesprocessor/internal/kube/client_test.go +++ b/processor/k8sattributesprocessor/internal/kube/client_test.go @@ -258,13 +258,13 @@ func TestReplicaSetHandler(t *testing.T) { c.handleReplicaSetAdd(replicaset) assert.Len(t, c.ReplicaSets, 1) got := c.ReplicaSets[string(replicaset.UID)] - assert.Equal(t, got.Name, "deployment-aaa") - assert.Equal(t, got.Namespace, "namespaceA") - assert.Equal(t, got.UID, "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") - assert.Equal(t, got.Deployment, Deployment{ + assert.Equal(t, "deployment-aaa", got.Name) + assert.Equal(t, "namespaceA", got.Namespace) + assert.Equal(t, "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", got.UID) + assert.Equal(t, Deployment{ Name: "deployment", UID: "ffffffff-gggg-hhhh-iiii-jjjjjjjjjjj", - }) + }, got.Deployment) // test update replicaset updatedReplicaset := replicaset @@ -272,13 +272,13 @@ func TestReplicaSetHandler(t *testing.T) { c.handleReplicaSetUpdate(replicaset, updatedReplicaset) assert.Len(t, c.ReplicaSets, 1) got = c.ReplicaSets[string(replicaset.UID)] - assert.Equal(t, got.Name, "deployment-aaa") - assert.Equal(t, got.Namespace, "namespaceA") - assert.Equal(t, got.UID, "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") - assert.Equal(t, got.Deployment, Deployment{ + assert.Equal(t, "deployment-aaa", got.Name) + assert.Equal(t, "namespaceA", got.Namespace) + assert.Equal(t, "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", got.UID) + assert.Equal(t, Deployment{ Name: "deployment", UID: "ffffffff-gggg-hhhh-iiii-jjjjjjjjjjj", - }) + }, got.Deployment) // test delete replicaset c.handleReplicaSetDelete(updatedReplicaset) diff --git a/processor/metricsgenerationprocessor/factory_test.go b/processor/metricsgenerationprocessor/factory_test.go index 65b6e5a876e9..891920dbd192 100644 --- a/processor/metricsgenerationprocessor/factory_test.go +++ b/processor/metricsgenerationprocessor/factory_test.go @@ -27,7 +27,7 @@ func TestType(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{}) + assert.Equal(t, &Config{}, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/processor/metricstransformprocessor/factory_test.go b/processor/metricstransformprocessor/factory_test.go index fddfb0984bf1..1ae4f3116406 100644 --- a/processor/metricstransformprocessor/factory_test.go +++ b/processor/metricstransformprocessor/factory_test.go @@ -29,7 +29,7 @@ func TestType(t *testing.T) { func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{}) + assert.Equal(t, &Config{}, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/processor/resourcedetectionprocessor/config_test.go b/processor/resourcedetectionprocessor/config_test.go index 0140ebfc3914..499474e81d17 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -212,7 +212,7 @@ func TestGetConfigFromType(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { output := tt.inputDetectorConfig.GetConfigFromType(tt.detectorType) - assert.Equal(t, output, tt.expectedConfig) + assert.Equal(t, tt.expectedConfig, output) }) } } diff --git a/processor/resourcedetectionprocessor/internal/aws/ec2/ec2_test.go b/processor/resourcedetectionprocessor/internal/aws/ec2/ec2_test.go index bf0385758595..1a8c29266151 100644 --- a/processor/resourcedetectionprocessor/internal/aws/ec2/ec2_test.go +++ b/processor/resourcedetectionprocessor/internal/aws/ec2/ec2_test.go @@ -353,7 +353,7 @@ func TestEC2Tags(t *testing.T) { return } assert.NoError(t, err) - assert.Equal(t, output, tt.expectedOutput) + assert.Equal(t, tt.expectedOutput, output) }) } } diff --git a/processor/resourcedetectionprocessor/internal/resourcedetection_test.go b/processor/resourcedetectionprocessor/internal/resourcedetection_test.go index 67e49ca4f620..5817b6ad3e7a 100644 --- a/processor/resourcedetectionprocessor/internal/resourcedetection_test.go +++ b/processor/resourcedetectionprocessor/internal/resourcedetection_test.go @@ -281,7 +281,7 @@ func TestFilterAttributes_NoMatch(t *testing.T) { _, ok = attr.Get("host.id") assert.False(t, ok) - assert.EqualValues(t, droppedAttributes, []string{"host.name", "host.id"}) + assert.EqualValues(t, []string{"host.name", "host.id"}, droppedAttributes) } func TestFilterAttributes_NilAttributes(t *testing.T) { diff --git a/processor/routingprocessor/logs_test.go b/processor/routingprocessor/logs_test.go index ead511b87fac..e6572f2f43ee 100644 --- a/processor/routingprocessor/logs_test.go +++ b/processor/routingprocessor/logs_test.go @@ -365,8 +365,8 @@ func TestLogsAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { assert.Len(t, firstExp.AllLogs(), 1) assert.Len(t, secondExp.AllLogs(), 1) - assert.Equal(t, firstExp.AllLogs()[0].LogRecordCount(), 2) - assert.Equal(t, secondExp.AllLogs()[0].LogRecordCount(), 2) + assert.Equal(t, 2, firstExp.AllLogs()[0].LogRecordCount()) + assert.Equal(t, 2, secondExp.AllLogs()[0].LogRecordCount()) assert.Equal(t, firstExp.AllLogs(), secondExp.AllLogs()) }) @@ -396,7 +396,7 @@ func TestLogsAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { rspan := defaultExp.AllLogs()[0].ResourceLogs().At(0) attr, ok := rspan.Resource().Attributes().Get("X-Tenant") assert.True(t, ok, "routing attribute must exists") - assert.Equal(t, attr.AsString(), "something-else") + assert.Equal(t, "something-else", attr.AsString()) }) } diff --git a/processor/routingprocessor/metrics_test.go b/processor/routingprocessor/metrics_test.go index 70e706a03f87..87e6e1614eb4 100644 --- a/processor/routingprocessor/metrics_test.go +++ b/processor/routingprocessor/metrics_test.go @@ -433,8 +433,8 @@ func TestMetricsAreCorrectlySplitPerResourceAttributeRoutingWithOTTL(t *testing. assert.Len(t, firstExp.AllMetrics(), 1) assert.Len(t, secondExp.AllMetrics(), 1) - assert.Equal(t, firstExp.AllMetrics()[0].MetricCount(), 2) - assert.Equal(t, secondExp.AllMetrics()[0].MetricCount(), 2) + assert.Equal(t, 2, firstExp.AllMetrics()[0].MetricCount()) + assert.Equal(t, 2, secondExp.AllMetrics()[0].MetricCount()) assert.Equal(t, firstExp.AllMetrics(), secondExp.AllMetrics()) }) diff --git a/processor/routingprocessor/traces_test.go b/processor/routingprocessor/traces_test.go index 6d4e584aa4b2..55b5de17146d 100644 --- a/processor/routingprocessor/traces_test.go +++ b/processor/routingprocessor/traces_test.go @@ -421,8 +421,8 @@ func TestTracesAreCorrectlySplitPerResourceAttributeWithOTTL(t *testing.T) { assert.Len(t, firstExp.AllTraces(), 1) assert.Len(t, secondExp.AllTraces(), 1) - assert.Equal(t, firstExp.AllTraces()[0].SpanCount(), 2) - assert.Equal(t, secondExp.AllTraces()[0].SpanCount(), 2) + assert.Equal(t, 2, firstExp.AllTraces()[0].SpanCount()) + assert.Equal(t, 2, secondExp.AllTraces()[0].SpanCount()) assert.Equal(t, firstExp.AllTraces(), secondExp.AllTraces()) }) diff --git a/processor/sumologicprocessor/aggregate_attributes_processor_test.go b/processor/sumologicprocessor/aggregate_attributes_processor_test.go index 53aa738d00a7..b6a8deb097cd 100644 --- a/processor/sumologicprocessor/aggregate_attributes_processor_test.go +++ b/processor/sumologicprocessor/aggregate_attributes_processor_test.go @@ -133,7 +133,7 @@ func TestMetrics(t *testing.T) { name: "empty", createMetric: pmetric.NewMetric, test: func(m pmetric.Metric) { - require.Equal(t, m.Type(), pmetric.MetricTypeEmpty) + require.Equal(t, pmetric.MetricTypeEmpty, m.Type()) }, }, { @@ -149,7 +149,7 @@ func TestMetrics(t *testing.T) { s := pmetric.NewMetric().SetEmptySum() s.DataPoints().AppendEmpty().Attributes().PutEmptyMap("a").PutStr("c", "x") - require.Equal(t, m.Type(), pmetric.MetricTypeSum) + require.Equal(t, pmetric.MetricTypeSum, m.Type()) require.Equal(t, s.DataPoints().At(0).Attributes().AsRaw(), m.Sum().DataPoints().At(0).Attributes().AsRaw()) }, }, @@ -166,7 +166,7 @@ func TestMetrics(t *testing.T) { s := pmetric.NewMetric().SetEmptyGauge() s.DataPoints().AppendEmpty().Attributes().PutEmptyMap("a").PutStr("c", "x") - require.Equal(t, m.Type(), pmetric.MetricTypeGauge) + require.Equal(t, pmetric.MetricTypeGauge, m.Type()) require.Equal(t, s.DataPoints().At(0).Attributes().AsRaw(), m.Gauge().DataPoints().At(0).Attributes().AsRaw()) }, }, @@ -183,7 +183,7 @@ func TestMetrics(t *testing.T) { s := pmetric.NewMetric().SetEmptyHistogram() s.DataPoints().AppendEmpty().Attributes().PutEmptyMap("a").PutStr("c", "x") - require.Equal(t, m.Type(), pmetric.MetricTypeHistogram) + require.Equal(t, pmetric.MetricTypeHistogram, m.Type()) require.Equal(t, s.DataPoints().At(0).Attributes().AsRaw(), m.Histogram().DataPoints().At(0).Attributes().AsRaw()) }, }, @@ -200,7 +200,7 @@ func TestMetrics(t *testing.T) { s := pmetric.NewMetric().SetEmptyExponentialHistogram() s.DataPoints().AppendEmpty().Attributes().PutEmptyMap("a").PutStr("c", "x") - require.Equal(t, m.Type(), pmetric.MetricTypeExponentialHistogram) + require.Equal(t, pmetric.MetricTypeExponentialHistogram, m.Type()) require.Equal(t, s.DataPoints().At(0).Attributes().AsRaw(), m.ExponentialHistogram().DataPoints().At(0).Attributes().AsRaw()) }, }, @@ -217,7 +217,7 @@ func TestMetrics(t *testing.T) { s := pmetric.NewMetric().SetEmptySummary() s.DataPoints().AppendEmpty().Attributes().PutEmptyMap("a").PutStr("c", "x") - require.Equal(t, m.Type(), pmetric.MetricTypeSummary) + require.Equal(t, pmetric.MetricTypeSummary, m.Type()) require.Equal(t, s.DataPoints().At(0).Attributes().AsRaw(), m.Summary().DataPoints().At(0).Attributes().AsRaw()) }, }, diff --git a/processor/sumologicprocessor/translate_docker_metrics_processor_test.go b/processor/sumologicprocessor/translate_docker_metrics_processor_test.go index d452fd3a2375..a6dd12f78ae6 100644 --- a/processor/sumologicprocessor/translate_docker_metrics_processor_test.go +++ b/processor/sumologicprocessor/translate_docker_metrics_processor_test.go @@ -95,7 +95,7 @@ func TestTranslateDockerMetric_ResourceAttrbutesAreTranslatedCorrectly(t *testin res, ok := actual.Get(tc.nameOut) assert.True(t, ok) - assert.Equal(t, res.AsString(), "a") + assert.Equal(t, "a", res.AsString()) }) } } diff --git a/processor/tailsamplingprocessor/config_test.go b/processor/tailsamplingprocessor/config_test.go index 164aa318013d..c94b3fc6b12e 100644 --- a/processor/tailsamplingprocessor/config_test.go +++ b/processor/tailsamplingprocessor/config_test.go @@ -31,7 +31,6 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) assert.Equal(t, - cfg, &Config{ DecisionWait: 10 * time.Second, NumTraces: 100, @@ -185,5 +184,5 @@ func TestLoadConfig(t *testing.T) { }, }, }, - }) + }, cfg) } diff --git a/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go b/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go index f05fd3be3ccf..2be833dc655c 100644 --- a/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/always_sample_test.go @@ -17,5 +17,5 @@ func TestEvaluate_AlwaysSample(t *testing.T) { decision, err := filter.Evaluate(context.Background(), pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), newTraceStringAttrs(nil, "example", "value")) assert.NoError(t, err) - assert.Equal(t, decision, Sampled) + assert.Equal(t, Sampled, decision) } diff --git a/processor/tailsamplingprocessor/internal/sampling/and_test.go b/processor/tailsamplingprocessor/internal/sampling/and_test.go index 6c68279cf183..0094768f7590 100644 --- a/processor/tailsamplingprocessor/internal/sampling/and_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/and_test.go @@ -35,7 +35,7 @@ func TestAndEvaluatorNotSampled(t *testing.T) { } decision, err := and.Evaluate(context.Background(), traceID, trace) require.NoError(t, err, "Failed to evaluate and policy: %v", err) - assert.Equal(t, decision, NotSampled) + assert.Equal(t, NotSampled, decision) } @@ -61,7 +61,7 @@ func TestAndEvaluatorSampled(t *testing.T) { } decision, err := and.Evaluate(context.Background(), traceID, trace) require.NoError(t, err, "Failed to evaluate and policy: %v", err) - assert.Equal(t, decision, Sampled) + assert.Equal(t, Sampled, decision) } @@ -87,7 +87,7 @@ func TestAndEvaluatorStringInvertSampled(t *testing.T) { } decision, err := and.Evaluate(context.Background(), traceID, trace) require.NoError(t, err, "Failed to evaluate and policy: %v", err) - assert.Equal(t, decision, Sampled) + assert.Equal(t, Sampled, decision) } @@ -113,6 +113,6 @@ func TestAndEvaluatorStringInvertNotSampled(t *testing.T) { } decision, err := and.Evaluate(context.Background(), traceID, trace) require.NoError(t, err, "Failed to evaluate and policy: %v", err) - assert.Equal(t, decision, InvertNotSampled) + assert.Equal(t, InvertNotSampled, decision) } diff --git a/processor/tailsamplingprocessor/internal/sampling/composite_test.go b/processor/tailsamplingprocessor/internal/sampling/composite_test.go index d7ef82fd7333..66a7d1606c34 100644 --- a/processor/tailsamplingprocessor/internal/sampling/composite_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/composite_test.go @@ -71,7 +71,7 @@ func TestCompositeEvaluatorNotSampled(t *testing.T) { // None of the numeric filters should match since input trace data does not contain // the "tag", so the decision should be NotSampled. expected := NotSampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } func TestCompositeEvaluatorSampled(t *testing.T) { @@ -88,7 +88,7 @@ func TestCompositeEvaluatorSampled(t *testing.T) { // The second policy is AlwaysSample, so the decision should be Sampled. expected := Sampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } func TestCompositeEvaluator_OverflowAlwaysSampled(t *testing.T) { @@ -107,7 +107,7 @@ func TestCompositeEvaluator_OverflowAlwaysSampled(t *testing.T) { // The first policy is NewNumericAttributeFilter and trace tag matches criteria, so the decision should be Sampled. expected := Sampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) trace = newTraceWithKV(traceID, "tag", int64(11)) @@ -116,7 +116,7 @@ func TestCompositeEvaluator_OverflowAlwaysSampled(t *testing.T) { // The first policy is NewNumericAttributeFilter and trace tag matches criteria, so the decision should be Sampled. expected = NotSampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) trace = newTraceWithKV(traceID, "tag", int64(1001)) decision, err = c.Evaluate(context.Background(), traceID, trace) @@ -124,7 +124,7 @@ func TestCompositeEvaluator_OverflowAlwaysSampled(t *testing.T) { // The first policy fails as the tag value is higher than the range set where as the second policy is AlwaysSample, so the decision should be Sampled. expected = Sampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } func TestCompositeEvaluatorSampled_AlwaysSampled(t *testing.T) { @@ -142,7 +142,7 @@ func TestCompositeEvaluatorSampled_AlwaysSampled(t *testing.T) { // The second policy is AlwaysSample, so the decision should be Sampled. expected := Sampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } } @@ -161,7 +161,7 @@ func TestCompositeEvaluatorInverseSampled_AlwaysSampled(t *testing.T) { // The second policy is AlwaysSample, so the decision should be Sampled. expected := Sampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } } @@ -181,7 +181,7 @@ func TestCompositeEvaluatorThrottling(t *testing.T) { require.NoError(t, err, "Failed to evaluate composite policy: %v", err) expected := Sampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } // Now we hit the rate limit, so subsequent evaluations should result in 100% NotSampled @@ -190,7 +190,7 @@ func TestCompositeEvaluatorThrottling(t *testing.T) { require.NoError(t, err, "Failed to evaluate composite policy: %v", err) expected := NotSampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } // Let the time advance by one second. @@ -202,7 +202,7 @@ func TestCompositeEvaluatorThrottling(t *testing.T) { require.NoError(t, err, "Failed to evaluate composite policy: %v", err) expected := Sampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } } @@ -249,7 +249,7 @@ func TestCompositeEvaluator2SubpolicyThrottling(t *testing.T) { require.NoError(t, err, "Failed to evaluate composite policy: %v", err) expected := Sampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } // Now let's hit the hard limit and exceed the total by a factor of 2 @@ -258,7 +258,7 @@ func TestCompositeEvaluator2SubpolicyThrottling(t *testing.T) { require.NoError(t, err, "Failed to evaluate composite policy: %v", err) expected := NotSampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } // Let the time advance by one second. @@ -270,6 +270,6 @@ func TestCompositeEvaluator2SubpolicyThrottling(t *testing.T) { require.NoError(t, err, "Failed to evaluate composite policy: %v", err) expected := Sampled - assert.Equal(t, decision, expected) + assert.Equal(t, expected, decision) } } diff --git a/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go b/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go index 84918bb66eed..afa58ca78484 100644 --- a/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go +++ b/processor/tailsamplingprocessor/internal/sampling/rate_limiting_test.go @@ -24,7 +24,7 @@ func TestRateLimiter(t *testing.T) { trace.SpanCount = traceSpanCount decision, err := rateLimiter.Evaluate(context.Background(), traceID, trace) assert.NoError(t, err) - assert.Equal(t, decision, NotSampled) + assert.Equal(t, NotSampled, decision) // Trace span count equal to spans per second traceSpanCount = &atomic.Int64{} @@ -32,7 +32,7 @@ func TestRateLimiter(t *testing.T) { trace.SpanCount = traceSpanCount decision, err = rateLimiter.Evaluate(context.Background(), traceID, trace) assert.NoError(t, err) - assert.Equal(t, decision, NotSampled) + assert.Equal(t, NotSampled, decision) // Trace span count less than spans per second traceSpanCount = &atomic.Int64{} @@ -40,12 +40,12 @@ func TestRateLimiter(t *testing.T) { trace.SpanCount = traceSpanCount decision, err = rateLimiter.Evaluate(context.Background(), traceID, trace) assert.NoError(t, err) - assert.Equal(t, decision, Sampled) + assert.Equal(t, Sampled, decision) // Trace span count less than spans per second traceSpanCount = &atomic.Int64{} trace.SpanCount = traceSpanCount decision, err = rateLimiter.Evaluate(context.Background(), traceID, trace) assert.NoError(t, err) - assert.Equal(t, decision, Sampled) + assert.Equal(t, Sampled, decision) } diff --git a/processor/transformprocessor/factory_test.go b/processor/transformprocessor/factory_test.go index f3e7a8c7e52a..97a459a096ba 100644 --- a/processor/transformprocessor/factory_test.go +++ b/processor/transformprocessor/factory_test.go @@ -29,12 +29,12 @@ func TestFactory_Type(t *testing.T) { func TestFactory_CreateDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Equal(t, cfg, &Config{ + assert.Equal(t, &Config{ ErrorMode: ottl.PropagateError, TraceStatements: []common.ContextStatements{}, MetricStatements: []common.ContextStatements{}, LogStatements: []common.ContextStatements{}, - }) + }, cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) } diff --git a/receiver/awscloudwatchreceiver/config_test.go b/receiver/awscloudwatchreceiver/config_test.go index 4da170bc895a..2f85c8cd01b4 100644 --- a/receiver/awscloudwatchreceiver/config_test.go +++ b/receiver/awscloudwatchreceiver/config_test.go @@ -260,7 +260,7 @@ func TestLoadConfig(t *testing.T) { loaded, err := cm.Sub(component.NewIDWithName(metadata.Type, tc.name).String()) require.NoError(t, err) require.NoError(t, loaded.Unmarshal(cfg)) - require.Equal(t, cfg, tc.expectedConfig) + require.Equal(t, tc.expectedConfig, cfg) require.NoError(t, component.ValidateConfig(cfg)) }) } diff --git a/receiver/awscloudwatchreceiver/logs_test.go b/receiver/awscloudwatchreceiver/logs_test.go index 6861abe2280c..e1558eba9316 100644 --- a/receiver/awscloudwatchreceiver/logs_test.go +++ b/receiver/awscloudwatchreceiver/logs_test.go @@ -95,7 +95,7 @@ func TestPrefixedNamedStreamsConfig(t *testing.T) { groupRequests := alertRcvr.groupRequests require.Len(t, groupRequests, 1) - require.Equal(t, groupRequests[0].groupName(), "test-log-group-name") + require.Equal(t, "test-log-group-name", groupRequests[0].groupName()) err = alertRcvr.Shutdown(context.Background()) require.NoError(t, err) @@ -129,7 +129,7 @@ func TestNamedConfigNoStreamFilter(t *testing.T) { groupRequests := alertRcvr.groupRequests require.Len(t, groupRequests, 1) - require.Equal(t, groupRequests[0].groupName(), "test-log-group-name") + require.Equal(t, "test-log-group-name", groupRequests[0].groupName()) err = alertRcvr.Shutdown(context.Background()) require.NoError(t, err) diff --git a/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go b/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go index d40fce2cb845..cefbe4f56c8a 100644 --- a/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go +++ b/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go @@ -351,7 +351,7 @@ func TestPodStore_addContainerID(t *testing.T) { expected := map[string]any{} expected["docker"] = map[string]string{"container_id": "637631e2634ea92c0c1aa5d24734cfe794f09c57933026592c12acafbaf6972c"} assert.Equal(t, expected, kubernetesBlob) - assert.Equal(t, metric.GetTag(ci.ContainerNamekey), "ubuntu") + assert.Equal(t, "ubuntu", metric.GetTag(ci.ContainerNamekey)) tags = map[string]string{ci.ContainerNamekey: "notUbuntu", ci.ContainerIDkey: "123"} kubernetesBlob = map[string]any{} @@ -361,7 +361,7 @@ func TestPodStore_addContainerID(t *testing.T) { expected = map[string]any{} expected["container_id"] = "123" assert.Equal(t, expected, kubernetesBlob) - assert.Equal(t, metric.GetTag(ci.ContainerNamekey), "notUbuntu") + assert.Equal(t, "notUbuntu", metric.GetTag(ci.ContainerNamekey)) } func TestPodStore_addLabel(t *testing.T) { diff --git a/receiver/awsxrayreceiver/internal/translator/cause_test.go b/receiver/awsxrayreceiver/internal/translator/cause_test.go index a87549c1bc03..5e6aee268c7b 100644 --- a/receiver/awsxrayreceiver/internal/translator/cause_test.go +++ b/receiver/awsxrayreceiver/internal/translator/cause_test.go @@ -30,7 +30,7 @@ func TestConvertStackFramesToStackTraceStr(t *testing.T) { }, } actual := convertStackFramesToStackTraceStr(excp) - assert.Equal(t, actual, "exceptionType: exceptionMessage\n\tat label0(path0: 10)\n\tat label1(path1: 11)\n") + assert.Equal(t, "exceptionType: exceptionMessage\n\tat label0(path0: 10)\n\tat label1(path1: 11)\n", actual) } func TestConvertStackFramesToStackTraceStrNoPath(t *testing.T) { @@ -50,7 +50,7 @@ func TestConvertStackFramesToStackTraceStrNoPath(t *testing.T) { }, } actual := convertStackFramesToStackTraceStr(excp) - assert.Equal(t, actual, "exceptionType: exceptionMessage\n\tat label0(path0: 10)\n\tat label1(: 11)\n") + assert.Equal(t, "exceptionType: exceptionMessage\n\tat label0(path0: 10)\n\tat label1(: 11)\n", actual) } func TestConvertStackFramesToStackTraceStrNoLine(t *testing.T) { @@ -70,7 +70,7 @@ func TestConvertStackFramesToStackTraceStrNoLine(t *testing.T) { }, } actual := convertStackFramesToStackTraceStr(excp) - assert.Equal(t, actual, "exceptionType: exceptionMessage\n\tat label0(path0: 10)\n\tat label1(path1: )\n") + assert.Equal(t, "exceptionType: exceptionMessage\n\tat label0(path0: 10)\n\tat label1(path1: )\n", actual) } func TestConvertStackFramesToStackTraceStrNoLabel(t *testing.T) { @@ -90,7 +90,7 @@ func TestConvertStackFramesToStackTraceStrNoLabel(t *testing.T) { }, } actual := convertStackFramesToStackTraceStr(excp) - assert.Equal(t, actual, "exceptionType: exceptionMessage\n\tat label0(path0: 10)\n\tat (path1: 11)\n") + assert.Equal(t, "exceptionType: exceptionMessage\n\tat label0(path0: 10)\n\tat (path1: 11)\n", actual) } func TestConvertStackFramesToStackTraceStrNoErrorMessage(t *testing.T) { @@ -108,5 +108,5 @@ func TestConvertStackFramesToStackTraceStrNoErrorMessage(t *testing.T) { }, } actual := convertStackFramesToStackTraceStr(excp) - assert.Equal(t, actual, ": \n\tat label0(path0: 10)\n\tat (path1: 11)\n") + assert.Equal(t, ": \n\tat label0(path0: 10)\n\tat (path1: 11)\n", actual) } diff --git a/receiver/awsxrayreceiver/internal/translator/translator_test.go b/receiver/awsxrayreceiver/internal/translator/translator_test.go index 2fa7015fad27..f241cca3ef34 100644 --- a/receiver/awsxrayreceiver/internal/translator/translator_test.go +++ b/receiver/awsxrayreceiver/internal/translator/translator_test.go @@ -1092,7 +1092,7 @@ func TestDecodeXRayTraceID(t *testing.T) { traceIDBytes, err := decodeXRayTraceID(&traceID) expectedTraceIDBytes := [16]byte{0x5f, 0x84, 0xc7, 0xa1, 0xe7, 0xd1, 0x85, 0x2d, 0xb8, 0xc4, 0xfd, 0x35, 0xd8, 0x8b, 0xf4, 0x9a} if assert.NoError(t, err) { - assert.Equal(t, traceIDBytes, expectedTraceIDBytes) + assert.Equal(t, expectedTraceIDBytes, traceIDBytes) } // invalid format @@ -1111,7 +1111,7 @@ func TestDecodeXRaySpanID(t *testing.T) { spanIDBytes, err := decodeXRaySpanID(&spanID) expectedSpanIDBytes := [8]byte{0xde, 0xfd, 0xfd, 0x99, 0x12, 0xdc, 0x5a, 0x56} if assert.NoError(t, err) { - assert.Equal(t, spanIDBytes, expectedSpanIDBytes) + assert.Equal(t, expectedSpanIDBytes, spanIDBytes) } // invalid format diff --git a/receiver/azureblobreceiver/receiver_test.go b/receiver/azureblobreceiver/receiver_test.go index 614850d47b23..8670ebea1508 100644 --- a/receiver/azureblobreceiver/receiver_test.go +++ b/receiver/azureblobreceiver/receiver_test.go @@ -38,7 +38,7 @@ func TestConsumeLogsJSON(t *testing.T) { err := logsConsumer.consumeLogsJSON(context.Background(), logsJSON) require.NoError(t, err) - assert.Equal(t, logsSink.LogRecordCount(), 1) + assert.Equal(t, 1, logsSink.LogRecordCount()) } func TestConsumeTracesJSON(t *testing.T) { @@ -52,7 +52,7 @@ func TestConsumeTracesJSON(t *testing.T) { err := tracesConsumer.consumeTracesJSON(context.Background(), tracesJSON) require.NoError(t, err) - assert.Equal(t, tracesSink.SpanCount(), 2) + assert.Equal(t, 2, tracesSink.SpanCount()) } func getBlobReceiver(t *testing.T) (component.Component, error) { diff --git a/receiver/azuremonitorreceiver/internal/metadata/metrics_test.go b/receiver/azuremonitorreceiver/internal/metadata/metrics_test.go index 1f953fe270a4..8b09ba23407f 100644 --- a/receiver/azuremonitorreceiver/internal/metadata/metrics_test.go +++ b/receiver/azuremonitorreceiver/internal/metadata/metrics_test.go @@ -84,7 +84,7 @@ func TestMetricsBuilder(t *testing.T) { assert.EqualValues(t, "attr-val", attrVal.Str()) } assert.Equal(t, enabledAttrCount, rm.Resource().Attributes().Len()) - assert.Equal(t, attrCount, 2) + assert.Equal(t, 2, attrCount) assert.Equal(t, 1, rm.ScopeMetrics().Len()) ms := rm.ScopeMetrics().At(0).Metrics() diff --git a/receiver/couchdbreceiver/scraper_test.go b/receiver/couchdbreceiver/scraper_test.go index a4e64ae77bbc..acda5b5be9a4 100644 --- a/receiver/couchdbreceiver/scraper_test.go +++ b/receiver/couchdbreceiver/scraper_test.go @@ -172,7 +172,7 @@ func TestMetricSettings(t *testing.T) { require.NoError(t, pmetrictest.CompareMetrics(expected, metrics, pmetrictest.IgnoreMetricDataPointsOrder(), pmetrictest.IgnoreStartTimestamp(), pmetrictest.IgnoreTimestamp())) - require.Equal(t, metrics.MetricCount(), 1) + require.Equal(t, 1, metrics.MetricCount()) } func getStats(filename string) (map[string]any, error) { diff --git a/receiver/datadogreceiver/receiver_test.go b/receiver/datadogreceiver/receiver_test.go index 526b8967fccc..e172735c3bcf 100644 --- a/receiver/datadogreceiver/receiver_test.go +++ b/receiver/datadogreceiver/receiver_test.go @@ -295,7 +295,7 @@ func TestDatadogMetricsV1_EndToEnd(t *testing.T) { body, err := io.ReadAll(resp.Body) require.NoError(t, multierr.Combine(err, resp.Body.Close()), "Must not error when reading body") - require.Equal(t, string(body), "OK", "Expected response to be 'OK', got %s", string(body)) + require.Equal(t, "OK", string(body), "Expected response to be 'OK', got %s", string(body)) require.Equal(t, http.StatusAccepted, resp.StatusCode) mds := sink.AllMetrics() @@ -373,7 +373,7 @@ func TestDatadogMetricsV2_EndToEnd(t *testing.T) { body, err := io.ReadAll(resp.Body) require.NoError(t, multierr.Combine(err, resp.Body.Close()), "Must not error when reading body") - require.Equal(t, string(body), "OK", "Expected response to be 'OK', got %s", string(body)) + require.Equal(t, "OK", string(body), "Expected response to be 'OK', got %s", string(body)) require.Equal(t, http.StatusAccepted, resp.StatusCode) mds := sink.AllMetrics() @@ -464,7 +464,7 @@ func TestStats_EndToEnd(t *testing.T) { body, err := io.ReadAll(resp.Body) require.NoError(t, multierr.Combine(err, resp.Body.Close()), "Must not error when reading body") - require.Equal(t, string(body), "OK", "Expected response to be 'OK', got %s", string(body)) + require.Equal(t, "OK", string(body), "Expected response to be 'OK', got %s", string(body)) require.Equal(t, http.StatusOK, resp.StatusCode) mds := sink.AllMetrics() diff --git a/receiver/elasticsearchreceiver/scraper_test.go b/receiver/elasticsearchreceiver/scraper_test.go index 72e99092d9ba..c34601544200 100644 --- a/receiver/elasticsearchreceiver/scraper_test.go +++ b/receiver/elasticsearchreceiver/scraper_test.go @@ -314,7 +314,7 @@ func TestScrapingError(t *testing.T) { require.Contains(t, err.Error(), err404.Error()) require.Contains(t, err.Error(), err500.Error()) - require.Equal(t, m.DataPointCount(), 0) + require.Equal(t, 0, m.DataPointCount()) }, }, { @@ -369,7 +369,7 @@ func TestScrapingError(t *testing.T) { require.Contains(t, err.Error(), err404.Error()) require.Contains(t, err.Error(), err500.Error()) - require.Equal(t, m.DataPointCount(), 0) + require.Equal(t, 0, m.DataPointCount()) }, }, { diff --git a/receiver/flinkmetricsreceiver/client_test.go b/receiver/flinkmetricsreceiver/client_test.go index 019b8d6c701f..d11d9b018d94 100644 --- a/receiver/flinkmetricsreceiver/client_test.go +++ b/receiver/flinkmetricsreceiver/client_test.go @@ -544,7 +544,7 @@ func TestGetSubtasksMetrics(t *testing.T) { var e *models.JobsResponse _ = json.Unmarshal(jobsData, &e) - require.EqualValues(t, e.Jobs[0].ID, "54a5c6e527e00e1bb861272a39fe13e4") + require.EqualValues(t, "54a5c6e527e00e1bb861272a39fe13e4", e.Jobs[0].ID) // Load the valid data into a struct to compare var expected *models.MetricsResponse diff --git a/receiver/googlecloudspannerreceiver/internal/metadata/metricdatatype_test.go b/receiver/googlecloudspannerreceiver/internal/metadata/metricdatatype_test.go index 54e1347d23d6..6c6f13aabc7a 100644 --- a/receiver/googlecloudspannerreceiver/internal/metadata/metricdatatype_test.go +++ b/receiver/googlecloudspannerreceiver/internal/metadata/metricdatatype_test.go @@ -15,21 +15,21 @@ func TestNewMetricType(t *testing.T) { metricDataType := NewMetricType(pmetric.MetricTypeGauge, pmetric.AggregationTemporalityDelta, true) require.NotNil(t, metricDataType) - assert.Equal(t, metricDataType.MetricType(), pmetric.MetricTypeGauge) - assert.Equal(t, metricDataType.AggregationTemporality(), pmetric.AggregationTemporalityDelta) + assert.Equal(t, pmetric.MetricTypeGauge, metricDataType.MetricType()) + assert.Equal(t, pmetric.AggregationTemporalityDelta, metricDataType.AggregationTemporality()) assert.True(t, metricDataType.IsMonotonic()) } func TestMetricValueDataType_MetricType(t *testing.T) { valueDataType := metricValueDataType{dataType: pmetric.MetricTypeGauge} - assert.Equal(t, valueDataType.MetricType(), pmetric.MetricTypeGauge) + assert.Equal(t, pmetric.MetricTypeGauge, valueDataType.MetricType()) } func TestMetricValueDataType_AggregationTemporality(t *testing.T) { valueDataType := metricValueDataType{aggregationTemporality: pmetric.AggregationTemporalityDelta} - assert.Equal(t, valueDataType.AggregationTemporality(), pmetric.AggregationTemporalityDelta) + assert.Equal(t, pmetric.AggregationTemporalityDelta, valueDataType.AggregationTemporality()) } func TestMetricValueDataType_IsMonotonic(t *testing.T) { diff --git a/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go b/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go index 6167a5e37f1c..b837b0f6e04a 100644 --- a/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go +++ b/receiver/googlecloudspannerreceiver/internal/metadata/metricsdatapoint_test.go @@ -169,7 +169,7 @@ func TestMetricsDataPoint_TruncateQueryText(t *testing.T) { metricsDataPoint.TruncateQueryText(6) assert.Len(t, metricsDataPoint.labelValues, 1) - assert.Equal(t, metricsDataPoint.labelValues[0].Value(), "SELECT") + assert.Equal(t, "SELECT", metricsDataPoint.labelValues[0].Value()) } func allPossibleLabelValues() []LabelValue { diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go index 783a7e774f2a..c4204a574e67 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go @@ -227,7 +227,7 @@ func assertNetworkIOMetricValid(t *testing.T, metric pmetric.Metric, expectedNam } func assertNetworkConnectionsMetricValid(t *testing.T, metric pmetric.Metric) { - assert.Equal(t, metric.Name(), "system.network.connections") + assert.Equal(t, "system.network.connections", metric.Name()) internal.AssertSumMetricHasAttributeValue(t, metric, 0, "protocol", pcommon.NewValueStr(metadata.AttributeProtocolTcp.String())) internal.AssertSumMetricHasAttribute(t, metric, 0, "state") diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/pagefile_linux_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/pagefile_linux_test.go index 7afe4c0b34ce..40f7213706dd 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/pagefile_linux_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/pagefile_linux_test.go @@ -27,19 +27,19 @@ func TestGetPageFileStats_ValidFile(t *testing.T) { stats, err := parseSwapsFile(strings.NewReader(validFile)) assert.NoError(err) - assert.Equal(*stats[0], pageFileStats{ + assert.Equal(pageFileStats{ deviceName: "/dev/dm-2", usedBytes: 502566912, freeBytes: 68128825344, totalBytes: 68631392256, - }) + }, *stats[0]) - assert.Equal(*stats[1], pageFileStats{ + assert.Equal(pageFileStats{ deviceName: "/swapfile", usedBytes: 1024, freeBytes: 1024, totalBytes: 2048, - }) + }, *stats[1]) } func TestGetPageFileStats_InvalidFile(t *testing.T) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go index 53f90293f21e..3c853a817d46 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go @@ -203,7 +203,7 @@ func validateFakeData(t *testing.T, metrics pmetric.MetricSlice) { attrs[val.Str()] = point.IntValue() } - assert.Equal(t, attrs, map[string]int64{ + assert.Equal(t, map[string]int64{ metadata.AttributeStatusBlocked.String(): 3, metadata.AttributeStatusPaging.String(): 1, metadata.AttributeStatusRunning.String(): 2, @@ -211,7 +211,7 @@ func validateFakeData(t *testing.T, metrics pmetric.MetricSlice) { metadata.AttributeStatusStopped.String(): 5, metadata.AttributeStatusUnknown.String(): 9, metadata.AttributeStatusZombies.String(): 6, - }) + }, attrs) } if expectProcessesCreatedMetric { diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handlecount/handles_windows_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handlecount/handles_windows_test.go index 8827b4ce3043..9ce32bf51e51 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handlecount/handles_windows_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handlecount/handles_windows_test.go @@ -25,11 +25,11 @@ func TestHandleCountManager(t *testing.T) { count, err := m.GetProcessHandleCount(1) assert.NoError(t, err) - assert.Equal(t, count, uint32(3)) + assert.Equal(t, uint32(3), count) count, err = m.GetProcessHandleCount(2) assert.NoError(t, err) - assert.Equal(t, count, uint32(5)) + assert.Equal(t, uint32(5), count) _, err = m.GetProcessHandleCount(3) assert.ErrorIs(t, errors.Unwrap(err), ErrNoHandleCountForProcess) diff --git a/receiver/iisreceiver/scraper_test.go b/receiver/iisreceiver/scraper_test.go index a66eb27123d9..632be6f11305 100644 --- a/receiver/iisreceiver/scraper_test.go +++ b/receiver/iisreceiver/scraper_test.go @@ -87,7 +87,7 @@ func TestScrapeFailure(t *testing.T) { require.Equal(t, 1, obs.Len()) log := obs.All()[0] - require.Equal(t, log.Level, zapcore.WarnLevel) + require.Equal(t, zapcore.WarnLevel, log.Level) require.Equal(t, "error", log.Context[0].Key) require.EqualError(t, log.Context[0].Interface.(error), expectedError) } @@ -121,7 +121,7 @@ func TestMaxQueueItemAgeScrapeFailure(t *testing.T) { require.Equal(t, 1, obs.Len()) log := obs.All()[0] - require.Equal(t, log.Level, zapcore.WarnLevel) + require.Equal(t, zapcore.WarnLevel, log.Level) require.Equal(t, "error", log.Context[0].Key) require.EqualError(t, log.Context[0].Interface.(error), expectedError) } diff --git a/receiver/jmxreceiver/internal/subprocess/subprocess_test.go b/receiver/jmxreceiver/internal/subprocess/subprocess_test.go index f5ed2a274007..7ef92c5593a5 100644 --- a/receiver/jmxreceiver/internal/subprocess/subprocess_test.go +++ b/receiver/jmxreceiver/internal/subprocess/subprocess_test.go @@ -21,8 +21,8 @@ func TestSubprocessAndConfig(t *testing.T) { require.Same(t, logger, subprocess.logger) require.NotNil(t, subprocess.Stdout) - require.Equal(t, *config.ShutdownTimeout, 5*time.Second) - require.Equal(t, *config.RestartDelay, 5*time.Second) + require.Equal(t, 5*time.Second, *config.ShutdownTimeout) + require.Equal(t, 5*time.Second, *config.RestartDelay) } func TestConfigDurations(t *testing.T) { diff --git a/receiver/k8seventsreceiver/k8s_event_to_logdata_test.go b/receiver/k8seventsreceiver/k8s_event_to_logdata_test.go index 7b0a84a7d163..a603a40bc67e 100644 --- a/receiver/k8seventsreceiver/k8s_event_to_logdata_test.go +++ b/receiver/k8seventsreceiver/k8s_event_to_logdata_test.go @@ -19,14 +19,14 @@ func TestK8sEventToLogData(t *testing.T) { resourceAttrs := rl.Resource().Attributes() lr := rl.ScopeLogs().At(0) attrs := lr.LogRecords().At(0).Attributes() - assert.Equal(t, ld.ResourceLogs().Len(), 1) - assert.Equal(t, resourceAttrs.Len(), 7) - assert.Equal(t, attrs.Len(), 7) + assert.Equal(t, 1, ld.ResourceLogs().Len()) + assert.Equal(t, 7, resourceAttrs.Len()) + assert.Equal(t, 7, attrs.Len()) // Count attribute will not be present in the LogData k8sEvent.Count = 0 ld = k8sEventToLogData(zap.NewNop(), k8sEvent) - assert.Equal(t, ld.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Attributes().Len(), 6) + assert.Equal(t, 6, ld.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Attributes().Len()) } func TestK8sEventToLogDataWithApiAndResourceVersion(t *testing.T) { @@ -59,6 +59,6 @@ func TestUnknownSeverity(t *testing.T) { rl := ld.ResourceLogs().At(0) logEntry := rl.ScopeLogs().At(0).LogRecords().At(0) - assert.Equal(t, logEntry.SeverityNumber(), plog.SeverityNumberUnspecified) - assert.Equal(t, logEntry.SeverityText(), "") + assert.Equal(t, plog.SeverityNumberUnspecified, logEntry.SeverityNumber()) + assert.Equal(t, "", logEntry.SeverityText()) } diff --git a/receiver/k8seventsreceiver/receiver_test.go b/receiver/k8seventsreceiver/receiver_test.go index 88d00b204e89..ee39b2ed113f 100644 --- a/receiver/k8seventsreceiver/receiver_test.go +++ b/receiver/k8seventsreceiver/receiver_test.go @@ -66,7 +66,7 @@ func TestHandleEvent(t *testing.T) { k8sEvent := getEvent() recv.handleEvent(k8sEvent) - assert.Equal(t, sink.LogRecordCount(), 1) + assert.Equal(t, 1, sink.LogRecordCount()) } func TestDropEventsOlderThanStartupTime(t *testing.T) { @@ -85,7 +85,7 @@ func TestDropEventsOlderThanStartupTime(t *testing.T) { k8sEvent.FirstTimestamp = v1.Time{Time: time.Now().Add(-time.Hour)} recv.handleEvent(k8sEvent) - assert.Equal(t, sink.LogRecordCount(), 0) + assert.Equal(t, 0, sink.LogRecordCount()) } func TestGetEventTimestamp(t *testing.T) { diff --git a/receiver/k8sobjectsreceiver/unstructured_to_logdata_test.go b/receiver/k8sobjectsreceiver/unstructured_to_logdata_test.go index 56623eecadd8..61620fa940b7 100644 --- a/receiver/k8sobjectsreceiver/unstructured_to_logdata_test.go +++ b/receiver/k8sobjectsreceiver/unstructured_to_logdata_test.go @@ -41,10 +41,10 @@ func TestUnstructuredListToLogData(t *testing.T) { } logs := pullObjectsToLogData(&objects, time.Now(), config) - assert.Equal(t, logs.LogRecordCount(), 4) + assert.Equal(t, 4, logs.LogRecordCount()) resourceLogs := logs.ResourceLogs() - assert.Equal(t, resourceLogs.Len(), 2) + assert.Equal(t, 2, resourceLogs.Len()) namespaces = []string{"ns1", "ns2"} for i, namespace := range namespaces { @@ -52,8 +52,8 @@ func TestUnstructuredListToLogData(t *testing.T) { resourceAttributes := rl.Resource().Attributes() ns, _ := resourceAttributes.Get(semconv.AttributeK8SNamespaceName) assert.Equal(t, ns.AsString(), namespace) - assert.Equal(t, rl.ScopeLogs().Len(), 1) - assert.Equal(t, rl.ScopeLogs().At(0).LogRecords().Len(), 2) + assert.Equal(t, 1, rl.ScopeLogs().Len()) + assert.Equal(t, 2, rl.ScopeLogs().At(0).LogRecords().Len()) } }) @@ -78,17 +78,17 @@ func TestUnstructuredListToLogData(t *testing.T) { logs := pullObjectsToLogData(&objects, time.Now(), config) - assert.Equal(t, logs.LogRecordCount(), 3) + assert.Equal(t, 3, logs.LogRecordCount()) resourceLogs := logs.ResourceLogs() - assert.Equal(t, resourceLogs.Len(), 1) + assert.Equal(t, 1, resourceLogs.Len()) rl := resourceLogs.At(0) resourceAttributes := rl.Resource().Attributes() logRecords := rl.ScopeLogs().At(0).LogRecords() _, ok := resourceAttributes.Get(semconv.AttributeK8SNamespaceName) assert.False(t, ok) - assert.Equal(t, rl.ScopeLogs().Len(), 1) - assert.Equal(t, logRecords.Len(), 3) + assert.Equal(t, 1, rl.ScopeLogs().Len()) + assert.Equal(t, 3, logRecords.Len()) }) @@ -116,14 +116,14 @@ func TestUnstructuredListToLogData(t *testing.T) { logs, err := watchObjectsToLogData(event, time.Now(), config) assert.NoError(t, err) - assert.Equal(t, logs.LogRecordCount(), 1) + assert.Equal(t, 1, logs.LogRecordCount()) resourceLogs := logs.ResourceLogs() - assert.Equal(t, resourceLogs.Len(), 1) + assert.Equal(t, 1, resourceLogs.Len()) rl := resourceLogs.At(0) logRecords := rl.ScopeLogs().At(0).LogRecords() - assert.Equal(t, rl.ScopeLogs().Len(), 1) - assert.Equal(t, logRecords.Len(), 1) + assert.Equal(t, 1, rl.ScopeLogs().Len()) + assert.Equal(t, 1, logRecords.Len()) attrs := logRecords.At(0).Attributes() eventName, ok := attrs.Get("event.name") @@ -157,14 +157,14 @@ func TestUnstructuredListToLogData(t *testing.T) { logs, err := watchObjectsToLogData(event, observedAt, config) assert.NoError(t, err) - assert.Equal(t, logs.LogRecordCount(), 1) + assert.Equal(t, 1, logs.LogRecordCount()) resourceLogs := logs.ResourceLogs() - assert.Equal(t, resourceLogs.Len(), 1) + assert.Equal(t, 1, resourceLogs.Len()) rl := resourceLogs.At(0) logRecords := rl.ScopeLogs().At(0).LogRecords() - assert.Equal(t, rl.ScopeLogs().Len(), 1) - assert.Equal(t, logRecords.Len(), 1) + assert.Equal(t, 1, rl.ScopeLogs().Len()) + assert.Equal(t, 1, logRecords.Len()) assert.Greater(t, logRecords.At(0).ObservedTimestamp().AsTime().Unix(), int64(0)) assert.Equal(t, logRecords.At(0).ObservedTimestamp().AsTime().Unix(), observedAt.Unix()) }) diff --git a/receiver/kafkametricsreceiver/broker_scraper_test.go b/receiver/kafkametricsreceiver/broker_scraper_test.go index 590454bb8b80..eabcbb1fc3e2 100644 --- a/receiver/kafkametricsreceiver/broker_scraper_test.go +++ b/receiver/kafkametricsreceiver/broker_scraper_test.go @@ -49,7 +49,7 @@ func TestBrokerShutdown_closed(t *testing.T) { func TestBrokerScraper_Name(t *testing.T) { s := brokerScraper{} - assert.Equal(t, s.Name(), brokersScraperName) + assert.Equal(t, brokersScraperName, s.Name()) } func TestBrokerScraper_createBrokerScraper(t *testing.T) { diff --git a/receiver/kafkametricsreceiver/consumer_scraper_test.go b/receiver/kafkametricsreceiver/consumer_scraper_test.go index 06b2f6f0cc51..f01217066922 100644 --- a/receiver/kafkametricsreceiver/consumer_scraper_test.go +++ b/receiver/kafkametricsreceiver/consumer_scraper_test.go @@ -44,7 +44,7 @@ func TestConsumerShutdown_closed(t *testing.T) { func TestConsumerScraper_Name(t *testing.T) { s := consumerScraper{} - assert.Equal(t, s.Name(), consumersScraperName) + assert.Equal(t, consumersScraperName, s.Name()) } func TestConsumerScraper_createConsumerScraper(t *testing.T) { diff --git a/receiver/kafkametricsreceiver/topic_scraper_test.go b/receiver/kafkametricsreceiver/topic_scraper_test.go index af04850e34b6..71c96ef7ee3c 100644 --- a/receiver/kafkametricsreceiver/topic_scraper_test.go +++ b/receiver/kafkametricsreceiver/topic_scraper_test.go @@ -48,7 +48,7 @@ func TestTopicShutdown_closed(t *testing.T) { func TestTopicScraper_Name(t *testing.T) { s := topicScraper{} - assert.Equal(t, s.Name(), topicsScraperName) + assert.Equal(t, topicsScraperName, s.Name()) } func TestTopicScraper_createsScraper(t *testing.T) { diff --git a/receiver/kafkareceiver/kafka_receiver_test.go b/receiver/kafkareceiver/kafka_receiver_test.go index 9bea18c48ecd..755fe2ea351a 100644 --- a/receiver/kafkareceiver/kafka_receiver_test.go +++ b/receiver/kafkareceiver/kafka_receiver_test.go @@ -1080,7 +1080,7 @@ func TestLogsConsumerGroupHandler_unmarshal_text(t *testing.T) { groupClaim.messageChan <- &sarama.ConsumerMessage{Value: encoded} close(groupClaim.messageChan) wg.Wait() - require.Equal(t, sink.LogRecordCount(), 1) + require.Equal(t, 1, sink.LogRecordCount()) log := sink.AllLogs()[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0) assert.Equal(t, log.Body().Str(), test.text) assert.LessOrEqual(t, t1, log.ObservedTimestamp().AsTime()) diff --git a/receiver/mongodbatlasreceiver/alerts_integration_test.go b/receiver/mongodbatlasreceiver/alerts_integration_test.go index 5d59c01a686d..268e999e0beb 100644 --- a/receiver/mongodbatlasreceiver/alerts_integration_test.go +++ b/receiver/mongodbatlasreceiver/alerts_integration_test.go @@ -93,7 +93,7 @@ func TestAlertsReceiver(t *testing.T) { defer resp.Body.Close() - require.Equal(t, resp.StatusCode, http.StatusOK) + require.Equal(t, http.StatusOK, resp.StatusCode) require.Eventually(t, func() bool { return sink.LogRecordCount() > 0 @@ -167,7 +167,7 @@ func TestAlertsReceiverTLS(t *testing.T) { defer resp.Body.Close() - require.Equal(t, resp.StatusCode, http.StatusOK) + require.Equal(t, http.StatusOK, resp.StatusCode) require.Eventually(t, func() bool { return sink.LogRecordCount() > 0 diff --git a/receiver/mongodbatlasreceiver/alerts_test.go b/receiver/mongodbatlasreceiver/alerts_test.go index 098b3f6cda48..95736392f955 100644 --- a/receiver/mongodbatlasreceiver/alerts_test.go +++ b/receiver/mongodbatlasreceiver/alerts_test.go @@ -515,7 +515,7 @@ func TestAlertsRetrieval(t *testing.T) { return testClient() }, validateEntries: func(t *testing.T, logs plog.Logs) { - require.Equal(t, logs.LogRecordCount(), 1) + require.Equal(t, 1, logs.LogRecordCount()) }, }, { @@ -572,7 +572,7 @@ func TestAlertsRetrieval(t *testing.T) { return tc }, validateEntries: func(t *testing.T, l plog.Logs) { - require.Equal(t, l.LogRecordCount(), 1) + require.Equal(t, 1, l.LogRecordCount()) rl := l.ResourceLogs().At(0) sl := rl.ScopeLogs().At(0) lr := sl.LogRecords().At(0) diff --git a/receiver/mongodbatlasreceiver/mongodb_event_to_logdata_test.go b/receiver/mongodbatlasreceiver/mongodb_event_to_logdata_test.go index 99a426122417..2d7bf692184b 100644 --- a/receiver/mongodbatlasreceiver/mongodb_event_to_logdata_test.go +++ b/receiver/mongodbatlasreceiver/mongodb_event_to_logdata_test.go @@ -126,8 +126,8 @@ func TestUnknownSeverity(t *testing.T) { rl := ld.ResourceLogs().At(0) logEntry := rl.ScopeLogs().At(0).LogRecords().At(0) - assert.Equal(t, logEntry.SeverityNumber(), plog.SeverityNumberUnspecified) - assert.Equal(t, logEntry.SeverityText(), "") + assert.Equal(t, plog.SeverityNumberUnspecified, logEntry.SeverityNumber()) + assert.Equal(t, "", logEntry.SeverityText()) } func TestMongoEventToAuditLogData5_0(t *testing.T) { @@ -152,8 +152,8 @@ func TestMongoEventToAuditLogData5_0(t *testing.T) { lr := sl.LogRecords().At(0) attrs := lr.Attributes() - assert.Equal(t, ld.ResourceLogs().Len(), 1) - assert.Equal(t, resourceAttrs.Len(), 6) + assert.Equal(t, 1, ld.ResourceLogs().Len()) + assert.Equal(t, 6, resourceAttrs.Len()) assertString(t, resourceAttrs, "mongodb_atlas.org", "Org") assertString(t, resourceAttrs, "mongodb_atlas.project", "Project") assertString(t, resourceAttrs, "mongodb_atlas.cluster", "clusterName") @@ -176,13 +176,13 @@ func TestMongoEventToAuditLogData5_0(t *testing.T) { roles, ok := attrs.Get("roles") require.True(t, ok, "roles key does not exist") - require.Equal(t, roles.Slice().Len(), 1) + require.Equal(t, 1, roles.Slice().Len()) assertString(t, roles.Slice().At(0).Map(), "role", "test_role") assertString(t, roles.Slice().At(0).Map(), "db", "test_db") users, ok := attrs.Get("users") require.True(t, ok, "users key does not exist") - require.Equal(t, users.Slice().Len(), 1) + require.Equal(t, 1, users.Slice().Len()) assertString(t, users.Slice().At(0).Map(), "user", "mongo_user") assertString(t, users.Slice().At(0).Map(), "db", "my_db") @@ -218,8 +218,8 @@ func TestMongoEventToAuditLogData4_2(t *testing.T) { lr := sl.LogRecords().At(0) attrs := lr.Attributes() - assert.Equal(t, ld.ResourceLogs().Len(), 1) - assert.Equal(t, resourceAttrs.Len(), 6) + assert.Equal(t, 1, ld.ResourceLogs().Len()) + assert.Equal(t, 6, resourceAttrs.Len()) assertString(t, resourceAttrs, "mongodb_atlas.org", "Org") assertString(t, resourceAttrs, "mongodb_atlas.project", "Project") assertString(t, resourceAttrs, "mongodb_atlas.cluster", "clusterName") @@ -239,13 +239,13 @@ func TestMongoEventToAuditLogData4_2(t *testing.T) { roles, ok := attrs.Get("roles") require.True(t, ok, "roles key does not exist") - require.Equal(t, roles.Slice().Len(), 1) + require.Equal(t, 1, roles.Slice().Len()) assertString(t, roles.Slice().At(0).Map(), "role", "test_role") assertString(t, roles.Slice().At(0).Map(), "db", "test_db") users, ok := attrs.Get("users") require.True(t, ok, "users key does not exist") - require.Equal(t, users.Slice().Len(), 1) + require.Equal(t, 1, users.Slice().Len()) assertString(t, users.Slice().At(0).Map(), "user", "mongo_user") assertString(t, users.Slice().At(0).Map(), "db", "my_db") diff --git a/receiver/mongodbatlasreceiver/receiver_test.go b/receiver/mongodbatlasreceiver/receiver_test.go index 89631c861573..9d1c4a9eaf22 100644 --- a/receiver/mongodbatlasreceiver/receiver_test.go +++ b/receiver/mongodbatlasreceiver/receiver_test.go @@ -17,7 +17,7 @@ import ( func TestDefaultConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - require.Equal(t, cfg.(*Config).ControllerConfig.CollectionInterval, 3*time.Minute) + require.Equal(t, 3*time.Minute, cfg.(*Config).ControllerConfig.CollectionInterval) ctx, cancel := context.WithCancel(context.Background()) defer cancel() diff --git a/receiver/mongodbreceiver/client_test.go b/receiver/mongodbreceiver/client_test.go index a2808b3f1332..5f4fdc24cd7d 100644 --- a/receiver/mongodbreceiver/client_test.go +++ b/receiver/mongodbreceiver/client_test.go @@ -90,7 +90,7 @@ func TestListDatabaseNames(t *testing.T) { } dbNames, err := client.ListDatabaseNames(context.Background(), bson.D{}) require.NoError(t, err) - require.Equal(t, dbNames[0], "admin") + require.Equal(t, "admin", dbNames[0]) }) } diff --git a/receiver/mysqlreceiver/scraper_test.go b/receiver/mysqlreceiver/scraper_test.go index f68cd3692bfd..d0232ca48984 100644 --- a/receiver/mysqlreceiver/scraper_test.go +++ b/receiver/mysqlreceiver/scraper_test.go @@ -121,7 +121,7 @@ func TestScrape(t *testing.T) { require.True(t, errors.As(scrapeErr, &partialError), "returned error was not PartialScrapeError") // 5 comes from 4 failed "must-have" metrics that aren't present, // and the other failure comes from a row that fails to parse as a number - require.Equal(t, partialError.Failed, 5, "Expected partial error count to be 5") + require.Equal(t, 5, partialError.Failed, "Expected partial error count to be 5") }) } diff --git a/receiver/oracledbreceiver/factory_test.go b/receiver/oracledbreceiver/factory_test.go index c7f1bc440435..a8abbdebd8c7 100644 --- a/receiver/oracledbreceiver/factory_test.go +++ b/receiver/oracledbreceiver/factory_test.go @@ -93,7 +93,7 @@ func TestGetDataSource(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { dataSource := getDataSource(*tc.config) - require.Equal(t, dataSource, tc.expected) + require.Equal(t, tc.expected, dataSource) _, err := url.PathUnescape(dataSource) require.NoError(t, err) }) diff --git a/receiver/podmanreceiver/record_metrics_test.go b/receiver/podmanreceiver/record_metrics_test.go index 922a2d1f83f4..ac949613a488 100644 --- a/receiver/podmanreceiver/record_metrics_test.go +++ b/receiver/podmanreceiver/record_metrics_test.go @@ -20,7 +20,7 @@ type point struct { } func assertStatsEqualToMetrics(t *testing.T, podmanStats *containerStats, md pmetric.Metrics) { - assert.Equal(t, md.ResourceMetrics().Len(), 1) + assert.Equal(t, 1, md.ResourceMetrics().Len()) rsm := md.ResourceMetrics().At(0) resourceAttrs := map[string]string{ @@ -35,10 +35,10 @@ func assertStatsEqualToMetrics(t *testing.T, podmanStats *containerStats, md pme assert.Equal(t, v, attr.Str()) } - assert.Equal(t, rsm.ScopeMetrics().Len(), 1) + assert.Equal(t, 1, rsm.ScopeMetrics().Len()) metrics := rsm.ScopeMetrics().At(0).Metrics() - assert.Equal(t, metrics.Len(), 11) + assert.Equal(t, 11, metrics.Len()) for i := 0; i < metrics.Len(); i++ { m := metrics.At(i) @@ -103,11 +103,11 @@ func assertPoints(t *testing.T, dpts pmetric.NumberDataPointSlice, pts []point) for i, expected := range pts { got := dpts.At(i) assert.Equal(t, got.IntValue(), int64(expected.intVal)) - assert.Equal(t, got.DoubleValue(), expected.doubleVal) + assert.Equal(t, expected.doubleVal, got.DoubleValue()) for k, expectedV := range expected.attributes { gotV, exists := got.Attributes().Get(k) assert.True(t, exists) - assert.Equal(t, gotV.Str(), expectedV) + assert.Equal(t, expectedV, gotV.Str()) } } } diff --git a/receiver/prometheusreceiver/config_test.go b/receiver/prometheusreceiver/config_test.go index 2903a940f972..02b72f9eb989 100644 --- a/receiver/prometheusreceiver/config_test.go +++ b/receiver/prometheusreceiver/config_test.go @@ -41,11 +41,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) r1 := cfg.(*Config) - assert.Equal(t, r1.PrometheusConfig.ScrapeConfigs[0].JobName, "demo") - assert.Equal(t, time.Duration(r1.PrometheusConfig.ScrapeConfigs[0].ScrapeInterval), 5*time.Second) + assert.Equal(t, "demo", r1.PrometheusConfig.ScrapeConfigs[0].JobName) + assert.Equal(t, 5*time.Second, time.Duration(r1.PrometheusConfig.ScrapeConfigs[0].ScrapeInterval)) assert.True(t, r1.UseStartTimeMetric) assert.True(t, r1.TrimMetricSuffixes) - assert.Equal(t, r1.StartTimeMetricRegex, "^(.+_)*process_start_time_seconds$") + assert.Equal(t, "^(.+_)*process_start_time_seconds$", r1.StartTimeMetricRegex) assert.True(t, r1.ReportExtraScrapeMetrics) assert.Equal(t, "http://my-targetallocator-service", r1.TargetAllocator.Endpoint) diff --git a/receiver/prometheusreceiver/internal/util_test.go b/receiver/prometheusreceiver/internal/util_test.go index 3e9e121f5ee3..755f531730cc 100644 --- a/receiver/prometheusreceiver/internal/util_test.go +++ b/receiver/prometheusreceiver/internal/util_test.go @@ -111,7 +111,7 @@ func TestConvToMetricType(t *testing.T) { t.Run(tt.name, func(t *testing.T) { got, monotonic := convToMetricType(tt.mtype) require.Equal(t, got.String(), tt.want.String()) - require.Equal(t, monotonic, tt.wantMonotonic) + require.Equal(t, tt.wantMonotonic, monotonic) }) } } @@ -172,7 +172,7 @@ func TestGetBoundary(t *testing.T) { } assert.NoError(t, err) - assert.Equal(t, value, tt.wantValue) + assert.Equal(t, tt.wantValue, value) }) } } diff --git a/receiver/prometheusreceiver/metrics_receiver_helper_test.go b/receiver/prometheusreceiver/metrics_receiver_helper_test.go index b4297dfb7040..0ab15d8c885b 100644 --- a/receiver/prometheusreceiver/metrics_receiver_helper_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_helper_test.go @@ -626,7 +626,7 @@ func compareDoubleValue(doubleVal float64) numberPointComparator { func assertNormalNan() numberPointComparator { return func(t *testing.T, numberDataPoint pmetric.NumberDataPoint) { - assert.Equal(t, math.Float64bits(numberDataPoint.DoubleValue()), value.NormalNaN, + assert.Equal(t, value.NormalNaN, math.Float64bits(numberDataPoint.DoubleValue()), "Metric double value is not normalNaN as expected") } } @@ -663,7 +663,7 @@ func compareSummary(count uint64, sum float64, quantiles [][]float64) summaryPoi assert.Equal(t, quantiles[i][0], summaryDataPoint.QuantileValues().At(i).Quantile(), "Summary quantile do not match") if math.IsNaN(quantiles[i][1]) { - assert.Equal(t, math.Float64bits(summaryDataPoint.QuantileValues().At(i).Value()), value.NormalNaN, + assert.Equal(t, value.NormalNaN, math.Float64bits(summaryDataPoint.QuantileValues().At(i).Value()), "Summary quantile value is not normalNaN as expected") } else { assert.Equal(t, quantiles[i][1], summaryDataPoint.QuantileValues().At(i).Value(), diff --git a/receiver/prometheusreceiver/metrics_receiver_labels_test.go b/receiver/prometheusreceiver/metrics_receiver_labels_test.go index af253535cdc3..ebc4744bbbca 100644 --- a/receiver/prometheusreceiver/metrics_receiver_labels_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_labels_test.go @@ -803,19 +803,19 @@ func verifyMultipleScopes(t *testing.T, td *testData, rms []pmetric.ResourceMetr require.NotEmpty(t, rms, "At least one resource metric should be present") sms := rms[0].ScopeMetrics() - require.Equal(t, sms.Len(), 3, "Three scope metrics should be present") + require.Equal(t, 3, sms.Len(), "Three scope metrics should be present") sms.Sort(func(a, b pmetric.ScopeMetrics) bool { return a.Scope().Name() < b.Scope().Name() }) - require.Equal(t, sms.At(0).Scope().Name(), "fake.scope.name") - require.Equal(t, sms.At(0).Scope().Version(), "v0.1.0") - require.Equal(t, sms.At(0).Scope().Attributes().Len(), 0) - require.Equal(t, sms.At(1).Scope().Name(), "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver") - require.Equal(t, sms.At(1).Scope().Attributes().Len(), 0) - require.Equal(t, sms.At(2).Scope().Name(), "scope.with.attributes") - require.Equal(t, sms.At(2).Scope().Version(), "v1.5.0") - require.Equal(t, sms.At(2).Scope().Attributes().Len(), 1) + require.Equal(t, "fake.scope.name", sms.At(0).Scope().Name()) + require.Equal(t, "v0.1.0", sms.At(0).Scope().Version()) + require.Equal(t, 0, sms.At(0).Scope().Attributes().Len()) + require.Equal(t, "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver", sms.At(1).Scope().Name()) + require.Equal(t, 0, sms.At(1).Scope().Attributes().Len()) + require.Equal(t, "scope.with.attributes", sms.At(2).Scope().Name()) + require.Equal(t, "v1.5.0", sms.At(2).Scope().Version()) + require.Equal(t, 1, sms.At(2).Scope().Attributes().Len()) scopeAttrVal, found := sms.At(2).Scope().Attributes().Get("animal") require.True(t, found) - require.Equal(t, scopeAttrVal.Str(), "bear") + require.Equal(t, "bear", scopeAttrVal.Str()) } diff --git a/receiver/redisreceiver/latencystats_test.go b/receiver/redisreceiver/latencystats_test.go index 9f1c6e6d1eae..06cf32a672ec 100644 --- a/receiver/redisreceiver/latencystats_test.go +++ b/receiver/redisreceiver/latencystats_test.go @@ -12,10 +12,10 @@ import ( func TestParseLatencyStats(t *testing.T) { ls, err := parseLatencyStats("p50=181.247,p55=182.271,p99=309.247,p99.9=1023.999") require.NoError(t, err) - require.Equal(t, ls["p50"], 181.247) - require.Equal(t, ls["p55"], 182.271) - require.Equal(t, ls["p99"], 309.247) - require.Equal(t, ls["p99.9"], 1023.999) + require.Equal(t, 181.247, ls["p50"]) + require.Equal(t, 182.271, ls["p55"]) + require.Equal(t, 309.247, ls["p99"]) + require.Equal(t, 1023.999, ls["p99.9"]) } func TestParseMalformedLatencyStats(t *testing.T) { diff --git a/receiver/snmpreceiver/scraper_test.go b/receiver/snmpreceiver/scraper_test.go index 50a2275852e7..b5c3100c4388 100644 --- a/receiver/snmpreceiver/scraper_test.go +++ b/receiver/snmpreceiver/scraper_test.go @@ -137,7 +137,7 @@ func TestScrape(t *testing.T) { } metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) }, }, { @@ -172,7 +172,7 @@ func TestScrape(t *testing.T) { } metrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, clientErr.Error()) - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) }, }, { @@ -208,7 +208,7 @@ func TestScrape(t *testing.T) { } metrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, expectedScrapeErr.Error()) - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) }, }, { @@ -639,7 +639,7 @@ func TestScrape(t *testing.T) { } metrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, clientErr.Error()) - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) }, }, { @@ -687,7 +687,7 @@ func TestScrape(t *testing.T) { } metrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, expectedScrapeErrMsg) - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) }, }, { @@ -1289,7 +1289,7 @@ func TestScrape(t *testing.T) { metrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, fmt.Sprintf("%s; %s; %s", clientErr, expectedErr1, expectedErr2)) - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) }, }, { @@ -1373,7 +1373,7 @@ func TestScrape(t *testing.T) { metrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, fmt.Sprintf("%s; %s; %s; %s", expectedErr1, expectedErr2, expectedErr3, expectedErr4)) - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) }, }, { @@ -1838,7 +1838,7 @@ func TestScrape(t *testing.T) { metrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, fmt.Sprintf("%s; %s; %s", clientErr, expectedErr1, expectedErr2)) - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) }, }, { @@ -1918,7 +1918,7 @@ func TestScrape(t *testing.T) { metrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, fmt.Sprintf("%s; %s; %s; %s", expectedErr1, expectedErr2, expectedErr3, expectedErr4)) - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) }, }, { diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index b222a6befcf3..e2f2590c3590 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -1768,7 +1768,7 @@ func Test_splunkhecreceiver_handleHealthPath(t *testing.T) { respBytes, err := io.ReadAll(resp.Body) assert.NoError(t, err) defer resp.Body.Close() - assert.Equal(t, string(respBytes), responseHecHealthy) + assert.Equal(t, responseHecHealthy, string(respBytes)) assert.Equal(t, 200, resp.StatusCode) } diff --git a/receiver/statsdreceiver/internal/protocol/metric_translator_test.go b/receiver/statsdreceiver/internal/protocol/metric_translator_test.go index e880ad976372..a4609d502643 100644 --- a/receiver/statsdreceiver/internal/protocol/metric_translator_test.go +++ b/receiver/statsdreceiver/internal/protocol/metric_translator_test.go @@ -37,7 +37,7 @@ func TestBuildCounterMetric(t *testing.T) { dp := expectedMetric.Sum().DataPoints().AppendEmpty() dp.SetIntValue(32) dp.Attributes().PutStr("mykey", "myvalue") - assert.Equal(t, metric, expectedMetrics) + assert.Equal(t, expectedMetrics, metric) } func TestSetTimestampsForCounterMetric(t *testing.T) { @@ -90,7 +90,7 @@ func TestBuildGaugeMetric(t *testing.T) { dp.SetTimestamp(pcommon.NewTimestampFromTime(timeNow)) dp.Attributes().PutStr("mykey", "myvalue") dp.Attributes().PutStr("mykey2", "myvalue2") - assert.Equal(t, metric, expectedMetrics) + assert.Equal(t, expectedMetrics, metric) } func TestBuildSummaryMetricUnsampled(t *testing.T) { diff --git a/receiver/vcenterreceiver/scraper_test.go b/receiver/vcenterreceiver/scraper_test.go index c550f4d441f4..ce703c1e04b5 100644 --- a/receiver/vcenterreceiver/scraper_test.go +++ b/receiver/vcenterreceiver/scraper_test.go @@ -75,7 +75,7 @@ func testScrape(ctx context.Context, t *testing.T, cfg *Config, fileName string) metrics, err := scraper.scrape(ctx) require.NoError(t, err) - require.NotEqual(t, metrics.MetricCount(), 0) + require.NotEqual(t, 0, metrics.MetricCount()) goldenPath := filepath.Join("testdata", "metrics", fileName) expectedMetrics, err := golden.ReadMetrics(goldenPath) @@ -119,7 +119,7 @@ func TestScrape_NoClient(t *testing.T) { } metrics, err := scraper.scrape(ctx) require.ErrorContains(t, err, "unable to connect to vSphere SDK") - require.Equal(t, metrics.MetricCount(), 0) + require.Equal(t, 0, metrics.MetricCount()) require.NoError(t, scraper.Shutdown(ctx)) } diff --git a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go index cc26a90bbd82..b7e2ce005235 100644 --- a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go +++ b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go @@ -219,7 +219,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { } else { require.Equal(t, 1, obs.Len()) log := obs.All()[0] - assert.Equal(t, log.Level, zapcore.WarnLevel) + assert.Equal(t, zapcore.WarnLevel, log.Level) assert.Equal(t, test.startMessage, log.Message) assert.Equal(t, "error", log.Context[0].Key) assert.EqualError(t, log.Context[0].Interface.(error), test.startErr) diff --git a/receiver/zipkinreceiver/proto_parse_test.go b/receiver/zipkinreceiver/proto_parse_test.go index 2dbdbd7a2200..105e3b200b21 100644 --- a/receiver/zipkinreceiver/proto_parse_test.go +++ b/receiver/zipkinreceiver/proto_parse_test.go @@ -95,7 +95,7 @@ func TestConvertSpansToTraceSpans_protobuf(t *testing.T) { // 3. Get that payload converted to OpenCensus proto spans. reqs, err := zi.v2ToTraceSpans(protoBlob, hdr) require.NoError(t, err, "Failed to parse convert Zipkin spans in Protobuf to Trace spans: %v", err) - require.Equal(t, reqs.ResourceSpans().Len(), 2, "Expecting exactly 2 requests since spans have different node/localEndpoint: %v", reqs.ResourceSpans().Len()) + require.Equal(t, 2, reqs.ResourceSpans().Len(), "Expecting exactly 2 requests since spans have different node/localEndpoint: %v", reqs.ResourceSpans().Len()) want := ptrace.NewTraces() want.ResourceSpans().EnsureCapacity(2) diff --git a/testbed/tests/syslog_integration_test.go b/testbed/tests/syslog_integration_test.go index 97dd08583cb1..bd7576a923e3 100644 --- a/testbed/tests/syslog_integration_test.go +++ b/testbed/tests/syslog_integration_test.go @@ -183,8 +183,8 @@ service: } require.Len(t, backend.ReceivedLogs, 1) - require.Equal(t, backend.ReceivedLogs[0].ResourceLogs().Len(), 1) - require.Equal(t, backend.ReceivedLogs[0].ResourceLogs().At(0).ScopeLogs().Len(), 1) + require.Equal(t, 1, backend.ReceivedLogs[0].ResourceLogs().Len()) + require.Equal(t, 1, backend.ReceivedLogs[0].ResourceLogs().At(0).ScopeLogs().Len()) require.Len(t, expectedData, backend.ReceivedLogs[0].ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().Len()) // Clean received logs diff --git a/testbed/tests/trace_test.go b/testbed/tests/trace_test.go index aef4184b8773..3e713e2330f7 100644 --- a/testbed/tests/trace_test.go +++ b/testbed/tests/trace_test.go @@ -382,7 +382,7 @@ func TestTraceAttributesProcessor(t *testing.T) { // verifySpan verifies that attributes was added to the internal data span. verifySpan := func(span ptrace.Span) { require.NotNil(t, span) - require.Equal(t, span.Attributes().Len(), 1) + require.Equal(t, 1, span.Attributes().Len()) attrVal, ok := span.Attributes().Get("new_attr") assert.True(t, ok) assert.EqualValues(t, "string value", attrVal.Str()) @@ -395,14 +395,14 @@ func TestTraceAttributesProcessor(t *testing.T) { verifySingleSpan(t, tc, nodeToExclude, spanToInclude, func(span ptrace.Span) { // Verify attributes was not added to the new internal data span. - assert.Equal(t, span.Attributes().Len(), 0) + assert.Equal(t, 0, span.Attributes().Len()) }) // Create another span that does not match "include" filter. spanToExclude := "span-not-to-add-attr" verifySingleSpan(t, tc, nodeToInclude, spanToExclude, func(span ptrace.Span) { // Verify attributes was not added to the new internal data span. - assert.Equal(t, span.Attributes().Len(), 0) + assert.Equal(t, 0, span.Attributes().Len()) }) }) } @@ -470,7 +470,7 @@ func TestTraceAttributesProcessorJaegerGRPC(t *testing.T) { // verifySpan verifies that attributes was added to the internal data span. verifySpan := func(span ptrace.Span) { require.NotNil(t, span) - require.Equal(t, span.Attributes().Len(), 1) + require.Equal(t, 1, span.Attributes().Len()) attrVal, ok := span.Attributes().Get("new_attr") assert.True(t, ok) assert.EqualValues(t, "string value", attrVal.Str()) @@ -483,13 +483,13 @@ func TestTraceAttributesProcessorJaegerGRPC(t *testing.T) { verifySingleSpan(t, tc, nodeToExclude, spanToInclude, func(span ptrace.Span) { // Verify attributes was not added to the new internal data span. - assert.Equal(t, span.Attributes().Len(), 0) + assert.Equal(t, 0, span.Attributes().Len()) }) // Create another span that does not match "include" filter. spanToExclude := "span-not-to-add-attr" verifySingleSpan(t, tc, nodeToInclude, spanToExclude, func(span ptrace.Span) { // Verify attributes was not added to the new internal data span. - assert.Equal(t, span.Attributes().Len(), 0) + assert.Equal(t, 0, span.Attributes().Len()) }) }