Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 05:14:13 +01:00
Code Packages Releases Activity

Merge pull request #1612 from LukeCarrier/fix-otel-tracing

Browse Source 
tracing: test for and address semconv/SDK version conflicts
This commit is contained in:
Kubernetes Prow Robot
2025-01-24 11:09:23 -08:00
committed by GitHub
parent 1a49e116df d5b609b34a
commit fa3fb4e954
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/tracing/tracing.go
View File

@@ -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.24.0"
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
"go.opentelemetry.io/otel/trace"
"google.golang.org/grpc/credentials"
"k8s.io/klog/v2"
@@ -121,7 +121,7 @@ func NewTracerProvider(ctx context.Context, endpoint, caCert, name, namespace st
klog.V(5).InfoS("no name provided, using default service name for tracing", "name", DefaultServiceName)
name = DefaultServiceName
}
resourceOpts := []sdkresource.Option{sdkresource.WithAttributes(semconv.ServiceNameKey.String(name)), sdkresource.WithSchemaURL(semconv.SchemaURL), sdkresource.WithProcess()}
resourceOpts := defaultResourceOpts(name)
if namespace != "" {
resourceOpts = append(resourceOpts, sdkresource.WithAttributes(semconv.ServiceNamespaceKey.String(namespace)))
}
@@ -141,6 +141,10 @@ func NewTracerProvider(ctx context.Context, endpoint, caCert, name, namespace st
return
}
func defaultResourceOpts(name string) []sdkresource.Option {
return []sdkresource.Option{sdkresource.WithAttributes(semconv.ServiceNameKey.String(name)), sdkresource.WithSchemaURL(semconv.SchemaURL), sdkresource.WithProcess()}
}
// Shutdown shuts down the global trace exporter.
func Shutdown(ctx context.Context) error {
tp, ok := provider.(*sdktrace.TracerProvider)

17
pkg/tracing/tracing_test.go Normal file
View File

@@ -0,0 +1,17 @@
package tracing
import (
"context"
"testing"
sdkresource "go.opentelemetry.io/otel/sdk/resource"
)
func TestCreateTraceableResource(t *testing.T) {
ctx := context.TODO()
resourceOpts := defaultResourceOpts("descheduler")
_, err := sdkresource.New(ctx, resourceOpts...)
if err != nil {
t.Errorf("error initialising tracer provider: %!", err)
}
}