From 35c9f226bede95cd78f9ca445e7175b473e620e4 Mon Sep 17 00:00:00 2001
From: Wise-Wizard <saransh.shankar@gmail.com>
Date: Tue, 16 Jul 2024 21:46:51 +0530
Subject: [PATCH] Test configuration changes

Signed-off-by: Wise-Wizard <saransh.shankar@gmail.com>
---
 cmd/jaeger/internal/all-in-one.yaml                | 14 +++++++++++++-
 .../internal/extension/jaegerquery/server.go       | 13 ++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/cmd/jaeger/internal/all-in-one.yaml b/cmd/jaeger/internal/all-in-one.yaml
index 2e99217191f..391db5d86b0 100644
--- a/cmd/jaeger/internal/all-in-one.yaml
+++ b/cmd/jaeger/internal/all-in-one.yaml
@@ -5,7 +5,19 @@ service:
       receivers: [otlp, jaeger, zipkin]
       processors: [batch]
       exporters: [jaeger_storage_exporter]
-
+  telemetry:
+    metrics:
+      level: detailed
+    traces:
+      processors:
+        - batch:
+            schedule_delay: 1000
+            exporter:
+              otlp:
+                endpoint: http://localhost:4318/v1/traces
+                protocol: http/protobuf
+                headers:
+                  Authorization: "Basic ..."
 extensions:
   jaeger_query:
     trace_storage: some_storage
diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go
index d4dfa53715d..bee57a90f40 100644
--- a/cmd/jaeger/internal/extension/jaegerquery/server.go
+++ b/cmd/jaeger/internal/extension/jaegerquery/server.go
@@ -14,7 +14,6 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 	queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
-	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
@@ -73,14 +72,14 @@ func (s *server) Start(_ context.Context, host component.Host) error {
 	// TODO OTel-collector does not initialize the tracer currently
 	// https://github.com/open-telemetry/opentelemetry-collector/issues/7532
 	//nolint
-	tracerProvider, err := jtracer.New("jaeger")
-	if err != nil {
-		return fmt.Errorf("could not initialize a tracer: %w", err)
-	}
-	s.closeTracer = tracerProvider.Close
+	// tracerProvider, err := jtracer.New("jaeger")
+	// if err != nil {
+	// 	return fmt.Errorf("could not initialize a tracer: %w", err)
+	// }
+	// s.closeTracer = tracerProvider.Close
 	telset := telemetery.Setting{
 		Logger:         s.telset.Logger,
-		TracerProvider: tracerProvider.OTEL,
+		TracerProvider: s.telset.TracerProvider,
 		ReportStatus:   s.telset.ReportStatus,
 	}