Fixed typos, vestigial code and improper use of log_extender

Author: davidigandan

pyproject.toml

@@ -20,7 +20,7 @@ classifiers = [
 ]
 license = { text = "BSD-3-Clause" }
 requires-python = ">=3.10"
-dependencies = ["zocalo","marshmallow","bidict", "pika", "setuptools", "stomp-py>=7", "opentelemetry-api==1.20.0", "opentelemetry-sdk==1.20.0", "opentelemetry-exporter-otlp-proto-http==1.20.0" ]
+dependencies = ["bidict", "pika", "setuptools", "stomp-py>=7", "opentelemetry-api==1.20.0", "opentelemetry-sdk==1.20.0", "opentelemetry-exporter-otlp-proto-http==1.20.0" ]
 
 [project.urls]
 Download = "https://github.com/DiamondLightSource/python-workflows/releases"

src/workflows/recipe/__init__.py

@@ -72,40 +72,34 @@ def unwrap_recipe(header, message):
         if header.get("workflows-recipe") in {True, "True", "true", 1}:
             rw = RecipeWrapper(message=message, transport=transport_layer)
 
-            # Extract recipe_id on the current span
+            # Extract recipe ID from environment and add to current span
             span = trace.get_current_span()
-            recipe_id = None
-
-            # Extract recipe ID from environment
-            if isinstance(message, dict):
-                environment = message.get("environment", {})
-                if isinstance(environment, dict):
-                    recipe_id = environment.get("ID")
+            recipe_id = rw.environment.get("ID")
 
             if recipe_id:
                 span.set_attribute("recipe_id", recipe_id)
-                span.add_event(
-                    "recipe.id_extracted", attributes={"recipe_id": recipe_id}
-                )
 
             # Extract span_id and trace_id for logging
             span_context = span.get_span_context()
             if span_context and span_context.is_valid:
-                span_id = format(span_context.span_id, "016x")
-                trace_id = format(span_context.trace_id, "032x")
+                span_id = span_context.span_id
+                trace_id = span_context.trace_id
 
-                log_extra = {
+                otel_logs = {
                     "span_id": span_id,
                     "trace_id": trace_id,
                 }
-
+                
                 if recipe_id:
-                    log_extra["recipe_id"] = recipe_id
+                    otel_logs["recipe_id"] = recipe_id
+            else:
+                otel_logs = "No OTEL related logs available"
 
             if log_extender and rw.environment and rw.environment.get("ID"):
-                with log_extender("recipe_ID", rw.environment["ID"]):
+                with log_extender("recipe_ID", rw.environment["ID"]), log_extender("otel_logs", otel_logs):
                     return callback(rw, header, message.get("payload"))
             return callback(rw, header, message.get("payload"))
+        
         if allow_non_recipe_messages:
             return callback(None, header, message)
         #   self.log.warning('Discarding non-recipe message:\n' + \

src/workflows/services/common_service.py

@@ -195,44 +195,37 @@ def start_transport(self):
             try:
                 # Configure OTELTracing if configuration is available
                 otel_config = (
-                    self.config.opentelemetry if self.config and hasattr(self.config, "opentelemetry") else None
+                    self.config._opentelemetry if self.config and hasattr(self.config, "opentelemetry") else None
+                )
+                
+                if otel_config and "timeout" not in otel_config:
+                    self.log.warning("Missing optional OTEL configuration field `timeout`. Will default to 10 seconds. ")
+
+                # Configure OTELTracing
+                resource = Resource.create(
+                    {
+                        SERVICE_NAME: self._service_name,
+                    }
                 )
 
-                if otel_config:
-                    if "endpoint" not in otel_config:
-                        self.log.warning("Missing required OTEL configuration field `endpoint`.")
-                    
-                    if "timeout" not in otel_config:
-                        self.log.warning("Missing optional OTEL configuration field `timout`. Will default to 10 seconds. ")
-
-                    # Configure OTELTracing
-                    resource = Resource.create(
-                        {
-                            SERVICE_NAME: self._service_name,
-                        }
-                    )
-
-                    self.log.debug("Configuring OTELTracing")
-                    provider = TracerProvider(resource=resource)
-                    trace.set_tracer_provider(provider)
+                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)
+                # 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)
 
-                    # Add OTELTracingMiddleware to the transport layer
-                    tracer = trace.get_tracer(__name__)
-                    otel_middleware = OTELTracingMiddleware(
-                        tracer, service_name=self._service_name
-                    )
-                    self._transport.add_middleware(otel_middleware)
-            except Exception as e:
-                # Continue without tracing if configuration fails
-                self.log.warning("Failed to configure OpenTelemetry tracing: %s", str(e))
+                # Add OTELTracingMiddleware to the transport layer
+                tracer = trace.get_tracer(__name__)
+                otel_middleware = OTELTracingMiddleware(
+                    tracer, service_name=self._service_name
+                )
+                self._transport.add_middleware(otel_middleware)
 
             metrics = self._environment.get("metrics")
             if metrics: