Made suggested changes

Signed-off-by: Wise-Wizard <[email protected]>
jaegertracing · Jun 24, 2024 · 4e7dcbb · 4e7dcbb
1 parent 33d5855
commit 4e7dcbb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/internal/metrics/benchmark_test.go b/internal/metrics/benchmark_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"go.opentelemetry.io/otel/sdk/metric"
-	"go.opentelemetry.io/otel/sdk/resource"
 
 	"github.com/jaegertracing/jaeger/internal/metrics/otelmetrics"
 	prom "github.com/jaegertracing/jaeger/internal/metrics/prometheus"
@@ -33,10 +32,7 @@ func BenchmarkPrometheusCounter(b *testing.B) {
 }
 
 func BenchmarkOTELCounter(b *testing.B) {
-	res := resource.NewWithAttributes(
-		resource.Default().SchemaURL(),
-	)
-	meterProvider := metric.NewMeterProvider(metric.WithResource(res))
+	meterProvider := metric.NewMeterProvider()
 	factory := otelmetrics.NewFactory(meterProvider)
 	benchmarkCounter(b, factory)
 }
diff --git a/internal/metrics/otelmetrics/factory.go b/internal/metrics/otelmetrics/factory.go
@@ -8,20 +8,17 @@ import (
 	"log"
 
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	metric "go.opentelemetry.io/otel/metric"
-	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
 )
 
 type otelFactory struct {
 	meter metric.Meter
 }
 
-func NewFactory(meterProvider *sdkmetric.MeterProvider) metrics.Factory {
-	otel.SetMeterProvider(meterProvider)
+func NewFactory(meterProvider metric.MeterProvider) metrics.Factory {
 	return &otelFactory{
-		meter: otel.Meter("jaeger-V2"),
+		meter: meterProvider.Meter("jaeger-v2"),
 	}
 }