From 1ac98996edc19ce27d171f1421079935e0ce69fc Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 10 Nov 2020 12:48:20 -0800 Subject: [PATCH] Enable unconvert linter, fix errors (#1546) Signed-off-by: Bogdan Drutu --- .golangci.yml | 1 + .../metricsdata_to_logservice.go | 2 +- .../tracedata_to_logservice.go | 2 +- exporter/awsemfexporter/metric_translator_test.go | 2 +- exporter/azuremonitorexporter/trace_to_envelope.go | 2 +- .../azuremonitorexporter/trace_to_envelope_test.go | 2 +- .../carbonexporter/metricdata_to_plaintext_test.go | 2 +- exporter/datadogexporter/metrics/utils.go | 2 +- exporter/datadogexporter/metrics_translator.go | 8 +++----- exporter/datadogexporter/translate_traces.go | 2 +- exporter/honeycombexporter/translator_test.go | 2 +- exporter/newrelicexporter/transformer_test.go | 2 +- exporter/splunkhecexporter/client_test.go | 2 +- exporter/splunkhecexporter/tracedata_to_splunk_test.go | 2 +- processor/groupbytraceprocessor/processor_test.go | 4 ++-- .../internal/resourcedetection_test.go | 2 +- .../awsecscontainermetrics/accumulator_test.go | 2 +- .../awsecscontainermetrics/metrics_helper_test.go | 2 +- .../awsecscontainermetrics/metrics_test.go | 2 +- .../awsecscontainermetrics/translator.go | 10 +++++----- .../awsecscontainermetrics/translator_test.go | 2 +- .../internal/translator/annotations_test.go | 6 +++--- receiver/collectdreceiver/factory.go | 2 +- .../k8sclusterreceiver/collection/metricsstore_test.go | 2 +- .../kubeletstatsreceiver/kubelet/accumulator_test.go | 7 +++---- receiver/kubeletstatsreceiver/kubelet/metadata_test.go | 9 ++++----- receiver/receivercreator/runner.go | 2 +- receiver/stanzareceiver/mocks_test.go | 2 +- .../mockawsxrayreceiver/trace_receiver.go | 4 ++-- 29 files changed, 44 insertions(+), 47 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index b8b1b1f8e826d..110581f8d18cd 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -100,6 +100,7 @@ linters: - staticcheck - misspell - scopelint + - unconvert issues: # Excluding configuration per-path, per-linter, per-text and per-source diff --git a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go index 3a166168496f2..646504db0ec06 100644 --- a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go +++ b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go @@ -97,7 +97,7 @@ func (kv *KeyValues) String() string { func (kv *KeyValues) labelToStringBuilder(sb *strings.Builder) { for index, label := range kv.keyValues { - sb.WriteString(string(label.Key)) + sb.WriteString(label.Key) sb.WriteString("#$#") sb.WriteString(label.Value) if index != len(kv.keyValues)-1 { diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go index 068c062fbf796..240868cf7aa45 100644 --- a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go +++ b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go @@ -217,7 +217,7 @@ func spansToLogServiceData(spans []*tracepb.Span) []*sls.Log { for k, v := range span.GetAttributes().GetAttributeMap() { contents = append(contents, &sls.LogContent{ - Key: proto.String(tagsPrefix + string(k)), + Key: proto.String(tagsPrefix + k), Value: proto.String(attributeValueToString(v)), }) } diff --git a/exporter/awsemfexporter/metric_translator_test.go b/exporter/awsemfexporter/metric_translator_test.go index 991b126d99ebf..0979648147d5d 100644 --- a/exporter/awsemfexporter/metric_translator_test.go +++ b/exporter/awsemfexporter/metric_translator_test.go @@ -958,7 +958,7 @@ func TestBuildCWMetric(t *testing.T) { "label1": "value1", }) dp.SetCount(uint64(17)) - dp.SetSum(float64(17.13)) + dp.SetSum(17.13) dp.SetBucketCounts([]uint64{1, 2, 3}) dp.SetExplicitBounds([]float64{1, 2, 3}) diff --git a/exporter/azuremonitorexporter/trace_to_envelope.go b/exporter/azuremonitorexporter/trace_to_envelope.go index 75c518dbd4a35..d873d2ad951de 100644 --- a/exporter/azuremonitorexporter/trace_to_envelope.go +++ b/exporter/azuremonitorexporter/trace_to_envelope.go @@ -641,7 +641,7 @@ func setAttributeValueAsPropertyOrMeasurement( measurements[key] = float64(attributeValue.IntVal()) case pdata.AttributeValueDOUBLE: - measurements[key] = float64(attributeValue.DoubleVal()) + measurements[key] = attributeValue.DoubleVal() } } diff --git a/exporter/azuremonitorexporter/trace_to_envelope_test.go b/exporter/azuremonitorexporter/trace_to_envelope_test.go index 6f2da623b29e1..98673215f05e3 100644 --- a/exporter/azuremonitorexporter/trace_to_envelope_test.go +++ b/exporter/azuremonitorexporter/trace_to_envelope_test.go @@ -737,7 +737,7 @@ func assertAttributesCopiedToPropertiesOrMeasurements( case pdata.AttributeValueDOUBLE: m, exists := measurements[k] assert.True(t, exists) - assert.Equal(t, float64(v.DoubleVal()), m) + assert.Equal(t, v.DoubleVal(), m) } }) } diff --git a/exporter/carbonexporter/metricdata_to_plaintext_test.go b/exporter/carbonexporter/metricdata_to_plaintext_test.go index 742095300b6cd..3484e33673f10 100644 --- a/exporter/carbonexporter/metricdata_to_plaintext_test.go +++ b/exporter/carbonexporter/metricdata_to_plaintext_test.go @@ -317,7 +317,7 @@ func expectedSummaryLines( ) []string { lines := []string{ metricName + ".count" + tags + " " + formatInt64(count) + " " + timestampStr, - metricName + tags + " " + formatFloatForValue(float64(sum)) + " " + timestampStr, + metricName + tags + " " + formatFloatForValue(sum) + " " + timestampStr, } for _, p := range percentiles { diff --git a/exporter/datadogexporter/metrics/utils.go b/exporter/datadogexporter/metrics/utils.go index 5477c72673de3..60bf69d331d5e 100644 --- a/exporter/datadogexporter/metrics/utils.go +++ b/exporter/datadogexporter/metrics/utils.go @@ -49,7 +49,7 @@ func NewGauge(name string, ts uint64, value float64, tags []string) datadog.Metr // DefaultMetrics creates built-in metrics to report that an exporter is running func DefaultMetrics(exporterType string, timestamp uint64) []datadog.Metric { return []datadog.Metric{ - NewGauge(fmt.Sprintf("datadog_exporter.%s.running", exporterType), timestamp, float64(1.0), []string{}), + NewGauge(fmt.Sprintf("datadog_exporter.%s.running", exporterType), timestamp, 1.0, []string{}), } } diff --git a/exporter/datadogexporter/metrics_translator.go b/exporter/datadogexporter/metrics_translator.go index aad37487e88e0..0d3ae2ca61f90 100644 --- a/exporter/datadogexporter/metrics_translator.go +++ b/exporter/datadogexporter/metrics_translator.go @@ -48,9 +48,7 @@ func mapIntMetrics(name string, slice pdata.IntDataPointSlice) []datadog.Metric if p.IsNil() { continue } - ms = append(ms, - metrics.NewGauge(name, uint64(p.Timestamp()), float64(p.Value()), getTags(p.LabelsMap())), - ) + ms = append(ms, metrics.NewGauge(name, uint64(p.Timestamp()), float64(p.Value()), getTags(p.LabelsMap()))) } return ms } @@ -65,7 +63,7 @@ func mapDoubleMetrics(name string, slice pdata.DoubleDataPointSlice) []datadog.M continue } ms = append(ms, - metrics.NewGauge(name, uint64(p.Timestamp()), float64(p.Value()), getTags(p.LabelsMap())), + metrics.NewGauge(name, uint64(p.Timestamp()), p.Value(), getTags(p.LabelsMap())), ) } return ms @@ -131,7 +129,7 @@ func mapDoubleHistogramMetrics(name string, slice pdata.DoubleHistogramDataPoint ms = append(ms, metrics.NewGauge(fmt.Sprintf("%s.count", name), ts, float64(p.Count()), tags), - metrics.NewGauge(fmt.Sprintf("%s.sum", name), ts, float64(p.Sum()), tags), + metrics.NewGauge(fmt.Sprintf("%s.sum", name), ts, p.Sum(), tags), ) if buckets { diff --git a/exporter/datadogexporter/translate_traces.go b/exporter/datadogexporter/translate_traces.go index f0d66a34237a9..14661a50a2c9d 100644 --- a/exporter/datadogexporter/translate_traces.go +++ b/exporter/datadogexporter/translate_traces.go @@ -261,7 +261,7 @@ func spanToDatadogSpan(s pdata.Span, Resource: getDatadogResourceName(s, tags), Service: serviceName, Start: int64(startTime), - Duration: int64(duration), + Duration: duration, Metrics: map[string]float64{}, Meta: map[string]string{}, Type: datadogType, diff --git a/exporter/honeycombexporter/translator_test.go b/exporter/honeycombexporter/translator_test.go index 091ec9e75c594..8aa971cb298c7 100644 --- a/exporter/honeycombexporter/translator_test.go +++ b/exporter/honeycombexporter/translator_test.go @@ -74,7 +74,7 @@ func TestSpanAttributesToMap(t *testing.T) { got := spanAttributesToMap(attrs) want := wantResults[i] for k := range want { - if interface{}(got[k]) != want[k] { + if got[k] != want[k] { t.Errorf("Got: %+v, Want: %+v", got[k], want[k]) } } diff --git a/exporter/newrelicexporter/transformer_test.go b/exporter/newrelicexporter/transformer_test.go index 05b23e2d9932e..ce30f93e191f7 100644 --- a/exporter/newrelicexporter/transformer_test.go +++ b/exporter/newrelicexporter/transformer_test.go @@ -174,7 +174,7 @@ func TestTransformSpan(t *testing.T) { "resource": "R1", "prod": true, "weight": int64(10), - "score": float64(99.8), + "score": 99.8, "user": "alice", }, }, diff --git a/exporter/splunkhecexporter/client_test.go b/exporter/splunkhecexporter/client_test.go index bba388ec1c57b..78e2dfb877f3b 100644 --- a/exporter/splunkhecexporter/client_test.go +++ b/exporter/splunkhecexporter/client_test.go @@ -89,7 +89,7 @@ func createTraceData(numberOfTraces int) pdata.Traces { span.SetEndTime(pdata.TimestampUnixNano((i + 2) * 1e9)) span.SetTraceID(pdata.NewTraceID([16]byte{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1})) span.SetSpanID(pdata.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1})) - span.SetTraceState(pdata.TraceState("foo")) + span.SetTraceState("foo") if i%2 == 0 { span.SetParentSpanID(pdata.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) span.Status().InitEmpty() diff --git a/exporter/splunkhecexporter/tracedata_to_splunk_test.go b/exporter/splunkhecexporter/tracedata_to_splunk_test.go index 15d5622148d53..ca725b46733a1 100644 --- a/exporter/splunkhecexporter/tracedata_to_splunk_test.go +++ b/exporter/splunkhecexporter/tracedata_to_splunk_test.go @@ -135,7 +135,7 @@ func makeSpan(name string, ts *pdata.TimestampUnixNano) pdata.Span { } spanLink := pdata.NewSpanLink() spanLink.InitEmpty() - spanLink.SetTraceState(pdata.TraceState("OK")) + spanLink.SetTraceState("OK") bytes, _ := hex.DecodeString("12345678") var traceID [16]byte copy(traceID[:], bytes) diff --git a/processor/groupbytraceprocessor/processor_test.go b/processor/groupbytraceprocessor/processor_test.go index 4408aef3cdf12..f1c33b5f41d3c 100644 --- a/processor/groupbytraceprocessor/processor_test.go +++ b/processor/groupbytraceprocessor/processor_test.go @@ -225,7 +225,7 @@ func TestTraceDisappearedFromStorageBeforeReleasing(t *testing.T) { // test // we trigger this manually, instead of waiting the whole duration - err = p.markAsReleased(pdata.TraceID(traceID)) + err = p.markAsReleased(traceID) // verify assert.Error(t, err) @@ -261,7 +261,7 @@ func TestTraceErrorFromStorageWhileReleasing(t *testing.T) { // test // we trigger this manually, instead of waiting the whole duration - err = p.markAsReleased(pdata.TraceID(traceID)) + err = p.markAsReleased(traceID) // verify assert.True(t, errors.Is(err, expectedError)) diff --git a/processor/resourcedetectionprocessor/internal/resourcedetection_test.go b/processor/resourcedetectionprocessor/internal/resourcedetection_test.go index bacb210b530ec..6102177563668 100644 --- a/processor/resourcedetectionprocessor/internal/resourcedetection_test.go +++ b/processor/resourcedetectionprocessor/internal/resourcedetection_test.go @@ -223,7 +223,7 @@ func TestAttributesToMap(t *testing.T) { m := map[string]interface{}{ "str": "a", "int": int64(5), - "double": float64(5.0), + "double": 5.0, "bool": true, "map": map[string]interface{}{ "inner": "val", diff --git a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/accumulator_test.go b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/accumulator_test.go index 77df7d5287c1f..cce9de3a07e03 100644 --- a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/accumulator_test.go +++ b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/accumulator_test.go @@ -23,7 +23,7 @@ import ( func TestGetMetricsData(t *testing.T) { v := uint64(1) - f := float64(1.0) + f := 1.0 memStats := make(map[string]uint64) memStats["cache"] = v diff --git a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/metrics_helper_test.go b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/metrics_helper_test.go index 7d63ad99d2c25..7729cf0245f99 100644 --- a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/metrics_helper_test.go +++ b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/metrics_helper_test.go @@ -23,7 +23,7 @@ import ( func TestGetContainerAndTaskMetrics(t *testing.T) { v := uint64(1) - f := float64(1.0) + f := 1.0 floatZero := float64(0) memStats := make(map[string]uint64) diff --git a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/metrics_test.go b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/metrics_test.go index 5aa1747777704..9383dabd9712a 100644 --- a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/metrics_test.go +++ b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/metrics_test.go @@ -28,7 +28,7 @@ func TestMetricSampleFile(t *testing.T) { func TestMetricData(t *testing.T) { v := uint64(1) - f := float64(1.0) + f := 1.0 memStats := make(map[string]uint64) memStats["cache"] = v diff --git a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/translator.go b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/translator.go index f4faf33cd7947..2cd04a13c8f6f 100644 --- a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/translator.go +++ b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/translator.go @@ -41,12 +41,12 @@ func convertToOTLPMetrics(prefix string, m ECSMetrics, r pdata.Resource, timesta ilms.Append(intGauge(prefix+AttributeCPUCores, UnitCount, int64(m.NumOfCPUCores), timestamp)) ilms.Append(intGauge(prefix+AttributeCPUOnlines, UnitCount, int64(m.CPUOnlineCpus), timestamp)) ilms.Append(intSum(prefix+AttributeCPUSystemUsage, UnitNanoSecond, int64(m.SystemCPUUsage), timestamp)) - ilms.Append(doubleGauge(prefix+AttributeCPUUtilized, UnitPercent, float64(m.CPUUtilized), timestamp)) - ilms.Append(doubleGauge(prefix+AttributeCPUReserved, UnitVCpu, float64(m.CPUReserved), timestamp)) - ilms.Append(doubleGauge(prefix+AttributeCPUUsageInVCPU, UnitVCpu, float64(m.CPUUsageInVCPU), timestamp)) + ilms.Append(doubleGauge(prefix+AttributeCPUUtilized, UnitPercent, m.CPUUtilized, timestamp)) + ilms.Append(doubleGauge(prefix+AttributeCPUReserved, UnitVCpu, m.CPUReserved, timestamp)) + ilms.Append(doubleGauge(prefix+AttributeCPUUsageInVCPU, UnitVCpu, m.CPUUsageInVCPU, timestamp)) - ilms.Append(doubleGauge(prefix+AttributeNetworkRateRx, UnitBytesPerSec, float64(m.NetworkRateRxBytesPerSecond), timestamp)) - ilms.Append(doubleGauge(prefix+AttributeNetworkRateTx, UnitBytesPerSec, float64(m.NetworkRateTxBytesPerSecond), timestamp)) + ilms.Append(doubleGauge(prefix+AttributeNetworkRateRx, UnitBytesPerSec, m.NetworkRateRxBytesPerSecond, timestamp)) + ilms.Append(doubleGauge(prefix+AttributeNetworkRateTx, UnitBytesPerSec, m.NetworkRateTxBytesPerSecond, timestamp)) ilms.Append(intSum(prefix+AttributeNetworkRxBytes, UnitBytes, int64(m.NetworkRxBytes), timestamp)) ilms.Append(intSum(prefix+AttributeNetworkRxPackets, UnitCount, int64(m.NetworkRxPackets), timestamp)) diff --git a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/translator_test.go b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/translator_test.go index 176784e45312a..3057078194e6f 100644 --- a/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/translator_test.go +++ b/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics/translator_test.go @@ -46,7 +46,7 @@ func TestIntGauge(t *testing.T) { func TestDoubleGauge(t *testing.T) { timestamp := pdata.TimeToUnixNano(time.Now()) - floatValue := float64(100.01) + floatValue := 100.01 m := doubleGauge("cpu_utilized", "Count", floatValue, timestamp) require.NotNil(t, m) diff --git a/receiver/awsxrayreceiver/internal/translator/annotations_test.go b/receiver/awsxrayreceiver/internal/translator/annotations_test.go index bb58fa14c042f..6e7b83c28b410 100644 --- a/receiver/awsxrayreceiver/internal/translator/annotations_test.go +++ b/receiver/awsxrayreceiver/internal/translator/annotations_test.go @@ -28,7 +28,7 @@ func TestAddAnnotations(t *testing.T) { input["int64"] = int64(2) input["bool"] = false input["float32"] = float32(4.5) - input["float64"] = float64(5.5) + input["float64"] = 5.5 attrMap := pdata.NewAttributeMap() attrMap.InitEmptyWithCapacity(initAttrCapacity) @@ -41,8 +41,8 @@ func TestAddAnnotations(t *testing.T) { "int32": pdata.NewAttributeValueInt(int64(1)), "int64": pdata.NewAttributeValueInt(int64(2)), "bool": pdata.NewAttributeValueBool(false), - "float32": pdata.NewAttributeValueDouble(float64(4.5)), - "float64": pdata.NewAttributeValueDouble(float64(5.5)), + "float32": pdata.NewAttributeValueDouble(4.5), + "float64": pdata.NewAttributeValueDouble(5.5), }, ) assert.Equal(t, expectedAttrMap.Sort(), attrMap.Sort(), "attribute maps differ") diff --git a/receiver/collectdreceiver/factory.go b/receiver/collectdreceiver/factory.go index 182d1e311f991..4479fd7788c2e 100644 --- a/receiver/collectdreceiver/factory.go +++ b/receiver/collectdreceiver/factory.go @@ -32,7 +32,7 @@ import ( const ( typeStr = "collectd" defaultBindEndpoint = "localhost:8081" - defaultTimeout = time.Duration(time.Second * 30) + defaultTimeout = time.Second * 30 defaultEncodingFormat = "json" ) diff --git a/receiver/k8sclusterreceiver/collection/metricsstore_test.go b/receiver/k8sclusterreceiver/collection/metricsstore_test.go index 8566c54dcfcea..7b239cdb26293 100644 --- a/receiver/k8sclusterreceiver/collection/metricsstore_test.go +++ b/receiver/k8sclusterreceiver/collection/metricsstore_test.go @@ -65,7 +65,7 @@ func TestMetricsStoreOperations(t *testing.T) { // Remove non existent item ms.remove(&corev1.Pod{ ObjectMeta: v1.ObjectMeta{ - UID: types.UID("1"), + UID: "1", }, }) require.Equal(t, len(updates), len(ms.metricsCache)) diff --git a/receiver/kubeletstatsreceiver/kubelet/accumulator_test.go b/receiver/kubeletstatsreceiver/kubelet/accumulator_test.go index 2b981853c8bfa..a334f20c514c7 100644 --- a/receiver/kubeletstatsreceiver/kubelet/accumulator_test.go +++ b/receiver/kubeletstatsreceiver/kubelet/accumulator_test.go @@ -27,7 +27,6 @@ import ( "go.uber.org/zap/zaptest/observer" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" ) @@ -53,7 +52,7 @@ func TestMetadataErrorCases(t *testing.T) { Items: []v1.Pod{ { ObjectMeta: metav1.ObjectMeta{ - UID: types.UID("pod-uid-123"), + UID: "pod-uid-123", }, Status: v1.PodStatus{ ContainerStatuses: []v1.ContainerStatus{ @@ -121,7 +120,7 @@ func TestMetadataErrorCases(t *testing.T) { Items: []v1.Pod{ { ObjectMeta: metav1.ObjectMeta{ - UID: types.UID("pod-uid-123"), + UID: "pod-uid-123", }, Spec: v1.PodSpec{ Volumes: []v1.Volume{ @@ -163,7 +162,7 @@ func TestMetadataErrorCases(t *testing.T) { Items: []v1.Pod{ { ObjectMeta: metav1.ObjectMeta{ - UID: types.UID("pod-uid-123"), + UID: "pod-uid-123", }, Spec: v1.PodSpec{ Volumes: []v1.Volume{ diff --git a/receiver/kubeletstatsreceiver/kubelet/metadata_test.go b/receiver/kubeletstatsreceiver/kubelet/metadata_test.go index 95934149e976e..0a195e724ff71 100644 --- a/receiver/kubeletstatsreceiver/kubelet/metadata_test.go +++ b/receiver/kubeletstatsreceiver/kubelet/metadata_test.go @@ -21,7 +21,6 @@ import ( "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" ) func TestValidateMetadataLabelsConfig(t *testing.T) { @@ -88,7 +87,7 @@ func TestSetExtraLabels(t *testing.T) { Items: []v1.Pod{ { ObjectMeta: metav1.ObjectMeta{ - UID: types.UID("uid-1234"), + UID: "uid-1234", }, Status: v1.PodStatus{ ContainerStatuses: []v1.ContainerStatus{ @@ -118,7 +117,7 @@ func TestSetExtraLabels(t *testing.T) { Items: []v1.Pod{ { ObjectMeta: metav1.ObjectMeta{ - UID: types.UID("uid-1234"), + UID: "uid-1234", }, Status: v1.PodStatus{ ContainerStatuses: []v1.ContainerStatus{ @@ -146,7 +145,7 @@ func TestSetExtraLabels(t *testing.T) { Items: []v1.Pod{ { ObjectMeta: metav1.ObjectMeta{ - UID: types.UID("uid-1234"), + UID: "uid-1234", }, Spec: v1.PodSpec{ Volumes: []v1.Volume{ @@ -312,7 +311,7 @@ func TestSetExtraLabelsForVolumeTypes(t *testing.T) { Items: []v1.Pod{ { ObjectMeta: metav1.ObjectMeta{ - UID: types.UID("uid-1234"), + UID: "uid-1234", }, Spec: v1.PodSpec{ Volumes: []v1.Volume{ diff --git a/receiver/receivercreator/runner.go b/receiver/receivercreator/runner.go index 74c2f6006a2e3..325aae8a3de59 100644 --- a/receiver/receivercreator/runner.go +++ b/receiver/receivercreator/runner.go @@ -94,7 +94,7 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( return nil, fmt.Errorf("failed to merge template config from discovered runtime values: %v", err) } - receiverConfig, err := config.LoadReceiver(mergedConfig, configmodels.Type(receiver.typeStr), receiver.fullName, factory) + receiverConfig, err := config.LoadReceiver(mergedConfig, receiver.typeStr, receiver.fullName, factory) if err != nil { return nil, fmt.Errorf("failed to load template config: %v", err) } diff --git a/receiver/stanzareceiver/mocks_test.go b/receiver/stanzareceiver/mocks_test.go index 06964154ec33e..071d69a0e55c6 100644 --- a/receiver/stanzareceiver/mocks_test.go +++ b/receiver/stanzareceiver/mocks_test.go @@ -43,7 +43,7 @@ type UnstartableOperator struct { } func newUnstartableParams() pipeline.Params { - return pipeline.Params(map[string]interface{}{"type": "unstartable_operator"}) + return map[string]interface{}{"type": "unstartable_operator"} } // NewUnstartableConfig creates new output config diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go b/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go index 10121d2dd0d6e..80a9cc81c826c 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/trace_receiver.go @@ -115,9 +115,9 @@ func (ar *MockAwsXrayReceiver) handleRequest(ctx context.Context, req *http.Requ var result map[string]interface{} - json.Unmarshal([]byte(body), &result) + json.Unmarshal(body, &result) - traces, _ := ToTraces([]byte(body)) + traces, _ := ToTraces(body) ar.nextConsumer.ConsumeTraces(ctx, *traces)