From 219b241cf93718832902178120c8468c233850f3 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 4 Oct 2022 10:28:41 -0700 Subject: [PATCH] more clone --- .../batchperresourceattr_test.go | 24 ++++++++++++------- .../opencensus/oc_to_metrics_test.go | 6 +++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/pkg/batchperresourceattr/batchperresourceattr_test.go b/pkg/batchperresourceattr/batchperresourceattr_test.go index 59c40fa39615f..11523e3ccbf5e 100644 --- a/pkg/batchperresourceattr/batchperresourceattr_test.go +++ b/pkg/batchperresourceattr/batchperresourceattr_test.go @@ -59,7 +59,8 @@ func TestSplitTracesSameResource(t *testing.T) { fillResourceSpans(inBatch.ResourceSpans().AppendEmpty(), "same_attr_val", "1") fillResourceSpans(inBatch.ResourceSpans().AppendEmpty(), "same_attr_val", "1") fillResourceSpans(inBatch.ResourceSpans().AppendEmpty(), "same_attr_val", "1") - expected := inBatch.Clone() + expected := ptrace.NewTraces() + inBatch.CopyTo(expected) sink := new(consumertest.TracesSink) bpr := NewBatchPerResourceTraces("same_attr_val", sink) @@ -80,7 +81,8 @@ func TestSplitTracesIntoDifferentBatches(t *testing.T) { fillResourceSpans(inBatch.ResourceSpans().AppendEmpty(), "attr_key", "3") fillResourceSpans(inBatch.ResourceSpans().AppendEmpty(), "attr_key", "4") fillResourceSpans(inBatch.ResourceSpans().AppendEmpty(), "diff_attr_key", "1") - expected := inBatch.Clone() + expected := ptrace.NewTraces() + inBatch.CopyTo(expected) sink := new(consumertest.TracesSink) bpr := NewBatchPerResourceTraces("attr_key", sink) @@ -98,7 +100,8 @@ func TestSplitTracesIntoDifferentBatches(t *testing.T) { func TestSplitMetricsOneResourceMetrics(t *testing.T) { inBatch := pmetric.NewMetrics() fillResourceMetrics(inBatch.ResourceMetrics().AppendEmpty(), "attr_key", "1") - expected := inBatch.Clone() + expected := pmetric.NewMetrics() + inBatch.CopyTo(expected) sink := new(consumertest.MetricsSink) bpr := NewBatchPerResourceMetrics("attr_key", sink) @@ -124,7 +127,8 @@ func TestSplitMetricsSameResource(t *testing.T) { fillResourceMetrics(inBatch.ResourceMetrics().AppendEmpty(), "same_attr_val", "1") fillResourceMetrics(inBatch.ResourceMetrics().AppendEmpty(), "same_attr_val", "1") fillResourceMetrics(inBatch.ResourceMetrics().AppendEmpty(), "same_attr_val", "1") - expected := inBatch.Clone() + expected := pmetric.NewMetrics() + inBatch.CopyTo(expected) sink := new(consumertest.MetricsSink) bpr := NewBatchPerResourceMetrics("same_attr_val", sink) @@ -145,7 +149,8 @@ func TestSplitMetricsIntoDifferentBatches(t *testing.T) { fillResourceMetrics(inBatch.ResourceMetrics().AppendEmpty(), "attr_key", "3") fillResourceMetrics(inBatch.ResourceMetrics().AppendEmpty(), "attr_key", "4") fillResourceMetrics(inBatch.ResourceMetrics().AppendEmpty(), "diff_attr_key", "1") - expected := inBatch.Clone() + expected := pmetric.NewMetrics() + inBatch.CopyTo(expected) sink := new(consumertest.MetricsSink) bpr := NewBatchPerResourceMetrics("attr_key", sink) @@ -163,7 +168,8 @@ func TestSplitMetricsIntoDifferentBatches(t *testing.T) { func TestSplitLogsOneResourceLogs(t *testing.T) { inBatch := plog.NewLogs() fillResourceLogs(inBatch.ResourceLogs().AppendEmpty(), "attr_key", "1") - expected := inBatch.Clone() + expected := plog.NewLogs() + inBatch.CopyTo(expected) sink := new(consumertest.LogsSink) bpr := NewBatchPerResourceLogs("attr_key", sink) @@ -189,7 +195,8 @@ func TestSplitLogsSameResource(t *testing.T) { fillResourceLogs(inBatch.ResourceLogs().AppendEmpty(), "same_attr_val", "1") fillResourceLogs(inBatch.ResourceLogs().AppendEmpty(), "same_attr_val", "1") fillResourceLogs(inBatch.ResourceLogs().AppendEmpty(), "same_attr_val", "1") - expected := inBatch.Clone() + expected := plog.NewLogs() + inBatch.CopyTo(expected) sink := new(consumertest.LogsSink) bpr := NewBatchPerResourceLogs("same_attr_val", sink) @@ -210,7 +217,8 @@ func TestSplitLogsIntoDifferentBatches(t *testing.T) { fillResourceLogs(inBatch.ResourceLogs().AppendEmpty(), "attr_key", "3") fillResourceLogs(inBatch.ResourceLogs().AppendEmpty(), "attr_key", "4") fillResourceLogs(inBatch.ResourceLogs().AppendEmpty(), "diff_attr_key", "1") - expected := inBatch.Clone() + expected := plog.NewLogs() + inBatch.CopyTo(expected) sink := new(consumertest.LogsSink) bpr := NewBatchPerResourceLogs("attr_key", sink) diff --git a/pkg/translator/opencensus/oc_to_metrics_test.go b/pkg/translator/opencensus/oc_to_metrics_test.go index d4db2e00cc3ef..d097ee5a23771 100644 --- a/pkg/translator/opencensus/oc_to_metrics_test.go +++ b/pkg/translator/opencensus/oc_to_metrics_test.go @@ -139,7 +139,8 @@ func TestOCToMetrics(t *testing.T) { func TestOCToMetrics_ResourceInMetric(t *testing.T) { internal := testdata.GenerateMetricsOneMetric() - want := internal.Clone() + want := pmetric.NewMetrics() + internal.CopyTo(want) want.ResourceMetrics().At(0).CopyTo(want.ResourceMetrics().AppendEmpty()) want.ResourceMetrics().At(1).Resource().Attributes().PutString("resource-attr", "another-value") oc := generateOCTestDataMetricsOneMetric() @@ -153,7 +154,8 @@ func TestOCToMetrics_ResourceInMetric(t *testing.T) { func TestOCToMetrics_ResourceInMetricOnly(t *testing.T) { internal := testdata.GenerateMetricsOneMetric() - want := internal.Clone() + want := pmetric.NewMetrics() + internal.CopyTo(want) oc := generateOCTestDataMetricsOneMetric() // Move resource to metric level. // We shouldn't have a "combined" resource after conversion