rebrandly-otel 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

rebrandly_otel/fastapi_support.py

@@ -1,7 +1,7 @@
 # fastapi_integration.py
 """FastAPI integration for Rebrandly OTEL SDK."""
 import json
-from rebrandly_otel import Status, StatusCode, SpanKind
+from opentelemetry.trace import Status, StatusCode, SpanKind
 from .http_utils import filter_important_headers
 from fastapi import HTTPException, Depends
 from starlette.requests import Request

rebrandly_otel/flask_support.py

@@ -2,7 +2,7 @@
 """Flask integration for Rebrandly OTEL SDK."""
 
 import json
-from rebrandly_otel import Status, StatusCode, SpanKind
+from opentelemetry.trace import Status, StatusCode, SpanKind
 from .http_utils import filter_important_headers
 
 from flask import request, jsonify

rebrandly_otel/http_utils.py

@@ -18,7 +18,8 @@ def filter_important_headers(headers):
         'x-forwarded-proto',
         'x-request-id',
         'x-correlation-id',
-        'x-trace-id'
+        'x-trace-id',
+        'user-agent'
     ]
 
     filtered = {}

rebrandly_otel/otel_utils.py

@@ -6,7 +6,7 @@ import sys
 import grpc
 import json
 
-from opentelemetry.sdk.resources import Resource, SERVICE_NAMESPACE
+from opentelemetry.sdk.resources import Resource, SERVICE_NAMESPACE, DEPLOYMENT_ENVIRONMENT
 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
@@ -21,11 +21,14 @@ def create_resource(name: str = None, version: str = None) -> Resource:
     if version is None:
         version = get_service_version()
 
+    env = os.environ.get('ENV', os.environ.get('ENVIRONMENT', os.environ.get('NODE_ENV', 'local')))
+
     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'))),
+        SERVICE_NAMESPACE: env,
+        DEPLOYMENT_ENVIRONMENT: env,
         telemetry_attributes.TELEMETRY_SDK_LANGUAGE: "python"
     }
 
@@ -41,6 +44,13 @@ def create_resource(name: str = None, version: str = None) -> Resource:
                     resources_attributes[k.strip()] = v.strip()
         except Exception as e:
             print(f"[OTEL Utils] Warning: Invalid OTEL_RESOURCE_ATTRIBUTES value: {e}")
+
+    if os.environ.get('OTEL_REPO_NAME', None) is not None:
+        resources_attributes['repository.name'] = os.environ.get('OTEL_REPO_NAME')
+
+    if os.environ.get('OTEL_COMMIT_ID', None) is not None:
+        resources_attributes[service_attributes.SERVICE_VERSION] = os.environ.get('OTEL_COMMIT_ID')
+
     resource = Resource.create(
         resources_attributes
     )

rebrandly_otel/rebrandly_otel.py

@@ -73,7 +73,7 @@ class RebrandlyOTEL:
              kind: SpanKind = SpanKind.INTERNAL,
              message=None):
         """Create a span using context manager."""
-        with self.tracer.start_span(name, attributes=attributes, kind=kind) as span:
+        with self.tracer.start_span(name=name, attributes=attributes, kind=kind) as span:
             try:
                 yield span
                 span.set_status(Status(StatusCode.OK))
@@ -510,7 +510,13 @@ class RebrandlyOTEL:
                 attributes=combined_attributes,
                 kind=kind
         ) as span:
-            yield span
+            try:
+                yield span
+                span.set_status(Status(StatusCode.OK))
+            except Exception as e:
+                span.record_exception(e)
+                span.set_status(Status(StatusCode.ERROR, str(e)))
+                raise
 
 
 # Create Singleton instance

{rebrandly_otel-0.2.4.dist-info → rebrandly_otel-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rebrandly_otel
-Version: 0.2.4
+Version: 0.2.6
 Summary: Python OTEL wrapper by Rebrandly
 Home-page: https://github.com/rebrandly/rebrandly-otel-python
 Author: Antonio Romano
@@ -502,6 +502,42 @@ Environment configuration:
 ### More examples
 You can find More examples [here](examples)
 
+## Testing
+
+### Running Tests
+
+The test suite uses [pytest](https://docs.pytest.org/).
+
+Run all tests:
+```bash
+pytest
+```
+
+Run specific test file:
+```bash
+pytest tests/test_flask_support.py -v
+pytest tests/test_fastapi_support.py -v
+pytest tests/test_usage.py -v
+pytest tests/test_pymysql_instrumentation.py -v
+pytest tests/test_metrics_and_logs.py -v
+pytest tests/test_decorators.py -v
+```
+
+Run with coverage:
+```bash
+pytest --cov=src --cov-report=html
+```
+
+### Test Coverage
+
+The test suite includes:
+- **Integration tests** (`test_usage.py`): Core OTEL functionality, Lambda handlers, message processing
+- **Flask integration tests** (`test_flask_support.py`): Flask setup and hooks
+- **FastAPI integration tests** (`test_fastapi_support.py`): FastAPI setup and middleware
+- **PyMySQL instrumentation tests** (`test_pymysql_instrumentation.py`): Database connection instrumentation, query tracing, helper functions
+- **Metrics and logs tests** (`test_metrics_and_logs.py`): Custom metrics creation (counter, histogram, gauge), logging levels (info, warning, debug, error)
+- **Decorators tests** (`test_decorators.py`): Lambda handler decorator, AWS message handler decorator, traces decorator, aws_message_span context manager
+
 ## License
 
 Rebrandly Python SDK is released under the MIT License.

rebrandly_otel-0.2.6.dist-info/RECORD

@@ -0,0 +1,15 @@
+rebrandly_otel/__init__.py,sha256=dEcTvHbhNNp0XD_7jojxeHXNa1QDCI9HxayeICaK_WY,491
+rebrandly_otel/fastapi_support.py,sha256=M1FHkM9Uv6pga6s8F3O-IeXAXzc4EMPAXAStRk7bGu4,8222
+rebrandly_otel/flask_support.py,sha256=wn_Esiu4cy48f_rD-kwIypRKeJ8D1pT6x4WZacEQmZY,6321
+rebrandly_otel/http_utils.py,sha256=5mHJQCJ-5FDFNmTRPaErtdQLAEzCbcDJqoiGzjgKe0w,741
+rebrandly_otel/logs.py,sha256=9uwWbQ9h9YcxF7-2vtsYucaMGCqMoPnO2vWf6qkyGgI,5328
+rebrandly_otel/metrics.py,sha256=jZPygTY7vie33sadXc7P1DwLTKe9tJvAWSZuGHW1xQg,7743
+rebrandly_otel/otel_utils.py,sha256=vr5ygRXY2If-c2Vq2ectupTm1AHgSPkflEw25O5T7NE,6162
+rebrandly_otel/pymysql_instrumentation.py,sha256=lS_V5DcsnpQ3f2PoNqeM7t3Jyiew2KNURM9iILfz8sM,6477
+rebrandly_otel/rebrandly_otel.py,sha256=dnE8jkcnP3X7Eu_tpjWU96pYJ5dULV-QVK_Im_msdEM,22675
+rebrandly_otel/traces.py,sha256=JY_3RWbzpUxzEx3GqTVgggsyA2DB4oR-zDftIFFJha4,7174
+rebrandly_otel-0.2.6.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
+rebrandly_otel-0.2.6.dist-info/METADATA,sha256=rzUepZJY4gckBpN6NIIrMajNwIQITBvEH-h6bSjaKM0,15740
+rebrandly_otel-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rebrandly_otel-0.2.6.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
+rebrandly_otel-0.2.6.dist-info/RECORD,,

rebrandly_otel-0.2.4.dist-info/RECORD

@@ -1,15 +0,0 @@
-rebrandly_otel/__init__.py,sha256=dEcTvHbhNNp0XD_7jojxeHXNa1QDCI9HxayeICaK_WY,491
-rebrandly_otel/fastapi_support.py,sha256=Fq0ggBvmz4nSGBw8p9PGIGcTcpwlbmt5BgLLbl1bf6s,8217
-rebrandly_otel/flask_support.py,sha256=G0Q3apg4urtvHfXFb1uANomryAL7Mo2nPPULEe7j7WQ,6316
-rebrandly_otel/http_utils.py,sha256=Cwo1Ku1-BMqRp37ycvHtbiArxEjFPYU_zkF1H9_7CIE,719
-rebrandly_otel/logs.py,sha256=9uwWbQ9h9YcxF7-2vtsYucaMGCqMoPnO2vWf6qkyGgI,5328
-rebrandly_otel/metrics.py,sha256=jZPygTY7vie33sadXc7P1DwLTKe9tJvAWSZuGHW1xQg,7743
-rebrandly_otel/otel_utils.py,sha256=rZhrLUSlDGxlaCDQMPeL8JGMj3F2HUp5Knl2e1HD-Rk,5782
-rebrandly_otel/pymysql_instrumentation.py,sha256=lS_V5DcsnpQ3f2PoNqeM7t3Jyiew2KNURM9iILfz8sM,6477
-rebrandly_otel/rebrandly_otel.py,sha256=8ty2rxcuaYV5WsNye7odxXXuh91kpdd5RVGOGSvsT98,22430
-rebrandly_otel/traces.py,sha256=JY_3RWbzpUxzEx3GqTVgggsyA2DB4oR-zDftIFFJha4,7174
-rebrandly_otel-0.2.4.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
-rebrandly_otel-0.2.4.dist-info/METADATA,sha256=EYalPNbuHeVBQNN8XIp-b-nnLgO3rICy2C494Unv8BA,14509
-rebrandly_otel-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rebrandly_otel-0.2.4.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
-rebrandly_otel-0.2.4.dist-info/RECORD,,