rebrandly-otel 0.1.33__tar.gz → 0.1.35__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of rebrandly-otel might be problematic. Click here for more details.
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/PKG-INFO +1 -1
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/rebrandly_otel.egg-info/PKG-INFO +1 -1
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/setup.py +1 -1
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/src/logs.py +5 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/src/metrics.py +8 -2
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/src/rebrandly_otel.py +8 -3
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/LICENSE +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/README.md +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/rebrandly_otel.egg-info/SOURCES.txt +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/rebrandly_otel.egg-info/dependency_links.txt +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/rebrandly_otel.egg-info/requires.txt +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/rebrandly_otel.egg-info/top_level.txt +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/setup.cfg +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/src/__init__.py +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/src/fastapi_support.py +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/src/flask_support.py +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/src/otel_utils.py +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/src/pymysql_instrumentation.py +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/src/traces.py +0 -0
- {rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/tests/test_usage.py +0 -0
|
@@ -73,6 +73,11 @@ class RebrandlyLogger:
|
|
|
73
73
|
# Add OTEL handler without removing existing handlers
|
|
74
74
|
otel_handler = LoggingHandler(logger_provider=self._provider)
|
|
75
75
|
otel_handler.setLevel(logging.INFO)
|
|
76
|
+
|
|
77
|
+
# Add filter to prevent OpenTelemetry's internal logs from being captured
|
|
78
|
+
# This prevents infinite recursion when OTEL tries to log warnings
|
|
79
|
+
otel_handler.addFilter(lambda record: not record.name.startswith('opentelemetry'))
|
|
80
|
+
|
|
76
81
|
root_logger.addHandler(otel_handler)
|
|
77
82
|
|
|
78
83
|
# Create service-specific logger
|
|
@@ -120,7 +120,7 @@ class RebrandlyMeter:
|
|
|
120
120
|
def __register_default_metrics(self):
|
|
121
121
|
"""Register default metrics."""
|
|
122
122
|
for name, definition in self.DEFAULT_METRICS.items():
|
|
123
|
-
self.register_metric(definition)
|
|
123
|
+
self.register_metric(definition, key=name)
|
|
124
124
|
|
|
125
125
|
@property
|
|
126
126
|
def meter(self) -> Meter:
|
|
@@ -162,13 +162,19 @@ class RebrandlyMeter:
|
|
|
162
162
|
except Exception as e:
|
|
163
163
|
print(f"[Meter] Error during shutdown: {e}")
|
|
164
164
|
|
|
165
|
-
def register_metric(self, definition: MetricDefinition) -> Instrument:
|
|
165
|
+
def register_metric(self, definition: MetricDefinition, key: Optional[str] = None) -> Instrument:
|
|
166
166
|
"""Register a new metric."""
|
|
167
|
+
# Use the full name as primary key
|
|
167
168
|
if definition.name in self._metrics:
|
|
168
169
|
return self._metrics[definition.name]
|
|
169
170
|
|
|
170
171
|
metric = self.__create_metric(definition)
|
|
171
172
|
self._metrics[definition.name] = metric
|
|
173
|
+
|
|
174
|
+
# Also store by key name if provided (for easy lookup)
|
|
175
|
+
if key:
|
|
176
|
+
self._metrics[key] = metric
|
|
177
|
+
|
|
172
178
|
return metric
|
|
173
179
|
|
|
174
180
|
def __create_metric(self, definition: MetricDefinition) -> Instrument:
|
|
@@ -348,9 +348,14 @@ class RebrandlyOTEL:
|
|
|
348
348
|
cpu_percent = psutil.cpu_percent(interval=0.1) # Shorter interval for Lambda
|
|
349
349
|
memory = psutil.virtual_memory()
|
|
350
350
|
|
|
351
|
-
# Record metrics using standardized names
|
|
352
|
-
|
|
353
|
-
|
|
351
|
+
# Record metrics using standardized names (with safety checks)
|
|
352
|
+
try:
|
|
353
|
+
if self.meter.GlobalMetrics.memory_usage_bytes:
|
|
354
|
+
self.meter.GlobalMetrics.memory_usage_bytes.set(memory.used)
|
|
355
|
+
if self.meter.GlobalMetrics.cpu_usage_percentage:
|
|
356
|
+
self.meter.GlobalMetrics.cpu_usage_percentage.set(cpu_percent)
|
|
357
|
+
except Exception as e:
|
|
358
|
+
print(f"[Rebrandly OTEL] Warning: Could not record system metrics: {e}")
|
|
354
359
|
|
|
355
360
|
print(f"Function Memory usage: {memory.percent}%, CPU usage: {cpu_percent}%")
|
|
356
361
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rebrandly_otel-0.1.33 → rebrandly_otel-0.1.35}/rebrandly_otel.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|