rebrandly-otel 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

rebrandly_otel/otel_utils.py

@@ -6,11 +6,14 @@ 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
 
+# Cache for endpoint validation results
+_ENDPOINT_CACHE = {}
+
 def create_resource(name: str = None, version: str = None) -> Resource:
 
     if name is None:
@@ -18,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"
     }
 
@@ -38,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
     )
@@ -85,36 +98,49 @@ def get_subsystem_name(subsystem_name: str = None) -> str:
 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:
-
-        if endpoint.strip() == "":
-            return None
+    # Return cached result if available
+    cache_key = endpoint if endpoint else '__none__'
+    if cache_key in _ENDPOINT_CACHE:
+        return _ENDPOINT_CACHE[cache_key]
 
-        try:
-            from urllib.parse import urlparse
+    # Store the result to cache
+    result = None
 
-            # Parse the endpoint
-            parsed = urlparse(endpoint if '://' in endpoint else f'http://{endpoint}')
-            host = parsed.hostname
-            port = parsed.port
+    if endpoint is not None:
 
-            # Test gRPC connection
-            channel = grpc.insecure_channel(f'{host}:{port}')
+        if endpoint.strip() == "":
+            result = None
+        else:
             try:
-                # Wait for the channel to be ready
-                grpc.channel_ready_future(channel).result(timeout=3)
-                return endpoint
-            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] 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
+                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)
+                    result = endpoint
+                finally:
+                    channel.close()
+
+            except grpc.FutureTimeoutError:
+                print(f"[OTEL] Error: Connection timeout to OTLP endpoint {endpoint}. Check if the collector is running and accessible.")
+                result = None
+            except Exception as 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.")
+                result = None
+    else:
+        result = None
+
+    # Cache the result
+    _ENDPOINT_CACHE[cache_key] = result
+    return result
 
 def is_otel_debug() -> bool:
     return os.environ.get('OTEL_DEBUG', 'false').lower() == 'true'

rebrandly_otel/pymysql_instrumentation.py

@@ -41,8 +41,8 @@ def instrument_pymysql(otel_instance, connection, options=None):
         print('[Rebrandly OTEL PyMySQL] No valid OTEL instance provided for instrumentation')
         return connection
 
-    # Get tracer from RebrandlyOTEL instance
-    tracer = otel_instance.tracer
+    # Get the underlying OpenTelemetry tracer from RebrandlyOTEL instance
+    tracer = otel_instance.tracer.tracer
 
     # Extract database name from connection
     db_name = getattr(connection, 'db', None) or getattr(connection, 'database', None)

{rebrandly_otel-0.2.3.dist-info → rebrandly_otel-0.2.5.dist-info}/METADATA

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

{rebrandly_otel-0.2.3.dist-info → rebrandly_otel-0.2.5.dist-info}/RECORD

@@ -4,12 +4,12 @@ rebrandly_otel/flask_support.py,sha256=G0Q3apg4urtvHfXFb1uANomryAL7Mo2nPPULEe7j7
 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=f7n1vEUXeMtTT4CafFZ0-yYhjmoVhBZqoCe9DpdhpDQ,5297
-rebrandly_otel/pymysql_instrumentation.py,sha256=rUCEbCOD5FiquH7MOcXJ3NCUeGCO0dvkzdylKm-BLZs,6441
+rebrandly_otel/otel_utils.py,sha256=vr5ygRXY2If-c2Vq2ectupTm1AHgSPkflEw25O5T7NE,6162
+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.3.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
-rebrandly_otel-0.2.3.dist-info/METADATA,sha256=1BcpvnEcc8CMJ2uF7Gy8BkL-rkHBVFnlQEUn6vrGODg,14509
-rebrandly_otel-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rebrandly_otel-0.2.3.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
-rebrandly_otel-0.2.3.dist-info/RECORD,,
+rebrandly_otel-0.2.5.dist-info/licenses/LICENSE,sha256=KMXHvTwP62S2q-SG7CFfMU_09rUwxiqlM0izaYGdcgY,1103
+rebrandly_otel-0.2.5.dist-info/METADATA,sha256=-kU1ruj2BNZA2yJ8vYouX1wiuxfzyFJWri69bThqJeI,14509
+rebrandly_otel-0.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rebrandly_otel-0.2.5.dist-info/top_level.txt,sha256=26PSC1gjVUl8tTH5QfKbFevjVV4E2yojoukEfiTScvM,15
+rebrandly_otel-0.2.5.dist-info/RECORD,,