From 1fb343cb50b4b9956c3340b7f4177778b4ba9786 Mon Sep 17 00:00:00 2001
From: Stefan Hellander <stefan@scaleoutsystems.com>
Date: Mon, 29 Apr 2024 17:05:46 +0200
Subject: [PATCH] Change to OTLP endpoint

---
 fedn/fedn/common/telemetry.py          | 18 ++++++++++++++----
 fedn/fedn/network/combiner/combiner.py |  3 +++
 fedn/setup.py                          |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/fedn/fedn/common/telemetry.py b/fedn/fedn/common/telemetry.py
index db8745b9a..0abeb7671 100644
--- a/fedn/fedn/common/telemetry.py
+++ b/fedn/fedn/common/telemetry.py
@@ -4,6 +4,7 @@
 import psutil
 from opentelemetry import trace
 from opentelemetry.exporter.jaeger.thrift import JaegerExporter
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
 from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
@@ -62,15 +63,24 @@ def initialize_tracer():
         )
     )
 
+    print(telemetry_server)
+    print(telemetry_port)
     # Set up the Jaeger exporter
-    jaeger_exporter = JaegerExporter(
-        agent_host_name=telemetry_server,
-        agent_port=telemetry_port,
+    # jaeger_exporter = JaegerExporter(
+    #     # agent_host_name=telemetry_server,
+    #     collector_endpoint=f"http://{telemetry_server}:{telemetry_port}/api/traces",
+    #     # agent_port=telemetry_port,
+    # )
+
+    otlp_exporter = OTLPSpanExporter(
+        endpoint="http://localhost:4317",  # Default OTLP port for Jaeger, adjust as needed
+        insecure=True  # Use this only if you are not setting up TLS/SSL
     )
 
+
     # Attach the exporter to the tracer provider
     trace.get_tracer_provider().add_span_processor(
-        BatchSpanProcessor(jaeger_exporter)
+        BatchSpanProcessor(otlp_exporter)
     )
 
     return trace.get_tracer(__name__)
diff --git a/fedn/fedn/network/combiner/combiner.py b/fedn/fedn/network/combiner/combiner.py
index c94feffe0..046242253 100644
--- a/fedn/fedn/network/combiner/combiner.py
+++ b/fedn/fedn/network/combiner/combiner.py
@@ -108,6 +108,9 @@ def __init__(self, config):
                 logger.info(response)
                 logger.info("Status.UnMatchedConfig")
                 sys.exit("Exiting: Missing config")
+            else:
+                logger.info("Status.Unassigned")
+                time.sleep(5)
 
         cert = announce_config['certificate']
         key = announce_config['key']
diff --git a/fedn/setup.py b/fedn/setup.py
index 51f8b6150..60602689e 100644
--- a/fedn/setup.py
+++ b/fedn/setup.py
@@ -32,6 +32,7 @@
         "opentelemetry-api",
         "opentelemetry-sdk",
         "opentelemetry-exporter-jaeger",
+        "opentelemetry-exporter-otlp",
     ],
     extras_require={
         'flower': ["flwr==1.8.0"]