rebrandly-otel 0.1.10__py3-none-any.whl → 0.1.13__py3-none-any.whl

rebrandly_otel/rebrandly_otel.py

@@ -101,102 +101,115 @@ class RebrandlyOTEL:
 
     # Fix for the lambda_handler method in rebrandly_otel.py
     # Replace the lambda_handler method (around line 132) with this fixed version:
-
     def lambda_handler(self,
                        name: Optional[str] = None,
                        attributes: Optional[Dict[str, Any]] = None,
-                       kind: SpanKind = SpanKind.CONSUMER,
+                       kind: SpanKind = SpanKind.SERVER,
                        auto_flush: bool = True,
-                       skip_aws_link: bool = True):
+                       skip_aws_link: bool = False):
         """
         Decorator specifically for Lambda handlers with automatic flushing.
         """
         def decorator(func):
             @functools.wraps(func)
-            def wrapper(event=None, context=None):
+            def wrapper(event=None, lambda_context=None):
                 # Determine span name
                 span_name = name or f"lambda.{func.__name__}"
-                start_func = datetime.now()
+                start_time = datetime.now()
 
                 # Build span attributes
                 span_attributes = attributes or {}
-
                 span_attributes['faas.trigger'] = self._detect_lambda_trigger(event)
 
                 # Add Lambda-specific attributes if context is available
-                if context is not None:
+                if lambda_context is not None:
                     span_attributes.update({
-                        "faas.execution": getattr(context, 'aws_request_id', 'unknown'),
-                        "faas.id": getattr(context, 'function_name', 'unknown'),
-                        "cloud.provider": "aws",
-                        "cloud.platform": "aws_lambda"
+                        "faas.execution": getattr(lambda_context, 'aws_request_id', 'unknown'),
+                        "faas.id": getattr(lambda_context, 'function_arn', 'unknown'),
+                        "faas.name": getattr(lambda_context, 'function_name', 'unknown'),
+                        "faas.version": getattr(lambda_context, 'function_version', 'unknown')
                     })
 
+                # Handle context extraction from AWS events
+                token = None
+                if not skip_aws_link and event and isinstance(event, dict) and 'Records' in event:
+                    first_record = event['Records'][0] if event['Records'] else None
+                    if first_record:
+                        carrier = {}
+
+                        # Extract from SQS
+                        if 'MessageAttributes' in first_record:
+                            for key, value in first_record['MessageAttributes'].items():
+                                if isinstance(value, dict) and 'StringValue' in value:
+                                    carrier[key] = value['StringValue']
+
+                        # Extract from SNS
+                        elif 'Sns' in first_record and 'MessageAttributes' in first_record['Sns']:
+                            for key, value in first_record['Sns']['MessageAttributes'].items():
+                                if isinstance(value, dict):
+                                    if 'Value' in value:
+                                        carrier[key] = value['Value']
+                                    elif 'StringValue' in value:
+                                        carrier[key] = value['StringValue']
+
+                        # Attach extracted context
+                        if carrier:
+                            from opentelemetry import propagate, context as otel_context
+                            extracted_context = propagate.extract(carrier)
+                            token = otel_context.attach(extracted_context)
+                            span_attributes['message.has_trace_context'] = True
+
                 result = None
                 try:
-                    # Increment invocations counter
+                    # Increment invocation counter
                     self.meter.GlobalMetrics.invocations.add(1, {'function': span_name})
 
-                    # Determine if we should extract context from AWS message
-                    extracted_context = None
-                    if not skip_aws_link and event is not None and 'Records' in event and len(event['Records']) > 0:
-                        first_record = event['Records'][0]
+                    # Create and execute within span
+                    with self.tracer.start_span(
+                            name=span_name,
+                            attributes=span_attributes,
+                            kind=kind
+                    ) as span:
+                        # Add invocation start event
+                        span.add_event("lambda.invocation.start", {
+                            'event.type': type(event).__name__ if event else 'None'
+                        })
 
-                        # Check different message formats
-                        if 'messageAttributes' in first_record or 'MessageAttributes' in first_record:
-                            # SQS format
-                            extracted_context = self.extract_context(first_record)
-                        elif 'Sns' in first_record and 'MessageAttributes' in first_record['Sns']:
-                            # SNS format
-                            extracted_context = self.extract_context(first_record)
-
-                    # Create span - use extracted context if available
-                    if extracted_context:
-                        token = self.attach_context(extracted_context)
-                        try:
-                            with self.span(span_name, attributes=span_attributes, kind=kind) as span_context:
-                                # Add event type as span event
-                                if event is not None:
-                                    span_context.add_event("lambda.invocation.start",
-                                                           attributes={"event.type": type(event).__name__})
-
-                                result = func(event, context) if event is not None else func()
-
-                                # Handle result
-                                self._process_lambda_result(result, span_context, span_name)
-                        finally:
-                            self.detach_context(token)
-                    else:
-                        # No context extraction needed
-                        with self.span(span_name, attributes=span_attributes, kind=kind) as span_context:
-                            # Add event type as span event
-                            if event is not None:
-                                span_context.add_event("lambda.invocation.start",
-                                                       attributes={"event.type": type(event).__name__})
-
-                            result = func(event, context) if event is not None else func()
-
-                            # Handle result
-                            self._process_lambda_result(result, span_context, span_name)
+                        # Execute handler
+                        result = func(event, lambda_context)
+
+                        # Process result
+                        self._process_lambda_result(result, span, span_name)
 
                     return result
 
                 except Exception as e:
                     # Increment error counter
-                    self.meter.GlobalMetrics.error_invocations.add(1, {'function': span_name, 'error': type(e).__name__})
+                    self.meter.GlobalMetrics.error_invocations.add(1, {
+                        'function': span_name,
+                        'error': type(e).__name__
+                    })
 
-                    # Log error with context
+                    # Log error
                     self.logger.logger.error(f"Lambda execution failed: {e}", exc_info=True)
                     raise
 
                 finally:
+                    # Always detach context if we attached it
+                    if token is not None:
+                        from opentelemetry import context as otel_context
+                        otel_context.detach(token)
+
                     # Record duration
-                    duration = (datetime.now() - start_func).total_seconds() * 1000
+                    duration = (datetime.now() - start_time).total_seconds() * 1000
                     self.meter.GlobalMetrics.duration.record(duration, {'function': span_name})
 
+                    # Force flush if enabled
                     if auto_flush:
-                        self.logger.logger.info(f"[OTEL] Lambda handler '{span_name}' completed in {duration:.2f}ms, flushing telemetry...")
-                        self.force_flush(start_datetime=start_func)
+                        self.logger.logger.info(f"[OTEL] Lambda '{span_name}' completed in {duration:.2f}ms, flushing...")
+                        flush_success = self.force_flush(timeout_millis=1000)
+                        if not flush_success:
+                            self.logger.logger.warning("[OTEL] Force flush may not have completed fully")
 
             return wrapper
         return decorator
@@ -297,7 +310,6 @@ class RebrandlyOTEL:
 
                 finally:
                     if auto_flush:
-                        self.logger.logger.info(f"[OTEL] Lambda handler '{span_name}' completed, flushing telemetry...")
                         self.force_flush(start_datetime=start_func)
 
             return wrapper
@@ -326,7 +338,7 @@ class RebrandlyOTEL:
             self.meter.GlobalMetrics.duration.record(duration, {'source': 'force_flush'})
             self.meter.GlobalMetrics.memory_usage_bytes.set(memory.used)
             self.meter.GlobalMetrics.cpu_usage_percentage.set(cpu_percent)
-            self.logger.logger.info(f"[OTEL] Function duration: {duration}ms, Memory usage: {memory.percent}%, CPU usage: {cpu_percent}%")
+            self.logger.logger.info(f"Function duration: {duration}ms, Memory usage: {memory.percent}%, CPU usage: {cpu_percent}%")
 
         try:
             # Flush traces
@@ -364,9 +376,9 @@ class RebrandlyOTEL:
                 self._meter.shutdown()
             if self._logger:
                 self._logger.shutdown()
-            self.logger.logger.info("[OTEL] Shutdown completed")
+            print("[OTEL] Shutdown completed")
         except Exception as e:
-            self.logger.logger.info(f"[OTEL] Error during shutdown: {e}")
+            print(f"[OTEL] Error during shutdown: {e}")
 
     def _detect_lambda_trigger(self, event: Any) -> str:
         """Detect Lambda trigger type from event."""
@@ -435,43 +447,15 @@ class RebrandlyOTEL:
                          message: Dict[str, Any]=None,
                          attributes: Optional[Dict[str, Any]] = None,
                          kind: SpanKind = SpanKind.CONSUMER):
-        """Create span from AWS message with extracted context."""
-        # Extract context from the message if it contains trace context
-        token = None
-        if message and isinstance(message, dict):
-            carrier = {}
+        """Create span from AWS message - properly handling trace context."""
+
+        from opentelemetry import trace, context as otel_context
 
-            # Check for trace context in different possible locations
-            if 'MessageAttributes' in message:
-                # SQS format
-                for key, value in message.get('MessageAttributes', {}).items():
-                    if isinstance(value, dict) and 'StringValue' in value:
-                        carrier[key] = value['StringValue']
-            elif 'Sns' in message and 'MessageAttributes' in message['Sns']:
-                # SNS format - MessageAttributes are nested under 'Sns'
-                for key, value in message['Sns'].get('MessageAttributes', {}).items():
-                    if isinstance(value, dict):
-                        # SNS uses 'Value' instead of 'StringValue'
-                        if 'Value' in value:
-                            carrier[key] = value['Value']
-                        elif 'StringValue' in value:
-                            carrier[key] = value['StringValue']
-            elif 'messageAttributes' in message:
-                # Alternative format
-                for key, value in message.get('messageAttributes', {}).items():
-                    if isinstance(value, dict) and 'stringValue' in value:
-                        carrier[key] = value['stringValue']
-
-            # If we found trace context, attach it
-            if carrier:
-                token = self.attach_context(carrier)
-
-        # Create a span with the potentially extracted context
         combined_attributes = attributes or {}
 
-        # Add message-specific attributes
+        # Extract message attributes for linking/attributes
         if message and isinstance(message, dict):
-            # Add SNS-specific attributes
+            # Add message-specific attributes
             if 'Sns' in message:
                 sns_msg = message['Sns']
                 if 'MessageId' in sns_msg:
@@ -479,24 +463,40 @@ class RebrandlyOTEL:
                 if 'TopicArn' in sns_msg:
                     combined_attributes['messaging.destination'] = sns_msg['TopicArn']
                 combined_attributes['messaging.system'] = 'aws_sns'
-            # Add SQS-specific attributes
+
+                # Check for trace context in SNS
+                if 'MessageAttributes' in sns_msg:
+                    for key, value in sns_msg['MessageAttributes'].items():
+                        if key == 'traceparent' and 'Value' in value:
+                            combined_attributes['message.traceparent'] = value['Value']
+                            combined_attributes['message.has_trace_context'] = True
+
             elif 'messageId' in message:
+                # SQS message
                 combined_attributes['messaging.message_id'] = message['messageId']
                 if 'eventSource' in message:
                     combined_attributes['messaging.system'] = message['eventSource']
 
-            # Add common attributes
+                # Check for trace context in SQS
+                if 'MessageAttributes' in message or 'messageAttributes' in message:
+                    attrs = message.get('MessageAttributes') or message.get('messageAttributes', {})
+                    for key, value in attrs.items():
+                        if key == 'traceparent':
+                            tp_value = value.get('StringValue') or value.get('stringValue', '')
+                            combined_attributes['message.traceparent'] = tp_value
+                            combined_attributes['message.has_trace_context'] = True
+
             if 'awsRegion' in message:
                 combined_attributes['cloud.region'] = message['awsRegion']
 
-        try:
-            # Use the regular span method which properly handles context
-            with self.span(name, attributes=combined_attributes, kind=kind) as span:
-                yield span
-        finally:
-            # Detach context if we attached one
-            if token:
-                self.detach_context(token)
+        # Use the tracer's start_span method directly to ensure it works
+        # This creates a child span of whatever is currently active
+        with self.tracer.start_span(
+                name=name,
+                attributes=combined_attributes,
+                kind=kind
+        ) as span:
+            yield span
 
 
 # Create Singleton instance

rebrandly_otel/traces.py

@@ -93,6 +93,7 @@ class RebrandlyTracer:
                    attributes: Optional[Dict[str, Any]] = None,
                    kind: trace.SpanKind = trace.SpanKind.INTERNAL) -> ContextManager[Span]:
         """Start a new span as the current span."""
+        # Ensure we use the tracer to create a child span of the current span
         with self.tracer.start_as_current_span(
                 name,
                 attributes=attributes,

{rebrandly_otel-0.1.10.dist-info → rebrandly_otel-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rebrandly_otel
-Version: 0.1.10
+Version: 0.1.13
 Summary: Python OTEL wrapper by Rebrandly
 Home-page: https://github.com/rebrandly/rebrandly-otel-python
 Author: Antonio Romano

rebrandly_otel-0.1.13.dist-info/RECORD

@@ -0,0 +1,11 @@
+rebrandly_otel/__init__.py,sha256=AHcEKWq4KRafIF_x_Y8jiIQ5crNG1nbEwdnlGaEP6js,287
+rebrandly_otel/logs.py,sha256=92jaxzI5hCHnKHu3lsSAa7K_SPHQgL46AlQUESsYNds,3724
+rebrandly_otel/metrics.py,sha256=57jwrn8e1u66BOO7fcFrmtE3Rpt4VDixG9I78K-zrUU,8537
+rebrandly_otel/otel_utils.py,sha256=uJmfz2NspSnTVJXGKoaLUl1CYb0ow6VHKjmg2d_rdwg,1704
+rebrandly_otel/rebrandly_otel.py,sha256=cnWTDMH-z4n32HTxCbML0zedKhG5ZKPtkej5sL1epok,21438
+rebrandly_otel/traces.py,sha256=v582WtJv3t4Bn92vlDyZouibHtgWNxdRo_XmQCmSOEA,7126
+rebrandly_otel-0.1.13.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
+rebrandly_otel-0.1.13.dist-info/METADATA,sha256=Xu5Rxr80l_mB6Hx489zddCbWDqNKxcr6klUzujSV-4Y,9628
+rebrandly_otel-0.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rebrandly_otel-0.1.13.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
+rebrandly_otel-0.1.13.dist-info/RECORD,,

rebrandly_otel-0.1.10.dist-info/RECORD

@@ -1,11 +0,0 @@
-rebrandly_otel/__init__.py,sha256=AHcEKWq4KRafIF_x_Y8jiIQ5crNG1nbEwdnlGaEP6js,287
-rebrandly_otel/logs.py,sha256=92jaxzI5hCHnKHu3lsSAa7K_SPHQgL46AlQUESsYNds,3724
-rebrandly_otel/metrics.py,sha256=57jwrn8e1u66BOO7fcFrmtE3Rpt4VDixG9I78K-zrUU,8537
-rebrandly_otel/otel_utils.py,sha256=uJmfz2NspSnTVJXGKoaLUl1CYb0ow6VHKjmg2d_rdwg,1704
-rebrandly_otel/rebrandly_otel.py,sha256=KSzrGSdUgqXZO1C0RBrBLNcAh-9oR5wqSWLJc0-Itww,21626
-rebrandly_otel/traces.py,sha256=EiZMWNerzAisn_2MEcE9u1zVkRlZZrbnY3PVzVWWOuI,7048
-rebrandly_otel-0.1.10.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
-rebrandly_otel-0.1.10.dist-info/METADATA,sha256=27eO_Dw6gLu-4FLXTW9rMj7zVmpImBHwKhAUjebmDWw,9628
-rebrandly_otel-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rebrandly_otel-0.1.10.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
-rebrandly_otel-0.1.10.dist-info/RECORD,,