github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

cmd/kubelet: remove deprecated otel NewNoopTracerProvider

Browse Source 
Signed-off-by: TommyStarK <thomasmilox@gmail.com>
This commit is contained in:
TommyStarK 2024-05-19 23:43:06 +02:00
parent a31030543c
commit 902a6b55eb
No known key found for this signature in database
GPG Key ID: 9D2DFCECABB40F9E
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubelet/app/server.go
View File

@ -48,6 +48,7 @@ import (
otelsdkresource "go.opentelemetry.io/otel/sdk/resource" otelsdkresource "go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.12.0" semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
oteltrace "go.opentelemetry.io/otel/trace" oteltrace "go.opentelemetry.io/otel/trace"
noopoteltrace "go.opentelemetry.io/otel/trace/noop"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@ -449,7 +450,8 @@ func UnsecuredDependencies(s *options.KubeletServer, featureGate featuregate.Fea
if err != nil { if err != nil {
return nil, err return nil, err
} }
tp := oteltrace.NewNoopTracerProvider() var tp oteltrace.TracerProvider
tp = noopoteltrace.NewTracerProvider()
if utilfeature.DefaultFeatureGate.Enabled(features.KubeletTracing) { if utilfeature.DefaultFeatureGate.Enabled(features.KubeletTracing) {
tp, err = newTracerProvider(s) tp, err = newTracerProvider(s)
if err != nil { if err != nil {
@ -1358,7 +1360,7 @@ func parseResourceList(m map[string]string) (v1.ResourceList, error) {
func newTracerProvider(s *options.KubeletServer) (oteltrace.TracerProvider, error) { func newTracerProvider(s *options.KubeletServer) (oteltrace.TracerProvider, error) {
if s.KubeletConfiguration.Tracing == nil { if s.KubeletConfiguration.Tracing == nil {
return oteltrace.NewNoopTracerProvider(), nil return noopoteltrace.NewTracerProvider(), nil
} }
hostname, err := nodeutil.GetHostname(s.HostnameOverride) hostname, err := nodeutil.GetHostname(s.HostnameOverride)
if err != nil { if err != nil {