From cce8551272de44882a3cd4fc7c06805247941086 Mon Sep 17 00:00:00 2001 From: TommyStarK Date: Fri, 7 Jun 2024 19:57:37 +0200 Subject: [PATCH] kube-apiserver: remove deprecated otel NewNoopTracerProvider Signed-off-by: TommyStarK --- cmd/kube-apiserver/app/options/options_test.go | 4 ++-- pkg/controlplane/apiserver/config.go | 4 ++-- pkg/controlplane/apiserver/options/options_test.go | 4 ++-- .../pkg/cmd/server/options/options.go | 4 ++-- .../pkg/endpoints/filterlatency/filterlatency_test.go | 6 +++--- .../k8s.io/apiserver/pkg/storage/storagebackend/config.go | 3 ++- .../pkg/storage/storagebackend/factory/tls_test.go | 4 ++-- staging/src/k8s.io/component-base/tracing/utils.go | 3 ++- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go index cb3e6d9ab91..2fa5da605a6 100644 --- a/cmd/kube-apiserver/app/options/options_test.go +++ b/cmd/kube-apiserver/app/options/options_test.go @@ -25,7 +25,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/spf13/pflag" - oteltrace "go.opentelemetry.io/otel/trace" + noopoteltrace "go.opentelemetry.io/otel/trace/noop" "k8s.io/apiserver/pkg/admission" apiserveroptions "k8s.io/apiserver/pkg/server/options" @@ -155,7 +155,7 @@ func TestAddFlags(t *testing.T) { KeyFile: "/var/run/kubernetes/etcd.key", TrustedCAFile: "/var/run/kubernetes/etcdca.crt", CertFile: "/var/run/kubernetes/etcdce.crt", - TracerProvider: oteltrace.NewNoopTracerProvider(), + TracerProvider: noopoteltrace.NewTracerProvider(), }, Prefix: "/registry", CompactionInterval: storagebackend.DefaultCompactInterval, diff --git a/pkg/controlplane/apiserver/config.go b/pkg/controlplane/apiserver/config.go index 127edc55e06..b413fac34c6 100644 --- a/pkg/controlplane/apiserver/config.go +++ b/pkg/controlplane/apiserver/config.go @@ -23,7 +23,7 @@ import ( "net/http" "time" - oteltrace "go.opentelemetry.io/otel/trace" + noopoteltrace "go.opentelemetry.io/otel/trace/noop" "k8s.io/apimachinery/pkg/runtime" utilnet "k8s.io/apimachinery/pkg/util/net" @@ -181,7 +181,7 @@ func BuildGenericConfig( if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.APIServerTracing) { s.Etcd.StorageConfig.Transport.TracerProvider = genericConfig.TracerProvider } else { - s.Etcd.StorageConfig.Transport.TracerProvider = oteltrace.NewNoopTracerProvider() + s.Etcd.StorageConfig.Transport.TracerProvider = noopoteltrace.NewTracerProvider() } storageFactoryConfig := kubeapiserver.NewStorageFactoryConfig() diff --git a/pkg/controlplane/apiserver/options/options_test.go b/pkg/controlplane/apiserver/options/options_test.go index 28c6cce137b..88fe5b961dd 100644 --- a/pkg/controlplane/apiserver/options/options_test.go +++ b/pkg/controlplane/apiserver/options/options_test.go @@ -24,7 +24,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/spf13/pflag" - oteltrace "go.opentelemetry.io/otel/trace" + noopoteltrace "go.opentelemetry.io/otel/trace/noop" "k8s.io/apiserver/pkg/admission" apiserveroptions "k8s.io/apiserver/pkg/server/options" @@ -141,7 +141,7 @@ func TestAddFlags(t *testing.T) { KeyFile: "/var/run/kubernetes/etcd.key", TrustedCAFile: "/var/run/kubernetes/etcdca.crt", CertFile: "/var/run/kubernetes/etcdce.crt", - TracerProvider: oteltrace.NewNoopTracerProvider(), + TracerProvider: noopoteltrace.NewTracerProvider(), }, Prefix: "/registry", CompactionInterval: storagebackend.DefaultCompactInterval, diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go index ef77ee42e91..3d42acf8b3d 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go @@ -23,7 +23,7 @@ import ( "net/url" "github.com/spf13/pflag" - oteltrace "go.opentelemetry.io/otel/trace" + noopoteltrace "go.opentelemetry.io/otel/trace/noop" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" @@ -119,7 +119,7 @@ func (o CustomResourceDefinitionsServerOptions) Config() (*apiserver.Config, err ExtraConfig: apiserver.ExtraConfig{ CRDRESTOptionsGetter: NewCRDRESTOptionsGetter(*o.RecommendedOptions.Etcd, serverConfig.ResourceTransformers, serverConfig.StorageObjectCountTracker), ServiceResolver: &serviceResolver{serverConfig.SharedInformerFactory.Core().V1().Services().Lister()}, - AuthResolverWrapper: webhook.NewDefaultAuthenticationInfoResolverWrapper(nil, nil, serverConfig.LoopbackClientConfig, oteltrace.NewNoopTracerProvider()), + AuthResolverWrapper: webhook.NewDefaultAuthenticationInfoResolverWrapper(nil, nil, serverConfig.LoopbackClientConfig, noopoteltrace.NewTracerProvider()), }, } return config, nil diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filterlatency/filterlatency_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filterlatency/filterlatency_test.go index 9ab14240e37..de138ca3ca0 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filterlatency/filterlatency_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filterlatency/filterlatency_test.go @@ -25,7 +25,7 @@ import ( sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" - "go.opentelemetry.io/otel/trace" + noopoteltrace "go.opentelemetry.io/otel/trace/noop" testingclock "k8s.io/utils/clock/testing" ) @@ -45,7 +45,7 @@ func TestTrackStartedWithContextAlreadyHasFilterRecord(t *testing.T) { }) requestFilterStarted := time.Now() - wrapped := trackStarted(handler, trace.NewNoopTracerProvider(), filterName, testingclock.NewFakeClock(requestFilterStarted)) + wrapped := trackStarted(handler, noopoteltrace.NewTracerProvider(), filterName, testingclock.NewFakeClock(requestFilterStarted)) testRequest, err := http.NewRequest(http.MethodGet, "/api/v1/namespaces", nil) if err != nil { @@ -88,7 +88,7 @@ func TestTrackStartedWithContextDoesNotHaveFilterRecord(t *testing.T) { }) requestFilterStarted := time.Now() - wrapped := trackStarted(handler, trace.NewNoopTracerProvider(), filterName, testingclock.NewFakeClock(requestFilterStarted)) + wrapped := trackStarted(handler, noopoteltrace.NewTracerProvider(), filterName, testingclock.NewFakeClock(requestFilterStarted)) testRequest, err := http.NewRequest(http.MethodGet, "/api/v1/namespaces", nil) if err != nil { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go index 93b1e707f66..822470778df 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go @@ -20,6 +20,7 @@ import ( "time" oteltrace "go.opentelemetry.io/otel/trace" + noopoteltrace "go.opentelemetry.io/otel/trace/noop" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -117,6 +118,6 @@ func NewDefaultConfig(prefix string, codec runtime.Codec) *Config { HealthcheckTimeout: DefaultHealthcheckTimeout, ReadycheckTimeout: DefaultReadinessTimeout, LeaseManagerConfig: etcd3.NewDefaultLeaseManagerConfig(), - Transport: TransportConfig{TracerProvider: oteltrace.NewNoopTracerProvider()}, + Transport: TransportConfig{TracerProvider: noopoteltrace.NewTracerProvider()}, } } diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go index c35a7cb37ce..2f22cd06440 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go @@ -25,7 +25,7 @@ import ( "testing" "go.etcd.io/etcd/client/pkg/v3/transport" - oteltrace "go.opentelemetry.io/otel/trace" + noopoteltrace "go.opentelemetry.io/otel/trace/noop" apitesting "k8s.io/apimachinery/pkg/api/apitesting" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -77,7 +77,7 @@ func TestTLSConnection(t *testing.T) { CertFile: certFile, KeyFile: keyFile, TrustedCAFile: caFile, - TracerProvider: oteltrace.NewNoopTracerProvider(), + TracerProvider: noopoteltrace.NewTracerProvider(), }, Codec: codec, } diff --git a/staging/src/k8s.io/component-base/tracing/utils.go b/staging/src/k8s.io/component-base/tracing/utils.go index b5141f03388..dde7a5b28d2 100644 --- a/staging/src/k8s.io/component-base/tracing/utils.go +++ b/staging/src/k8s.io/component-base/tracing/utils.go @@ -27,6 +27,7 @@ import ( sdktrace "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.17.0" oteltrace "go.opentelemetry.io/otel/trace" + noopoteltrace "go.opentelemetry.io/otel/trace/noop" "k8s.io/client-go/transport" "k8s.io/component-base/tracing/api/v1" @@ -47,7 +48,7 @@ func (n *noopTracerProvider) Shutdown(context.Context) error { } func NewNoopTracerProvider() TracerProvider { - return &noopTracerProvider{TracerProvider: oteltrace.NewNoopTracerProvider()} + return &noopTracerProvider{TracerProvider: noopoteltrace.NewTracerProvider()} } // NewProvider creates a TracerProvider in a component, and enforces recommended tracing behavior