Skip to content

Parse negative span offsets in OpenMetrics native histograms #1233

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
auraseb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Parse negative span offsets in OpenMetrics native histograms #1233

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion prometheus_client/openmetrics/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ def _parse_nh_sample(text, suffixes):

def _parse_nh_struct(text):
pattern = r'(\w+):\s*([^,}]+)'
re_spans = re.compile(r'(positive_spans|negative_spans):\[(\d+:\d+(,\d+:\d+)*)\]')
re_spans = re.compile(r'(positive_spans|negative_spans):\[(-?\d+:\d+(,-?\d+:\d+)*)\]')
re_deltas = re.compile(r'(positive_deltas|negative_deltas):\[(-?\d+(?:,-?\d+)*)\]')

items = dict(re.findall(pattern, text))
Expand Down
12 changes: 12 additions & 0 deletions tests/openmetrics/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,18 @@ def test_native_histogram_three_pos_spans_no_neg_spans_or_deltas(self):
hfm.add_sample("nhsp", None, None, None, None, NativeHistogram(4, 6, 3, 2.938735877055719e-39, 1, (BucketSpan(0, 1), BucketSpan(7, 1), BucketSpan(4, 1)), None, (1, 0, 0), None))
self.assertEqual([hfm], families)

def test_native_histogram_negative_span_offsets(self):
families = text_string_to_metric_families("""# TYPE nhneg histogram
# HELP nhneg Is a native histogram whose first spans start at negative bucket indexes
nhneg {count:5,sum:-1.5,schema:0,zero_threshold:0.001,zero_count:0,positive_spans:[-2:2],negative_spans:[-1:1,2:1],positive_deltas:[1,1],negative_deltas:[1,0]}
# EOF
""")
families = list(families)

hfm = HistogramMetricFamily("nhneg", "Is a native histogram whose first spans start at negative bucket indexes")
hfm.add_sample("nhneg", None, None, None, None, NativeHistogram(5, -1.5, 0, 0.001, 0, (BucketSpan(-2, 2),), (BucketSpan(-1, 1), BucketSpan(2, 1)), (1, 1), (1, 0)))
self.assertEqual([hfm], families)

def test_native_histogram_with_labels(self):
families = text_string_to_metric_families("""# TYPE hist_w_labels histogram
# HELP hist_w_labels Is a basic example of a native histogram with labels
Expand Down