Skip to content

refactor(prometheus): simplify _CustomCollector by replacing deque with Optional[MetricsData] #5258

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

Open
sridhar-3009 wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −20
Open

refactor(prometheus): simplify _CustomCollector by replacing deque with Optional[MetricsData] #5258

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
39 changes: 19 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 Iterable, Sequence
from itertools import chain
from json import dumps
Expand Down Expand Up @@ -172,14 +171,14 @@ class _CustomCollector:

def __init__(self, disable_target_info: bool = False, prefix: str = ""):
self._callback = None
self._metrics_datas: deque[MetricsData] = deque()
self._metrics_data: MetricsData | None = None
self._disable_target_info = disable_target_info
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 @@ -190,29 +189,29 @@ def collect(self) -> Iterable[PrometheusMetric]:
if self._callback is not None:
self._callback()

metrics_data = self._metrics_data
self._metrics_data = None

if metrics_data is None:
return

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 not self._disable_target_info:
if self._target_info is None:
attributes: Attributes = {}
for res in metrics_data.resource_metrics:
attributes = {**attributes, **res.resource.attributes}

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
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

while self._metrics_datas:
self._translate_to_prometheus(
self._metrics_datas.popleft(), metric_family_id_metric_family
)
self._translate_to_prometheus(metrics_data, metric_family_id_metric_family)

if metric_family_id_metric_family:
yield from metric_family_id_metric_family.values()
if metric_family_id_metric_family:
yield from metric_family_id_metric_family.values()

# pylint: disable=too-many-locals,too-many-branches
def _translate_to_prometheus(
Expand Down
Loading