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

rebrandly_otel/rebrandly_otel.py

@@ -99,6 +99,9 @@ class RebrandlyOTEL:
             return wrapper
         return decorator
 
+    # 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,
@@ -107,22 +110,6 @@ class RebrandlyOTEL:
                        skip_aws_link: bool = True):
         """
         Decorator specifically for Lambda handlers with automatic flushing.
-
-        Args:
-            name: Optional span name (defaults to 'lambda.{function_name}')
-            attributes: Additional span attributes
-            kind: Span kind (defaults to SERVER)
-            auto_flush: If True, automatically flush after handler completes
-
-        Usage:
-            @lambda_handler()
-            def my_handler(event, context): ...
-
-            @lambda_handler(name="custom_span_name")
-            def my_handler(event, context): ...
-
-            @lambda_handler(name="my_span", attributes={"env": "prod"})
-            def my_handler(event, context): ...
         """
         def decorator(func):
             @functools.wraps(func)
@@ -150,50 +137,91 @@ class RebrandlyOTEL:
                     # Increment invocations counter
                     self.meter.GlobalMetrics.invocations.add(1, {'function': span_name})
 
-                    # Create span and execute function
-                    record = None
-                    span_function = self.span
-                    if not skip_aws_link and event is not None and 'Records' in event and len(event['Records']) > 0 and 'MessageAttributes' in event['Records'][0]:
-                        span_function = self.aws_message_span
-                        record = event['Records'][0]
-
-                    with span_function(span_name, message=record, 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)
-                        else:
-                            result = func()
-
-                        # Add result information if applicable
-                        if isinstance(result, dict):
-                            if 'statusCode' in result:
-                                span_context.set_attribute("http.status_code", result['statusCode'])
-                                # Set span status based on HTTP status code
-                                if result['statusCode'] >= 400:
-                                    span_context.set_status(Status(StatusCode.ERROR, f"HTTP {result['statusCode']}"))
-                                else:
-                                    span_context.set_status(Status(StatusCode.OK))
-
-                        # Increment success counter
-                        self.meter.GlobalMetrics.successful_invocations.add(1, {'function': span_name})
-
-                        return result
+                    # 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]
+
+                        # 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)
+
+                    return result
 
                 except Exception as e:
                     # Increment error counter
                     self.meter.GlobalMetrics.error_invocations.add(1, {'function': span_name, 'error': type(e).__name__})
+
+                    # Log error with context
+                    self.logger.logger.error(f"Lambda execution failed: {e}", exc_info=True)
                     raise
 
                 finally:
+                    # Record duration
+                    duration = (datetime.now() - start_func).total_seconds() * 1000
+                    self.meter.GlobalMetrics.duration.record(duration, {'function': span_name})
+
                     if auto_flush:
-                        self.logger.logger.info(f"[OTEL] Lambda handler '{span_name}' completed, flushing telemetry...")
+                        self.logger.logger.info(f"[OTEL] Lambda handler '{span_name}' completed in {duration:.2f}ms, flushing telemetry...")
                         self.force_flush(start_datetime=start_func)
 
             return wrapper
         return decorator
 
+    def _process_lambda_result(self, result, span_context, span_name):
+        """Helper method to process Lambda result and update span accordingly"""
+        if isinstance(result, dict):
+            if 'statusCode' in result:
+                span_context.set_attribute("http.status_code", result['statusCode'])
+                # Set span status based on HTTP status code
+                if result['statusCode'] >= 400:
+                    span_context.set_status(Status(StatusCode.ERROR, f"HTTP {result['statusCode']}"))
+                else:
+                    span_context.set_status(Status(StatusCode.OK))
+
+            # Add completion event
+            span_context.add_event("lambda.invocation.complete",
+                                   attributes={"success": result.get('statusCode', 200) < 400})
+        else:
+            span_context.set_status(Status(StatusCode.OK))
+            span_context.add_event("lambda.invocation.complete", attributes={"success": True})
+
+        # Increment success counter
+        self.meter.GlobalMetrics.successful_invocations.add(1, {'function': span_name})
+
     def aws_message_handler(self,
                        name: Optional[str] = None,
                        attributes: Optional[Dict[str, Any]] = None,

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

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

rebrandly_otel-0.1.10.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=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,,

rebrandly_otel-0.1.9.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=e8G6Tw6Wlauc7rjrrauRcDqD6phRxiq7x7z2nJ1MRfs,19819
-rebrandly_otel/traces.py,sha256=EiZMWNerzAisn_2MEcE9u1zVkRlZZrbnY3PVzVWWOuI,7048
-rebrandly_otel-0.1.9.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
-rebrandly_otel-0.1.9.dist-info/METADATA,sha256=3k0tqqcRbWfS2bhJk_HuH9w8bVeauSR5Lk0FNtS_lzw,9627
-rebrandly_otel-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rebrandly_otel-0.1.9.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
-rebrandly_otel-0.1.9.dist-info/RECORD,,