Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: Yuri Shkuro <github@ysh.us>
  • Loading branch information
yurishkuro committed Sep 11, 2024
1 parent 5b29ca4 commit 67c0a78
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cmd/jaeger/internal/extension/jaegerquery/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
"go.opentelemetry.io/otel/metric"
noopMeter "go.opentelemetry.io/otel/metric/noop"
noopmetric "go.opentelemetry.io/otel/metric/noop"
"go.uber.org/zap"
"go.uber.org/zap/zaptest"

Expand Down Expand Up @@ -193,7 +193,7 @@ func TestServerStart(t *testing.T) {
LeveledMeterProvider: func(level configtelemetry.Level) metric.MeterProvider {

Check failure on line 193 in cmd/jaeger/internal/extension/jaegerquery/server_test.go

View workflow job for this annotation

GitHub Actions / lint

unused-parameter: parameter 'level' seems to be unused, consider removing or renaming it as _ (revive)
return noopmetric.NewMeterProvider()
},
MeterProvider: noopMeter.NewMeterProvider(),
MeterProvider: noopmetric.NewMeterProvider(),
}
tt.config.HTTP.Endpoint = ":0"
tt.config.GRPC.NetAddr.Endpoint = ":0"
Expand Down
7 changes: 7 additions & 0 deletions plugin/storage/grpc/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ import (
"github.com/spf13/viper"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configtelemetry"
"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.uber.org/zap"
"google.golang.org/grpc"
Expand Down Expand Up @@ -93,6 +96,10 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger)
telset := component.TelemetrySettings{
Logger: logger,
TracerProvider: f.tracerProvider,
// TODO needs to be joined with the metricsFactory
LeveledMeterProvider: func(level configtelemetry.Level) metric.MeterProvider {

Check failure on line 100 in plugin/storage/grpc/factory.go

View workflow job for this annotation

GitHub Actions / lint

unused-parameter: parameter 'level' seems to be unused, consider removing or renaming it as _ (revive)
return noopmetric.NewMeterProvider()
},
}
newClientFn := func(opts ...grpc.DialOption) (conn *grpc.ClientConn, err error) {
return f.configV2.ToClientConn(context.Background(), componenttest.NewNopHost(), telset, opts...)
Expand Down

0 comments on commit 67c0a78

Please sign in to comment.