From 0a0b88054e6e380514e37af66b667a0cb57a9a3b Mon Sep 17 00:00:00 2001 From: toschli Date: Mon, 2 Oct 2023 13:37:36 +0200 Subject: [PATCH] fixed config --- backend/pkg/helper/tracing.go | 8 ++++---- helm/kioku/templates/frontend_proxy.yaml | 2 +- helm/kioku/templates/jaeger.yaml | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/backend/pkg/helper/tracing.go b/backend/pkg/helper/tracing.go index 6b24f3b2..00caabb7 100644 --- a/backend/pkg/helper/tracing.go +++ b/backend/pkg/helper/tracing.go @@ -6,7 +6,7 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" "go.opentelemetry.io/otel/sdk/resource" "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.12.0" @@ -15,11 +15,11 @@ import ( func SetupTracing(ctx context.Context, serviceName string) (*trace.TracerProvider, error) { tracingUrl := os.Getenv("TRACING_COLLECTOR") if tracingUrl == "" { - tracingUrl = "simple-prod-collector.observability.svc.cluster.local:4318" + tracingUrl = "simple-prod-collector.observability.svc.cluster.local:4317" } - exporter, err := otlptracehttp.New( + exporter, err := otlptracegrpc.New( ctx, - otlptracehttp.WithEndpoint(tracingUrl), + otlptracegrpc.WithEndpoint(tracingUrl), ) if err != nil { return nil, err diff --git a/helm/kioku/templates/frontend_proxy.yaml b/helm/kioku/templates/frontend_proxy.yaml index 977a61c3..477fcfa2 100644 --- a/helm/kioku/templates/frontend_proxy.yaml +++ b/helm/kioku/templates/frontend_proxy.yaml @@ -40,7 +40,7 @@ spec: envFrom: - configMapRef: name: service-env - -configMapRef: + - configMapRef: name: tracing-config - secretRef: name: {{ .Values.frontend_proxy.keySecret }} diff --git a/helm/kioku/templates/jaeger.yaml b/helm/kioku/templates/jaeger.yaml index 1e506921..2b24e3fb 100644 --- a/helm/kioku/templates/jaeger.yaml +++ b/helm/kioku/templates/jaeger.yaml @@ -19,6 +19,5 @@ apiVersion: v1 kind: ConfigMap metadata: name: tracing-config - namespace: observability data: TRACING_COLLECTOR: "simple-prod-collector.observability.svc.cluster.local:4318" \ No newline at end of file