Skip to content
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

[Monitor Exporter] Update Azure SDK messaging span util #40059

Merged
merged 1 commit into from
Mar 18, 2025
Merged

[Monitor Exporter] Update Azure SDK messaging span util #40059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

- Support `syntheticSource` from `user_agent.synthetic.type` semantic convention
([#40004](https://github.com/Azure/azure-sdk-for-python/pull/40004))
- Support `server.address` attributes when converting Azure SDK messaging spans to envelopes
([#40059](https://github.com/Azure/azure-sdk-for-python/pull/40059))

### Breaking Changes

Expand Down
5 changes: 3 additions & 2 deletions ...onitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/trace/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ def _get_azure_sdk_target_source(attributes: Attributes) -> Optional[str]:
# Currently logic only works for ServiceBus and EventHub
if attributes:
# New semconv attributes: https://github.com/Azure/azure-sdk-for-python/pull/29203
# TODO: Keep track of when azure-sdk supports stable semconv for these fields
peer_address = attributes.get("net.peer.name") or attributes.get("peer.address")
peer_address = (
attributes.get("server.address") or attributes.get("net.peer.name") or attributes.get("peer.address")
)
destination = attributes.get("messaging.destination.name") or attributes.get("message_bus.destination")
if peer_address and destination:
return str(peer_address) + "/" + str(destination)
Expand Down
8 changes: 8 additions & 0 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 @@ -1002,6 +1002,14 @@ def test_span_envelope_request_azure(self):
envelope = exporter._span_to_envelope(span)
self.assertEqual(envelope.data.base_data.source, "Test_name//testdest")

span._attributes = {
"az.namespace": "Microsoft.EventHub",
"server.address": "Test_name",
"messaging.destination.name": "/testdest",
}
envelope = exporter._span_to_envelope(span)
self.assertEqual(envelope.data.base_data.source, "Test_name//testdest")

def test_span_envelope_server_http(self):
exporter = self._exporter
start_time = 1575494316027613500
Expand Down
Loading