Skip to content

Commit 7d9ec13

Browse files
bogdandrutubogdandrutu
committed
[chore] Replace usage of metadatatest.SetupTelemetry with new componentest
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 44eb293 commit 7d9ec13

File tree

4 files changed

+146
-370
lines changed

4 files changed

+146
-370
lines changed

‎exporter/prometheusremotewriteexporter/exporter_test.go

Lines changed: 19 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -736,11 +736,7 @@ func Test_PushMetrics(t *testing.T) {
736736
}
737737

738738
assert.NotNil(t, cfg)
739-
buildInfo := component.BuildInfo{
740-
Description: "OpenTelemetry Collector",
741-
Version: "1.0",
742-
}
743-
tel := metadatatest.SetupTelemetry(
739+
tel := componenttest.NewTelemetry(
744740
componenttest.WithMetricOptions(sdkmetric.WithView(
745741
// Drop otelhttp metrics
746742
sdkmetric.NewView(
@@ -752,8 +748,12 @@ func Test_PushMetrics(t *testing.T) {
752748
},
753749
))),
754750
)
755-
set := tel.NewSettings()
756-
set.BuildInfo = buildInfo
751+
t.Cleanup(func() { require.NoError(t, tel.Shutdown(context.Background())) })
752+
set := metadatatest.NewSettings(tel)
753+
set.BuildInfo = component.BuildInfo{
754+
Description: "OpenTelemetry Collector",
755+
Version: "1.0",
756+
}
757757

758758
prwe, nErr := newPRWExporter(cfg, set)
759759

@@ -769,42 +769,22 @@ func Test_PushMetrics(t *testing.T) {
769769
assert.Error(t, err)
770770
return
771771
}
772-
expectedMetrics := []metricdata.Metrics{}
772+
assert.NoError(t, err)
773773
if tt.expectedFailedTranslations > 0 {
774-
expectedMetrics = append(expectedMetrics, metricdata.Metrics{
775-
Name: "otelcol_exporter_prometheusremotewrite_failed_translations",
776-
Description: "Number of translation operations that failed to translate metrics from Otel to Prometheus",
777-
Unit: "1",
778-
Data: metricdata.Sum[int64]{
779-
Temporality: metricdata.CumulativeTemporality,
780-
IsMonotonic: true,
781-
DataPoints: []metricdata.DataPoint[int64]{
782-
{
783-
Value: int64(tt.expectedFailedTranslations),
784-
Attributes: attribute.NewSet(attribute.String("exporter", "prometheusremotewrite")),
785-
},
786-
},
774+
metadatatest.AssertEqualExporterPrometheusremotewriteFailedTranslations(t, tel, []metricdata.DataPoint[int64]{
775+
{
776+
Value: int64(tt.expectedFailedTranslations),
777+
Attributes: attribute.NewSet(attribute.String("exporter", "prometheusremotewrite")),
787778
},
788-
})
779+
}, metricdatatest.IgnoreTimestamp())
789780
}
790781

791-
expectedMetrics = append(expectedMetrics, metricdata.Metrics{
792-
Name: "otelcol_exporter_prometheusremotewrite_translated_time_series",
793-
Description: "Number of Prometheus time series that were translated from OTel metrics",
794-
Unit: "1",
795-
Data: metricdata.Sum[int64]{
796-
Temporality: metricdata.CumulativeTemporality,
797-
IsMonotonic: true,
798-
DataPoints: []metricdata.DataPoint[int64]{
799-
{
800-
Value: int64(tt.expectedTimeSeries),
801-
Attributes: attribute.NewSet(attribute.String("exporter", "prometheusremotewrite")),
802-
},
803-
},
782+
metadatatest.AssertEqualExporterPrometheusremotewriteTranslatedTimeSeries(t, tel, []metricdata.DataPoint[int64]{
783+
{
784+
Value: int64(tt.expectedTimeSeries),
785+
Attributes: attribute.NewSet(attribute.String("exporter", "prometheusremotewrite")),
804786
},
805-
})
806-
tel.AssertMetrics(t, expectedMetrics, metricdatatest.IgnoreTimestamp())
807-
assert.NoError(t, err)
787+
}, metricdatatest.IgnoreTimestamp())
808788
})
809789
}
810790
})
@@ -1306,8 +1286,7 @@ func benchmarkPushMetrics(b *testing.B, numMetrics, numConsumers int) {
13061286
endpointURL, err := url.Parse(mockServer.URL)
13071287
require.NoError(b, err)
13081288

1309-
tel := metadatatest.SetupTelemetry()
1310-
set := tel.NewSettings()
1289+
set := exportertest.NewNopSettings()
13111290
// Adjusted retry settings for faster testing
13121291
retrySettings := configretry.BackOffConfig{
13131292
Enabled: true,

‎processor/groupbyattrsprocessor/processor_test.go

Lines changed: 77 additions & 182 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313

1414
"github.com/stretchr/testify/assert"
1515
"github.com/stretchr/testify/require"
16+
"go.opentelemetry.io/collector/component/componenttest"
1617
"go.opentelemetry.io/collector/pdata/pcommon"
1718
"go.opentelemetry.io/collector/pdata/plog"
1819
"go.opentelemetry.io/collector/pdata/pmetric"
@@ -273,8 +274,10 @@ func TestComplexAttributeGrouping(t *testing.T) {
273274
inputMetrics := someComplexMetrics(tt.withResourceAttrIndex, tt.inputResourceCount, tt.inputInstrumentationLibraryCount, 2)
274275
inputHistogramMetrics := someComplexHistogramMetrics(tt.withResourceAttrIndex, tt.inputResourceCount, tt.inputInstrumentationLibraryCount, 2, 2)
275276

276-
tel := metadatatest.SetupTelemetry()
277-
gap, err := createGroupByAttrsProcessor(tel.NewSettings(), tt.groupByKeys)
277+
tel := componenttest.NewTelemetry()
278+
t.Cleanup(func() { require.NoError(t, tel.Shutdown(context.Background())) })
279+
280+
gap, err := createGroupByAttrsProcessor(metadatatest.NewSettings(tel), tt.groupByKeys)
278281
require.NoError(t, err)
279282

280283
processedLogs, err := gap.processLogs(context.Background(), inputLogs)
@@ -374,213 +377,105 @@ func TestComplexAttributeGrouping(t *testing.T) {
374377
}
375378
}
376379
}
377-
var want []metricdata.Metrics
378380
if tt.shouldMoveCommonGroupedAttr {
379-
want = []metricdata.Metrics{
381+
metadatatest.AssertEqualProcessorGroupbyattrsNumGroupedLogs(t, tel, []metricdata.DataPoint[int64]{
380382
{
381-
Name: "otelcol_processor_groupbyattrs_num_grouped_logs",
382-
Description: "Number of logs that had attributes grouped",
383-
Unit: "1",
384-
Data: metricdata.Sum[int64]{
385-
Temporality: metricdata.CumulativeTemporality,
386-
IsMonotonic: true,
387-
DataPoints: []metricdata.DataPoint[int64]{
388-
{
389-
Value: int64(tt.outputTotalRecordsCount),
390-
},
391-
},
392-
},
383+
Value: int64(tt.outputTotalRecordsCount),
393384
},
385+
}, metricdatatest.IgnoreTimestamp())
386+
metadatatest.AssertEqualProcessorGroupbyattrsNumGroupedMetrics(t, tel, []metricdata.DataPoint[int64]{
394387
{
395-
Name: "otelcol_processor_groupbyattrs_num_grouped_metrics",
396-
Description: "Number of metrics that had attributes grouped",
397-
Unit: "1",
398-
Data: metricdata.Sum[int64]{
399-
Temporality: metricdata.CumulativeTemporality,
400-
IsMonotonic: true,
401-
DataPoints: []metricdata.DataPoint[int64]{
402-
{
403-
Value: 4 * int64(tt.outputTotalRecordsCount),
404-
},
405-
},
406-
},
388+
Value: 4 * int64(tt.outputTotalRecordsCount),
407389
},
390+
}, metricdatatest.IgnoreTimestamp())
391+
metadatatest.AssertEqualProcessorGroupbyattrsNumGroupedSpans(t, tel, []metricdata.DataPoint[int64]{
408392
{
409-
Name: "otelcol_processor_groupbyattrs_num_grouped_spans",
410-
Description: "Number of spans that had attributes grouped",
411-
Unit: "1",
412-
Data: metricdata.Sum[int64]{
413-
Temporality: metricdata.CumulativeTemporality,
414-
IsMonotonic: true,
415-
DataPoints: []metricdata.DataPoint[int64]{
416-
{
417-
Value: int64(tt.outputTotalRecordsCount),
418-
},
419-
},
420-
},
393+
Value: int64(tt.outputTotalRecordsCount),
421394
},
395+
}, metricdatatest.IgnoreTimestamp())
396+
metadatatest.AssertEqualProcessorGroupbyattrsLogGroups(t, tel, []metricdata.HistogramDataPoint[int64]{
422397
{
423-
Name: "otelcol_processor_groupbyattrs_log_groups",
424-
Description: "Distribution of groups extracted for logs",
425-
Unit: "1",
426-
Data: metricdata.Histogram[int64]{
427-
Temporality: metricdata.CumulativeTemporality,
428-
DataPoints: []metricdata.HistogramDataPoint[int64]{
429-
{
430-
Attributes: *attribute.EmptySet(),
431-
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
432-
BucketCounts: []uint64{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
433-
Count: 1,
434-
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
435-
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
436-
Sum: int64(tt.outputResourceCount),
437-
},
438-
},
439-
},
398+
Attributes: *attribute.EmptySet(),
399+
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
400+
BucketCounts: []uint64{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
401+
Count: 1,
402+
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
403+
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
404+
Sum: int64(tt.outputResourceCount),
440405
},
406+
}, metricdatatest.IgnoreTimestamp())
407+
metadatatest.AssertEqualProcessorGroupbyattrsMetricGroups(t, tel, []metricdata.HistogramDataPoint[int64]{
441408
{
442-
Name: "otelcol_processor_groupbyattrs_metric_groups",
443-
Description: "Distribution of groups extracted for metrics",
444-
Unit: "1",
445-
Data: metricdata.Histogram[int64]{
446-
Temporality: metricdata.CumulativeTemporality,
447-
DataPoints: []metricdata.HistogramDataPoint[int64]{
448-
{
449-
Attributes: *attribute.EmptySet(),
450-
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
451-
BucketCounts: []uint64{0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
452-
Count: 2,
453-
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
454-
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
455-
Sum: 2 * int64(tt.outputResourceCount),
456-
},
457-
},
458-
},
409+
Attributes: *attribute.EmptySet(),
410+
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
411+
BucketCounts: []uint64{0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
412+
Count: 2,
413+
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
414+
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
415+
Sum: 2 * int64(tt.outputResourceCount),
459416
},
417+
}, metricdatatest.IgnoreTimestamp())
418+
metadatatest.AssertEqualProcessorGroupbyattrsSpanGroups(t, tel, []metricdata.HistogramDataPoint[int64]{
460419
{
461-
Name: "otelcol_processor_groupbyattrs_span_groups",
462-
Description: "Distribution of groups extracted for spans",
463-
Unit: "1",
464-
Data: metricdata.Histogram[int64]{
465-
Temporality: metricdata.CumulativeTemporality,
466-
DataPoints: []metricdata.HistogramDataPoint[int64]{
467-
{
468-
Attributes: *attribute.EmptySet(),
469-
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
470-
BucketCounts: []uint64{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
471-
Count: 1,
472-
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
473-
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
474-
Sum: int64(tt.outputResourceCount),
475-
},
476-
},
477-
},
420+
Attributes: *attribute.EmptySet(),
421+
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
422+
BucketCounts: []uint64{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
423+
Count: 1,
424+
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
425+
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
426+
Sum: int64(tt.outputResourceCount),
478427
},
479-
}
428+
}, metricdatatest.IgnoreTimestamp())
480429
} else {
481-
want = []metricdata.Metrics{
430+
metadatatest.AssertEqualProcessorGroupbyattrsNumNonGroupedLogs(t, tel, []metricdata.DataPoint[int64]{
482431
{
483-
Name: "otelcol_processor_groupbyattrs_num_non_grouped_logs",
484-
Description: "Number of logs that did not have attributes grouped",
485-
Unit: "1",
486-
Data: metricdata.Sum[int64]{
487-
Temporality: metricdata.CumulativeTemporality,
488-
IsMonotonic: true,
489-
DataPoints: []metricdata.DataPoint[int64]{
490-
{
491-
Value: int64(tt.outputTotalRecordsCount),
492-
},
493-
},
494-
},
432+
Value: int64(tt.outputTotalRecordsCount),
495433
},
434+
}, metricdatatest.IgnoreTimestamp())
435+
metadatatest.AssertEqualProcessorGroupbyattrsNumNonGroupedMetrics(t, tel, []metricdata.DataPoint[int64]{
496436
{
497-
Name: "otelcol_processor_groupbyattrs_num_non_grouped_metrics",
498-
Description: "Number of metrics that did not have attributes grouped",
499-
Unit: "1",
500-
Data: metricdata.Sum[int64]{
501-
Temporality: metricdata.CumulativeTemporality,
502-
IsMonotonic: true,
503-
DataPoints: []metricdata.DataPoint[int64]{
504-
{
505-
Value: 4 * int64(tt.outputTotalRecordsCount),
506-
},
507-
},
508-
},
437+
Value: 4 * int64(tt.outputTotalRecordsCount),
509438
},
439+
}, metricdatatest.IgnoreTimestamp())
440+
metadatatest.AssertEqualProcessorGroupbyattrsNumNonGroupedSpans(t, tel, []metricdata.DataPoint[int64]{
510441
{
511-
Name: "otelcol_processor_groupbyattrs_num_non_grouped_spans",
512-
Description: "Number of spans that did not have attributes grouped",
513-
Unit: "1",
514-
Data: metricdata.Sum[int64]{
515-
Temporality: metricdata.CumulativeTemporality,
516-
IsMonotonic: true,
517-
DataPoints: []metricdata.DataPoint[int64]{
518-
{
519-
Value: int64(tt.outputTotalRecordsCount),
520-
},
521-
},
522-
},
442+
Value: int64(tt.outputTotalRecordsCount),
523443
},
444+
}, metricdatatest.IgnoreTimestamp())
445+
metadatatest.AssertEqualProcessorGroupbyattrsLogGroups(t, tel, []metricdata.HistogramDataPoint[int64]{
524446
{
525-
Name: "otelcol_processor_groupbyattrs_log_groups",
526-
Description: "Distribution of groups extracted for logs",
527-
Unit: "1",
528-
Data: metricdata.Histogram[int64]{
529-
Temporality: metricdata.CumulativeTemporality,
530-
DataPoints: []metricdata.HistogramDataPoint[int64]{
531-
{
532-
Attributes: *attribute.EmptySet(),
533-
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
534-
BucketCounts: []uint64{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
535-
Count: 1,
536-
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
537-
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
538-
Sum: int64(tt.outputResourceCount),
539-
},
540-
},
541-
},
447+
Attributes: *attribute.EmptySet(),
448+
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
449+
BucketCounts: []uint64{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
450+
Count: 1,
451+
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
452+
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
453+
Sum: int64(tt.outputResourceCount),
542454
},
455+
}, metricdatatest.IgnoreTimestamp())
456+
metadatatest.AssertEqualProcessorGroupbyattrsMetricGroups(t, tel, []metricdata.HistogramDataPoint[int64]{
543457
{
544-
Name: "otelcol_processor_groupbyattrs_metric_groups",
545-
Description: "Distribution of groups extracted for metrics",
546-
Unit: "1",
547-
Data: metricdata.Histogram[int64]{
548-
Temporality: metricdata.CumulativeTemporality,
549-
DataPoints: []metricdata.HistogramDataPoint[int64]{
550-
{
551-
Attributes: *attribute.EmptySet(),
552-
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
553-
BucketCounts: []uint64{0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
554-
Count: 2,
555-
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
556-
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
557-
Sum: 2 * int64(tt.outputResourceCount),
558-
},
559-
},
560-
},
458+
Attributes: *attribute.EmptySet(),
459+
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
460+
BucketCounts: []uint64{0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
461+
Count: 2,
462+
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
463+
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
464+
Sum: 2 * int64(tt.outputResourceCount),
561465
},
466+
}, metricdatatest.IgnoreTimestamp())
467+
metadatatest.AssertEqualProcessorGroupbyattrsSpanGroups(t, tel, []metricdata.HistogramDataPoint[int64]{
562468
{
563-
Name: "otelcol_processor_groupbyattrs_span_groups",
564-
Description: "Distribution of groups extracted for spans",
565-
Unit: "1",
566-
Data: metricdata.Histogram[int64]{
567-
Temporality: metricdata.CumulativeTemporality,
568-
DataPoints: []metricdata.HistogramDataPoint[int64]{
569-
{
570-
Attributes: *attribute.EmptySet(),
571-
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
572-
BucketCounts: []uint64{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
573-
Count: 1,
574-
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
575-
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
576-
Sum: int64(tt.outputResourceCount),
577-
},
578-
},
579-
},
469+
Attributes: *attribute.EmptySet(),
470+
Bounds: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000},
471+
BucketCounts: []uint64{0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
472+
Count: 1,
473+
Min: metricdata.NewExtrema(int64(tt.outputResourceCount)),
474+
Max: metricdata.NewExtrema(int64(tt.outputResourceCount)),
475+
Sum: int64(tt.outputResourceCount),
580476
},
581-
}
477+
}, metricdatatest.IgnoreTimestamp())
582478
}
583-
tel.AssertMetrics(t, want, metricdatatest.IgnoreTimestamp())
584479
})
585480
}
586481
}

0 commit comments

Comments
 (0)