Skip to content

Commit 6f9c20e

Browse files
authored
Rename endpoint label to bentoml_endpoint tag (#21777)
* rename endpoint label to bentoml_endpoint tag * Update 21773.fixed * Rename 21773.fixed to 21777.fixed
1 parent 8653d93 commit 6f9c20e

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

bentoml/changelog.d/21777.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remap `endpoint` label to `bentoml_endpoint` to prevent it from clashing with OMv2 default `endpoint` tag

bentoml/datadog_checks/bentoml/check.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from urllib.parse import urlparse, urlunparse
55

66
from datadog_checks.base import OpenMetricsBaseCheckV2
7-
from datadog_checks.bentoml.metrics import ENDPOINT_METRICS, METRICS
7+
from datadog_checks.bentoml.metrics import ENDPOINT_METRICS, LABEL_RENAME_MAP, METRICS
88

99

1010
class BentomlCheck(OpenMetricsBaseCheckV2):
@@ -27,6 +27,7 @@ def get_default_config(self):
2727
return {
2828
'openmetrics_endpoint': self.openmetrics_endpoint,
2929
'metrics': [METRICS],
30+
'rename_labels': LABEL_RENAME_MAP,
3031
}
3132

3233
def check(self, instance):

bentoml/datadog_checks/bentoml/metrics.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@
1717
"/livez": "endpoint_livez",
1818
"/readyz": "endpoint_readyz",
1919
}
20+
21+
LABEL_RENAME_MAP = {
22+
"endpoint": "bentoml_endpoint",
23+
}

bentoml/tests/test_unit.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def test_bentoml_mock_metrics(dd_run_check, aggregator, mock_http_response):
3939
assert mock_http.get.call_count == 2
4040
aggregator.assert_metrics_using_metadata(get_metadata_metrics())
4141
aggregator.assert_all_metrics_covered()
42+
aggregator.assert_metric_has_tag('bentoml.service.request.count', 'bentoml_endpoint:/summarize')
4243
aggregator.assert_service_check('bentoml.openmetrics.health', ServiceCheck.OK)
4344

4445

0 commit comments

Comments
 (0)