Use plugin configurations to configure connection to OTELCollector

Author: davidigandan

src/workflows/services/common_service.py

@@ -193,20 +193,24 @@ def start_transport(self):
                 self._transport_interceptor
             )
 
-            # Configure OTELTracing
-            resource = Resource.create({
-                SERVICE_NAME: self._service_name,
-            })
-
-            self.log.debug("Configuring OTELTracing")
-            provider = TracerProvider(resource=resource)
-            trace.set_tracer_provider(provider)
-
-            # Configure BatchProcessor and OTLPSpanExporter to point to OTELCollector
-            otlp_exporter = OTLPSpanExporter(
-                endpoint="https://otel.tracing.diamond.ac.uk:4318/v1/traces",
-                timeout=10
-            )
+            # Configure OTELTracing if configuration is available
+            otel_config = OTEL.config if hasattr(OTEL, 'config') and OTEL.config else None
+            
+            if otel_config:
+                # Configure OTELTracing
+                resource = Resource.create({
+                    SERVICE_NAME: self._service_name,
+                })
+
+                self.log.debug("Configuring OTELTracing")
+                provider = TracerProvider(resource=resource)
+                trace.set_tracer_provider(provider)
+
+                # Configure BatchProcessor and OTLPSpanExporter using config values
+                otlp_exporter = OTLPSpanExporter(
+                    endpoint=otel_config["endpoint"],
+                    timeout=otel_config.get("timeout", 10)
+                )
             span_processor = BatchSpanProcessor(otlp_exporter)
             provider.add_span_processor(span_processor)
 

src/workflows/util/zocalo/configuration.py

@@ -7,6 +7,29 @@
 from workflows.transport.pika_transport import PikaTransport
 from workflows.transport.stomp_transport import StompTransport
 
+class OTEL:
+    """A Zocalo configuration plugin to pre-populate OTELTracing config defaults"""
+
+    class Schema(PluginSchema):
+        host = fields.Str(required=True)
+        port = fields.Int(required=True)
+        endpoint = fields.Str(required=False)
+        timeout = fields.Int(required=False, load_default=10)
+
+    # Store configuration for access by services
+    config = {}
+
+    @staticmethod
+    def activate(configuration):
+        # Build the full endpoint URL if not provided
+        if "endpoint" not in configuration:
+            endpoint = f"https://{configuration['host']}:{configuration['port']}/v1/traces"
+        else:
+            endpoint = configuration["endpoint"]
+        
+        OTEL.config["endpoint"] = endpoint
+        OTEL.config["timeout"] = configuration.get("timeout", 10)
+
 
 class Stomp:
     """A Zocalo configuration plugin to pre-populate StompTransport config defaults"""