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

kubelet: remove deprecated otel NewNoopTracerProvider

Browse Source 
Signed-off-by: TommyStarK <thomasmilox@gmail.com>
This commit is contained in:
TommyStarK 2024-05-22 17:38:20 +02:00
parent 902a6b55eb
commit c0ed4972ac
No known key found for this signature in database
GPG Key ID: 9D2DFCECABB40F9E
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/images/image_gc_manager_test.go
View File

@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"go.uber.org/mock/gomock" "go.uber.org/mock/gomock"
oteltrace "go.opentelemetry.io/otel/trace" noopoteltrace "go.opentelemetry.io/otel/trace/noop"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
@ -51,7 +51,7 @@ func newRealImageGCManager(policy ImageGCPolicy, mockStatsProvider stats.Provide
imageRecords: make(map[string]*imageRecord), imageRecords: make(map[string]*imageRecord),
statsProvider: mockStatsProvider, statsProvider: mockStatsProvider,
recorder: &record.FakeRecorder{}, recorder: &record.FakeRecorder{},
tracer: oteltrace.NewNoopTracerProvider().Tracer(""), tracer: noopoteltrace.NewTracerProvider().Tracer(""),
}, fakeRuntime }, fakeRuntime
} }
@ -949,7 +949,7 @@ func TestValidateImageGCPolicy(t *testing.T) {
} }
for _, tc := range testCases { for _, tc := range testCases {
if _, err := NewImageGCManager(nil, nil, nil, nil, tc.imageGCPolicy, oteltrace.NewNoopTracerProvider()); err != nil { if _, err := NewImageGCManager(nil, nil, nil, nil, tc.imageGCPolicy, noopoteltrace.NewTracerProvider()); err != nil {
if err.Error() != tc.expectErr { if err.Error() != tc.expectErr {
t.Errorf("[%s:]Expected err:%v, but got:%v", tc.name, tc.expectErr, err.Error()) t.Errorf("[%s:]Expected err:%v, but got:%v", tc.name, tc.expectErr, err.Error())
} }

9
pkg/kubelet/kubelet_test.go
View File

@ -34,6 +34,7 @@ import (
sdktrace "go.opentelemetry.io/otel/sdk/trace" sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/sdk/trace/tracetest" "go.opentelemetry.io/otel/sdk/trace/tracetest"
oteltrace "go.opentelemetry.io/otel/trace" oteltrace "go.opentelemetry.io/otel/trace"
noopoteltrace "go.opentelemetry.io/otel/trace/noop"
cadvisorapi "github.com/google/cadvisor/info/v1" cadvisorapi "github.com/google/cadvisor/info/v1"
cadvisorapiv2 "github.com/google/cadvisor/info/v2" cadvisorapiv2 "github.com/google/cadvisor/info/v2"
@ -257,7 +258,7 @@ func newTestKubeletWithImageList(
kubelet.cadvisor = &cadvisortest.Fake{} kubelet.cadvisor = &cadvisortest.Fake{}
machineInfo, _ := kubelet.cadvisor.MachineInfo() machineInfo, _ := kubelet.cadvisor.MachineInfo()
kubelet.setCachedMachineInfo(machineInfo) kubelet.setCachedMachineInfo(machineInfo)
kubelet.tracer = oteltrace.NewNoopTracerProvider().Tracer("") kubelet.tracer = noopoteltrace.NewTracerProvider().Tracer("")
fakeMirrorClient := podtest.NewFakeMirrorClient() fakeMirrorClient := podtest.NewFakeMirrorClient()
secretManager := secret.NewSimpleSecretManager(kubelet.kubeClient) secretManager := secret.NewSimpleSecretManager(kubelet.kubeClient)
@ -312,7 +313,7 @@ func newTestKubeletWithImageList(
HighThresholdPercent: 90, HighThresholdPercent: 90,
LowThresholdPercent: 80, LowThresholdPercent: 80,
} }
imageGCManager, err := images.NewImageGCManager(fakeRuntime, kubelet.StatsProvider, fakeRecorder, fakeNodeRef, fakeImageGCPolicy, oteltrace.NewNoopTracerProvider()) imageGCManager, err := images.NewImageGCManager(fakeRuntime, kubelet.StatsProvider, fakeRecorder, fakeNodeRef, fakeImageGCPolicy, noopoteltrace.NewTracerProvider())
assert.NoError(t, err) assert.NoError(t, err)
kubelet.imageManager = &fakeImageGCManager{ kubelet.imageManager = &fakeImageGCManager{
fakeImageService: fakeRuntime, fakeImageService: fakeRuntime,
@ -3052,7 +3053,7 @@ func TestNewMainKubeletStandAlone(t *testing.T) {
MemoryThrottlingFactor: utilpointer.Float64(0), MemoryThrottlingFactor: utilpointer.Float64(0),
} }
var prober volume.DynamicPluginProber var prober volume.DynamicPluginProber
tp := oteltrace.NewNoopTracerProvider() tp := noopoteltrace.NewTracerProvider()
mockCtrl := gomock.NewController(t) mockCtrl := gomock.NewController(t)
defer mockCtrl.Finish() defer mockCtrl.Finish()
cadvisor := cadvisortest.NewMockInterface(mockCtrl) cadvisor := cadvisortest.NewMockInterface(mockCtrl)
@ -3072,7 +3073,7 @@ func TestNewMainKubeletStandAlone(t *testing.T) {
fakeRuntime.Stop() fakeRuntime.Stop()
}() }()
fakeRecorder := &record.FakeRecorder{} fakeRecorder := &record.FakeRecorder{}
rtSvc := createRemoteRuntimeService(endpoint, t, oteltrace.NewNoopTracerProvider()) rtSvc := createRemoteRuntimeService(endpoint, t, noopoteltrace.NewTracerProvider())
kubeDep := &Dependencies{ kubeDep := &Dependencies{
Auth: nil, Auth: nil,
CAdvisorInterface: cadvisor, CAdvisorInterface: cadvisor,

4
pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
View File

@ -31,7 +31,7 @@ import (
cadvisorapi "github.com/google/cadvisor/info/v1" cadvisorapi "github.com/google/cadvisor/info/v1"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
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"
@ -71,7 +71,7 @@ func customTestRuntimeManager(keyring *credentialprovider.BasicDockerKeyring) (*
MemoryCapacity: uint64(memoryCapacityQuantity.Value()), MemoryCapacity: uint64(memoryCapacityQuantity.Value()),
} }
osInterface := &containertest.FakeOS{} osInterface := &containertest.FakeOS{}
manager, err := newFakeKubeRuntimeManager(fakeRuntimeService, fakeImageService, machineInfo, osInterface, &containertest.FakeRuntimeHelper{}, keyring, oteltrace.NewNoopTracerProvider().Tracer("")) manager, err := newFakeKubeRuntimeManager(fakeRuntimeService, fakeImageService, machineInfo, osInterface, &containertest.FakeRuntimeHelper{}, keyring, noopoteltrace.NewTracerProvider().Tracer(""))
return fakeRuntimeService, fakeImageService, manager, err return fakeRuntimeService, fakeImageService, manager, err
} }