Skip to content

Commit

Permalink
Cleanup usages of Resize(1), after PR open-telemetry#2970 (open-telem…
Browse files Browse the repository at this point in the history
…etry#2971)

Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
bogdandrutu committed Apr 21, 2021
1 parent b8dccfc commit 13e4566
Show file tree
Hide file tree
Showing 34 changed files with 121 additions and 252 deletions.
6 changes: 2 additions & 4 deletions consumer/pdata/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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())

Expand Down
24 changes: 8 additions & 16 deletions consumer/pdata/metric_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,27 +168,22 @@ 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())
}

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()
Expand Down Expand Up @@ -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()
Expand Down
5 changes: 1 addition & 4 deletions consumer/pdata/trace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 2 additions & 4 deletions consumer/simple/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,15 @@ 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 {
res.Attributes().Insert(k, pdata.NewAttributeValueString(v))
}

ilms := rm.InstrumentationLibraryMetrics()
ilms.Resize(1)
ilm := ilms.At(0)
ilm := ilms.AppendEmpty()

il := ilm.InstrumentationLibrary()
il.SetName(mb.InstrumentationLibraryName)
Expand Down
9 changes: 3 additions & 6 deletions consumer/simple/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
5 changes: 1 addition & 4 deletions exporter/exporterhelper/tracehelper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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++ {
Expand Down
5 changes: 1 addition & 4 deletions exporter/jaegerexporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 1 addition & 3 deletions exporter/kafkaexporter/jaeger_marshaller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
53 changes: 18 additions & 35 deletions internal/testdata/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ var (
)

func GenerateLogDataEmpty() pdata.Logs {
ld := pdata.NewLogs()
return ld
return pdata.NewLogs()
}

func generateLogOtlpEmpty() *otlpcollectorlog.ExportLogsServiceRequest {
Expand All @@ -40,7 +39,7 @@ func generateLogOtlpEmpty() *otlpcollectorlog.ExportLogsServiceRequest {

func GenerateLogDataOneEmptyResourceLogs() pdata.Logs {
ld := GenerateLogDataEmpty()
ld.ResourceLogs().Resize(1)
ld.ResourceLogs().AppendEmpty()
return ld
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand Down Expand Up @@ -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 {
Expand Down
9 changes: 3 additions & 6 deletions internal/testdata/metric.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
40 changes: 14 additions & 26 deletions internal/testdata/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ var (
)

func GenerateTraceDataEmpty() pdata.Traces {
td := pdata.NewTraces()
return td
return pdata.NewTraces()
}

func generateTraceOtlpEmpty() *otlpcollectortrace.ExportTraceServiceRequest {
Expand All @@ -45,7 +44,7 @@ func generateTraceOtlpEmpty() *otlpcollectortrace.ExportTraceServiceRequest {

func GenerateTraceDataOneEmptyResourceSpans() pdata.Traces {
td := GenerateTraceDataEmpty()
td.ResourceSpans().Resize(1)
td.ResourceSpans().AppendEmpty()
return td
}

Expand Down Expand Up @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand All @@ -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
}

Expand Down
11 changes: 3 additions & 8 deletions processor/attributesprocessor/attributes_log_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading

0 comments on commit 13e4566

Please sign in to comment.