Skip to content

Commit fe2dcdc

Browse files
mahadzaryab1amol-verma-allen
authored andcommitted
[grpc][v2] Use v2 gRPC factory in storage extension (jaegertracing#6969)
## Which problem is this PR solving? - Resolves jaegertracing#6965 ## Description of the changes - This PR updates the jaegerstorage extension to use the new v2 gRPC storage factory ## How was this change tested? - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: Mahad Zaryab <[email protected]>
1 parent f0238f4 commit fe2dcdc

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
2020
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
2121
es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
22-
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc"
2322
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
23+
"github.com/jaegertracing/jaeger/internal/storage/v2/grpc"
2424
)
2525

2626
var (

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
1919
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
2020
es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
21-
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc"
2221
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
2322
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
23+
"github.com/jaegertracing/jaeger/internal/storage/v2/grpc"
2424
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
2525
"github.com/jaegertracing/jaeger/internal/telemetry"
2626
)
@@ -142,7 +142,7 @@ func newStorageExt(config *Config, telset component.TelemetrySettings) *storageE
142142
}
143143
}
144144

145-
func (s *storageExt) Start(_ context.Context, host component.Host) error {
145+
func (s *storageExt) Start(ctx context.Context, host component.Host) error {
146146
telset := telemetry.FromOtelComponent(s.telset, host)
147147
telset.Metrics = telset.Metrics.Namespace(metrics.NSOptions{Name: "jaeger"})
148148
scopedMetricsFactory := func(name, kind, role string) metrics.Factory {
@@ -175,8 +175,7 @@ func (s *storageExt) Start(_ context.Context, host component.Host) error {
175175
case cfg.GRPC != nil:
176176
grpcTelset := telset
177177
grpcTelset.Metrics = scopedMetricsFactory(storageName, "grpc", "tracestore")
178-
//nolint: contextcheck
179-
v1Factory, err = grpc.NewFactoryWithConfig(*cfg.GRPC, grpcTelset)
178+
factory, err = grpc.NewFactory(ctx, *cfg.GRPC, grpcTelset)
180179
case cfg.Cassandra != nil:
181180
v1Factory, err = cassandra.NewFactoryWithConfig(
182181
*cfg.Cassandra,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
esCfg "github.com/jaegertracing/jaeger/internal/storage/elasticsearch/config"
2626
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
2727
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
28-
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc"
2928
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
3029
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
30+
"github.com/jaegertracing/jaeger/internal/storage/v2/grpc"
3131
)
3232

3333
type errorFactory struct {

internal/storage/v2/grpc/factory.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ type Factory struct {
4343

4444
// NewFactory initializes a new gRPC (remote) storage backend.
4545
func NewFactory(
46+
ctx context.Context,
4647
cfg Config,
4748
telset telemetry.Settings,
4849
) (*Factory, error) {
@@ -58,7 +59,7 @@ func NewFactory(
5859
for _, opt := range opts {
5960
clientOpts = append(clientOpts, configgrpc.WithGrpcDialOption(opt))
6061
}
61-
return f.config.ToClientConn(context.Background(), f.telset.Host, telset, clientOpts...)
62+
return f.config.ToClientConn(ctx, f.telset.Host, telset, clientOpts...)
6263
}
6364

6465
if err := f.initializeConnections(readerTelset, writerTelset, newClientFn); err != nil {

internal/storage/v2/grpc/factory_test.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package grpc
55

66
import (
7+
"context"
78
"net"
89
"testing"
910
"time"
@@ -26,7 +27,7 @@ func TestNewFactory_NonEmptyAuthenticator(t *testing.T) {
2627
Auth: &configauth.Authentication{},
2728
},
2829
}
29-
_, err := NewFactory(*cfg, telemetry.NoopSettings())
30+
_, err := NewFactory(context.Background(), *cfg, telemetry.NoopSettings())
3031
require.ErrorContains(t, err, "authenticator is not supported")
3132
}
3233

@@ -50,7 +51,7 @@ func TestNewFactory(t *testing.T) {
5051
},
5152
}
5253
telset := telemetry.NoopSettings()
53-
f, err := NewFactory(cfg, telset)
54+
f, err := NewFactory(context.Background(), cfg, telset)
5455
require.NoError(t, err)
5556
require.NoError(t, f.Close())
5657
}
@@ -86,11 +87,13 @@ func TestFactory(t *testing.T) {
8687
}
8788

8889
func TestInitializeConnections_ClientError(t *testing.T) {
89-
f, err := NewFactory(Config{
90-
ClientConfig: configgrpc.ClientConfig{
91-
Endpoint: ":0",
92-
},
93-
}, telemetry.NoopSettings())
90+
f, err := NewFactory(
91+
context.Background(),
92+
Config{
93+
ClientConfig: configgrpc.ClientConfig{
94+
Endpoint: ":0",
95+
},
96+
}, telemetry.NoopSettings())
9497
require.NoError(t, err)
9598
t.Cleanup(func() { require.NoError(t, f.Close()) })
9699
newClientFn := func(_ component.TelemetrySettings, _ ...grpc.DialOption) (conn *grpc.ClientConn, err error) {

0 commit comments

Comments
 (0)