From d699454d5e01d2f846dd630b395a60883fdf6532 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Thu, 6 Jun 2024 13:05:55 +0000 Subject: [PATCH 1/2] Bump otel semconv to 1.24 --- pkg/tracing/tracing.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tracing/tracing.go b/pkg/tracing/tracing.go index 9af141754..53cb4f7fc 100644 --- a/pkg/tracing/tracing.go +++ b/pkg/tracing/tracing.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/otel/propagation" sdkresource "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" - semconv "go.opentelemetry.io/otel/semconv/v1.12.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" "go.opentelemetry.io/otel/trace" "google.golang.org/grpc/credentials" "k8s.io/klog/v2" From 47cc875fe8bde698c53931af70abebb55d91ebb8 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Thu, 6 Jun 2024 13:52:29 +0000 Subject: [PATCH 2/2] Don't crash if failing to create tracer provider --- cmd/descheduler/app/server.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/descheduler/app/server.go b/cmd/descheduler/app/server.go index e7ef71346..74651128d 100644 --- a/cmd/descheduler/app/server.go +++ b/cmd/descheduler/app/server.go @@ -117,9 +117,10 @@ func NewDeschedulerCommand(out io.Writer) *cobra.Command { func Run(ctx context.Context, rs *options.DeschedulerServer) error { err := tracing.NewTracerProvider(ctx, rs.Tracing.CollectorEndpoint, rs.Tracing.TransportCert, rs.Tracing.ServiceName, rs.Tracing.ServiceNamespace, rs.Tracing.SampleRate, rs.Tracing.FallbackToNoOpProviderOnError) if err != nil { - return err + klog.ErrorS(err, "failed to create tracer provider") } defer tracing.Shutdown(ctx) + // increase the fake watch channel so the dry-run mode can be run // over a cluster with thousands of pods watch.DefaultChanSize = 100000