rebrandly-otel 0.1.25__tar.gz → 0.1.27__tar.gz

{rebrandly_otel-0.1.25 → rebrandly_otel-0.1.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rebrandly_otel
-Version: 0.1.25
+Version: 0.1.27
 Summary: Python OTEL wrapper by Rebrandly
 Home-page: https://github.com/rebrandly/rebrandly-otel-python
 Author: Antonio Romano
@@ -14,7 +14,6 @@ Requires-Dist: opentelemetry-api>=1.34.0
 Requires-Dist: opentelemetry-sdk>=1.34.0
 Requires-Dist: opentelemetry-exporter-otlp>=1.34.0
 Requires-Dist: psutil>=5.0.0
-Requires-Dist: flask>=3.1.2
 Requires-Dist: fastapi>=0.118.0
 Dynamic: author
 Dynamic: author-email

{rebrandly_otel-0.1.25 → rebrandly_otel-0.1.27}/rebrandly_otel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rebrandly_otel
-Version: 0.1.25
+Version: 0.1.27
 Summary: Python OTEL wrapper by Rebrandly
 Home-page: https://github.com/rebrandly/rebrandly-otel-python
 Author: Antonio Romano
@@ -14,7 +14,6 @@ Requires-Dist: opentelemetry-api>=1.34.0
 Requires-Dist: opentelemetry-sdk>=1.34.0
 Requires-Dist: opentelemetry-exporter-otlp>=1.34.0
 Requires-Dist: psutil>=5.0.0
-Requires-Dist: flask>=3.1.2
 Requires-Dist: fastapi>=0.118.0
 Dynamic: author
 Dynamic: author-email

{rebrandly_otel-0.1.25 → rebrandly_otel-0.1.27}/rebrandly_otel.egg-info/requires.txt

@@ -2,5 +2,4 @@ opentelemetry-api>=1.34.0
 opentelemetry-sdk>=1.34.0
 opentelemetry-exporter-otlp>=1.34.0
 psutil>=5.0.0
-flask>=3.1.2
 fastapi>=0.118.0

{rebrandly_otel-0.1.25 → rebrandly_otel-0.1.27}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="rebrandly_otel",
-    version="0.1.25",
+    version="0.1.27",
     author="Antonio Romano",
     author_email="antonio@rebrandly.com",
     description="Python OTEL wrapper by Rebrandly",
@@ -19,7 +19,6 @@ setuptools.setup(
         "opentelemetry-sdk>=1.34.0",
         "opentelemetry-exporter-otlp>=1.34.0",
         "psutil>=5.0.0",
-        "flask>=3.1.2",
         "fastapi>=0.118.0"
     ],
     classifiers=[

{rebrandly_otel-0.1.25 → rebrandly_otel-0.1.27}/src/fastapi_support.py

@@ -49,25 +49,34 @@ def add_otel_middleware(otel, app):
             # Start span for request
             span_name = f"{request.method} {request.url.path}"
 
+            # 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),
+                "url.full": str(request.url),
+                "url.scheme": request.url.scheme,
+                "url.path": request.url.path,
+                "network.protocol.version": "1.1",  # FastAPI/Starlette typically uses HTTP/1.1
+                "server.address": request.url.hostname,
+                "server.port": request.url.port or (443 if request.url.scheme == 'https' else 80),
+            }
+
+            # Add optional attributes only if they have values
+            if request.url.query:
+                attributes["url.query"] = request.url.query
+
+            user_agent = request.headers.get("user-agent")
+            if user_agent:
+                attributes["user_agent.original"] = user_agent
+
+            if request.client and request.client.host:
+                attributes["client.address"] = request.client.host
+
             # Use start_as_current_span for proper context propagation
             with self.otel.tracer.tracer.start_as_current_span(
                     span_name,
-                    attributes={
-                        # Required HTTP attributes per semantic conventions
-                        "http.request.method": request.method,
-                        "http.request.headers": json.dumps(request.headers, default=str),
-                        "http.response.status_code": None,  # Will be set after response
-                        "url.full": str(request.url),
-                        "url.scheme": request.url.scheme,
-                        "url.path": request.url.path,
-                        "url.query": request.url.query if request.url.query else None,
-                        "user_agent.original": request.headers.get("user-agent"),
-                        "http.route": None,  # Will be set after routing
-                        "network.protocol.version": "1.1",  # FastAPI/Starlette typically uses HTTP/1.1
-                        "server.address": request.url.hostname,
-                        "server.port": request.url.port or (443 if request.url.scheme == 'https' else 80),
-                        "client.address": request.client.host if request.client else None,
-                    },
+                    attributes=attributes,
                     kind=SpanKind.SERVER
             ) as span:
                 # Log request start

{rebrandly_otel-0.1.25 → rebrandly_otel-0.1.27}/src/flask_support.py

@@ -40,25 +40,34 @@ def app_before_request(otel):
     # Route will be available after request routing is done
     span_name = f"{request.method} {request.path}"
 
+    # 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),
+        "url.full": request.url,
+        "url.scheme": request.scheme,
+        "url.path": request.path,
+        "http.route": request.path,  # Flask doesn't expose route pattern easily
+        "network.protocol.version": request.environ.get('SERVER_PROTOCOL', 'HTTP/1.1').split('/')[-1],
+        "server.address": request.host.split(':')[0],
+        "server.port": request.host.split(':')[1] if ':' in request.host else (443 if request.scheme == 'https' else 80),
+    }
+
+    # Add optional attributes only if they have values
+    if request.query_string:
+        attributes["url.query"] = request.query_string.decode('utf-8')
+
+    if request.user_agent and request.user_agent.string:
+        attributes["user_agent.original"] = request.user_agent.string
+
+    if request.remote_addr:
+        attributes["client.address"] = request.remote_addr
+
     # Start span for request using start_as_current_span to make it the active span
     span = otel.tracer.tracer.start_as_current_span(
         span_name,
-        attributes={
-            # Required HTTP attributes per semantic conventions
-            "http.request.method": request.method,
-            "http.request.headers": json.dumps(request.headers, default=str),
-            "http.response.status_code": None,  # Will be set in after_request
-            "url.full": request.url,
-            "url.scheme": request.scheme,
-            "url.path": request.path,
-            "url.query": request.query_string.decode('utf-8') if request.query_string else None,
-            "user_agent.original": request.user_agent.string if request.user_agent else None,
-            "http.route": request.path,  # Flask doesn't expose route pattern easily
-            "network.protocol.version": request.environ.get('SERVER_PROTOCOL', 'HTTP/1.1').split('/')[-1],
-            "server.address": request.host.split(':')[0],
-            "server.port": request.host.split(':')[1] if ':' in request.host else (443 if request.scheme == 'https' else 80),
-            "client.address": request.remote_addr,
-        },
+        attributes=attributes,
         kind=SpanKind.SERVER
     )
     # Store both the span context manager and the span itself

{rebrandly_otel-0.1.25 → rebrandly_otel-0.1.27}/src/otel_utils.py

@@ -6,7 +6,7 @@ import sys
 import grpc
 import json
 
-from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.resources import Resource, SERVICE_NAMESPACE
 from opentelemetry.semconv.attributes import service_attributes
 from opentelemetry.semconv._incubating.attributes import process_attributes, deployment_attributes
 
@@ -22,7 +22,7 @@ def create_resource(name: str = None, version: str = None) -> Resource:
             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}",
-            deployment_attributes.DEPLOYMENT_ENVIRONMENT_NAME: os.environ.get('ENV', os.environ.get('ENVIRONMENT', os.environ.get('NODE_ENV', 'local')))
+            SERVICE_NAMESPACE: os.environ.get('ENV', os.environ.get('ENVIRONMENT', os.environ.get('NODE_ENV', 'local')))
         }
     )
     return resource