Skip to content

Commit 9d2d44a

Browse files
authored
chore(grpc): simplify the code (#7665)
1 parent 24b66af commit 9d2d44a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

instrumentation/google.golang.org/grpc/otelgrpc/metadata_supplier.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
)
1414

1515
type metadataSupplier struct {
16-
metadata *metadata.MD
16+
metadata metadata.MD
1717
}
1818

1919
// assert that metadataSupplier implements the TextMapCarrier interface.
@@ -32,8 +32,8 @@ func (s *metadataSupplier) Set(key, value string) {
3232
}
3333

3434
func (s *metadataSupplier) Keys() []string {
35-
out := make([]string, 0, len(*s.metadata))
36-
for key := range *s.metadata {
35+
out := make([]string, 0, len(s.metadata))
36+
for key := range s.metadata {
3737
out = append(out, key)
3838
}
3939
return out
@@ -47,7 +47,7 @@ func (s *metadataSupplier) Keys() []string {
4747
func Inject(ctx context.Context, md *metadata.MD, opts ...Option) {
4848
c := newConfig(opts)
4949
c.Propagators.Inject(ctx, &metadataSupplier{
50-
metadata: md,
50+
metadata: *md,
5151
})
5252
}
5353

@@ -57,7 +57,7 @@ func inject(ctx context.Context, propagators propagation.TextMapPropagator) cont
5757
md = metadata.MD{}
5858
}
5959
propagators.Inject(ctx, &metadataSupplier{
60-
metadata: &md,
60+
metadata: md,
6161
})
6262
return metadata.NewOutgoingContext(ctx, md)
6363
}
@@ -70,7 +70,7 @@ func inject(ctx context.Context, propagators propagation.TextMapPropagator) cont
7070
func Extract(ctx context.Context, md *metadata.MD, opts ...Option) (baggage.Baggage, trace.SpanContext) {
7171
c := newConfig(opts)
7272
ctx = c.Propagators.Extract(ctx, &metadataSupplier{
73-
metadata: md,
73+
metadata: *md,
7474
})
7575

7676
return baggage.FromContext(ctx), trace.SpanContextFromContext(ctx)
@@ -83,6 +83,6 @@ func extract(ctx context.Context, propagators propagation.TextMapPropagator) con
8383
}
8484

8585
return propagators.Extract(ctx, &metadataSupplier{
86-
metadata: &md,
86+
metadata: md,
8787
})
8888
}

instrumentation/google.golang.org/grpc/otelgrpc/metadata_supplier_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func TestMetadataSupplier(t *testing.T) {
1414
md := metadata.New(map[string]string{
1515
"k1": "v1",
1616
})
17-
ms := &metadataSupplier{&md}
17+
ms := &metadataSupplier{md}
1818

1919
v1 := ms.Get("k1")
2020
assert.Equal(t, "v1", v1)

0 commit comments

Comments
 (0)