Skip to content

Commit 6799afc

Browse files
committed
add more tests as per comments
Signed-off-by: emdneto <[email protected]>
1 parent f7bcf51 commit 6799afc

File tree

1 file changed

+47
-11
lines changed

1 file changed

+47
-11
lines changed

opentelemetry-instrumentation/tests/test_semconv.py

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from opentelemetry.trace.status import StatusCode
2727

2828

29-
def semconv_stability_mode(mode):
29+
def stability_mode(mode):
3030
def decorator(test_case):
3131
@patch.dict(os.environ, {OTEL_SEMCONV_STABILITY_OPT_IN: mode})
3232
def wrapper(*args, **kwargs):
@@ -40,25 +40,31 @@ def wrapper(*args, **kwargs):
4040

4141

4242
class TestOpenTelemetrySemConvStability(TestCase):
43-
@semconv_stability_mode("")
43+
@stability_mode("")
4444
def test_default_mode(self):
4545
self.assertEqual(
4646
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
4747
_OpenTelemetryStabilitySignalType.HTTP
4848
),
4949
_StabilityMode.DEFAULT,
5050
)
51+
self.assertEqual(
52+
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
53+
_OpenTelemetryStabilitySignalType.DATABASE
54+
),
55+
_StabilityMode.DEFAULT,
56+
)
5157

52-
@semconv_stability_mode("http")
53-
def test_http_mode(self):
58+
@stability_mode("http")
59+
def test_http_stable_mode(self):
5460
self.assertEqual(
5561
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
5662
_OpenTelemetryStabilitySignalType.HTTP
5763
),
5864
_StabilityMode.HTTP,
5965
)
6066

61-
@semconv_stability_mode("http/dup")
67+
@stability_mode("http/dup")
6268
def test_http_dup_mode(self):
6369
self.assertEqual(
6470
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
@@ -67,16 +73,16 @@ def test_http_dup_mode(self):
6773
_StabilityMode.HTTP_DUP,
6874
)
6975

70-
@semconv_stability_mode("database")
71-
def test_database_mode(self):
76+
@stability_mode("database")
77+
def test_database_stable_mode(self):
7278
self.assertEqual(
7379
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
7480
_OpenTelemetryStabilitySignalType.DATABASE
7581
),
7682
_StabilityMode.DATABASE,
7783
)
7884

79-
@semconv_stability_mode("database/dup")
85+
@stability_mode("database/dup")
8086
def test_database_dup_mode(self):
8187
self.assertEqual(
8288
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
@@ -85,22 +91,52 @@ def test_database_dup_mode(self):
8591
_StabilityMode.DATABASE_DUP,
8692
)
8793

88-
@semconv_stability_mode("database,http")
89-
def test_multiple_stability_modes(self):
94+
@stability_mode("database,http")
95+
def test_multiple_stability_database_http_modes(self):
96+
self.assertEqual(
97+
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
98+
_OpenTelemetryStabilitySignalType.DATABASE
99+
),
100+
_StabilityMode.DATABASE,
101+
)
102+
self.assertEqual(
103+
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
104+
_OpenTelemetryStabilitySignalType.HTTP
105+
),
106+
_StabilityMode.HTTP,
107+
)
108+
109+
@stability_mode("database,http/dup")
110+
def test_multiple_stability_database_http_dup_modes(self):
90111
self.assertEqual(
91112
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
92113
_OpenTelemetryStabilitySignalType.DATABASE
93114
),
94115
_StabilityMode.DATABASE,
95116
)
117+
self.assertEqual(
118+
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
119+
_OpenTelemetryStabilitySignalType.HTTP
120+
),
121+
_StabilityMode.HTTP_DUP,
122+
)
123+
124+
@stability_mode("database/dup,http")
125+
def test_multiple_stability_database_dup_http_stable_modes(self):
126+
self.assertEqual(
127+
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
128+
_OpenTelemetryStabilitySignalType.DATABASE
129+
),
130+
_StabilityMode.DATABASE_DUP,
131+
)
96132
self.assertEqual(
97133
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(
98134
_OpenTelemetryStabilitySignalType.HTTP
99135
),
100136
_StabilityMode.HTTP,
101137
)
102138

103-
@semconv_stability_mode("database,database/dup,http,http/dup")
139+
@stability_mode("database,database/dup,http,http/dup")
104140
def test_stability_mode_dup_precedence(self):
105141
self.assertEqual(
106142
_OpenTelemetrySemanticConventionStability._get_opentelemetry_stability_opt_in_mode(

0 commit comments

Comments
 (0)