Skip to content

Commit cfb5a96

Browse files
authored
Drop stale replace directive on otelgrpc (#53117)
### What does this PR do? Remove the `v0.60.0` version pin on `otelgrpc`, thus making `v0.69.0` actual. ### Motivation kubernetes/apiserver@b887c9e ("Drop usages of deprecated otelgrpc methods") was named as the removal condition: ``` // TODO(songy23): remove this once kubernetes/apiserver@b887c9e is brought to agent ``` That commit indeed first landed in `k8s.io/apiserver v0.34.0`. It turns out that a number of PRs had put the agent way past that threshold: | PR | `k8s.io/apiserver` | |--------|----------------------------| | #37844 | v0.32.2 -> **v0.34.1** | | #42171 | -> v0.35.0-alpha.0 | | #46808 | -> v0.35.0 | | #48796 | -> v0.35.3 | | #49973 | -> v0.35.4 | | #51049 | -> v0.35.5 | Dropping the stale `replace` directive is therefore safe and sound. Co-authored-by: regis.desgroppes <regis.desgroppes@datadoghq.com>
1 parent a5a3729 commit cfb5a96

3 files changed

Lines changed: 15 additions & 52 deletions

File tree

LICENSE-3rdparty.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2991,11 +2991,13 @@ core,go.opentelemetry.io/otel/semconv/v1.26.0,Apache-2.0,Copyright The OpenTelem
29912991
core,go.opentelemetry.io/otel/semconv/v1.27.0,Apache-2.0,Copyright The OpenTelemetry Authors
29922992
core,go.opentelemetry.io/otel/semconv/v1.37.0,Apache-2.0,Copyright The OpenTelemetry Authors
29932993
core,go.opentelemetry.io/otel/semconv/v1.37.0/goconv,Apache-2.0,Copyright The OpenTelemetry Authors
2994+
core,go.opentelemetry.io/otel/semconv/v1.37.0/rpcconv,Apache-2.0,Copyright The OpenTelemetry Authors
29942995
core,go.opentelemetry.io/otel/semconv/v1.38.0,Apache-2.0,Copyright The OpenTelemetry Authors
29952996
core,go.opentelemetry.io/otel/semconv/v1.40.0,Apache-2.0,Copyright The OpenTelemetry Authors
29962997
core,go.opentelemetry.io/otel/semconv/v1.41.0,Apache-2.0,Copyright The OpenTelemetry Authors
29972998
core,go.opentelemetry.io/otel/semconv/v1.41.0/httpconv,Apache-2.0,Copyright The OpenTelemetry Authors
29982999
core,go.opentelemetry.io/otel/semconv/v1.41.0/otelconv,Apache-2.0,Copyright The OpenTelemetry Authors
3000+
core,go.opentelemetry.io/otel/semconv/v1.41.0/rpcconv,Apache-2.0,Copyright The OpenTelemetry Authors
29993001
core,go.opentelemetry.io/otel/semconv/v1.5.0,Apache-2.0,Copyright The OpenTelemetry Authors
30003002
core,go.opentelemetry.io/otel/semconv/v1.6.1,Apache-2.0,Copyright The OpenTelemetry Authors
30013003
core,go.opentelemetry.io/otel/semconv/v1.9.0,Apache-2.0,Copyright The OpenTelemetry Authors

go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,9 +1166,6 @@ require (
11661166
go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect
11671167
)
11681168

1169-
// TODO(songy23): remove this once https://github.com/kubernetes/apiserver/commit/b887c9ebecf558a2001fc5c5dbd5c87fd672500c is brought to agent
1170-
replace go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0
1171-
11721169
replace github.com/vishvananda/netlink => github.com/DataDog/netlink v1.0.1-0.20240223195320-c7a4f832a3d1
11731170

11741171
// use datadog fork of vault/api/auth/aws to reduce binary size for secret-generic-connector

0 commit comments

Comments
 (0)