Skip to content

Commit e7b901a

Browse files
authored
Update Opentelemetry dependency to 1.0.0rc1 for monitor exporter (Azure#16866)
1 parent 5c3114e commit e7b901a

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
install_requires=[
8080
"azure-core<2.0.0,>=1.6.0",
8181
"msrest>=0.6.10",
82-
"opentelemetry-api == 0.17b0",
83-
"opentelemetry-sdk == 0.17b0"
82+
"opentelemetry-api == 1.0.0rc1",
83+
"opentelemetry-sdk == 1.0.0rc1"
8484
],
8585
)

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_base_exporter.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from datetime import datetime
1010

1111
import requests
12-
from opentelemetry.sdk.metrics.export import MetricsExportResult
1312
from opentelemetry.sdk.trace.export import SpanExportResult
1413

1514
from azure.core.exceptions import HttpResponseError, ServiceRequestError

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/trace/test_trace.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,16 @@ def test_span_to_envelope_tags(self):
180180
envelope = exporter._span_to_envelope(test_span)
181181

182182
self.assertIsNotNone(envelope.tags)
183-
self.assertIsNone(envelope.tags.get("ai.cloud.role"))
183+
self.assertIsNotNone(envelope.tags.get("ai.cloud.role"))
184+
self.assertEqual(envelope.tags.get("ai.cloud.role"), "unknown_service")
184185
self.assertIsNone(envelope.tags.get("ai.cloud.roleInstance"))
185186
self.assertIsNotNone(envelope.tags.get("ai.device.id"))
186187
self.assertIsNotNone(envelope.tags.get("ai.device.locale"))
187188
self.assertIsNotNone(envelope.tags.get("ai.device.osVersion"))
188189
self.assertIsNotNone(envelope.tags.get("ai.device.type"))
189190
self.assertIsNotNone(envelope.tags.get("ai.internal.sdkVersion"))
190191

191-
test_span.resource = resources.Resource(
192+
test_span._resource = resources.Resource(
192193
{"service.name": "testServiceName",
193194
"service.namespace": "testServiceNamespace",
194195
"service.instance.id": "testServiceInstanceId"})
@@ -235,7 +236,7 @@ def test_span_to_envelope(self):
235236
)
236237
span.start(start_time=start_time)
237238
span.end(end_time=end_time)
238-
span.status = Status(status_code=StatusCode.OK)
239+
span._status = Status(status_code=StatusCode.OK)
239240
envelope = exporter._span_to_envelope(span)
240241
self.assertEqual(envelope.instrumentation_key,
241242
"12345678-1234-5678-abcd-12345678abcd")
@@ -265,7 +266,7 @@ def test_span_to_envelope(self):
265266
)
266267
self.assertEqual(envelope.data.base_data.result_code, "200")
267268

268-
span.attributes = {
269+
span._attributes = {
269270
"component": "http",
270271
"http.method": "GET",
271272
"net.peer.port": 1234,
@@ -275,7 +276,7 @@ def test_span_to_envelope(self):
275276
envelope = exporter._span_to_envelope(span)
276277
self.assertEqual(envelope.data.base_data.target, "testhost:1234")
277278

278-
span.attributes = {
279+
span._attributes = {
279280
"component": "http",
280281
"http.method": "GET",
281282
"net.peer.port": 1234,
@@ -308,7 +309,7 @@ def test_span_to_envelope(self):
308309
)
309310
span.start(start_time=start_time)
310311
span.end(end_time=end_time)
311-
span.status = Status(status_code=StatusCode.OK)
312+
span._status = Status(status_code=StatusCode.OK)
312313
envelope = exporter._span_to_envelope(span)
313314
self.assertTrue(envelope.data.base_data.success)
314315
self.assertEqual(envelope.data.base_data.type, "sql")
@@ -337,7 +338,7 @@ def test_span_to_envelope(self):
337338
)
338339
span.start(start_time=start_time)
339340
span.end(end_time=end_time)
340-
span.status = Status(status_code=StatusCode.OK)
341+
span._status = Status(status_code=StatusCode.OK)
341342
envelope = exporter._span_to_envelope(span)
342343
self.assertTrue(envelope.data.base_data.success)
343344
self.assertEqual(envelope.data.base_data.type, "rpc.system")
@@ -366,7 +367,7 @@ def test_span_to_envelope(self):
366367
)
367368
span.start(start_time=start_time)
368369
span.end(end_time=end_time)
369-
span.status = Status(status_code=StatusCode.OK)
370+
span._status = Status(status_code=StatusCode.OK)
370371
envelope = exporter._span_to_envelope(span)
371372
self.assertTrue(envelope.data.base_data.success)
372373
self.assertEqual(envelope.data.base_data.type,
@@ -396,7 +397,7 @@ def test_span_to_envelope(self):
396397
)
397398
span.start(start_time=start_time)
398399
span.end(end_time=end_time)
399-
span.status = Status(status_code=StatusCode.OK)
400+
span._status = Status(status_code=StatusCode.OK)
400401
envelope = exporter._span_to_envelope(span)
401402
self.assertTrue(envelope.data.base_data.success)
402403
self.assertEqual(envelope.data.base_data.type, "InProc")
@@ -424,7 +425,7 @@ def test_span_to_envelope(self):
424425
links=[],
425426
kind=SpanKind.SERVER,
426427
)
427-
span.status = Status(status_code=StatusCode.OK)
428+
span._status = Status(status_code=StatusCode.OK)
428429
span.start(start_time=start_time)
429430
span.end(end_time=end_time)
430431
envelope = exporter._span_to_envelope(span)
@@ -480,7 +481,7 @@ def test_span_to_envelope(self):
480481
links=[],
481482
kind=SpanKind.SERVER,
482483
)
483-
span.status = Status(status_code=StatusCode.OK)
484+
span._status = Status(status_code=StatusCode.OK)
484485
span.start(start_time=start_time)
485486
span.end(end_time=end_time)
486487
envelope = exporter._span_to_envelope(span)
@@ -513,7 +514,7 @@ def test_span_to_envelope(self):
513514
links=[],
514515
kind=SpanKind.CLIENT,
515516
)
516-
span.status = Status(status_code=StatusCode.ERROR)
517+
span._status = Status(status_code=StatusCode.ERROR)
517518
span.start(start_time=start_time)
518519
span.end(end_time=end_time)
519520
envelope = exporter._span_to_envelope(span)
@@ -541,7 +542,7 @@ def test_span_to_envelope(self):
541542
links=[],
542543
kind=SpanKind.CLIENT,
543544
)
544-
span.status = Status(status_code=StatusCode.OK)
545+
span._status = Status(status_code=StatusCode.OK)
545546
span.start(start_time=start_time)
546547
span.end(end_time=end_time)
547548
envelope = exporter._span_to_envelope(span)
@@ -579,7 +580,7 @@ def test_span_to_envelope(self):
579580
links=links,
580581
kind=SpanKind.CLIENT,
581582
)
582-
span.status = Status(status_code=StatusCode.OK)
583+
span._status = Status(status_code=StatusCode.OK)
583584
span.start(start_time=start_time)
584585
span.end(end_time=end_time)
585586
envelope = exporter._span_to_envelope(span)

shared_requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ opentelemetry-sdk==0.17b0
190190
#override azure-ai-metricsadvisor msrest>=0.6.12
191191
#override azure-monitor-opentelemetry-exporter azure-core<2.0.0,>=1.6.0
192192
#override azure-monitor-opentelemetry-exporter msrest>=0.6.10
193+
#override azure-monitor-opentelemetry-exporter opentelemetry-api==1.0.0rc1
194+
#override azure-monitor-opentelemetry-exporter opentelemetry-sdk==1.0.0rc1
193195
#override azure-core-tracing-opentelemetry opentelemetry-api==0.17b0
194196
#override azure-identity six>=1.12.0
195197
#override azure-ai-formrecognizer

0 commit comments

Comments
 (0)