@@ -15,7 +15,6 @@ import (
1515 "github.com/stretchr/testify/require"
1616 "go.opentelemetry.io/collector/component"
1717 "go.opentelemetry.io/collector/component/componenttest"
18- "go.opentelemetry.io/collector/config/configtelemetry"
1918 "go.opentelemetry.io/collector/connector/connectortest"
2019 "go.opentelemetry.io/collector/consumer"
2120 "go.opentelemetry.io/collector/consumer/consumertest"
@@ -24,9 +23,7 @@ import (
2423 "go.opentelemetry.io/collector/pdata/pmetric"
2524 "go.opentelemetry.io/collector/pdata/ptrace"
2625 semconv "go.opentelemetry.io/collector/semconv/v1.13.0"
27- sdkmetric "go.opentelemetry.io/otel/sdk/metric"
2826 "go.opentelemetry.io/otel/sdk/metric/metricdata"
29- "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
3027 "go.uber.org/zap/zaptest"
3128
3229 "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden"
@@ -425,14 +422,6 @@ func TestMapsAreConsistentDuringCleanup(t *testing.T) {
425422 assert .NoError (t , p .Shutdown (context .Background ()))
426423}
427424
428- func setupTelemetry (reader * sdkmetric.ManualReader ) component.TelemetrySettings {
429- settings := componenttest .NewNopTelemetrySettings ()
430- settings .MetricsLevel = configtelemetry .LevelNormal
431-
432- settings .MeterProvider = sdkmetric .NewMeterProvider (sdkmetric .WithReader (reader ))
433- return settings
434- }
435-
436425func TestValidateOwnTelemetry (t * testing.T ) {
437426 cfg := & Config {
438427 Dimensions : []string {"some-attribute" , "non-existing-attribute" },
@@ -443,10 +432,8 @@ func TestValidateOwnTelemetry(t *testing.T) {
443432 }
444433
445434 mockMetricsExporter := newMockMetricsExporter ()
446-
447- reader := sdkmetric .NewManualReader ()
448- set := setupTelemetry (reader )
449- p , err := newConnector (set , cfg , mockMetricsExporter )
435+ set := setupTestTelemetry ()
436+ p , err := newConnector (set .NewSettings ().TelemetrySettings , cfg , mockMetricsExporter )
450437 require .NoError (t , err )
451438 assert .NoError (t , p .Start (context .Background (), componenttest .NewNopHost ()))
452439
@@ -468,26 +455,20 @@ func TestValidateOwnTelemetry(t *testing.T) {
468455
469456 // Shutdown the connector
470457 assert .NoError (t , p .Shutdown (context .Background ()))
471-
472- rm := metricdata.ResourceMetrics {}
473- assert .NoError (t , reader .Collect (context .Background (), & rm ))
474- require .Len (t , rm .ScopeMetrics , 1 )
475- sm := rm .ScopeMetrics [0 ]
476- require .Len (t , sm .Metrics , 1 )
477- got := sm .Metrics [0 ]
478- want := metricdata.Metrics {
479- Name : "otelcol_connector_servicegraph_total_edges" ,
480- Description : "Total number of unique edges" ,
481- Unit : "1" ,
482- Data : metricdata.Sum [int64 ]{
483- Temporality : metricdata .CumulativeTemporality ,
484- IsMonotonic : true ,
485- DataPoints : []metricdata.DataPoint [int64 ]{
486- {Value : 2 },
458+ set .assertMetrics (t , []metricdata.Metrics {
459+ {
460+ Name : "otelcol_connector_servicegraph_total_edges" ,
461+ Description : "Total number of unique edges" ,
462+ Unit : "1" ,
463+ Data : metricdata.Sum [int64 ]{
464+ Temporality : metricdata .CumulativeTemporality ,
465+ IsMonotonic : true ,
466+ DataPoints : []metricdata.DataPoint [int64 ]{
467+ {Value : 2 },
468+ },
487469 },
488470 },
489- }
490- metricdatatest .AssertEqual (t , want , got , metricdatatest .IgnoreTimestamp ())
471+ })
491472}
492473
493474func TestExtraDimensionsLabels (t * testing.T ) {
0 commit comments