From 71699cfae54a9e20f2b4a3892484b9e413975864 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 20 Apr 2021 17:27:34 -0700 Subject: [PATCH] Cleanup usages of Resize(1), after PR #2970 Signed-off-by: Bogdan Drutu --- consumer/pdata/common_test.go | 6 +-- consumer/pdata/metric_test.go | 24 +++------ consumer/pdata/trace_test.go | 5 +- consumer/simple/metrics.go | 6 +-- consumer/simple/metrics_test.go | 9 ++-- exporter/exporterhelper/tracehelper_test.go | 5 +- exporter/jaegerexporter/exporter_test.go | 5 +- .../kafkaexporter/jaeger_marshaller_test.go | 4 +- internal/testdata/log.go | 53 +++++++------------ internal/testdata/metric.go | 9 ++-- internal/testdata/trace.go | 40 +++++--------- .../attributes_log_test.go | 11 ++-- .../attributes_trace_test.go | 12 ++--- processor/batchprocessor/splitlogs_test.go | 6 +-- processor/batchprocessor/splitmetrics_test.go | 18 +++---- processor/batchprocessor/splittraces_test.go | 6 +-- .../probabilisticsampler.go | 3 +- .../probabilisticsampler_test.go | 9 ++-- processor/spanprocessor/span_test.go | 12 ++--- .../scraper/loadscraper/load_scraper.go | 4 +- .../processes_scraper_linux.go | 8 ++- .../scraper/processscraper/process_scraper.go | 10 +--- .../jaegerreceiver/trace_receiver_test.go | 10 ++-- .../kafkareceiver/otlp_unmarshaller_test.go | 3 +- .../kafkareceiver/zipkin_unmarshaller_test.go | 19 ++++--- receiver/scraperhelper/scrapercontroller.go | 6 +-- .../scraperhelper/scrapercontroller_test.go | 12 ++--- testbed/testbed/data_providers.go | 7 ++- testutil/logstest/logs.go | 10 +--- translator/internaldata/oc_to_traces.go | 10 +--- .../trace/jaeger/jaegerproto_to_traces.go | 4 +- .../jaeger/jaegerproto_to_traces_test.go | 12 ++--- .../trace/jaeger/jaegerthrift_to_traces.go | 8 +-- .../trace/zipkin/zipkinv2_to_traces_test.go | 7 +-- 34 files changed, 121 insertions(+), 252 deletions(-) diff --git a/consumer/pdata/common_test.go b/consumer/pdata/common_test.go index 342bddcd55a..135f32c7c82 100644 --- a/consumer/pdata/common_test.go +++ b/consumer/pdata/common_test.go @@ -1156,8 +1156,7 @@ func TestAttributeValueArray(t *testing.T) { assert.EqualValues(t, NewAnyValueArray(), a1.ArrayVal()) assert.EqualValues(t, 0, a1.ArrayVal().Len()) - a1.ArrayVal().Resize(1) - v := a1.ArrayVal().At(0) + v := a1.ArrayVal().AppendEmpty() v.SetDoubleVal(123) assertArrayJSON(t, `[123]`, a1) assert.EqualValues(t, 1, a1.ArrayVal().Len()) @@ -1169,8 +1168,7 @@ func TestAttributeValueArray(t *testing.T) { assertArrayJSON(t, `[]`, a2) assert.EqualValues(t, 0, a2.ArrayVal().Len()) - a2.ArrayVal().Resize(1) - a2.ArrayVal().At(0).SetStringVal("somestr") + a2.ArrayVal().AppendEmpty().SetStringVal("somestr") assertArrayJSON(t, `["somestr"]`, a2) assert.EqualValues(t, 1, a2.ArrayVal().Len()) diff --git a/consumer/pdata/metric_test.go b/consumer/pdata/metric_test.go index 6414b0dd60b..54729466b96 100644 --- a/consumer/pdata/metric_test.go +++ b/consumer/pdata/metric_test.go @@ -168,11 +168,9 @@ func TestMetricCount(t *testing.T) { rms := md.ResourceMetrics() rms.Resize(3) - rms.At(0).InstrumentationLibraryMetrics().Resize(1) - rms.At(0).InstrumentationLibraryMetrics().At(0).Metrics().Resize(1) - rms.At(1).InstrumentationLibraryMetrics().Resize(1) - rms.At(2).InstrumentationLibraryMetrics().Resize(1) - rms.At(2).InstrumentationLibraryMetrics().At(0).Metrics().Resize(5) + rms.At(1).InstrumentationLibraryMetrics().AppendEmpty() + rms.At(2).InstrumentationLibraryMetrics().AppendEmpty().Metrics().Resize(5) + // 5 + 1 (from rms.At(0) initialized first) assert.EqualValues(t, 6, md.MetricCount()) } @@ -180,15 +178,12 @@ func TestMetricSize(t *testing.T) { md := NewMetrics() assert.Equal(t, 0, md.OtlpProtoSize()) rms := md.ResourceMetrics() - rms.Resize(1) - rms.At(0).InstrumentationLibraryMetrics().Resize(1) - rms.At(0).InstrumentationLibraryMetrics().At(0).Metrics().Resize(1) - metric := rms.At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0) + metric := rms.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics().AppendEmpty() metric.SetDataType(MetricDataTypeHistogram) doubleHistogram := metric.Histogram() - doubleHistogram.DataPoints().Resize(1) - doubleHistogram.DataPoints().At(0).SetCount(123) - doubleHistogram.DataPoints().At(0).SetSum(123) + pt := doubleHistogram.DataPoints().AppendEmpty() + pt.SetCount(123) + pt.SetSum(123) otlp := internal.MetricsToOtlp(md.InternalRep()) size := otlp.Size() bytes, err := otlp.Marshal() @@ -280,10 +275,7 @@ func TestMetricAndDataPointCountWithEmpty(t *testing.T) { func TestMetricAndDataPointCountWithNilDataPoints(t *testing.T) { metrics := NewMetrics() - metrics.ResourceMetrics().Resize(1) - rm := metrics.ResourceMetrics().At(0) - rm.InstrumentationLibraryMetrics().Resize(1) - ilm := rm.InstrumentationLibraryMetrics().At(0) + ilm := metrics.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() intGauge := ilm.Metrics().AppendEmpty() intGauge.SetDataType(MetricDataTypeIntGauge) doubleGauge := ilm.Metrics().AppendEmpty() diff --git a/consumer/pdata/trace_test.go b/consumer/pdata/trace_test.go index ac14e7fffe4..2adeeff43e4 100644 --- a/consumer/pdata/trace_test.go +++ b/consumer/pdata/trace_test.go @@ -53,10 +53,7 @@ func TestSize(t *testing.T) { td := NewTraces() assert.Equal(t, 0, td.OtlpProtoSize()) rms := td.ResourceSpans() - rms.Resize(1) - rms.At(0).InstrumentationLibrarySpans().Resize(1) - rms.At(0).InstrumentationLibrarySpans().At(0).Spans().Resize(1) - rms.At(0).InstrumentationLibrarySpans().At(0).Spans().At(0).SetName("foo") + rms.AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty().SetName("foo") otlp := internal.TracesToOtlp(td.InternalRep()) size := otlp.Size() bytes, err := otlp.Marshal() diff --git a/consumer/simple/metrics.go b/consumer/simple/metrics.go index b6a23b170c9..af2cf2c7cf7 100644 --- a/consumer/simple/metrics.go +++ b/consumer/simple/metrics.go @@ -180,8 +180,7 @@ func (mb *Metrics) getMetricsSlice() pdata.MetricSlice { } rmsLen := rms.Len() - rms.Resize(rmsLen + 1) - rm := rms.At(rmsLen) + rm := rms.AppendEmpty() res := rm.Resource() for k, v := range mb.ResourceAttributes { @@ -189,8 +188,7 @@ func (mb *Metrics) getMetricsSlice() pdata.MetricSlice { } ilms := rm.InstrumentationLibraryMetrics() - ilms.Resize(1) - ilm := ilms.At(0) + ilm := ilms.AppendEmpty() il := ilm.InstrumentationLibrary() il.SetName(mb.InstrumentationLibraryName) diff --git a/consumer/simple/metrics_test.go b/consumer/simple/metrics_test.go index 5bee31ac9ef..558018a11c9 100644 --- a/consumer/simple/metrics_test.go +++ b/consumer/simple/metrics_test.go @@ -484,16 +484,13 @@ func BenchmarkPdataMetrics(b *testing.B) { resAttrs.Insert("host", pdata.NewAttributeValueString("my-host")) resAttrs.Insert("serviceName", pdata.NewAttributeValueString("app")) - ilms := rm.InstrumentationLibraryMetrics() - ilms.Resize(1) - ilm := ilms.At(0) - metrics := ilm.Metrics() - metrics.Resize(6) - + ilm := rm.InstrumentationLibraryMetrics().AppendEmpty() il := ilm.InstrumentationLibrary() il.SetName("example") il.SetVersion("0.1") + metrics := ilm.Metrics() + metrics.Resize(6) for i := 0; i < 50; i++ { metric := metrics.At(0) metric.SetName("gauge" + strconv.Itoa(i)) diff --git a/exporter/exporterhelper/tracehelper_test.go b/exporter/exporterhelper/tracehelper_test.go index 01d7be769d0..2692d288f01 100644 --- a/exporter/exporterhelper/tracehelper_test.go +++ b/exporter/exporterhelper/tracehelper_test.go @@ -188,10 +188,7 @@ func checkRecordedMetricsForTracesExporter(t *testing.T, te component.TracesExpo func generateTraceTraffic(t *testing.T, te component.TracesExporter, numRequests int, wantError error) { td := pdata.NewTraces() - rs := td.ResourceSpans() - rs.Resize(1) - rs.At(0).InstrumentationLibrarySpans().Resize(1) - rs.At(0).InstrumentationLibrarySpans().At(0).Spans().Resize(1) + td.ResourceSpans().AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() ctx, span := trace.StartSpan(context.Background(), fakeTraceParentSpanName, trace.WithSampler(trace.AlwaysSample())) defer span.End() for i := 0; i < numRequests; i++ { diff --git a/exporter/jaegerexporter/exporter_test.go b/exporter/jaegerexporter/exporter_test.go index 3bc374bcfc8..b186fdd16d3 100644 --- a/exporter/jaegerexporter/exporter_test.go +++ b/exporter/jaegerexporter/exporter_test.go @@ -243,10 +243,7 @@ func TestMutualTLS(t *testing.T) { spanID := pdata.NewSpanID([8]byte{0, 1, 2, 3, 4, 5, 6, 7}) td := pdata.NewTraces() - td.ResourceSpans().Resize(1) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().Resize(1) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().Resize(1) - span := td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().At(0) + span := td.ResourceSpans().AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() span.SetTraceID(traceID) span.SetSpanID(spanID) diff --git a/exporter/kafkaexporter/jaeger_marshaller_test.go b/exporter/kafkaexporter/jaeger_marshaller_test.go index 58e1b73aaaf..366f986a4fa 100644 --- a/exporter/kafkaexporter/jaeger_marshaller_test.go +++ b/exporter/kafkaexporter/jaeger_marshaller_test.go @@ -84,9 +84,7 @@ func TestJaegerMarshaller_error_covert_traceID(t *testing.T) { marshaller: jaegerProtoSpanMarshaller{}, } td := pdata.NewTraces() - td.ResourceSpans().Resize(1) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().Resize(1) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().Resize(1) + td.ResourceSpans().AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() // fails in zero traceID messages, err := marshaller.Marshal(td) require.Error(t, err) diff --git a/internal/testdata/log.go b/internal/testdata/log.go index acdae00b78d..6b04417548a 100644 --- a/internal/testdata/log.go +++ b/internal/testdata/log.go @@ -30,8 +30,7 @@ var ( ) func GenerateLogDataEmpty() pdata.Logs { - ld := pdata.NewLogs() - return ld + return pdata.NewLogs() } func generateLogOtlpEmpty() *otlpcollectorlog.ExportLogsServiceRequest { @@ -40,7 +39,7 @@ func generateLogOtlpEmpty() *otlpcollectorlog.ExportLogsServiceRequest { func GenerateLogDataOneEmptyResourceLogs() pdata.Logs { ld := GenerateLogDataEmpty() - ld.ResourceLogs().Resize(1) + ld.ResourceLogs().AppendEmpty() return ld } @@ -54,8 +53,7 @@ func generateLogOtlpOneEmptyResourceLogs() *otlpcollectorlog.ExportLogsServiceRe func GenerateLogDataNoLogRecords() pdata.Logs { ld := GenerateLogDataOneEmptyResourceLogs() - rs0 := ld.ResourceLogs().At(0) - initResource1(rs0.Resource()) + initResource1(ld.ResourceLogs().At(0).Resource()) return ld } @@ -72,8 +70,7 @@ func generateLogOtlpNoLogRecords() *otlpcollectorlog.ExportLogsServiceRequest { func GenerateLogDataOneEmptyLogs() pdata.Logs { ld := GenerateLogDataNoLogRecords() rs0 := ld.ResourceLogs().At(0) - rs0.InstrumentationLibraryLogs().Resize(1) - rs0.InstrumentationLibraryLogs().At(0).Logs().Resize(1) + rs0.InstrumentationLibraryLogs().AppendEmpty().Logs().AppendEmpty() return ld } @@ -97,10 +94,7 @@ func generateLogOtlpOneEmptyLogs() *otlpcollectorlog.ExportLogsServiceRequest { func GenerateLogDataOneLogNoResource() pdata.Logs { ld := GenerateLogDataOneEmptyResourceLogs() rs0 := ld.ResourceLogs().At(0) - rs0.InstrumentationLibraryLogs().Resize(1) - rs0.InstrumentationLibraryLogs().At(0).Logs().Resize(1) - rs0lr0 := rs0.InstrumentationLibraryLogs().At(0).Logs().At(0) - fillLogOne(rs0lr0) + fillLogOne(rs0.InstrumentationLibraryLogs().AppendEmpty().Logs().AppendEmpty()) return ld } @@ -122,11 +116,7 @@ func generateLogOtlpOneLogNoResource() *otlpcollectorlog.ExportLogsServiceReques func GenerateLogDataOneLog() pdata.Logs { ld := GenerateLogDataOneEmptyLogs() - rs0 := ld.ResourceLogs().At(0) - rs0.InstrumentationLibraryLogs().Resize(1) - rs0.InstrumentationLibraryLogs().At(0).Logs().Resize(1) - rs0lr0 := rs0.InstrumentationLibraryLogs().At(0).Logs().At(0) - fillLogOne(rs0lr0) + fillLogOne(ld.ResourceLogs().At(0).InstrumentationLibraryLogs().At(0).Logs().At(0)) return ld } @@ -149,11 +139,9 @@ func generateLogOtlpOneLog() *otlpcollectorlog.ExportLogsServiceRequest { func GenerateLogDataTwoLogsSameResource() pdata.Logs { ld := GenerateLogDataOneEmptyLogs() - rs0 := ld.ResourceLogs().At(0) - rs0.InstrumentationLibraryLogs().Resize(1) - rs0.InstrumentationLibraryLogs().At(0).Logs().Resize(2) - fillLogOne(rs0.InstrumentationLibraryLogs().At(0).Logs().At(0)) - fillLogTwo(rs0.InstrumentationLibraryLogs().At(0).Logs().At(1)) + logs := ld.ResourceLogs().At(0).InstrumentationLibraryLogs().At(0).Logs() + fillLogOne(logs.At(0)) + fillLogTwo(logs.AppendEmpty()) return ld } @@ -178,18 +166,14 @@ func generateLogOtlpSameResourceTwoLogs() *otlpcollectorlog.ExportLogsServiceReq func GenerateLogDataTwoLogsSameResourceOneDifferent() pdata.Logs { ld := pdata.NewLogs() - ld.ResourceLogs().Resize(2) - rl0 := ld.ResourceLogs().At(0) + rl0 := ld.ResourceLogs().AppendEmpty() initResource1(rl0.Resource()) - rl0.InstrumentationLibraryLogs().Resize(1) - rl0.InstrumentationLibraryLogs().At(0).Logs().Resize(2) - fillLogOne(rl0.InstrumentationLibraryLogs().At(0).Logs().At(0)) - fillLogTwo(rl0.InstrumentationLibraryLogs().At(0).Logs().At(1)) - rl1 := ld.ResourceLogs().At(1) + logs := rl0.InstrumentationLibraryLogs().AppendEmpty().Logs() + fillLogOne(logs.AppendEmpty()) + fillLogTwo(logs.AppendEmpty()) + rl1 := ld.ResourceLogs().AppendEmpty() initResource2(rl1.Resource()) - rl1.InstrumentationLibraryLogs().Resize(1) - rl1.InstrumentationLibraryLogs().At(0).Logs().Resize(1) - fillLogThree(rl1.InstrumentationLibraryLogs().At(0).Logs().At(0)) + fillLogThree(rl1.InstrumentationLibraryLogs().AppendEmpty().Logs().AppendEmpty()) return ld } @@ -318,11 +302,10 @@ func generateOtlpLogThree() *otlplogs.LogRecord { func GenerateLogDataManyLogsSameResource(count int) pdata.Logs { ld := GenerateLogDataOneEmptyLogs() - rs0 := ld.ResourceLogs().At(0) - rs0.InstrumentationLibraryLogs().Resize(1) - rs0.InstrumentationLibraryLogs().At(0).Logs().Resize(count) + logs := ld.ResourceLogs().At(0).InstrumentationLibraryLogs().At(0).Logs() + logs.Resize(count) for i := 0; i < count; i++ { - l := rs0.InstrumentationLibraryLogs().At(0).Logs().At(i) + l := logs.At(i) if i%2 == 0 { fillLogOne(l) } else { diff --git a/internal/testdata/metric.go b/internal/testdata/metric.go index bf8b020ecd9..7ecd054c0f8 100644 --- a/internal/testdata/metric.go +++ b/internal/testdata/metric.go @@ -529,12 +529,9 @@ func initDoubleSummaryMetric(sm pdata.Metric) { sdp1.SetCount(1) sdp1.SetSum(15) - quantiles := pdata.NewValueAtQuantileSlice() - quantiles.Resize(1) - quantiles.At(0).SetQuantile(0.01) - quantiles.At(0).SetValue(15) - - quantiles.CopyTo(sdp1.QuantileValues()) + quantile := sdp1.QuantileValues().AppendEmpty() + quantile.SetQuantile(0.01) + quantile.SetValue(15) } func generateOTLPDoubleSummaryMetric() *otlpmetrics.Metric { diff --git a/internal/testdata/trace.go b/internal/testdata/trace.go index f8a2a0f9946..6f61b7a47c1 100644 --- a/internal/testdata/trace.go +++ b/internal/testdata/trace.go @@ -35,8 +35,7 @@ var ( ) func GenerateTraceDataEmpty() pdata.Traces { - td := pdata.NewTraces() - return td + return pdata.NewTraces() } func generateTraceOtlpEmpty() *otlpcollectortrace.ExportTraceServiceRequest { @@ -45,7 +44,7 @@ func generateTraceOtlpEmpty() *otlpcollectortrace.ExportTraceServiceRequest { func GenerateTraceDataOneEmptyResourceSpans() pdata.Traces { td := GenerateTraceDataEmpty() - td.ResourceSpans().Resize(1) + td.ResourceSpans().AppendEmpty() return td } @@ -76,8 +75,7 @@ func generateTraceOtlpNoLibraries() *otlpcollectortrace.ExportTraceServiceReques func GenerateTraceDataOneEmptyInstrumentationLibrary() pdata.Traces { td := GenerateTraceDataNoLibraries() - rs0 := td.ResourceSpans().At(0) - rs0.InstrumentationLibrarySpans().Resize(1) + td.ResourceSpans().At(0).InstrumentationLibrarySpans().AppendEmpty() return td } @@ -97,10 +95,7 @@ func generateTraceOtlpOneEmptyInstrumentationLibrary() *otlpcollectortrace.Expor func GenerateTraceDataOneSpanNoResource() pdata.Traces { td := GenerateTraceDataOneEmptyResourceSpans() rs0 := td.ResourceSpans().At(0) - rs0.InstrumentationLibrarySpans().Resize(1) - rs0ils0 := rs0.InstrumentationLibrarySpans().At(0) - rs0ils0.Spans().Resize(1) - fillSpanOne(rs0ils0.Spans().At(0)) + fillSpanOne(rs0.InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty()) return td } @@ -123,8 +118,7 @@ func generateTraceOtlpOneSpanNoResource() *otlpcollectortrace.ExportTraceService func GenerateTraceDataOneSpan() pdata.Traces { td := GenerateTraceDataOneEmptyInstrumentationLibrary() rs0ils0 := td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0) - rs0ils0.Spans().Resize(1) - fillSpanOne(rs0ils0.Spans().At(0)) + fillSpanOne(rs0ils0.Spans().AppendEmpty()) return td } @@ -148,9 +142,8 @@ func generateTraceOtlpOneSpan() *otlpcollectortrace.ExportTraceServiceRequest { func GenerateTraceDataTwoSpansSameResource() pdata.Traces { td := GenerateTraceDataOneEmptyInstrumentationLibrary() rs0ils0 := td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0) - rs0ils0.Spans().Resize(2) - fillSpanOne(rs0ils0.Spans().At(0)) - fillSpanTwo(rs0ils0.Spans().At(1)) + fillSpanOne(rs0ils0.Spans().AppendEmpty()) + fillSpanTwo(rs0ils0.Spans().AppendEmpty()) return td } @@ -175,20 +168,15 @@ func generateTraceOtlpSameResourceTwoSpans() *otlpcollectortrace.ExportTraceServ func GenerateTraceDataTwoSpansSameResourceOneDifferent() pdata.Traces { td := pdata.NewTraces() - td.ResourceSpans().Resize(2) - rs0 := td.ResourceSpans().At(0) + rs0 := td.ResourceSpans().AppendEmpty() initResource1(rs0.Resource()) - rs0.InstrumentationLibrarySpans().Resize(1) - rs0ils0 := rs0.InstrumentationLibrarySpans().At(0) - rs0ils0.Spans().Resize(2) - fillSpanOne(rs0ils0.Spans().At(0)) - fillSpanTwo(rs0ils0.Spans().At(1)) - rs1 := td.ResourceSpans().At(1) + rs0ils0 := rs0.InstrumentationLibrarySpans().AppendEmpty() + fillSpanOne(rs0ils0.Spans().AppendEmpty()) + fillSpanTwo(rs0ils0.Spans().AppendEmpty()) + rs1 := td.ResourceSpans().AppendEmpty() initResource2(rs1.Resource()) - rs1.InstrumentationLibrarySpans().Resize(1) - rs1ils0 := rs1.InstrumentationLibrarySpans().At(0) - rs1ils0.Spans().Resize(1) - fillSpanThree(rs1ils0.Spans().At(0)) + rs1ils0 := rs1.InstrumentationLibrarySpans().AppendEmpty() + fillSpanThree(rs1ils0.Spans().AppendEmpty()) return td } diff --git a/processor/attributesprocessor/attributes_log_test.go b/processor/attributesprocessor/attributes_log_test.go index 058ad5a5b87..43338267880 100644 --- a/processor/attributesprocessor/attributes_log_test.go +++ b/processor/attributesprocessor/attributes_log_test.go @@ -51,14 +51,9 @@ func runIndividualLogTestCase(t *testing.T, tt logTestCase, tp component.LogsPro func generateLogData(logName string, attrs map[string]pdata.AttributeValue) pdata.Logs { td := pdata.NewLogs() - td.ResourceLogs().Resize(1) - rs := td.ResourceLogs().At(0) - rs.InstrumentationLibraryLogs().Resize(1) - ils := rs.InstrumentationLibraryLogs().At(0) - lrs := ils.Logs() - lrs.Resize(1) - lrs.At(0).SetName(logName) - lrs.At(0).Attributes().InitFromMap(attrs).Sort() + lr := td.ResourceLogs().AppendEmpty().InstrumentationLibraryLogs().AppendEmpty().Logs().AppendEmpty() + lr.SetName(logName) + lr.Attributes().InitFromMap(attrs).Sort() return td } diff --git a/processor/attributesprocessor/attributes_trace_test.go b/processor/attributesprocessor/attributes_trace_test.go index 68ffec31cf6..0590b7b7e73 100644 --- a/processor/attributesprocessor/attributes_trace_test.go +++ b/processor/attributesprocessor/attributes_trace_test.go @@ -53,17 +53,13 @@ func runIndividualTestCase(t *testing.T, tt testCase, tp component.TracesProcess func generateTraceData(serviceName, spanName string, attrs map[string]pdata.AttributeValue) pdata.Traces { td := pdata.NewTraces() - td.ResourceSpans().Resize(1) - rs := td.ResourceSpans().At(0) + rs := td.ResourceSpans().AppendEmpty() if serviceName != "" { rs.Resource().Attributes().UpsertString(conventions.AttributeServiceName, serviceName) } - rs.InstrumentationLibrarySpans().Resize(1) - ils := rs.InstrumentationLibrarySpans().At(0) - spans := ils.Spans() - spans.Resize(1) - spans.At(0).SetName(spanName) - spans.At(0).Attributes().InitFromMap(attrs).Sort() + span := rs.InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() + span.SetName(spanName) + span.Attributes().InitFromMap(attrs).Sort() return td } diff --git a/processor/batchprocessor/splitlogs_test.go b/processor/batchprocessor/splitlogs_test.go index 8e2d63376f5..36191e92111 100644 --- a/processor/batchprocessor/splitlogs_test.go +++ b/processor/batchprocessor/splitlogs_test.go @@ -40,10 +40,8 @@ func TestSplitLogs(t *testing.T) { logs.At(i).SetName(getTestLogName(0, i)) } cp := pdata.NewLogs() - cp.ResourceLogs().Resize(1) - cp.ResourceLogs().At(0).InstrumentationLibraryLogs().Resize(1) - cp.ResourceLogs().At(0).InstrumentationLibraryLogs().At(0).Logs().Resize(5) - cpLogs := cp.ResourceLogs().At(0).InstrumentationLibraryLogs().At(0).Logs() + cpLogs := cp.ResourceLogs().AppendEmpty().InstrumentationLibraryLogs().AppendEmpty().Logs() + cpLogs.Resize(5) td.ResourceLogs().At(0).Resource().CopyTo( cp.ResourceLogs().At(0).Resource()) td.ResourceLogs().At(0).InstrumentationLibraryLogs().At(0).InstrumentationLibrary().CopyTo( diff --git a/processor/batchprocessor/splitmetrics_test.go b/processor/batchprocessor/splitmetrics_test.go index 767c179967d..95153bee852 100644 --- a/processor/batchprocessor/splitmetrics_test.go +++ b/processor/batchprocessor/splitmetrics_test.go @@ -34,19 +34,17 @@ func TestSplitMetrics_noop(t *testing.T) { } func TestSplitMetrics(t *testing.T) { - td := testdata.GenerateMetricsManyMetricsSameResource(20) - metrics := td.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() + md := testdata.GenerateMetricsManyMetricsSameResource(20) + metrics := md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() for i := 0; i < metrics.Len(); i++ { metrics.At(i).SetName(getTestMetricName(0, i)) } cp := pdata.NewMetrics() - cp.ResourceMetrics().Resize(1) - cp.ResourceMetrics().At(0).InstrumentationLibraryMetrics().Resize(1) - cp.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().Resize(5) - cpMetrics := cp.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics() - td.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).InstrumentationLibrary().CopyTo( + cpMetrics := cp.ResourceMetrics().AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty().Metrics() + cpMetrics.Resize(5) + md.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).InstrumentationLibrary().CopyTo( cp.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).InstrumentationLibrary()) - td.ResourceMetrics().At(0).Resource().CopyTo( + md.ResourceMetrics().At(0).Resource().CopyTo( cp.ResourceMetrics().At(0).Resource()) metrics.At(19).CopyTo(cpMetrics.At(0)) metrics.At(18).CopyTo(cpMetrics.At(1)) @@ -55,10 +53,10 @@ func TestSplitMetrics(t *testing.T) { metrics.At(15).CopyTo(cpMetrics.At(4)) splitSize := 5 - split := splitMetrics(splitSize, td) + split := splitMetrics(splitSize, md) assert.Equal(t, splitSize, split.MetricCount()) assert.Equal(t, cp, split) - assert.Equal(t, 15, td.MetricCount()) + assert.Equal(t, 15, md.MetricCount()) assert.Equal(t, "test-metric-int-0-19", split.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Name()) assert.Equal(t, "test-metric-int-0-15", split.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(4).Name()) } diff --git a/processor/batchprocessor/splittraces_test.go b/processor/batchprocessor/splittraces_test.go index 6e54cc15f51..14ae8eeacdc 100644 --- a/processor/batchprocessor/splittraces_test.go +++ b/processor/batchprocessor/splittraces_test.go @@ -40,10 +40,8 @@ func TestSplitTraces(t *testing.T) { spans.At(i).SetName(getTestSpanName(0, i)) } cp := pdata.NewTraces() - cp.ResourceSpans().Resize(1) - cp.ResourceSpans().At(0).InstrumentationLibrarySpans().Resize(1) - cp.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().Resize(5) - cpSpans := cp.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans() + cpSpans := cp.ResourceSpans().AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans() + cpSpans.Resize(5) td.ResourceSpans().At(0).Resource().CopyTo( cp.ResourceSpans().At(0).Resource()) td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).InstrumentationLibrary().CopyTo( diff --git a/processor/probabilisticsamplerprocessor/probabilisticsampler.go b/processor/probabilisticsamplerprocessor/probabilisticsampler.go index 64f6a08f56a..cd50490e759 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler.go @@ -84,8 +84,7 @@ func (tsp *tracesamplerprocessor) processTraces(resourceSpans pdata.ResourceSpan sampledTraceData.ResourceSpans().Resize(sampledTraceData.ResourceSpans().Len() + 1) rs := sampledTraceData.ResourceSpans().At(sampledTraceData.ResourceSpans().Len() - 1) resourceSpans.Resource().CopyTo(rs.Resource()) - rs.InstrumentationLibrarySpans().Resize(1) - spns := rs.InstrumentationLibrarySpans().At(0).Spans() + spns := rs.InstrumentationLibrarySpans().AppendEmpty().Spans() ilss := resourceSpans.InstrumentationLibrarySpans() for j := 0; j < ilss.Len(); j++ { diff --git a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go index 2c725d5ee95..b8cc612bfb9 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go @@ -223,10 +223,8 @@ func Test_tracesamplerprocessor_SamplingPercentageRange_MultipleResourceSpans(t func Test_tracesamplerprocessor_SpanSamplingPriority(t *testing.T) { singleSpanWithAttrib := func(key string, attribValue pdata.AttributeValue) pdata.Traces { traces := pdata.NewTraces() - traces.ResourceSpans().Resize(1) - rs := traces.ResourceSpans().At(0) - rs.InstrumentationLibrarySpans().Resize(1) - instrLibrarySpans := rs.InstrumentationLibrarySpans().At(0) + rs := traces.ResourceSpans().AppendEmpty() + instrLibrarySpans := rs.InstrumentationLibrarySpans().AppendEmpty() instrLibrarySpans.Spans().Append(getSpanWithAttributes(key, attribValue)) return traces } @@ -449,8 +447,7 @@ func genRandomTestData(numBatches, numTracesPerBatch int, serviceName string, re rs.Resource().Attributes().InsertBool("bool", true) rs.Resource().Attributes().InsertString("string", "yes") rs.Resource().Attributes().InsertInt("int64", 10000000) - rs.InstrumentationLibrarySpans().Resize(1) - ils := rs.InstrumentationLibrarySpans().At(0) + ils := rs.InstrumentationLibrarySpans().AppendEmpty() ils.Spans().Resize(numTracesPerBatch) for k := 0; k < numTracesPerBatch; k++ { diff --git a/processor/spanprocessor/span_test.go b/processor/spanprocessor/span_test.go index 5c9c0a5cbab..12a52785416 100644 --- a/processor/spanprocessor/span_test.go +++ b/processor/spanprocessor/span_test.go @@ -80,17 +80,13 @@ func runIndividualTestCase(t *testing.T, tt testCase, tp component.TracesProcess func generateTraceData(serviceName, inputName string, attrs map[string]pdata.AttributeValue) pdata.Traces { td := pdata.NewTraces() - td.ResourceSpans().Resize(1) - rs := td.ResourceSpans().At(0) + rs := td.ResourceSpans().AppendEmpty() if serviceName != "" { rs.Resource().Attributes().UpsertString(conventions.AttributeServiceName, serviceName) } - rs.InstrumentationLibrarySpans().Resize(1) - ils := rs.InstrumentationLibrarySpans().At(0) - spans := ils.Spans() - spans.Resize(1) - spans.At(0).SetName(inputName) - spans.At(0).Attributes().InitFromMap(attrs).Sort() + span := rs.InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() + span.SetName(inputName) + span.Attributes().InitFromMap(attrs).Sort() return td } diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go index f91bc8f0423..b86df6fa050 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go @@ -73,9 +73,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.MetricSlice, error) { func initializeLoadMetric(metric pdata.Metric, metricDescriptor metadata.MetricIntf, now pdata.Timestamp, value float64) { metricDescriptor.Init(metric) - idps := metric.DoubleGauge().DataPoints() - idps.Resize(1) - dp := idps.At(0) + dp := metric.DoubleGauge().DataPoints().AppendEmpty() dp.SetTimestamp(now) dp.SetValue(value) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_linux.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_linux.go index 5158eff9b3d..26dec4e2331 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_linux.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_linux.go @@ -32,9 +32,7 @@ func appendUnixSystemSpecificProcessesMetrics(metrics pdata.MetricSlice, startIn func initializeProcessesCreatedMetric(metric pdata.Metric, now pdata.Timestamp, misc *load.MiscStat) { metadata.Metrics.SystemProcessesCreated.Init(metric) - - ddps := metric.IntSum().DataPoints() - ddps.Resize(1) - ddps.At(0).SetTimestamp(now) - ddps.At(0).SetValue(int64(misc.ProcsCreated)) + ddp := metric.IntSum().DataPoints().AppendEmpty() + ddp.SetTimestamp(now) + ddp.SetValue(int64(misc.ProcsCreated)) } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go index 2905f119492..36742fcac4e 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go @@ -102,10 +102,7 @@ func (s *scraper) scrape(_ context.Context) (pdata.ResourceMetricsSlice, error) for i, md := range metadata { rm := rms.At(i) md.initializeResource(rm.Resource()) - - ilms := rm.InstrumentationLibraryMetrics() - ilms.Resize(1) - metrics := ilms.At(0).Metrics() + metrics := rm.InstrumentationLibraryMetrics().AppendEmpty().Metrics() now := pdata.TimestampFromTime(time.Now()) @@ -213,10 +210,7 @@ func scrapeAndAppendMemoryUsageMetrics(metrics pdata.MetricSlice, now pdata.Time func initializeMemoryUsageMetric(metric pdata.Metric, metricIntf metadata.MetricIntf, now pdata.Timestamp, usage int64) { metricIntf.Init(metric) - - idps := metric.IntSum().DataPoints() - idps.Resize(1) - initializeMemoryUsageDataPoint(idps.At(0), now, usage) + initializeMemoryUsageDataPoint(metric.IntSum().DataPoints().AppendEmpty(), now, usage) } func initializeMemoryUsageDataPoint(dataPoint pdata.IntDataPoint, now pdata.Timestamp, usage int64) { diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index 16865ed5a44..eeec55d0efd 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -298,16 +298,14 @@ func expectedTraceData(t1, t2, t3 time.Time) pdata.Traces { childSpanID := pdata.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}) traces := pdata.NewTraces() - traces.ResourceSpans().Resize(1) - rs := traces.ResourceSpans().At(0) + rs := traces.ResourceSpans().AppendEmpty() rs.Resource().Attributes().InsertString(conventions.AttributeServiceName, "issaTest") rs.Resource().Attributes().InsertBool("bool", true) rs.Resource().Attributes().InsertString("string", "yes") rs.Resource().Attributes().InsertInt("int64", 10000000) - rs.InstrumentationLibrarySpans().Resize(1) - rs.InstrumentationLibrarySpans().At(0).Spans().Resize(2) + spans := rs.InstrumentationLibrarySpans().AppendEmpty().Spans() - span0 := rs.InstrumentationLibrarySpans().At(0).Spans().At(0) + span0 := spans.AppendEmpty() span0.SetSpanID(childSpanID) span0.SetParentSpanID(parentSpanID) span0.SetTraceID(traceID) @@ -317,7 +315,7 @@ func expectedTraceData(t1, t2, t3 time.Time) pdata.Traces { span0.Status().SetCode(pdata.StatusCodeError) span0.Status().SetMessage("Stale indices") - span1 := rs.InstrumentationLibrarySpans().At(0).Spans().At(1) + span1 := spans.AppendEmpty() span1.SetSpanID(parentSpanID) span1.SetTraceID(traceID) span1.SetName("ProxyFetch") diff --git a/receiver/kafkareceiver/otlp_unmarshaller_test.go b/receiver/kafkareceiver/otlp_unmarshaller_test.go index 350fa3f7cc1..22a8dca02d2 100644 --- a/receiver/kafkareceiver/otlp_unmarshaller_test.go +++ b/receiver/kafkareceiver/otlp_unmarshaller_test.go @@ -26,8 +26,7 @@ import ( func TestUnmarshallOTLPTraces(t *testing.T) { td := pdata.NewTraces() - td.ResourceSpans().Resize(1) - td.ResourceSpans().At(0).Resource().Attributes().InsertString("foo", "bar") + td.ResourceSpans().AppendEmpty().Resource().Attributes().InsertString("foo", "bar") expected, err := td.ToOtlpProtoBytes() require.NoError(t, err) diff --git a/receiver/kafkareceiver/zipkin_unmarshaller_test.go b/receiver/kafkareceiver/zipkin_unmarshaller_test.go index 469f5859092..118b5472a0d 100644 --- a/receiver/kafkareceiver/zipkin_unmarshaller_test.go +++ b/receiver/kafkareceiver/zipkin_unmarshaller_test.go @@ -31,17 +31,16 @@ import ( func TestUnmarshallZipkin(t *testing.T) { td := pdata.NewTraces() - td.ResourceSpans().Resize(1) - td.ResourceSpans().At(0).Resource().Attributes().InitFromMap( + rs := td.ResourceSpans().AppendEmpty() + rs.Resource().Attributes().InitFromMap( map[string]pdata.AttributeValue{conventions.AttributeServiceName: pdata.NewAttributeValueString("my_service")}) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().Resize(1) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().Resize(1) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().At(0).SetName("foo") - td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().At(0).SetStartTimestamp(pdata.Timestamp(1597759000)) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().At(0).SetEndTimestamp(pdata.Timestamp(1597769000)) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().At(0).SetTraceID(pdata.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().At(0).SetSpanID(pdata.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) - td.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).Spans().At(0).SetParentSpanID(pdata.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0})) + span := rs.InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() + span.SetName("foo") + span.SetStartTimestamp(pdata.Timestamp(1597759000)) + span.SetEndTimestamp(pdata.Timestamp(1597769000)) + span.SetTraceID(pdata.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})) + span.SetSpanID(pdata.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8})) + span.SetParentSpanID(pdata.NewSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 0})) spans, err := zipkintranslator.InternalTracesToZipkinSpans(td) require.NoError(t, err) diff --git a/receiver/scraperhelper/scrapercontroller.go b/receiver/scraperhelper/scrapercontroller.go index c3f62efab18..356733ef324 100644 --- a/receiver/scraperhelper/scrapercontroller.go +++ b/receiver/scraperhelper/scrapercontroller.go @@ -255,11 +255,7 @@ func (mms *multiMetricScraper) Shutdown(ctx context.Context) error { func (mms *multiMetricScraper) Scrape(ctx context.Context, receiverName string) (pdata.ResourceMetricsSlice, error) { rms := pdata.NewResourceMetricsSlice() - rms.Resize(1) - rm := rms.At(0) - ilms := rm.InstrumentationLibraryMetrics() - ilms.Resize(1) - ilm := ilms.At(0) + ilm := rms.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() var errs scrapererror.ScrapeErrors for _, scraper := range mms.scrapers { diff --git a/receiver/scraperhelper/scrapercontroller_test.go b/receiver/scraperhelper/scrapercontroller_test.go index 2c4b7396b15..6af76bfb171 100644 --- a/receiver/scraperhelper/scrapercontroller_test.go +++ b/receiver/scraperhelper/scrapercontroller_test.go @@ -401,19 +401,15 @@ func assertScraperViews(t *testing.T, expectedErr error, sink *consumertest.Metr func singleMetric() pdata.MetricSlice { metrics := pdata.NewMetricSlice() - metrics.Resize(1) - metrics.At(0).SetDataType(pdata.MetricDataTypeIntGauge) - metrics.At(0).IntGauge().DataPoints().Resize(1) + metric := metrics.AppendEmpty() + metric.SetDataType(pdata.MetricDataTypeIntGauge) + metric.IntGauge().DataPoints().AppendEmpty() return metrics } func singleResourceMetric() pdata.ResourceMetricsSlice { rms := pdata.NewResourceMetricsSlice() - rms.Resize(1) - rm := rms.At(0) - ilms := rm.InstrumentationLibraryMetrics() - ilms.Resize(1) - ilm := ilms.At(0) + ilm := rms.AppendEmpty().InstrumentationLibraryMetrics().AppendEmpty() singleMetric().MoveAndAppendTo(ilm.Metrics()) return rms } diff --git a/testbed/testbed/data_providers.go b/testbed/testbed/data_providers.go index 44b3fa3784a..ae572fe363f 100644 --- a/testbed/testbed/data_providers.go +++ b/testbed/testbed/data_providers.go @@ -160,16 +160,15 @@ func (dp *PerfTestDataProvider) GenerateMetrics() (pdata.Metrics, bool) { func (dp *PerfTestDataProvider) GenerateLogs() (pdata.Logs, bool) { logs := pdata.NewLogs() - logs.ResourceLogs().Resize(1) - logs.ResourceLogs().At(0).InstrumentationLibraryLogs().Resize(1) + rl := logs.ResourceLogs().AppendEmpty() if dp.options.Attributes != nil { - attrs := logs.ResourceLogs().At(0).Resource().Attributes() + attrs := rl.Resource().Attributes() attrs.EnsureCapacity(len(dp.options.Attributes)) for k, v := range dp.options.Attributes { attrs.UpsertString(k, v) } } - logRecords := logs.ResourceLogs().At(0).InstrumentationLibraryLogs().At(0).Logs() + logRecords := rl.InstrumentationLibraryLogs().AppendEmpty().Logs() logRecords.Resize(dp.options.ItemsPerBatch) now := pdata.TimestampFromTime(time.Now()) diff --git a/testutil/logstest/logs.go b/testutil/logstest/logs.go index c0e13ed48fa..5f947182b50 100644 --- a/testutil/logstest/logs.go +++ b/testutil/logstest/logs.go @@ -32,15 +32,7 @@ type Log struct { // Attributes are sorted by key name. func Logs(recs ...Log) pdata.Logs { out := pdata.NewLogs() - - logs := out.ResourceLogs() - - logs.Resize(1) - rls := logs.At(0) - - rls.InstrumentationLibraryLogs().Resize(1) - logSlice := rls.InstrumentationLibraryLogs().At(0).Logs() - + logSlice := out.ResourceLogs().AppendEmpty().InstrumentationLibraryLogs().AppendEmpty().Logs() logSlice.Resize(len(recs)) for i := range recs { l := logSlice.At(i) diff --git a/translator/internaldata/oc_to_traces.go b/translator/internaldata/oc_to_traces.go index fc50cb5e349..108a15e6bc2 100644 --- a/translator/internaldata/oc_to_traces.go +++ b/translator/internaldata/oc_to_traces.go @@ -84,9 +84,7 @@ func OCToTraces(node *occommon.Node, resource *ocresource.Resource, spans []*oct ocNodeResourceToInternal(node, resource, rs0.Resource()) // Allocate a slice for spans that need to be combined into first ResourceSpans. - ilss := rs0.InstrumentationLibrarySpans() - ilss.Resize(1) - ils0 := ilss.At(0) + ils0 := rs0.InstrumentationLibrarySpans().AppendEmpty() combinedSpans := ils0.Spans() combinedSpans.Resize(combinedSpanCount) @@ -123,11 +121,7 @@ func OCToTraces(node *occommon.Node, resource *ocresource.Resource, spans []*oct func ocSpanToResourceSpans(ocSpan *octrace.Span, node *occommon.Node, dest pdata.ResourceSpans) { ocNodeResourceToInternal(node, ocSpan.Resource, dest.Resource()) ilss := dest.InstrumentationLibrarySpans() - ilss.Resize(1) - ils0 := ilss.At(0) - spans := ils0.Spans() - spans.Resize(1) - ocSpanToInternal(ocSpan, spans.At(0)) + ocSpanToInternal(ocSpan, ilss.AppendEmpty().Spans().AppendEmpty()) } func ocSpanToInternal(src *octrace.Span, dest pdata.Span) { diff --git a/translator/trace/jaeger/jaegerproto_to_traces.go b/translator/trace/jaeger/jaegerproto_to_traces.go index 5e3f1d9b975..12dc2e2a824 100644 --- a/translator/trace/jaeger/jaegerproto_to_traces.go +++ b/translator/trace/jaeger/jaegerproto_to_traces.go @@ -67,9 +67,7 @@ func ProtoBatchToInternalTraces(batch model.Batch) pdata.Traces { return traceData } - rss := traceData.ResourceSpans() - rss.Resize(1) - protoBatchToResourceSpans(batch, rss.At(0)) + protoBatchToResourceSpans(batch, traceData.ResourceSpans().AppendEmpty()) return traceData } diff --git a/translator/trace/jaeger/jaegerproto_to_traces_test.go b/translator/trace/jaeger/jaegerproto_to_traces_test.go index 23275fbbf78..54fc40c6ef6 100644 --- a/translator/trace/jaeger/jaegerproto_to_traces_test.go +++ b/translator/trace/jaeger/jaegerproto_to_traces_test.go @@ -774,9 +774,9 @@ func generateTraceDataTwoSpansWithFollower() pdata.Traces { span.SetKind(pdata.SpanKindCONSUMER) span.Status().SetCode(pdata.StatusCodeOk) span.Status().SetMessage("status-ok") - span.Links().Resize(1) - span.Links().At(0).SetTraceID(span.TraceID()) - span.Links().At(0).SetSpanID(spans.At(0).SpanID()) + link := span.Links().AppendEmpty() + link.SetTraceID(span.TraceID()) + link.SetSpanID(spans.At(0).SpanID()) return td } @@ -842,8 +842,7 @@ func generateTraceDataTwoSpansFromTwoLibraries() pdata.Traces { rs0ils0 := rs0.InstrumentationLibrarySpans().At(0) rs0ils0.InstrumentationLibrary().SetName("library1") rs0ils0.InstrumentationLibrary().SetVersion("0.42.0") - rs0ils0.Spans().Resize(1) - span1 := rs0ils0.Spans().At(0) + span1 := rs0ils0.Spans().AppendEmpty() span1.SetTraceID(tracetranslator.UInt64ToTraceID(0, 0)) span1.SetSpanID(tracetranslator.UInt64ToSpanID(0)) span1.SetName("operation1") @@ -853,8 +852,7 @@ func generateTraceDataTwoSpansFromTwoLibraries() pdata.Traces { rs0ils1 := rs0.InstrumentationLibrarySpans().At(1) rs0ils1.InstrumentationLibrary().SetName("library2") rs0ils1.InstrumentationLibrary().SetVersion("0.42.0") - rs0ils1.Spans().Resize(1) - span2 := rs0ils1.Spans().At(0) + span2 := rs0ils1.Spans().AppendEmpty() span2.SetTraceID(span1.TraceID()) span2.SetSpanID(span1.SpanID()) span2.SetName("operation2") diff --git a/translator/trace/jaeger/jaegerthrift_to_traces.go b/translator/trace/jaeger/jaegerthrift_to_traces.go index 2898ebf7d50..2bb9f292535 100644 --- a/translator/trace/jaeger/jaegerthrift_to_traces.go +++ b/translator/trace/jaeger/jaegerthrift_to_traces.go @@ -36,18 +36,14 @@ func ThriftBatchToInternalTraces(batch *jaeger.Batch) pdata.Traces { return traceData } - rss := traceData.ResourceSpans() - rss.Resize(1) - rs := rss.At(0) + rs := traceData.ResourceSpans().AppendEmpty() jThriftProcessToInternalResource(jProcess, rs.Resource()) if len(jSpans) == 0 { return traceData } - ilss := rs.InstrumentationLibrarySpans() - ilss.Resize(1) - jThriftSpansToInternal(jSpans, ilss.At(0).Spans()) + jThriftSpansToInternal(jSpans, rs.InstrumentationLibrarySpans().AppendEmpty().Spans()) return traceData } diff --git a/translator/trace/zipkin/zipkinv2_to_traces_test.go b/translator/trace/zipkin/zipkinv2_to_traces_test.go index 6503e630b7b..3ddfa091ec0 100644 --- a/translator/trace/zipkin/zipkinv2_to_traces_test.go +++ b/translator/trace/zipkin/zipkinv2_to_traces_test.go @@ -139,12 +139,7 @@ func generateTraceSingleSpanMinmalResource() pdata.Traces { func generateTraceSingleSpanErrorStatus() pdata.Traces { td := pdata.NewTraces() - td.ResourceSpans().Resize(1) - rs := td.ResourceSpans().At(0) - rs.InstrumentationLibrarySpans().Resize(1) - ils := rs.InstrumentationLibrarySpans().At(0) - ils.Spans().Resize(1) - span := ils.Spans().At(0) + span := td.ResourceSpans().AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans().AppendEmpty() span.SetTraceID( pdata.NewTraceID([16]byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80})) span.SetSpanID(pdata.NewSpanID([8]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}))