Skip to content

Update Opentelemetry dependency to 1.0.0rc1 for monitor exporter #16866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzchen merged 4 commits into from
Feb 23, 2021
Merged

Update Opentelemetry dependency to 1.0.0rc1 for monitor exporter #16866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac63be8
version
lzchen Feb 22, 2021
8c85f31
req
lzchen Feb 22, 2021
86eac8c
fix test
lzchen Feb 22, 2021
8adda2c
fix tests
lzchen Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
install_requires=[
"azure-core<2.0.0,>=1.6.0",
"msrest>=0.6.10",
"opentelemetry-api == 0.17b0",
"opentelemetry-sdk == 0.17b0"
"opentelemetry-api == 1.0.0rc1",
"opentelemetry-sdk == 1.0.0rc1"
],
)
1 change: 0 additions & 1 deletion sdk/monitor/azure-monitor-opentelemetry-exporter/tests/test_base_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from datetime import datetime

import requests
from opentelemetry.sdk.metrics.export import MetricsExportResult
from opentelemetry.sdk.trace.export import SpanExportResult

from azure.core.exceptions import HttpResponseError, ServiceRequestError
Expand Down
29 changes: 15 additions & 14 deletions sdk/monitor/azure-monitor-opentelemetry-exporter/tests/trace/test_trace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,16 @@ def test_span_to_envelope_tags(self):
envelope = exporter._span_to_envelope(test_span)

self.assertIsNotNone(envelope.tags)
self.assertIsNone(envelope.tags.get("ai.cloud.role"))
self.assertIsNotNone(envelope.tags.get("ai.cloud.role"))
self.assertEqual(envelope.tags.get("ai.cloud.role"), "unknown_service")
self.assertIsNone(envelope.tags.get("ai.cloud.roleInstance"))
self.assertIsNotNone(envelope.tags.get("ai.device.id"))
self.assertIsNotNone(envelope.tags.get("ai.device.locale"))
self.assertIsNotNone(envelope.tags.get("ai.device.osVersion"))
self.assertIsNotNone(envelope.tags.get("ai.device.type"))
self.assertIsNotNone(envelope.tags.get("ai.internal.sdkVersion"))

test_span.resource = resources.Resource(
test_span._resource = resources.Resource(
{"service.name": "testServiceName",
"service.namespace": "testServiceNamespace",
"service.instance.id": "testServiceInstanceId"})
Expand Down Expand Up @@ -235,7 +236,7 @@ def test_span_to_envelope(self):
)
span.start(start_time=start_time)
span.end(end_time=end_time)
span.status = Status(status_code=StatusCode.OK)
span._status = Status(status_code=StatusCode.OK)
envelope = exporter._span_to_envelope(span)
self.assertEqual(envelope.instrumentation_key,
"12345678-1234-5678-abcd-12345678abcd")
Expand Down Expand Up @@ -265,7 +266,7 @@ def test_span_to_envelope(self):
)
self.assertEqual(envelope.data.base_data.result_code, "200")

span.attributes = {
span._attributes = {
"component": "http",
"http.method": "GET",
"net.peer.port": 1234,
Expand All @@ -275,7 +276,7 @@ def test_span_to_envelope(self):
envelope = exporter._span_to_envelope(span)
self.assertEqual(envelope.data.base_data.target, "testhost:1234")

span.attributes = {
span._attributes = {
"component": "http",
"http.method": "GET",
"net.peer.port": 1234,
Expand Down Expand Up @@ -308,7 +309,7 @@ def test_span_to_envelope(self):
)
span.start(start_time=start_time)
span.end(end_time=end_time)
span.status = Status(status_code=StatusCode.OK)
span._status = Status(status_code=StatusCode.OK)
envelope = exporter._span_to_envelope(span)
self.assertTrue(envelope.data.base_data.success)
self.assertEqual(envelope.data.base_data.type, "sql")
Expand Down Expand Up @@ -337,7 +338,7 @@ def test_span_to_envelope(self):
)
span.start(start_time=start_time)
span.end(end_time=end_time)
span.status = Status(status_code=StatusCode.OK)
span._status = Status(status_code=StatusCode.OK)
envelope = exporter._span_to_envelope(span)
self.assertTrue(envelope.data.base_data.success)
self.assertEqual(envelope.data.base_data.type, "rpc.system")
Expand Down Expand Up @@ -366,7 +367,7 @@ def test_span_to_envelope(self):
)
span.start(start_time=start_time)
span.end(end_time=end_time)
span.status = Status(status_code=StatusCode.OK)
span._status = Status(status_code=StatusCode.OK)
envelope = exporter._span_to_envelope(span)
self.assertTrue(envelope.data.base_data.success)
self.assertEqual(envelope.data.base_data.type,
Expand Down Expand Up @@ -396,7 +397,7 @@ def test_span_to_envelope(self):
)
span.start(start_time=start_time)
span.end(end_time=end_time)
span.status = Status(status_code=StatusCode.OK)
span._status = Status(status_code=StatusCode.OK)
envelope = exporter._span_to_envelope(span)
self.assertTrue(envelope.data.base_data.success)
self.assertEqual(envelope.data.base_data.type, "InProc")
Expand Down Expand Up @@ -424,7 +425,7 @@ def test_span_to_envelope(self):
links=[],
kind=SpanKind.SERVER,
)
span.status = Status(status_code=StatusCode.OK)
span._status = Status(status_code=StatusCode.OK)
span.start(start_time=start_time)
span.end(end_time=end_time)
envelope = exporter._span_to_envelope(span)
Expand Down Expand Up @@ -480,7 +481,7 @@ def test_span_to_envelope(self):
links=[],
kind=SpanKind.SERVER,
)
span.status = Status(status_code=StatusCode.OK)
span._status = Status(status_code=StatusCode.OK)
span.start(start_time=start_time)
span.end(end_time=end_time)
envelope = exporter._span_to_envelope(span)
Expand Down Expand Up @@ -513,7 +514,7 @@ def test_span_to_envelope(self):
links=[],
kind=SpanKind.CLIENT,
)
span.status = Status(status_code=StatusCode.ERROR)
span._status = Status(status_code=StatusCode.ERROR)
span.start(start_time=start_time)
span.end(end_time=end_time)
envelope = exporter._span_to_envelope(span)
Expand Down Expand Up @@ -541,7 +542,7 @@ def test_span_to_envelope(self):
links=[],
kind=SpanKind.CLIENT,
)
span.status = Status(status_code=StatusCode.OK)
span._status = Status(status_code=StatusCode.OK)
span.start(start_time=start_time)
span.end(end_time=end_time)
envelope = exporter._span_to_envelope(span)
Expand Down Expand Up @@ -579,7 +580,7 @@ def test_span_to_envelope(self):
links=links,
kind=SpanKind.CLIENT,
)
span.status = Status(status_code=StatusCode.OK)
span._status = Status(status_code=StatusCode.OK)
span.start(start_time=start_time)
span.end(end_time=end_time)
envelope = exporter._span_to_envelope(span)
Expand Down
2 changes: 2 additions & 0 deletions shared_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ opentelemetry-sdk==0.17b0
#override azure-ai-metricsadvisor msrest>=0.6.12
#override azure-monitor-opentelemetry-exporter azure-core<2.0.0,>=1.6.0
#override azure-monitor-opentelemetry-exporter msrest>=0.6.10
#override azure-monitor-opentelemetry-exporter opentelemetry-api==1.0.0rc1
#override azure-monitor-opentelemetry-exporter opentelemetry-sdk==1.0.0rc1
#override azure-core-tracing-opentelemetry opentelemetry-api==0.17b0
#override azure-identity six>=1.12.0
#override azure-ai-formrecognizer
Expand Down