Skip to content

Commit ea07244

Browse files
tammy-baylis-switammy-baylis-swi
committed
Update exporter tests
1 parent 4ae3e2c commit ea07244

File tree

3 files changed

+129
-63
lines changed

3 files changed

+129
-63
lines changed

‎exporter/opentelemetry-exporter-otlp-proto-common/tests/test_log_encoder.py‎

Lines changed: 61 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
from opentelemetry.sdk.resources import Resource as SDKResource
5151
from opentelemetry.sdk.util.instrumentation import InstrumentationScope
5252
from opentelemetry.trace import TraceFlags
53+
from opentelemetry.trace.span import SpanContext
5354

5455

5556
class TestOTLPLogEncoder(unittest.TestCase):
@@ -88,9 +89,12 @@ def _get_sdk_log_data() -> List[LogData]:
8889
log_record=SDKLogRecord(
8990
timestamp=1644650195189786880,
9091
observed_timestamp=1644650195189786881,
91-
trace_id=89564621134313219400156819398935297684,
92-
span_id=1312458408527513268,
93-
trace_flags=TraceFlags(0x01),
92+
span_context=SpanContext(
93+
89564621134313219400156819398935297684,
94+
1312458408527513268,
95+
True,
96+
TraceFlags(0x01),
97+
),
9498
severity_text="WARN",
9599
severity_number=SeverityNumber.WARN,
96100
body="Do not go gentle into that good night. Rage, rage against the dying of the light",
@@ -109,9 +113,12 @@ def _get_sdk_log_data() -> List[LogData]:
109113
log_record=SDKLogRecord(
110114
timestamp=1644650249738562048,
111115
observed_timestamp=1644650249738562049,
112-
trace_id=0,
113-
span_id=0,
114-
trace_flags=TraceFlags.DEFAULT,
116+
span_context=SpanContext(
117+
0,
118+
0,
119+
True,
120+
TraceFlags.DEFAULT,
121+
),
115122
severity_text="WARN",
116123
severity_number=SeverityNumber.WARN,
117124
body="Cooper, this is no time for caution!",
@@ -127,9 +134,12 @@ def _get_sdk_log_data() -> List[LogData]:
127134
log_record=SDKLogRecord(
128135
timestamp=1644650427658989056,
129136
observed_timestamp=1644650427658989057,
130-
trace_id=271615924622795969659406376515024083555,
131-
span_id=4242561578944770265,
132-
trace_flags=TraceFlags(0x01),
137+
span_context=SpanContext(
138+
271615924622795969659406376515024083555,
139+
4242561578944770265,
140+
True,
141+
TraceFlags(0x01),
142+
),
133143
severity_text="DEBUG",
134144
severity_number=SeverityNumber.DEBUG,
135145
body="To our galaxy",
@@ -143,9 +153,12 @@ def _get_sdk_log_data() -> List[LogData]:
143153
log_record=SDKLogRecord(
144154
timestamp=1644650584292683008,
145155
observed_timestamp=1644650584292683009,
146-
trace_id=212592107417388365804938480559624925555,
147-
span_id=6077757853989569223,
148-
trace_flags=TraceFlags(0x01),
156+
span_context=SpanContext(
157+
212592107417388365804938480559624925555,
158+
6077757853989569223,
159+
True,
160+
TraceFlags(0x01),
161+
),
149162
severity_text="INFO",
150163
severity_number=SeverityNumber.INFO,
151164
body="Love is the one thing that transcends time and space",
@@ -164,9 +177,12 @@ def _get_sdk_log_data() -> List[LogData]:
164177
log_record=SDKLogRecord(
165178
timestamp=1644650584292683009,
166179
observed_timestamp=1644650584292683010,
167-
trace_id=212592107417388365804938480559624925555,
168-
span_id=6077757853989569445,
169-
trace_flags=TraceFlags(0x01),
180+
span_context=SpanContext(
181+
212592107417388365804938480559624925555,
182+
6077757853989569445,
183+
True,
184+
TraceFlags(0x01),
185+
),
170186
severity_text="INFO",
171187
severity_number=SeverityNumber.INFO,
172188
body={"error": None, "array_with_nones": [1, None, 2]},
@@ -182,9 +198,12 @@ def _get_sdk_log_data() -> List[LogData]:
182198
log_record=SDKLogRecord(
183199
timestamp=1644650584292683022,
184200
observed_timestamp=1644650584292683022,
185-
trace_id=212592107417388365804938480559624925522,
186-
span_id=6077757853989569222,
187-
trace_flags=TraceFlags(0x01),
201+
span_context=SpanContext(
202+
212592107417388365804938480559624925522,
203+
6077757853989569222,
204+
True,
205+
TraceFlags(0x01),
206+
),
188207
severity_text="ERROR",
189208
severity_number=SeverityNumber.ERROR,
190209
body="This instrumentation scope has a schema url",
@@ -205,9 +224,12 @@ def _get_sdk_log_data() -> List[LogData]:
205224
log_record=SDKLogRecord(
206225
timestamp=1644650584292683033,
207226
observed_timestamp=1644650584292683033,
208-
trace_id=212592107417388365804938480559624925533,
209-
span_id=6077757853989569233,
210-
trace_flags=TraceFlags(0x01),
227+
span_context=SpanContext(
228+
212592107417388365804938480559624925533,
229+
6077757853989569233,
230+
True,
231+
TraceFlags(0x01),
232+
),
211233
severity_text="FATAL",
212234
severity_number=SeverityNumber.FATAL,
213235
body="This instrumentation scope has a schema url and attributes",
@@ -229,9 +251,12 @@ def _get_sdk_log_data() -> List[LogData]:
229251
log_record=SDKLogRecord(
230252
timestamp=1644650584292683044,
231253
observed_timestamp=1644650584292683044,
232-
trace_id=212592107417388365804938480559624925566,
233-
span_id=6077757853989569466,
234-
trace_flags=TraceFlags(0x01),
254+
span_context=SpanContext(
255+
212592107417388365804938480559624925566,
256+
6077757853989569466,
257+
True,
258+
TraceFlags(0x01),
259+
),
235260
severity_text="INFO",
236261
severity_number=SeverityNumber.INFO,
237262
body="Test export of extended attributes",
@@ -547,9 +572,12 @@ def _get_test_logs_dropped_attributes() -> List[LogData]:
547572
log1 = LogData(
548573
log_record=SDKLogRecord(
549574
timestamp=1644650195189786880,
550-
trace_id=89564621134313219400156819398935297684,
551-
span_id=1312458408527513268,
552-
trace_flags=TraceFlags(0x01),
575+
span_context=SpanContext(
576+
89564621134313219400156819398935297684,
577+
1312458408527513268,
578+
True,
579+
TraceFlags(0x01),
580+
),
553581
severity_text="WARN",
554582
severity_number=SeverityNumber.WARN,
555583
body="Do not go gentle into that good night. Rage, rage against the dying of the light",
@@ -565,9 +593,12 @@ def _get_test_logs_dropped_attributes() -> List[LogData]:
565593
log2 = LogData(
566594
log_record=SDKLogRecord(
567595
timestamp=1644650249738562048,
568-
trace_id=0,
569-
span_id=0,
570-
trace_flags=TraceFlags.DEFAULT,
596+
span_context=SpanContext(
597+
0,
598+
0,
599+
True,
600+
TraceFlags.DEFAULT,
601+
),
571602
severity_text="WARN",
572603
severity_number=SeverityNumber.WARN,
573604
body="Cooper, this is no time for caution!",

‎exporter/opentelemetry-exporter-otlp-proto-grpc/tests/logs/test_otlp_logs_exporter.py‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
from opentelemetry.sdk.resources import Resource as SDKResource
5353
from opentelemetry.sdk.util.instrumentation import InstrumentationScope
5454
from opentelemetry.trace import TraceFlags
55+
from opentelemetry.trace.span import SpanContext
5556

5657
THIS_DIR = dirname(__file__)
5758

@@ -62,9 +63,12 @@ def setUp(self):
6263
self.log_data_1 = LogData(
6364
log_record=LogRecord(
6465
timestamp=int(time.time() * 1e9),
65-
trace_id=2604504634922341076776623263868986797,
66-
span_id=5213367945872657620,
67-
trace_flags=TraceFlags(0x01),
66+
span_context=SpanContext(
67+
2604504634922341076776623263868986797,
68+
5213367945872657620,
69+
True,
70+
TraceFlags(0x01),
71+
),
6872
severity_text="WARNING",
6973
severity_number=SeverityNumber.WARN,
7074
body="Zhengzhou, We have a heaviest rains in 1000 years",
@@ -78,9 +82,12 @@ def setUp(self):
7882
self.log_data_2 = LogData(
7983
log_record=LogRecord(
8084
timestamp=int(time.time() * 1e9),
81-
trace_id=2604504634922341076776623263868986799,
82-
span_id=5213367945872657623,
83-
trace_flags=TraceFlags(0x01),
85+
span_context=SpanContext(
86+
2604504634922341076776623263868986799,
87+
5213367945872657623,
88+
True,
89+
TraceFlags(0x01),
90+
),
8491
severity_text="INFO",
8592
severity_number=SeverityNumber.INFO2,
8693
body="Sydney, Opera House is closed",
@@ -94,9 +101,12 @@ def setUp(self):
94101
self.log_data_3 = LogData(
95102
log_record=LogRecord(
96103
timestamp=int(time.time() * 1e9),
97-
trace_id=2604504634922341076776623263868986800,
98-
span_id=5213367945872657628,
99-
trace_flags=TraceFlags(0x01),
104+
span_context=SpanContext(
105+
2604504634922341076776623263868986800,
106+
5213367945872657628,
107+
True,
108+
TraceFlags(0x01),
109+
),
100110
severity_text="ERROR",
101111
severity_number=SeverityNumber.WARN,
102112
body="Mumbai, Boil water before drinking",
@@ -109,9 +119,12 @@ def setUp(self):
109119
self.log_data_4 = LogData(
110120
log_record=LogRecord(
111121
timestamp=int(time.time() * 1e9),
112-
trace_id=0,
113-
span_id=5213367945872657629,
114-
trace_flags=TraceFlags(0x01),
122+
span_context=SpanContext(
123+
0,
124+
213367945872657629,
125+
True,
126+
TraceFlags(0x01),
127+
),
115128
severity_text="ERROR",
116129
severity_number=SeverityNumber.WARN,
117130
body="Invalid trace id check",
@@ -124,9 +137,12 @@ def setUp(self):
124137
self.log_data_5 = LogData(
125138
log_record=LogRecord(
126139
timestamp=int(time.time() * 1e9),
127-
trace_id=2604504634922341076776623263868986801,
128-
span_id=0,
129-
trace_flags=TraceFlags(0x01),
140+
span_context=SpanContext(
141+
2604504634922341076776623263868986801,
142+
0,
143+
True,
144+
TraceFlags(0x01),
145+
),
130146
severity_text="ERROR",
131147
severity_number=SeverityNumber.WARN,
132148
body="Invalid span id check",

‎exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_log_exporter.py‎

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
from opentelemetry.sdk.resources import Resource as SDKResource
5858
from opentelemetry.sdk.util.instrumentation import InstrumentationScope
5959
from opentelemetry.trace import TraceFlags
60+
from opentelemetry.trace.span import SpanContext
6061

6162
ENV_ENDPOINT = "http://localhost.env:8080/"
6263
ENV_CERTIFICATE = "/etc/base.crt"
@@ -217,9 +218,12 @@ def test_exported_log_without_trace_id(self):
217218
log = LogData(
218219
log_record=SDKLogRecord(
219220
timestamp=1644650195189786182,
220-
trace_id=0,
221-
span_id=1312458408527513292,
222-
trace_flags=TraceFlags(0x01),
221+
span_context=SpanContext(
222+
0,
223+
1312458408527513292,
224+
True,
225+
TraceFlags(0x01),
226+
),
223227
severity_text="WARN",
224228
severity_number=SeverityNumber.WARN,
225229
body="Invalid trace id check",
@@ -244,9 +248,12 @@ def test_exported_log_without_span_id(self):
244248
log = LogData(
245249
log_record=SDKLogRecord(
246250
timestamp=1644650195189786360,
247-
trace_id=89564621134313219400156819398935297696,
248-
span_id=0,
249-
trace_flags=TraceFlags(0x01),
251+
span_context=SpanContext(
252+
89564621134313219400156819398935297696,
253+
0,
254+
True,
255+
TraceFlags(0x01),
256+
),
250257
severity_text="WARN",
251258
severity_number=SeverityNumber.WARN,
252259
body="Invalid span id check",
@@ -291,9 +298,12 @@ def _get_sdk_log_data() -> List[LogData]:
291298
log1 = LogData(
292299
log_record=SDKLogRecord(
293300
timestamp=1644650195189786880,
294-
trace_id=89564621134313219400156819398935297684,
295-
span_id=1312458408527513268,
296-
trace_flags=TraceFlags(0x01),
301+
span_context=SpanContext(
302+
89564621134313219400156819398935297684,
303+
1312458408527513268,
304+
True,
305+
TraceFlags(0x01),
306+
),
297307
severity_text="WARN",
298308
severity_number=SeverityNumber.WARN,
299309
body="Do not go gentle into that good night. Rage, rage against the dying of the light",
@@ -308,9 +318,12 @@ def _get_sdk_log_data() -> List[LogData]:
308318
log2 = LogData(
309319
log_record=SDKLogRecord(
310320
timestamp=1644650249738562048,
311-
trace_id=0,
312-
span_id=0,
313-
trace_flags=TraceFlags.DEFAULT,
321+
span_context=SpanContext(
322+
0,
323+
0,
324+
True,
325+
TraceFlags.DEFAULT,
326+
),
314327
severity_text="WARN",
315328
severity_number=SeverityNumber.WARN,
316329
body="Cooper, this is no time for caution!",
@@ -325,9 +338,12 @@ def _get_sdk_log_data() -> List[LogData]:
325338
log3 = LogData(
326339
log_record=SDKLogRecord(
327340
timestamp=1644650427658989056,
328-
trace_id=271615924622795969659406376515024083555,
329-
span_id=4242561578944770265,
330-
trace_flags=TraceFlags(0x01),
341+
span_context=SpanContext(
342+
271615924622795969659406376515024083555,
343+
4242561578944770265,
344+
True,
345+
TraceFlags(0x01),
346+
),
331347
severity_text="DEBUG",
332348
severity_number=SeverityNumber.DEBUG,
333349
body="To our galaxy",
@@ -340,9 +356,12 @@ def _get_sdk_log_data() -> List[LogData]:
340356
log4 = LogData(
341357
log_record=SDKLogRecord(
342358
timestamp=1644650584292683008,
343-
trace_id=212592107417388365804938480559624925555,
344-
span_id=6077757853989569223,
345-
trace_flags=TraceFlags(0x01),
359+
span_context=SpanContext(
360+
212592107417388365804938480559624925555,
361+
6077757853989569223,
362+
True,
363+
TraceFlags(0x01),
364+
),
346365
severity_text="INFO",
347366
severity_number=SeverityNumber.INFO,
348367
body="Love is the one thing that transcends time and space",

0 commit comments

Comments
 (0)