Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grpc: Replace deprecated otelgrpc interceptors #7237

Closed
wants to merge 4 commits into from
Closed

grpc: Replace deprecated otelgrpc interceptors #7237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99f67a6
grpc: Replace deprecated otelgrpc interceptors
pgporada Jan 3, 2024
004da44
go mod vendor
pgporada Jan 3, 2024
491eaed
Merge branch 'main' into replace-deprecated-otelhttp-interceptors
pgporada Apr 4, 2024
d83d86e
Merge branch 'main' into replace-deprecated-otelhttp-interceptors
pgporada May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions grpc/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,11 @@ func ClientSetup(c *cmd.GRPCClientConfig, tlsConfig *tls.Config, statsRegistry p
unaryInterceptors := []grpc.UnaryClientInterceptor{
cmi.Unary,
cmi.metrics.grpcMetrics.UnaryClientInterceptor(),
otelgrpc.UnaryClientInterceptor(),
}

streamInterceptors := []grpc.StreamClientInterceptor{
cmi.Stream,
cmi.metrics.grpcMetrics.StreamClientInterceptor(),
otelgrpc.StreamClientInterceptor(),
}

target, hostOverride, err := c.MakeTargetAndHostOverride()
Expand All @@ -65,6 +63,7 @@ func ClientSetup(c *cmd.GRPCClientConfig, tlsConfig *tls.Config, statsRegistry p
grpc.WithTransportCredentials(creds),
grpc.WithChainUnaryInterceptor(unaryInterceptors...),
grpc.WithChainStreamInterceptor(streamInterceptors...),
grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
)
}

Expand Down
6 changes: 3 additions & 3 deletions grpc/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/jmhodges/clock"
"github.com/prometheus/client_golang/prometheus"
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/filters"
"google.golang.org/grpc"
"google.golang.org/grpc/health"
healthpb "google.golang.org/grpc/health/grpc_health_v1"
Expand Down Expand Up @@ -154,20 +153,21 @@ func (sb *serverBuilder) Build(tlsConfig *tls.Config, statsRegistry prometheus.R
mi.metrics.grpcMetrics.UnaryServerInterceptor(),
ai.Unary,
mi.Unary,
otelgrpc.UnaryServerInterceptor(otelgrpc.WithInterceptorFilter(filters.Not(filters.HealthCheck()))),
}

streamInterceptors := []grpc.StreamServerInterceptor{
mi.metrics.grpcMetrics.StreamServerInterceptor(),
ai.Stream,
mi.Stream,
otelgrpc.StreamServerInterceptor(),
}

options := []grpc.ServerOption{
grpc.Creds(creds),
grpc.ChainUnaryInterceptor(unaryInterceptors...),
grpc.ChainStreamInterceptor(streamInterceptors...),
// TODO(https://github.com/open-telemetry/opentelemetry-go-contrib/issues/4575):
// Re-add the HealthCheck filter when upstream supports it.
grpc.StatsHandler(otelgrpc.NewServerHandler()),
}
if sb.cfg.MaxConnectionAge.Duration > 0 {
options = append(options,
Expand Down
158 changes: 0 additions & 158 deletions ...entelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/filters/filters.go
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ github.com/zmap/zlint/v3/util
# go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
## explicit; go 1.20
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/filters
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal
# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1
## explicit; go 1.20
Expand Down