Skip to content

Commit f88262c

Browse files
chahatsagarmainyurishkuro
chahatsagarmain
and
yurishkuro
authored
Pass real MeterProvider to components (#6173)
## Which problem is this PR solving? - Fixes #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]>
1 parent 47e1ee6 commit f88262c

File tree

13 files changed

+103
-34
lines changed

13 files changed

+103
-34
lines changed

‎cmd/all-in-one/main.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ import (
1414

1515
"github.com/spf13/cobra"
1616
"github.com/spf13/viper"
17+
"go.opentelemetry.io/collector/config/configtelemetry"
18+
"go.opentelemetry.io/otel/metric"
19+
"go.opentelemetry.io/otel/metric/noop"
1720
_ "go.uber.org/automaxprocs"
1821
"go.uber.org/zap"
1922

@@ -161,6 +164,9 @@ by default uses only in-memory database.`,
161164
TracerProvider: tracer.OTEL,
162165
Metrics: queryMetricsFactory,
163166
ReportStatus: telemetery.HCAdapter(svc.HC()),
167+
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
168+
return noop.NewMeterProvider()
169+
},
164170
}
165171
// query
166172
querySrv := startQuery(

‎cmd/jaeger/internal/extension/jaegerquery/server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ func (s *server) Start(ctx context.Context, host component.Host) error {
100100
ReportStatus: func(event *componentstatus.Event) {
101101
componentstatus.ReportStatus(host, event)
102102
},
103-
Host: host,
103+
LeveledMeterProvider: s.telset.LeveledMeterProvider,
104+
Host: host,
104105
}
105106

106107
s.server, err = queryApp.NewServer(

‎cmd/jaeger/internal/extension/jaegerstorage/extension.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ import (
1010
"io"
1111

1212
"go.opentelemetry.io/collector/component"
13+
"go.opentelemetry.io/collector/config/configtelemetry"
1314
"go.opentelemetry.io/collector/extension"
15+
"go.opentelemetry.io/otel/metric"
1416

1517
"github.com/jaegertracing/jaeger/internal/metrics/otelmetrics"
1618
"github.com/jaegertracing/jaeger/pkg/metrics"
19+
"github.com/jaegertracing/jaeger/pkg/telemetery"
1720
"github.com/jaegertracing/jaeger/plugin/metrics/prometheus"
1821
"github.com/jaegertracing/jaeger/plugin/storage/badger"
1922
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
@@ -125,8 +128,16 @@ func (s *storageExt) Start(_ context.Context, host component.Host) error {
125128
case cfg.Badger != nil:
126129
factory, err = badger.NewFactoryWithConfig(*cfg.Badger, mf, s.telset.Logger)
127130
case cfg.GRPC != nil:
131+
telset := telemetery.Setting{
132+
Logger: s.telset.Logger,
133+
Host: host,
134+
Metrics: mf,
135+
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
136+
return s.telset.MeterProvider
137+
},
138+
}
128139
//nolint: contextcheck
129-
factory, err = grpc.NewFactoryWithConfig(*cfg.GRPC, mf, s.telset.Logger, host)
140+
factory, err = grpc.NewFactoryWithConfig(*cfg.GRPC, telset)
130141
case cfg.Cassandra != nil:
131142
factory, err = cassandra.NewFactoryWithConfig(*cfg.Cassandra, mf, s.telset.Logger)
132143
case cfg.Elasticsearch != nil:

‎cmd/query/app/server.go

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ import (
1717
"go.opentelemetry.io/collector/component"
1818
"go.opentelemetry.io/collector/component/componentstatus"
1919
"go.opentelemetry.io/collector/config/configgrpc"
20-
"go.opentelemetry.io/collector/config/configtelemetry"
21-
"go.opentelemetry.io/otel/metric"
22-
"go.opentelemetry.io/otel/metric/noop"
2320
"go.uber.org/zap"
2421
"google.golang.org/grpc"
2522
"google.golang.org/grpc/health"
@@ -148,11 +145,9 @@ func createGRPCServer(
148145
ctx,
149146
telset.Host,
150147
component.TelemetrySettings{
151-
Logger: telset.Logger,
152-
TracerProvider: telset.TracerProvider,
153-
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
154-
return noop.NewMeterProvider()
155-
},
148+
Logger: telset.Logger,
149+
TracerProvider: telset.TracerProvider,
150+
LeveledMeterProvider: telset.LeveledMeterProvider,
156151
},
157152
grpcOpts...)
158153
}
@@ -219,11 +214,9 @@ func createHTTPServer(
219214
ctx,
220215
telset.Host,
221216
component.TelemetrySettings{
222-
Logger: telset.Logger,
223-
TracerProvider: telset.TracerProvider,
224-
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
225-
return noop.NewMeterProvider()
226-
},
217+
Logger: telset.Logger,
218+
TracerProvider: telset.TracerProvider,
219+
LeveledMeterProvider: telset.LeveledMeterProvider,
227220
},
228221
handler,
229222
)

‎cmd/query/app/server_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ import (
2121
"go.opentelemetry.io/collector/config/configgrpc"
2222
"go.opentelemetry.io/collector/config/confighttp"
2323
"go.opentelemetry.io/collector/config/confignet"
24+
"go.opentelemetry.io/collector/config/configtelemetry"
2425
"go.opentelemetry.io/collector/config/configtls"
26+
"go.opentelemetry.io/otel/metric"
27+
"go.opentelemetry.io/otel/metric/noop"
2528
sdktrace "go.opentelemetry.io/otel/sdk/trace"
2629
"go.opentelemetry.io/otel/sdk/trace/tracetest"
2730
"go.uber.org/zap"
@@ -53,6 +56,9 @@ func initTelSet(logger *zap.Logger, tracerProvider *jtracer.JTracer, hc *healthc
5356
TracerProvider: tracerProvider.OTEL,
5457
ReportStatus: telemetery.HCAdapter(hc),
5558
Host: componenttest.NewNopHost(),
59+
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
60+
return noop.NewMeterProvider()
61+
},
5662
}
5763
}
5864

‎cmd/query/app/token_propagation_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ import (
1717
"go.opentelemetry.io/collector/config/configgrpc"
1818
"go.opentelemetry.io/collector/config/confighttp"
1919
"go.opentelemetry.io/collector/config/confignet"
20+
"go.opentelemetry.io/collector/config/configtelemetry"
21+
"go.opentelemetry.io/otel/metric"
22+
"go.opentelemetry.io/otel/metric/noop"
2023
"go.uber.org/zap/zaptest"
2124

2225
"github.com/jaegertracing/jaeger/cmd/internal/flags"
@@ -89,6 +92,9 @@ func runQueryService(t *testing.T, esURL string) *Server {
8992
Logger: flagsSvc.Logger,
9093
TracerProvider: jtracer.NoOp().OTEL,
9194
ReportStatus: telemetery.HCAdapter(flagsSvc.HC()),
95+
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
96+
return noop.NewMeterProvider()
97+
},
9298
}
9399
server, err := NewServer(context.Background(), querySvc, nil,
94100
&QueryOptions{

‎cmd/query/main.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ import (
1212

1313
"github.com/spf13/cobra"
1414
"github.com/spf13/viper"
15+
"go.opentelemetry.io/collector/config/configtelemetry"
16+
"go.opentelemetry.io/otel/metric"
17+
"go.opentelemetry.io/otel/metric/noop"
1518
_ "go.uber.org/automaxprocs"
1619
"go.uber.org/zap"
1720

@@ -108,6 +111,9 @@ func main() {
108111
Logger: logger,
109112
TracerProvider: jt.OTEL,
110113
ReportStatus: telemetery.HCAdapter(svc.HC()),
114+
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
115+
return noop.NewMeterProvider()
116+
},
111117
}
112118
server, err := app.NewServer(context.Background(), queryService, metricsQueryService, queryOpts, tm, telset)
113119
if err != nil {

‎cmd/remote-storage/app/server_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ import (
1313
"github.com/stretchr/testify/mock"
1414
"github.com/stretchr/testify/require"
1515
"go.opentelemetry.io/collector/component/componentstatus"
16+
"go.opentelemetry.io/collector/config/configtelemetry"
17+
"go.opentelemetry.io/otel/metric"
18+
"go.opentelemetry.io/otel/metric/noop"
1619
"go.uber.org/zap"
1720
"go.uber.org/zap/zaptest/observer"
1821
"google.golang.org/grpc"
@@ -45,6 +48,9 @@ func TestNewServer_CreateStorageErrors(t *testing.T) {
4548
telset := telemetery.Setting{
4649
Logger: zap.NewNop(),
4750
ReportStatus: func(*componentstatus.Event) {},
51+
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
52+
return noop.NewMeterProvider()
53+
},
4854
}
4955
f := func() (*Server, error) {
5056
return NewServer(

‎cmd/remote-storage/main.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ import (
1010

1111
"github.com/spf13/cobra"
1212
"github.com/spf13/viper"
13+
"go.opentelemetry.io/collector/config/configtelemetry"
14+
"go.opentelemetry.io/otel/metric"
15+
"go.opentelemetry.io/otel/metric/noop"
1316
_ "go.uber.org/automaxprocs"
1417
"go.uber.org/zap"
1518

@@ -70,6 +73,9 @@ func main() {
7073
telset := telemetery.Setting{
7174
Logger: svc.Logger,
7275
ReportStatus: telemetery.HCAdapter(svc.HC()),
76+
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
77+
return noop.NewMeterProvider()
78+
},
7379
}
7480
server, err := app.NewServer(opts, storageFactory, tm, telset)
7581
if err != nil {

‎pkg/telemetery/settings.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ package telemetery
66
import (
77
"go.opentelemetry.io/collector/component"
88
"go.opentelemetry.io/collector/component/componentstatus"
9+
"go.opentelemetry.io/collector/config/configtelemetry"
10+
"go.opentelemetry.io/otel/metric"
911
"go.opentelemetry.io/otel/trace"
1012
"go.uber.org/zap"
1113

@@ -14,11 +16,12 @@ import (
1416
)
1517

1618
type Setting struct {
17-
Logger *zap.Logger
18-
TracerProvider trace.TracerProvider
19-
Metrics metrics.Factory
20-
ReportStatus func(*componentstatus.Event)
21-
Host component.Host
19+
Logger *zap.Logger
20+
Metrics metrics.Factory
21+
LeveledMeterProvider func(configtelemetry.Level) metric.MeterProvider
22+
TracerProvider trace.TracerProvider
23+
ReportStatus func(*componentstatus.Event)
24+
Host component.Host
2225
}
2326

2427
func HCAdapter(hc *healthcheck.HealthCheck) func(*componentstatus.Event) {

0 commit comments

Comments
 (0)