fix: change bucket boundaries and attributes in the metrics

Author: dalpasso

eodag/rest/utils.py

@@ -1126,26 +1126,56 @@ def telemetry_init(fastapi_app: Optional[FastAPI] = None) -> None:
     trace.set_tracer_provider(tracer_provider)
     # metrics
     reader = PeriodicExportingMetricReader(OTLPMetricExporter())
-    view = View(
+    view_histograms: View = View(
         instrument_type=Histogram,
         aggregation=ExplicitBucketHistogramAggregation(
             boundaries=(
-                0.02,
-                0.05,
-                0.1,
                 0.25,
-                0.5,
+                0.50,
                 0.75,
                 1.0,
-                2.5,
+                1.5,
+                2.0,
+                3.0,
+                4.0,
                 5.0,
-                7.5,
+                6.0,
+                7.0,
+                8.0,
+                9.0,
                 10.0,
-            ),
+            )
+        ),
+    )
+    view_overhead_histograms: View = View(
+        instrument_type=Histogram,
+        instrument_name="*overhead*",
+        aggregation=ExplicitBucketHistogramAggregation(
+            boundaries=(
+                0.030,
+                0.040,
+                0.050,
+                0.060,
+                0.070,
+                0.080,
+                0.090,
+                0.100,
+                0.125,
+                0.150,
+                0.175,
+                0.200,
+                0.250,
+                0.500,
+            )
         ),
     )
     meter_provider = MeterProvider(
-        resource=resource, metric_readers=[reader], views=(view,)
+        resource=resource,
+        metric_readers=[reader],
+        views=(
+            view_histograms,
+            view_overhead_histograms,
+        ),
     )
     metrics.set_meter_provider(meter_provider)
 

eodag/utils/instrumentation/eodag/__init__.py

@@ -195,8 +195,11 @@ def wrapper_server_search_stac_items(
             request_duration_seconds.record(
                 timer.get_global_time(), attributes=attributes
             )
+            overhead_attributes = {
+                k: v for k, v in attributes.items() if k != "product_type"
+            }
             request_overhead_duration_seconds.record(
-                timer.get_overhead_time(), attributes=attributes
+                timer.get_overhead_time(), attributes=overhead_attributes
             )
             del overhead_timers[trace_id]
             del trace_attributes[trace_id]
@@ -336,8 +339,11 @@ def wrapper_server_download_stac_item_by_id_stream(
             request_duration_seconds.record(
                 timer.get_global_time(), attributes=attributes
             )
+            overhead_attributes = {
+                k: v for k, v in attributes.items() if k != "product_type"
+            }
             request_overhead_duration_seconds.record(
-                timer.get_overhead_time(), attributes=attributes
+                timer.get_overhead_time(), attributes=overhead_attributes
             )
             del overhead_timers[trace_id]
             del trace_attributes[trace_id]
@@ -485,7 +491,7 @@ def _available_providers_callback(
         observations = [
             Observation(
                 v,
-                {"label": "Available Providers", "provider_id": k},
+                {"provider_id": k},
             )
             for k, v in observations_dict.items()
         ]
@@ -514,7 +520,7 @@ def _available_product_types_callback(
         observations = [
             Observation(
                 v,
-                {"label": "Available Product Types", "product_type_id": k},
+                {"product_type_id": k},
             )
             for k, v in observations_dict.items()
         ]