Skip to content

Commit fc3f712

Browse files
authored
fix(ci-insights): Set mergify.test.flaky_detection_enabled as a boolean (#173)
1 parent 37afe38 commit fc3f712

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed
Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import os
2+
13
from opentelemetry.sdk.resources import Resource, ResourceDetector
24

35
from pytest_mergify import utils
@@ -7,13 +9,24 @@ class MergifyResourceDetector(ResourceDetector):
79
"""Detects OpenTelemetry Resource attributes for Mergify fields."""
810

911
OPENTELEMETRY_MERGIFY_MAPPING = {
10-
"mergify.test.flaky_detection_enabled": (
11-
str,
12-
"MERGIFY_TEST_FLAKY_DETECTION_ENABLED",
13-
),
1412
"mergify.test.job.name": (str, "MERGIFY_TEST_JOB_NAME"),
1513
}
1614

1715
def detect(self) -> Resource:
1816
attributes = utils.get_attributes(self.OPENTELEMETRY_MERGIFY_MAPPING)
17+
18+
if _is_flaky_test_detection_enabled():
19+
attributes["mergify.test.flaky_detection_enabled"] = True
20+
1921
return Resource(attributes)
22+
23+
24+
def _is_flaky_test_detection_enabled() -> bool:
25+
return os.getenv("MERGIFY_TEST_FLAKY_DETECTION", default="").lower() in {
26+
"y",
27+
"yes",
28+
"t",
29+
"true",
30+
"on",
31+
"1",
32+
}

tests/test_resources.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ def test_span_resources_attributes_mergify(
3737
pytester_with_spans: conftest.PytesterWithSpanT,
3838
monkeypatch: pytest.MonkeyPatch,
3939
) -> None:
40-
monkeypatch.setenv("MERGIFY_TEST_FLAKY_DETECTION_ENABLED", "true")
40+
monkeypatch.setenv("MERGIFY_TEST_FLAKY_DETECTION", "yes")
4141
monkeypatch.setenv("MERGIFY_TEST_JOB_NAME", "f00b4r")
4242

4343
result, spans = pytester_with_spans()
4444
assert spans is not None
4545
assert all(
46-
span.resource.attributes["mergify.test.flaky_detection_enabled"] == "true"
46+
span.resource.attributes["mergify.test.flaky_detection_enabled"] is True
4747
for span in spans.values()
4848
)
4949
assert all(

0 commit comments

Comments
 (0)