rebrandly-otel 0.1.25__py3-none-any.whl → 0.1.26__py3-none-any.whl

rebrandly_otel/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/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.dist-info → rebrandly_otel-0.1.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rebrandly_otel
-Version: 0.1.25
+Version: 0.1.26
 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.dist-info → rebrandly_otel-0.1.26.dist-info}/RECORD

@@ -1,14 +1,14 @@
 rebrandly_otel/__init__.py,sha256=dEcTvHbhNNp0XD_7jojxeHXNa1QDCI9HxayeICaK_WY,491
-rebrandly_otel/fastapi_support.py,sha256=RuBBZJuzr3osBDrkHZ0oQPV70pmvnqxTfBBDVFBFQlo,8019
-rebrandly_otel/flask_support.py,sha256=cUVMGTjN6N8xZD4Zyng2LRWhNj62C5nmTH91SnYBp2A,6072
+rebrandly_otel/fastapi_support.py,sha256=LQXjLWxqU7qgz4-4AMWgPWWFrfcwXeJFGlwqmtF3-CM,8044
+rebrandly_otel/flask_support.py,sha256=9JhrNaNsARdje91DSPkZy2A3bELt2TZsRxL9lxXZQtI,6159
 rebrandly_otel/logs.py,sha256=tU8YGL2hcYgM64rDf13owHTr7ooGc2z25TQ9qve7euY,3898
 rebrandly_otel/metrics.py,sha256=Tf21BwSVK6eLPG2hz55gNpwdPq85uqAx4bttLO6rnq8,7542
 rebrandly_otel/otel_utils.py,sha256=bP6Xhel4g7gbQWzCUlABWJfBSJaveKU1fhSOngcfzc4,3577
 rebrandly_otel/pymysql_instrumentation.py,sha256=4MNIfqNQlMtOcmYLy5bq8FP0KoEw72bcZZqBdG6xupM,5955
 rebrandly_otel/rebrandly_otel.py,sha256=wT1GiOQQMZl2sVG8MGJ9qM9gx_zRwS7U5oAe77RbJdk,21618
 rebrandly_otel/traces.py,sha256=JY_3RWbzpUxzEx3GqTVgggsyA2DB4oR-zDftIFFJha4,7174
-rebrandly_otel-0.1.25.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
-rebrandly_otel-0.1.25.dist-info/METADATA,sha256=tB49FI27YHZN6oMmOdClUYgna5wQNxjGZRl-Oi_yBB8,14538
-rebrandly_otel-0.1.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rebrandly_otel-0.1.25.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
-rebrandly_otel-0.1.25.dist-info/RECORD,,
+rebrandly_otel-0.1.26.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
+rebrandly_otel-0.1.26.dist-info/METADATA,sha256=zyWrVFkzXNkIF8CuZl45R7KzLsAcuRBybN3RZwyFCBU,14510
+rebrandly_otel-0.1.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rebrandly_otel-0.1.26.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
+rebrandly_otel-0.1.26.dist-info/RECORD,,