rebrandly-otel 0.1.36__tar.gz → 0.2.3__tar.gz

{rebrandly_otel-0.1.36 → rebrandly_otel-0.2.3}/PKG-INFO

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

{rebrandly_otel-0.1.36 → rebrandly_otel-0.2.3}/rebrandly_otel.egg-info/PKG-INFO

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

{rebrandly_otel-0.1.36 → rebrandly_otel-0.2.3}/rebrandly_otel.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ rebrandly_otel.egg-info/top_level.txt
 src/__init__.py
 src/fastapi_support.py
 src/flask_support.py
+src/http_utils.py
 src/logs.py
 src/metrics.py
 src/otel_utils.py

{rebrandly_otel-0.1.36 → rebrandly_otel-0.2.3}/setup.py

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

{rebrandly_otel-0.1.36 → rebrandly_otel-0.2.3}/src/fastapi_support.py

@@ -2,6 +2,7 @@
 """FastAPI integration for Rebrandly OTEL SDK."""
 import json
 from rebrandly_otel import Status, StatusCode, SpanKind
+from .http_utils import filter_important_headers
 from fastapi import HTTPException, Depends
 from starlette.requests import Request
 from starlette.middleware.base import BaseHTTPMiddleware
@@ -49,11 +50,14 @@ def add_otel_middleware(otel, app):
             # Start span for request
             span_name = f"{request.method} {request.url.path}"
 
+            # Filter headers to keep only important ones
+            filtered_headers = filter_important_headers(headers)
+
             # Build attributes dict, excluding None values
             attributes = {
                 # Required HTTP attributes per semantic conventions
                 "http.request.method": request.method,
-                "http.request.headers": json.dumps(request.headers, default=str),
+                "http.request.headers": json.dumps(filtered_headers, default=str),
                 "url.full": str(request.url),
                 "url.scheme": request.url.scheme,
                 "url.path": request.url.path,

{rebrandly_otel-0.1.36 → rebrandly_otel-0.2.3}/src/flask_support.py

@@ -3,6 +3,7 @@
 
 import json
 from rebrandly_otel import Status, StatusCode, SpanKind
+from .http_utils import filter_important_headers
 
 from flask import request, jsonify
 from werkzeug.exceptions import HTTPException
@@ -40,11 +41,14 @@ def app_before_request(otel):
     # Route will be available after request routing is done
     span_name = f"{request.method} {request.path}"
 
+    # Filter headers to keep only important ones
+    filtered_headers = filter_important_headers(headers)
+
     # Build attributes dict, excluding None values
     attributes = {
         # Required HTTP attributes per semantic conventions
         "http.request.method": request.method,
-        "http.request.headers": json.dumps(request.headers, default=str),
+        "http.request.headers": json.dumps(filtered_headers, default=str),
         "url.full": request.url,
         "url.scheme": request.scheme,
         "url.path": request.path,

rebrandly_otel-0.2.3/src/http_utils.py

@@ -0,0 +1,28 @@
+# http_utils.py
+"""Shared HTTP utilities for Rebrandly OTEL SDK."""
+
+
+def filter_important_headers(headers):
+    """
+    Filter headers to keep only important ones for observability.
+    Excludes sensitive headers like authorization, cookies, and tokens.
+    """
+    important_headers = [
+        'content-type',
+        'content-length',
+        'accept',
+        'accept-encoding',
+        'accept-language',
+        'host',
+        'x-forwarded-for',
+        'x-forwarded-proto',
+        'x-request-id',
+        'x-correlation-id',
+        'x-trace-id'
+    ]
+
+    filtered = {}
+    for key, value in headers.items():
+        if key.lower() in important_headers:
+            filtered[key] = value
+    return filtered

{rebrandly_otel-0.1.36 → rebrandly_otel-0.2.3}/src/otel_utils.py

@@ -7,7 +7,8 @@ import grpc
 import json
 
 from opentelemetry.sdk.resources import Resource, SERVICE_NAMESPACE
-from opentelemetry.semconv.attributes import service_attributes
+from opentelemetry.semconv.attributes import service_attributes, telemetry_attributes
+from opentelemetry.semconv.resource import ResourceAttributes
 from opentelemetry.semconv._incubating.attributes import process_attributes, deployment_attributes
 
 def create_resource(name: str = None, version: str = None) -> Resource:
@@ -17,13 +18,28 @@ def create_resource(name: str = None, version: str = None) -> Resource:
     if version is None:
         version = get_service_version()
 
+    resources_attributes = {
+        service_attributes.SERVICE_NAME: name,
+        service_attributes.SERVICE_VERSION: version,
+        process_attributes.PROCESS_RUNTIME_VERSION: f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
+        SERVICE_NAMESPACE: os.environ.get('ENV', os.environ.get('ENVIRONMENT', os.environ.get('NODE_ENV', 'local'))),
+        telemetry_attributes.TELEMETRY_SDK_LANGUAGE: "python"
+    }
+
+    if os.environ.get('OTEL_RESOURCE_ATTRIBUTES', None) is not None and os.environ.get('OTEL_RESOURCE_ATTRIBUTES', None).strip() != "":
+        try:
+            ora = os.environ.get('OTEL_RESOURCE_ATTRIBUTES')
+            spl = ora.split(',')
+            for attr in spl:
+                attr = attr.strip()
+                if attr != "" and '=' in attr:
+                    # Split on first '=' only, in case value contains '='
+                    k, v = attr.split('=', 1)
+                    resources_attributes[k.strip()] = v.strip()
+        except Exception as e:
+            print(f"[OTEL Utils] Warning: Invalid OTEL_RESOURCE_ATTRIBUTES value: {e}")
     resource = Resource.create(
-        {
-            service_attributes.SERVICE_NAME: name,
-            service_attributes.SERVICE_VERSION: version,
-            process_attributes.PROCESS_RUNTIME_VERSION: f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
-            SERVICE_NAMESPACE: os.environ.get('ENV', os.environ.get('ENVIRONMENT', os.environ.get('NODE_ENV', 'local')))
-        }
+        resources_attributes
     )
     return resource
 
@@ -55,6 +71,17 @@ def get_service_version(service_version: str = None) -> str:
     return service_version
 
 
+def get_subsystem_name(subsystem_name: str = None) -> str:
+    """
+    Get subsystem name for Coralogix.
+    Checks OTEL_SUBSYSTEM_NAME or CX_SUBSYSTEM_NAME environment variables.
+    Returns None if not set (subsystem is optional).
+    """
+    if subsystem_name is None:
+        return os.environ.get('OTEL_SUBSYSTEM_NAME', os.environ.get('CX_SUBSYSTEM_NAME', None))
+    return subsystem_name
+
+
 def get_otlp_endpoint(otlp_endpoint: str = None) -> str | None:
     endpoint = otlp_endpoint or os.environ.get('OTEL_EXPORTER_OTLP_ENDPOINT', None)
 
@@ -80,8 +107,12 @@ def get_otlp_endpoint(otlp_endpoint: str = None) -> str | None:
             finally:
                 channel.close()
 
+        except grpc.FutureTimeoutError:
+            print(f"[OTEL] Error: Connection timeout to OTLP endpoint {endpoint}. Check if the collector is running and accessible.")
+            return None
         except Exception as e:
-            print(f"[OTEL] Failed to connect to OTLP endpoint {endpoint}: {e}")
+            print(f"[OTEL] Error: Failed to connect to OTLP endpoint {endpoint}: {type(e).__name__}: {e}")
+            print(f"[OTEL] Telemetry data will not be exported. Verify endpoint configuration and network connectivity.")
             return None
     return endpoint
 

{rebrandly_otel-0.1.36 → rebrandly_otel-0.2.3}/src/pymysql_instrumentation.py

@@ -110,7 +110,7 @@ def _trace_query(func, tracer, slow_query_threshold_ms, capture_bindings, db_nam
     # Start span
     span_name = f"pymysql.{'executemany' if many else 'execute'}"
 
-    with tracer.start_span(
+    with tracer.start_as_current_span(
         name=span_name,
         kind=SpanKind.CLIENT
     ) as span:

{rebrandly_otel-0.1.36 → rebrandly_otel-0.2.3}/src/rebrandly_otel.py

@@ -160,6 +160,7 @@ class RebrandlyOTEL:
                             token = otel_context.attach(extracted_context)
 
                 result = None
+                span = None
                 try:
 
                     # Create and execute within span
@@ -207,15 +208,16 @@ class RebrandlyOTEL:
 
                 except Exception as e:
 
-                    # Add failed completion event with error attribute (THIS IS THE KEY ADDITION)
-                    span.add_event("lambda.invocation.complete", {
-                        'success': False,
-                        'error': type(e).__name__
-                    })
+                    # Add failed completion event with error attribute (only if span exists)
+                    if span is not None and hasattr(span, 'is_recording') and span.is_recording():
+                        span.add_event("lambda.invocation.complete", {
+                            'success': False,
+                            'error': type(e).__name__
+                        })
 
-                    # Record the exception in the span
-                    span.record_exception(e)
-                    span.set_status(Status(StatusCode.ERROR, str(e)))
+                        # Record the exception in the span
+                        span.record_exception(e)
+                        span.set_status(Status(StatusCode.ERROR, str(e)))
 
                     # Log error
                     print(f"Lambda execution failed: {e}")