Skip to content

Commit 772528f

Browse files
authored
Updating OT exporter to consume latest version of OpenTelemetry API/SDK (Azure#15289)
* Updating to latest version of OpenTelemetry * Fix broken test * Adding try/catch for os.listdir
1 parent 9990bb6 commit 772528f

File tree

3 files changed

+61
-58
lines changed

3 files changed

+61
-58
lines changed

sdk/monitor/microsoft-opentelemetry-exporter-azuremonitor/microsoft/opentelemetry/exporter/azuremonitor/export/trace/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
99
from opentelemetry.sdk.util import ns_to_iso_str
1010
from opentelemetry.trace import Span, SpanKind
11-
from opentelemetry.trace.status import StatusCanonicalCode
11+
from opentelemetry.trace.status import StatusCode
1212

1313
from microsoft.opentelemetry.exporter.azuremonitor import utils
1414
from microsoft.opentelemetry.exporter.azuremonitor._generated.models import (
@@ -80,9 +80,9 @@ def convert_span_to_envelope(span: Span) -> TelemetryItem:
8080
data = RequestData(
8181
id="{:016x}".format(span.context.span_id),
8282
duration=utils.ns_to_duration(span.end_time - span.start_time),
83-
response_code=str(span.status.canonical_code.value),
84-
success=span.status.canonical_code
85-
== StatusCanonicalCode.OK, # Modify based off attributes or Status
83+
response_code=str(span.status.status_code.value),
84+
success=span.status.status_code
85+
== StatusCode.OK, # Modify based off attributes or Status
8686
properties={},
8787
)
8888
envelope.data = MonitorBase(base_data=data, base_type="RequestData")
@@ -108,10 +108,10 @@ def convert_span_to_envelope(span: Span) -> TelemetryItem:
108108
data = RemoteDependencyData(
109109
name=span.name,
110110
id="{:016x}".format(span.context.span_id),
111-
result_code=str(span.status.canonical_code.value),
111+
result_code=str(span.status.status_code.value),
112112
duration=utils.ns_to_duration(span.end_time - span.start_time),
113-
success=span.status.canonical_code
114-
== StatusCanonicalCode.OK, # Modify based off attributes or Status
113+
success=span.status.status_code
114+
== StatusCode.OK, # Modify based off attributes or Status
115115
properties={},
116116
)
117117
envelope.data = MonitorBase(

sdk/monitor/microsoft-opentelemetry-exporter-azuremonitor/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
install_requires=[
7676
"azure-core<2.0.0,>=1.6.0",
7777
"msrest>=0.6.10",
78-
"opentelemetry-api == 0.13b0",
79-
"opentelemetry-sdk == 0.13b0"
78+
"opentelemetry-api == 0.15b0",
79+
"opentelemetry-sdk == 0.15b0"
8080
],
8181
)

0 commit comments

Comments
 (0)