Skip to content

Simplify Prometheus metric collection #5368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
09Catho wants to merge 1 commit into from
Closed

Simplify Prometheus metric collection #5368

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
---
"""

from collections import deque
from collections.abc import Callable, Iterable, Sequence
from itertools import chain
from json import dumps
Expand Down Expand Up @@ -314,15 +313,15 @@ def __init__(
scope_info_enabled: bool = True,
):
self._callback = None
self._metrics_datas: deque[MetricsData] = deque()
self._metrics_data: MetricsData | None = None
self._disable_target_info = disable_target_info
self._scope_info_enabled = scope_info_enabled
self._target_info = None
self._prefix = prefix

def add_metrics_data(self, metrics_data: MetricsData) -> None:
"""Add metrics to Prometheus data"""
self._metrics_datas.append(metrics_data)
self._metrics_data = metrics_data

def collect(self) -> Iterable[PrometheusMetric]:
"""Collect fetches the metrics from OpenTelemetry
Expand All @@ -335,27 +334,28 @@ def collect(self) -> Iterable[PrometheusMetric]:

metric_family_id_metric_family = {}

if len(self._metrics_datas):
if not self._disable_target_info:
if self._target_info is None:
attributes: Attributes = {}
for res in self._metrics_datas[0].resource_metrics:
attributes = {**attributes, **res.resource.attributes}
if self._metrics_data is None:
return
Comment on lines +337 to +338

self._target_info = self._create_info_metric(
_TARGET_INFO_NAME, _TARGET_INFO_DESCRIPTION, attributes
)
metric_family_id_metric_family[_TARGET_INFO_NAME] = (
self._target_info
)
if not self._disable_target_info:
if self._target_info is None:
attributes: Attributes = {}
for res in self._metrics_data.resource_metrics:
attributes = {**attributes, **res.resource.attributes}

while self._metrics_datas:
self._translate_to_prometheus(
self._metrics_datas.popleft(), metric_family_id_metric_family
self._target_info = self._create_info_metric(
_TARGET_INFO_NAME, _TARGET_INFO_DESCRIPTION, attributes
)
metric_family_id_metric_family[_TARGET_INFO_NAME] = (
self._target_info
)

if metric_family_id_metric_family:
yield from metric_family_id_metric_family.values()
self._translate_to_prometheus(
self._metrics_data, metric_family_id_metric_family
)

if metric_family_id_metric_family:
yield from metric_family_id_metric_family.values()

def _translate_to_prometheus(
self,
Expand Down
Loading