Pass real MeterProvider to components (jaegertracing#6173)

## Which problem is this PR solving? - Fixes jaegertracing#6127 ## How was this change tested? - make lint test ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: chahatsagarmain <[email protected]> Signed-off-by: chahat sagar <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
Ayush-Vish · Nov 17, 2024 · f88262c · f88262c
1 parent 47e1ee6
commit f88262c
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 34 deletions.
diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
@@ -14,6 +14,9 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/metric/noop"
 	_ "go.uber.org/automaxprocs"
 	"go.uber.org/zap"
 
@@ -161,6 +164,9 @@ by default uses only in-memory database.`,
 				TracerProvider: tracer.OTEL,
 				Metrics:        queryMetricsFactory,
 				ReportStatus:   telemetery.HCAdapter(svc.HC()),
+				LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+					return noop.NewMeterProvider()
+				},
 			}
 			// query
 			querySrv := startQuery(

diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go
@@ -100,7 +100,8 @@ func (s *server) Start(ctx context.Context, host component.Host) error {
 		ReportStatus: func(event *componentstatus.Event) {
 			componentstatus.ReportStatus(host, event)
 		},
-		Host: host,
+		LeveledMeterProvider: s.telset.LeveledMeterProvider,
+		Host:                 host,
 	}
 
 	s.server, err = queryApp.NewServer(

diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go
@@ -10,10 +10,13 @@ import (
 	"io"
 
 	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/extension"
+	"go.opentelemetry.io/otel/metric"
 
 	"github.com/jaegertracing/jaeger/internal/metrics/otelmetrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/plugin/metrics/prometheus"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
 	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
@@ -125,8 +128,16 @@ func (s *storageExt) Start(_ context.Context, host component.Host) error {
 		case cfg.Badger != nil:
 			factory, err = badger.NewFactoryWithConfig(*cfg.Badger, mf, s.telset.Logger)
 		case cfg.GRPC != nil:
+			telset := telemetery.Setting{
+				Logger:  s.telset.Logger,
+				Host:    host,
+				Metrics: mf,
+				LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+					return s.telset.MeterProvider
+				},
+			}
 			//nolint: contextcheck
-			factory, err = grpc.NewFactoryWithConfig(*cfg.GRPC, mf, s.telset.Logger, host)
+			factory, err = grpc.NewFactoryWithConfig(*cfg.GRPC, telset)
 		case cfg.Cassandra != nil:
 			factory, err = cassandra.NewFactoryWithConfig(*cfg.Cassandra, mf, s.telset.Logger)
 		case cfg.Elasticsearch != nil:

diff --git a/cmd/query/app/server.go b/cmd/query/app/server.go
@@ -17,9 +17,6 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentstatus"
 	"go.opentelemetry.io/collector/config/configgrpc"
-	"go.opentelemetry.io/collector/config/configtelemetry"
-	"go.opentelemetry.io/otel/metric"
-	"go.opentelemetry.io/otel/metric/noop"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health"
@@ -148,11 +145,9 @@ func createGRPCServer(
 		ctx,
 		telset.Host,
 		component.TelemetrySettings{
-			Logger:         telset.Logger,
-			TracerProvider: telset.TracerProvider,
-			LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-				return noop.NewMeterProvider()
-			},
+			Logger:               telset.Logger,
+			TracerProvider:       telset.TracerProvider,
+			LeveledMeterProvider: telset.LeveledMeterProvider,
 		},
 		grpcOpts...)
 }
@@ -219,11 +214,9 @@ func createHTTPServer(
 		ctx,
 		telset.Host,
 		component.TelemetrySettings{
-			Logger:         telset.Logger,
-			TracerProvider: telset.TracerProvider,
-			LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-				return noop.NewMeterProvider()
-			},
+			Logger:               telset.Logger,
+			TracerProvider:       telset.TracerProvider,
+			LeveledMeterProvider: telset.LeveledMeterProvider,
 		},
 		handler,
 	)

diff --git a/cmd/query/app/server_test.go b/cmd/query/app/server_test.go
@@ -21,7 +21,10 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/config/configtls"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/metric/noop"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
 	"go.uber.org/zap"
@@ -53,6 +56,9 @@ func initTelSet(logger *zap.Logger, tracerProvider *jtracer.JTracer, hc *healthc
 		TracerProvider: tracerProvider.OTEL,
 		ReportStatus:   telemetery.HCAdapter(hc),
 		Host:           componenttest.NewNopHost(),
+		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+			return noop.NewMeterProvider()
+		},
 	}
 }
 

diff --git a/cmd/query/app/token_propagation_test.go b/cmd/query/app/token_propagation_test.go
@@ -17,6 +17,9 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/metric/noop"
 	"go.uber.org/zap/zaptest"
 
 	"github.com/jaegertracing/jaeger/cmd/internal/flags"
@@ -89,6 +92,9 @@ func runQueryService(t *testing.T, esURL string) *Server {
 		Logger:         flagsSvc.Logger,
 		TracerProvider: jtracer.NoOp().OTEL,
 		ReportStatus:   telemetery.HCAdapter(flagsSvc.HC()),
+		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+			return noop.NewMeterProvider()
+		},
 	}
 	server, err := NewServer(context.Background(), querySvc, nil,
 		&QueryOptions{

diff --git a/cmd/query/main.go b/cmd/query/main.go
@@ -12,6 +12,9 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/metric/noop"
 	_ "go.uber.org/automaxprocs"
 	"go.uber.org/zap"
 
@@ -108,6 +111,9 @@ func main() {
 				Logger:         logger,
 				TracerProvider: jt.OTEL,
 				ReportStatus:   telemetery.HCAdapter(svc.HC()),
+				LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+					return noop.NewMeterProvider()
+				},
 			}
 			server, err := app.NewServer(context.Background(), queryService, metricsQueryService, queryOpts, tm, telset)
 			if err != nil {

diff --git a/cmd/remote-storage/app/server_test.go b/cmd/remote-storage/app/server_test.go
@@ -13,6 +13,9 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component/componentstatus"
+	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/metric/noop"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest/observer"
 	"google.golang.org/grpc"
@@ -45,6 +48,9 @@ func TestNewServer_CreateStorageErrors(t *testing.T) {
 	telset := telemetery.Setting{
 		Logger:       zap.NewNop(),
 		ReportStatus: func(*componentstatus.Event) {},
+		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+			return noop.NewMeterProvider()
+		},
 	}
 	f := func() (*Server, error) {
 		return NewServer(

diff --git a/cmd/remote-storage/main.go b/cmd/remote-storage/main.go
@@ -10,6 +10,9 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/metric/noop"
 	_ "go.uber.org/automaxprocs"
 	"go.uber.org/zap"
 
@@ -70,6 +73,9 @@ func main() {
 			telset := telemetery.Setting{
 				Logger:       svc.Logger,
 				ReportStatus: telemetery.HCAdapter(svc.HC()),
+				LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+					return noop.NewMeterProvider()
+				},
 			}
 			server, err := app.NewServer(opts, storageFactory, tm, telset)
 			if err != nil {

diff --git a/pkg/telemetery/settings.go b/pkg/telemetery/settings.go
@@ -6,6 +6,8 @@ package telemetery
 import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componentstatus"
+	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 
@@ -14,11 +16,12 @@ import (
 )
 
 type Setting struct {
-	Logger         *zap.Logger
-	TracerProvider trace.TracerProvider
-	Metrics        metrics.Factory
-	ReportStatus   func(*componentstatus.Event)
-	Host           component.Host
+	Logger               *zap.Logger
+	Metrics              metrics.Factory
+	LeveledMeterProvider func(configtelemetry.Level) metric.MeterProvider
+	TracerProvider       trace.TracerProvider
+	ReportStatus         func(*componentstatus.Event)
+	Host                 component.Host
 }
 
 func HCAdapter(hc *healthcheck.HealthCheck) func(*componentstatus.Event) {

diff --git a/plugin/storage/grpc/factory.go b/plugin/storage/grpc/factory.go
@@ -18,14 +18,14 @@ import (
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/metric"
-	noopmetric "go.opentelemetry.io/otel/metric/noop"
 	"go.opentelemetry.io/otel/trace"
 	"go.opentelemetry.io/otel/trace/noop"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 
 	"github.com/jaegertracing/jaeger/pkg/bearertoken"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
@@ -51,6 +51,7 @@ type Factory struct {
 	tracedRemoteConn   *grpc.ClientConn
 	untracedRemoteConn *grpc.ClientConn
 	host               component.Host
+	meterProvider      metric.MeterProvider
 }
 
 // NewFactory creates a new Factory.
@@ -63,14 +64,13 @@ func NewFactory() *Factory {
 // NewFactoryWithConfig is used from jaeger(v2).
 func NewFactoryWithConfig(
 	cfg Config,
-	metricsFactory metrics.Factory,
-	logger *zap.Logger,
-	host component.Host,
+	telset telemetery.Setting,
 ) (*Factory, error) {
 	f := NewFactory()
 	f.config = cfg
-	f.host = host
-	if err := f.Initialize(metricsFactory, logger); err != nil {
+	f.host = telset.Host
+	f.meterProvider = telset.LeveledMeterProvider(configtelemetry.LevelNone)
+	if err := f.Initialize(telset.Metrics, telset.Logger); err != nil {
 		return nil, err
 	}
 	return f, nil
@@ -93,8 +93,8 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger)
 	f.metricsFactory, f.logger = metricsFactory, logger
 	f.tracerProvider = otel.GetTracerProvider()
 
-	tracedTelset := getTelset(logger, f.tracerProvider)
-	untracedTelset := getTelset(logger, noop.NewTracerProvider())
+	tracedTelset := getTelset(logger, f.tracerProvider, f.meterProvider)
+	untracedTelset := getTelset(logger, noop.NewTracerProvider(), f.meterProvider)
 	newClientFn := func(telset component.TelemetrySettings, opts ...grpc.DialOption) (conn *grpc.ClientConn, err error) {
 		clientOpts := make([]configgrpc.ToClientConnOption, 0)
 		for _, opt := range opts {
@@ -232,13 +232,12 @@ func (f *Factory) Close() error {
 	return errors.Join(errs...)
 }
 
-func getTelset(logger *zap.Logger, tracerProvider trace.TracerProvider) component.TelemetrySettings {
+func getTelset(logger *zap.Logger, tracerProvider trace.TracerProvider, meterProvider metric.MeterProvider) component.TelemetrySettings {
 	return component.TelemetrySettings{
 		Logger:         logger,
 		TracerProvider: tracerProvider,
-		// TODO needs to be joined with the metricsFactory
 		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
-			return noopmetric.NewMeterProvider()
+			return meterProvider
 		},
 	}
 }
diff --git a/plugin/storage/grpc/factory_test.go b/plugin/storage/grpc/factory_test.go
@@ -19,12 +19,16 @@ import (
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/configauth"
 	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/configtelemetry"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/metric/noop"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks"
@@ -106,8 +110,16 @@ func TestNewFactoryError(t *testing.T) {
 			Auth: &configauth.Authentication{},
 		},
 	}
+	telset := telemetery.Setting{
+		Logger: zap.NewNop(),
+		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+			return noop.NewMeterProvider()
+		},
+		Host:    componenttest.NewNopHost(),
+		Metrics: metrics.NullFactory,
+	}
 	t.Run("with_config", func(t *testing.T) {
-		_, err := NewFactoryWithConfig(*cfg, metrics.NullFactory, zap.NewNop(), componenttest.NewNopHost())
+		_, err := NewFactoryWithConfig(*cfg, telset)
 		assert.ErrorContains(t, err, "authenticator")
 	})
 
@@ -125,7 +137,7 @@ func TestNewFactoryError(t *testing.T) {
 			ClientConfig: configgrpc.ClientConfig{
 				Endpoint: ":0",
 			},
-		}, metrics.NullFactory, zap.NewNop(), componenttest.NewNopHost())
+		}, telset)
 		require.NoError(t, err)
 		t.Cleanup(func() { require.NoError(t, f.Close()) })
 		newClientFn := func(_ component.TelemetrySettings, _ ...grpc.DialOption) (conn *grpc.ClientConn, err error) {
@@ -176,7 +188,15 @@ func TestGRPCStorageFactoryWithConfig(t *testing.T) {
 			Enabled: true,
 		},
 	}
-	f, err := NewFactoryWithConfig(cfg, metrics.NullFactory, zap.NewNop(), componenttest.NewNopHost())
+	telset := telemetery.Setting{
+		Logger: zap.NewNop(),
+		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+			return noop.NewMeterProvider()
+		},
+		Host:    componenttest.NewNopHost(),
+		Metrics: metrics.NullFactory,
+	}
+	f, err := NewFactoryWithConfig(cfg, telset)
 	require.NoError(t, err)
 	require.NoError(t, f.Close())
 }

diff --git a/plugin/storage/integration/remote_memory_storage.go b/plugin/storage/integration/remote_memory_storage.go
@@ -10,6 +10,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/metric/noop"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
 	"google.golang.org/grpc"
@@ -51,6 +54,9 @@ func StartNewRemoteMemoryStorage(t *testing.T) *RemoteMemoryStorage {
 	telset := telemetery.Setting{
 		Logger:       logger,
 		ReportStatus: telemetery.HCAdapter(healthcheck.New()),
+		LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+			return noop.NewMeterProvider()
+		},
 	}
 	server, err := app.NewServer(opts, storageFactory, tm, telset)
 	require.NoError(t, err)