rebrandly-otel 0.1.18__py3-none-any.whl → 0.1.20__py3-none-any.whl

rebrandly_otel/logs.py

@@ -1,6 +1,7 @@
 # logs.py
 """Logging implementation for Rebrandly OTEL SDK."""
 import logging
+import sys
 from typing import Optional
 from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
 from opentelemetry.sdk._logs.export import (
@@ -34,12 +35,15 @@ class RebrandlyLogger:
             self._provider.add_log_record_processor(SimpleLogRecordProcessor(console_exporter))
 
         # Add OTLP exporter if configured
-        if get_otlp_endpoint():
-            otlp_exporter = OTLPLogExporter(endpoint=get_otlp_endpoint())
+        otel_endpoint = get_otlp_endpoint()
+        if otel_endpoint:
+            otlp_exporter = OTLPLogExporter(
+                timeout=5,
+                endpoint=otel_endpoint
+            )
             batch_processor = BatchLogRecordProcessor(otlp_exporter, export_timeout_millis=get_millis_batch_time())
             self._provider.add_log_record_processor(batch_processor)
 
-        # Set as global provider
         set_logger_provider(self._provider)
 
         # Configure standard logging

rebrandly_otel/metrics.py

@@ -78,8 +78,12 @@ class RebrandlyMeter:
             readers.append(console_reader)
 
         # Add OTLP exporter if configured
-        if get_otlp_endpoint() is not None:
-            otlp_exporter = OTLPMetricExporter(endpoint=get_otlp_endpoint())
+        otel_endpoint = get_otlp_endpoint()
+        if otel_endpoint is not None:
+            otlp_exporter = OTLPMetricExporter(
+                endpoint=otel_endpoint,
+                timeout=5
+            )
             otlp_reader = PeriodicExportingMetricReader(otlp_exporter, export_interval_millis=get_millis_batch_time())
             readers.append(otlp_reader)
 

rebrandly_otel/otel_utils.py

@@ -3,6 +3,8 @@
 
 import os
 import sys
+import grpc
+import json
 
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.semconv.attributes import service_attributes
@@ -33,8 +35,9 @@ def get_package_version():
         try:
             from importlib_metadata import version, PackageNotFoundError
             return version('rebrandly_otel')
-        except:
-            return '?.0.1'
+        except Exception as e:
+            print(f"[OTEL Utils] Warning: Could not get package version: {e}")
+            return '0.1.0'
 
 
 def get_service_name(service_name: str = None) -> str:
@@ -49,10 +52,31 @@ def get_service_version(service_version: str = None) -> str:
     return service_version
 
 
-def get_otlp_endpoint(otlp_endpoint: str = None) -> str:
-    if otlp_endpoint is None:
-        return os.environ.get('OTEL_EXPORTER_OTLP_ENDPOINT', None)
-    return otlp_endpoint
+def get_otlp_endpoint(otlp_endpoint: str = None) -> str | None:
+    endpoint = otlp_endpoint or os.environ.get('OTEL_EXPORTER_OTLP_ENDPOINT', None)
+
+    if endpoint is not None:
+        try:
+            from urllib.parse import urlparse
+
+            # Parse the endpoint
+            parsed = urlparse(endpoint if '://' in endpoint else f'http://{endpoint}')
+            host = parsed.hostname
+            port = parsed.port
+
+            # Test gRPC connection
+            channel = grpc.insecure_channel(f'{host}:{port}')
+            try:
+                # Wait for the channel to be ready
+                grpc.channel_ready_future(channel).result(timeout=3)
+                return endpoint
+            finally:
+                channel.close()
+
+        except Exception as e:
+            print(f"[OTEL] Failed to connect to OTLP endpoint {endpoint}: {e}")
+            return None
+    return endpoint
 
 def is_otel_debug() -> bool:
     return os.environ.get('OTEL_DEBUG', 'false').lower() == 'true'
@@ -61,5 +85,25 @@ def is_otel_debug() -> bool:
 def get_millis_batch_time():
     try:
         return int(os.environ.get('BATCH_EXPORT_TIME_MILLIS', 100))
-    except:
-        return 5000
+    except Exception as e:
+        print(f"[OTEL Utils] Warning: Invalid BATCH_EXPORT_TIME_MILLIS value, using default 5000ms: {e}")
+        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/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')
@@ -260,8 +261,11 @@ class RebrandlyOTEL:
                 try:
                     # Create span and execute function
                     span_function = self.span
-                    if record is not None and ('MessageAttributes' in record or 'messageAttributes' in record):
+                    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
@@ -370,6 +374,7 @@ class RebrandlyOTEL:
             time.sleep(0.1)
 
         except Exception as e:
+            print(f"[Rebrandly OTEL] Error during force flush: {e}")
             success = False
 
         return success
@@ -486,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

rebrandly_otel/traces.py

@@ -32,8 +32,12 @@ class RebrandlyTracer:
             self._provider.add_span_processor(SimpleSpanProcessor(console_exporter))
 
         # Add OTLP exporter if configured
-        if get_otlp_endpoint() is not None:
-            otlp_exporter = OTLPSpanExporter(endpoint=get_otlp_endpoint())
+        otel_endpoint = get_otlp_endpoint()
+        if otel_endpoint is not None:
+            otlp_exporter = OTLPSpanExporter(
+                endpoint=otel_endpoint,
+                timeout=5
+            )
 
             # Use batch processor for production
             batch_processor = BatchSpanProcessor(otlp_exporter, export_timeout_millis=get_millis_batch_time())
@@ -139,14 +143,14 @@ class RebrandlyTracer:
         if target_span and hasattr(target_span, 'record_exception'):
             if exception is not None:
                 target_span.record_exception(exception)
-            target_span.set_status(trace.Status(trace.StatusCode.ERROR, str(exception)), description=msg)
+                target_span.set_status(trace.Status(trace.StatusCode.ERROR, str(exception)))
 
 
     def record_span_success(self, span: Optional[Span] = None, msg: Optional[str] = None):
-        """Record an exception on a span."""
+        """Record success on a span."""
         target_span = span or self.get_current_span()
-        if target_span and hasattr(target_span, 'record_exception'):
-            target_span.set_status(trace.Status(trace.StatusCode.OK), description=msg)
+        if target_span and hasattr(target_span, 'set_status'):
+            target_span.set_status(trace.Status(trace.StatusCode.OK))
 
 
     def add_event(self, name: str, attributes: Optional[Dict[str, Any]] = None, span: Optional[Span] = None):

{rebrandly_otel-0.1.18.dist-info → rebrandly_otel-0.1.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rebrandly_otel
-Version: 0.1.18
+Version: 0.1.20
 Summary: Python OTEL wrapper by Rebrandly
 Home-page: https://github.com/rebrandly/rebrandly-otel-python
 Author: Antonio Romano
@@ -360,6 +360,93 @@ if __name__ == '__main__':
     app.run(debug=True)
 ```
 
+###
+FastAPI
+
+```python
+
+# main_fastapi.py
+from fastapi import FastAPI, HTTPException, Depends
+from contextlib import asynccontextmanager
+from src.rebrandly_otel import otel, logger, force_flush
+from src.fastapi_support import setup_fastapi, get_current_span
+from datetime import datetime
+from typing import Optional
+import uvicorn
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    # Startup
+    logger.info("FastAPI application starting up")
+    yield
+    # Shutdown
+    logger.info("FastAPI application shutting down")
+    force_flush()
+
+app = FastAPI(title="FastAPI OTEL Example", lifespan=lifespan)
+
+# Setup FastAPI with OTEL
+setup_fastapi(otel, app)
+
+@app.get("/health")
+async def health():
+    """Health check endpoint."""
+    logger.info("Health check requested")
+    return {"status": "healthy"}
+
+@app.post("/process")
+@app.get("/process")
+async def process(span = Depends(get_current_span)):
+    """Process endpoint with custom span."""
+    with otel.span("process_request"):
+        logger.info("Processing request")
+
+        # You can also use the injected span directly
+        if span:
+            span.add_event("custom_processing_event", {
+                "timestamp": datetime.now().isoformat()
+            })
+
+        # Simulate some processing
+        result = {
+            "processed": True,
+            "timestamp": datetime.now().isoformat()
+        }
+
+        logger.info(f"Returning result: {result}")
+        return result
+
+@app.get("/error")
+async def error():
+    """Endpoint that raises an error."""
+    logger.error("Error endpoint called")
+    raise HTTPException(status_code=400, detail="Simulated error")
+
+@app.get("/exception")
+async def exception():
+    """Endpoint that raises an unhandled exception."""
+    logger.error("Exception endpoint called")
+    raise ValueError("Simulated unhandled exception")
+
+@app.get("/items/{item_id}")
+async def get_item(item_id: int, q: Optional[str] = None):
+    """Example endpoint with path and query parameters."""
+    with otel.span("fetch_item", attributes={"item_id": item_id, "query": q}):
+        logger.info(f"Fetching item {item_id} with query: {q}")
+
+        if item_id == 999:
+            raise HTTPException(status_code=404, detail="Item not found")
+
+        return {
+            "item_id": item_id,
+            "name": f"Item {item_id}",
+            "query": q
+        }
+
+if __name__ == "__main__":
+    uvicorn.run(app, host="0.0.0.0", port=8000)
+```
+
 ### More examples
 You can find More examples [here](examples)
 

rebrandly_otel-0.1.20.dist-info/RECORD

@@ -0,0 +1,13 @@
+rebrandly_otel/__init__.py,sha256=tkZQJo5hR4FJ4dIRc-3b_YGxGo-uq-DsiSz8shdac-k,397
+rebrandly_otel/fastapi_support.py,sha256=RuBBZJuzr3osBDrkHZ0oQPV70pmvnqxTfBBDVFBFQlo,8019
+rebrandly_otel/flask_support.py,sha256=cUVMGTjN6N8xZD4Zyng2LRWhNj62C5nmTH91SnYBp2A,6072
+rebrandly_otel/logs.py,sha256=5byeN-cDmBRpeZDw9IBz_vuiJm3wsGEbcAk5pwYHNAU,3791
+rebrandly_otel/metrics.py,sha256=8aAqdr3SAcX_rVivTl_aHeD_BRByt-Qnfij_51Y7Fn0,7561
+rebrandly_otel/otel_utils.py,sha256=DodoBBqzDlo3pC5TLmWT2eAAE8NvW6MxxAoBrfVaxc4,3572
+rebrandly_otel/rebrandly_otel.py,sha256=wT1GiOQQMZl2sVG8MGJ9qM9gx_zRwS7U5oAe77RbJdk,21618
+rebrandly_otel/traces.py,sha256=JY_3RWbzpUxzEx3GqTVgggsyA2DB4oR-zDftIFFJha4,7174
+rebrandly_otel-0.1.20.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
+rebrandly_otel-0.1.20.dist-info/METADATA,sha256=II9R2GM1UWTYg-JmUbQewcXR9J_jww3eiKVOApklmkM,12854
+rebrandly_otel-0.1.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rebrandly_otel-0.1.20.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
+rebrandly_otel-0.1.20.dist-info/RECORD,,

rebrandly_otel-0.1.18.dist-info/RECORD

@@ -1,13 +0,0 @@
-rebrandly_otel/__init__.py,sha256=tkZQJo5hR4FJ4dIRc-3b_YGxGo-uq-DsiSz8shdac-k,397
-rebrandly_otel/fastapi_support.py,sha256=RuBBZJuzr3osBDrkHZ0oQPV70pmvnqxTfBBDVFBFQlo,8019
-rebrandly_otel/flask_support.py,sha256=cUVMGTjN6N8xZD4Zyng2LRWhNj62C5nmTH91SnYBp2A,6072
-rebrandly_otel/logs.py,sha256=92jaxzI5hCHnKHu3lsSAa7K_SPHQgL46AlQUESsYNds,3724
-rebrandly_otel/metrics.py,sha256=8Mgz_VcgsGQaBeYH2y6FtLGSqMqTwa2ilAa1pbYYymU,7472
-rebrandly_otel/otel_utils.py,sha256=tKelaETEeZxxvddKDpY8ESsGS77CcBbQku4oQjmiJx0,2078
-rebrandly_otel/rebrandly_otel.py,sha256=Es6ZQC2hr6qJ_M4Y-7nUvcAnGADj6-ofKn8hKFw7P1k,21166
-rebrandly_otel/traces.py,sha256=v582WtJv3t4Bn92vlDyZouibHtgWNxdRo_XmQCmSOEA,7126
-rebrandly_otel-0.1.18.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
-rebrandly_otel-0.1.18.dist-info/METADATA,sha256=CyoVBpLByY8eqh5C7UTmKTBH62thbZww1GxPjYKSV6Y,10410
-rebrandly_otel-0.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rebrandly_otel-0.1.18.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
-rebrandly_otel-0.1.18.dist-info/RECORD,,