Skip to content

Commit a08562a

Browse files
committed
Make metric contract tests case-insensitive
1 parent 2cdcf29 commit a08562a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

contract-tests/images/mock-collector/mock_collector_client.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ def get_metrics(self, present_metrics: Set[str]) -> List[ResourceScopeMetric]:
9595
resources.
9696
"""
9797

98+
present_metrics_lower: Set[str] = {s.lower() for s in present_metrics}
99+
98100
def get_export() -> List[ExportMetricsServiceRequest]:
99101
response: GetMetricsResponse = self.client.get_metrics(GetMetricsRequest())
100102
serialized_metrics: RepeatedScalarFieldContainer[bytes] = response.metrics
@@ -108,8 +110,8 @@ def wait_condition(
108110
for resource_metric in exported_metric.resource_metrics:
109111
for scope_metric in resource_metric.scope_metrics:
110112
for metric in scope_metric.metrics:
111-
received_metrics.add(metric.name)
112-
return 0 < len(exported) == len(current) and present_metrics.issubset(received_metrics)
113+
received_metrics.add(metric.name.lower())
114+
return 0 < len(exported) == len(current) and present_metrics_lower.issubset(received_metrics)
113115

114116
exported_metrics: List[ExportMetricsServiceRequest] = _wait_for_content(get_export, wait_condition)
115117
metrics: List[ResourceScopeMetric] = []

contract-tests/tests/test/amazon/requests/requests_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def _assert_metric_attributes(
166166
) -> None:
167167
target_metrics: List[Metric] = []
168168
for resource_scope_metric in resource_scope_metrics:
169-
if resource_scope_metric.metric.name == metric_name:
169+
if resource_scope_metric.metric.name.lower() == metric_name.lower():
170170
target_metrics.append(resource_scope_metric.metric)
171171

172172
self.assertEqual(len(target_metrics), 1)

0 commit comments

Comments
 (0)