Skip to content

Commit 902a6b5

Browse files
committed
cmd/kubelet: remove deprecated otel NewNoopTracerProvider
Signed-off-by: TommyStarK <[email protected]>
1 parent a310305 commit 902a6b5

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cmd/kubelet/app/server.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import (
4848
otelsdkresource "go.opentelemetry.io/otel/sdk/resource"
4949
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
5050
oteltrace "go.opentelemetry.io/otel/trace"
51+
noopoteltrace "go.opentelemetry.io/otel/trace/noop"
5152
v1 "k8s.io/api/core/v1"
5253
"k8s.io/apimachinery/pkg/api/resource"
5354
"k8s.io/apimachinery/pkg/runtime"
@@ -449,7 +450,8 @@ func UnsecuredDependencies(s *options.KubeletServer, featureGate featuregate.Fea
449450
if err != nil {
450451
return nil, err
451452
}
452-
tp := oteltrace.NewNoopTracerProvider()
453+
var tp oteltrace.TracerProvider
454+
tp = noopoteltrace.NewTracerProvider()
453455
if utilfeature.DefaultFeatureGate.Enabled(features.KubeletTracing) {
454456
tp, err = newTracerProvider(s)
455457
if err != nil {
@@ -1358,7 +1360,7 @@ func parseResourceList(m map[string]string) (v1.ResourceList, error) {
13581360

13591361
func newTracerProvider(s *options.KubeletServer) (oteltrace.TracerProvider, error) {
13601362
if s.KubeletConfiguration.Tracing == nil {
1361-
return oteltrace.NewNoopTracerProvider(), nil
1363+
return noopoteltrace.NewTracerProvider(), nil
13621364
}
13631365
hostname, err := nodeutil.GetHostname(s.HostnameOverride)
13641366
if err != nil {

0 commit comments

Comments
 (0)