rebrandly-otel 0.1.19__tar.gz → 0.1.20__tar.gz

{rebrandly_otel-0.1.19 → rebrandly_otel-0.1.20}/PKG-INFO

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

{rebrandly_otel-0.1.19 → rebrandly_otel-0.1.20}/rebrandly_otel.egg-info/PKG-INFO

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

{rebrandly_otel-0.1.19 → rebrandly_otel-0.1.20}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="rebrandly_otel",
-    version="0.1.19",
+    version="0.1.20",
     author="Antonio Romano",
     author_email="antonio@rebrandly.com",
     description="Python OTEL wrapper by Rebrandly",

{rebrandly_otel-0.1.19 → rebrandly_otel-0.1.20}/src/otel_utils.py

@@ -4,6 +4,7 @@
 import os
 import sys
 import grpc
+import json
 
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.semconv.attributes import service_attributes
@@ -86,4 +87,23 @@ def get_millis_batch_time():
         return int(os.environ.get('BATCH_EXPORT_TIME_MILLIS', 100))
     except Exception as e:
         print(f"[OTEL Utils] Warning: Invalid BATCH_EXPORT_TIME_MILLIS value, using default 5000ms: {e}")
-        return 5000
+        return 5000
+
+def extract_event_from(message) -> str | None:
+    body = None
+    if 'body' in message:
+        body = message['body']
+    if 'Body' in message:
+        body = message['Body']
+    if 'Message' in message:
+        body = message['Message']
+    if 'Sns' in message and 'Message' in message['Sns']:
+        body = message['Sns']['Message']
+    if body is not None:
+        try:
+            jbody = json.loads(body)
+            if 'event' in jbody:
+                return jbody['event']
+        except:
+            pass
+    return None

{rebrandly_otel-0.1.19 → rebrandly_otel-0.1.20}/src/rebrandly_otel.py

@@ -12,6 +12,7 @@ from opentelemetry import baggage, propagate, context
 from .traces import RebrandlyTracer
 from .metrics import RebrandlyMeter
 from .logs import RebrandlyLogger
+from .otel_utils import extract_event_from
 
 
 T = TypeVar('T')
@@ -262,6 +263,9 @@ class RebrandlyOTEL:
                     span_function = self.span
                     if record is not None and (('MessageAttributes' in record or 'messageAttributes' in record) or ('Sns' in record and 'MessageAttributes' in record['Sns'])):
                         span_function = self.aws_message_span
+                        evt = extract_event_from(record)
+                        if evt:
+                            span_attributes['event.type'] = evt
 
                     with span_function(span_name, message=record, attributes=span_attributes, kind=kind) as span_context:
                         # Add processing start event with standardized name
@@ -487,6 +491,10 @@ class RebrandlyOTEL:
             if 'awsRegion' in message:
                 combined_attributes['cloud.region'] = message['awsRegion']
 
+            evt = extract_event_from(message)
+            if evt:
+                combined_attributes['event.type'] = evt
+
 
         # Use the tracer's start_span method directly to ensure it works
         # This creates a child span of whatever is currently active