Skip to content

Add Operation Name Propagation for Dependencies and Logs #43588

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add Operation Name Propagation for Dependencies and Logs #43588

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f5e1a9
Add operation name to dependencies
rads-1996 Oct 22, 2025
c34bfea
Add operation name to logs
rads-1996 Oct 22, 2025
f40f5f1
Add CHANGELOG
rads-1996 Oct 22, 2025
012cabb
Updated CHANGELOG
rads-1996 Oct 22, 2025
402e786
Remove extra space
rads-1996 Oct 22, 2025
45d6406
Fix data.name override
rads-1996 Oct 22, 2025
d0fa710
added type safety
rads-1996 Oct 23, 2025
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
1 change: 1 addition & 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 @@ -3,6 +3,7 @@
## 1.0.0b45 (Unreleased)

### Features Added
- Added Operation Name Propagation for Dependencies and Logs

### Breaking Changes

Expand Down
4 changes: 4 additions & 0 deletions ...itor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ def _log_data_is_event(log_data: LogData) -> bool:


# pylint: disable=protected-access
# pylint: disable=too-many-statements
def _convert_log_to_envelope(log_data: LogData) -> TelemetryItem:
log_record = log_data.log_record
time_stamp = log_record.timestamp if log_record.timestamp is not None else log_record.observed_timestamp
Expand All @@ -127,6 +128,9 @@ def _convert_log_to_envelope(log_data: LogData) -> TelemetryItem:
envelope.tags[ContextTagKeys.AI_OPERATION_PARENT_ID] = "{:016x}".format( # type: ignore
log_record.span_id or _DEFAULT_SPAN_ID
)
envelope.tags[ContextTagKeys.AI_OPERATION_NAME] = log_record.attributes.get( #type: ignore
ContextTagKeys.AI_OPERATION_NAME
)
if _utils._is_any_synthetic_source(log_record.attributes):
envelope.tags[ContextTagKeys.AI_OPERATION_SYNTHETIC_SOURCE] = "True" # type: ignore
# Special use case: Customers want to be able to set location ip on log records
Expand Down
14 changes: 13 additions & 1 deletion ...tor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/trace/_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ def _convert_span_to_envelope(span: ReadableSpan) -> TelemetryItem:
data.url = data.url[:2048]
else: # INTERNAL, CLIENT, PRODUCER
envelope.name = _REMOTE_DEPENDENCY_ENVELOPE_NAME
# TODO: ai.operation.name for non-server spans
time = 0
if span.end_time and span.start_time:
time = span.end_time - span.start_time
Expand All @@ -334,6 +333,7 @@ def _convert_span_to_envelope(span: ReadableSpan) -> TelemetryItem:
properties={},
)
envelope.data = MonitorBase(base_data=data, base_type="RemoteDependencyData")
envelope.tags[ContextTagKeys.AI_OPERATION_NAME] = span.name
target = trace_utils._get_target_for_dependency_from_peer(span.attributes)
if span.kind is SpanKind.CLIENT:
gen_ai_attributes_val = ""
Expand All @@ -351,6 +351,12 @@ def _convert_span_to_envelope(span: ReadableSpan) -> TelemetryItem:
# TODO: Not exposed in Swagger, need to update def
envelope.tags["ai.user.userAgent"] = user_agent
url = trace_utils._get_url_for_http_dependency(span.attributes)
# Http specific logic for ai.operation.name
if SpanAttributes.HTTP_ROUTE in span.attributes:
envelope.tags[ContextTagKeys.AI_OPERATION_NAME] = "{} {}".format(
span.attributes.get(HTTP_REQUEST_METHOD) or span.attributes.get(SpanAttributes.HTTP_METHOD),
span.attributes[SpanAttributes.HTTP_ROUTE],
)
# data
if url:
data.data = url
Expand All @@ -365,6 +371,10 @@ def _convert_span_to_envelope(span: ReadableSpan) -> TelemetryItem:
span.attributes.get(SpanAttributes.HTTP_METHOD),
path,
)
envelope.tags[ContextTagKeys.AI_OPERATION_NAME] = "{} {}".format(
span.attributes.get(HTTP_REQUEST_METHOD) or span.attributes.get(SpanAttributes.HTTP_METHOD),
path,
)
status_code = span.attributes.get(HTTP_RESPONSE_STATUS_CODE) or \
span.attributes.get(SpanAttributes.HTTP_STATUS_CODE)
if status_code:
Expand Down Expand Up @@ -447,6 +457,8 @@ def _convert_span_to_envelope(span: ReadableSpan) -> TelemetryItem:
data.type += " | {}".format(span.attributes[_AZURE_SDK_NAMESPACE_NAME])
# Apply truncation
# See https://github.com/MohanGsk/ApplicationInsights-Home/tree/master/EndpointSpecs/Schemas/Bond
if envelope.tags.get(ContextTagKeys.AI_OPERATION_NAME):
data.name = envelope.tags[ContextTagKeys.AI_OPERATION_NAME][:1024]
if data.name:
data.name = str(data.name)[:1024]
if data.result_code:
Expand Down
9 changes: 6 additions & 3 deletions sdk/monitor/azure-monitor-opentelemetry-exporter/tests/logs/test_logs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def setUpClass(cls):
severity_number=SeverityNumber.WARN,
body="Test message",
resource=Resource.create(attributes={"asd": "test_resource"}),
attributes={"test": "attribute"},
attributes={"test": "attribute", "ai.operation.name": "TestOperationName"},
),
InstrumentationScope("test_name"),
)
Expand All @@ -87,7 +87,7 @@ def setUpClass(cls):
severity_number=SeverityNumber.WARN,
body="",
resource=Resource.create(attributes={"asd": "test_resource"}),
attributes={"test": "attribute"},
attributes={"test": "attribute", "ai.operation.name": "TestOperationName"},
),
InstrumentationScope("test_name"),
)
Expand Down Expand Up @@ -115,7 +115,7 @@ def setUpClass(cls):
severity_number=SeverityNumber.WARN,
body={"foo": {"bar": "baz", "qux": 42}},
resource=Resource.create(attributes={"asd": "test_resource"}),
attributes={"test": "attribute"},
attributes={"test": "attribute", "ai.operation.name": "TestOperationName"},
),
InstrumentationScope("test_name"),
)
Expand Down Expand Up @@ -394,6 +394,7 @@ def test_log_to_envelope_partA(self):
span_id = self._log_data.log_record.span_id
self.assertEqual(envelope.tags.get(ContextTagKeys.AI_OPERATION_PARENT_ID), "{:016x}".format(span_id))
self._log_data.log_record.resource = old_resource
self.assertEqual(envelope.tags.get(ContextTagKeys.AI_OPERATION_NAME), "TestOperationName")

def test_log_to_envelope_partA_default(self):
exporter = self._exporter
Expand Down Expand Up @@ -433,6 +434,7 @@ def test_log_to_envelope_log_empty(self):
self.assertEqual(envelope.name, "Microsoft.ApplicationInsights.Message")
self.assertEqual(envelope.data.base_type, "MessageData")
self.assertEqual(envelope.data.base_data.message, _DEFAULT_LOG_MESSAGE)
self.assertEqual(envelope.tags.get(ContextTagKeys.AI_OPERATION_NAME), "TestOperationName")

def test_log_to_envelope_log_empty_with_whitespaces(self):
exporter = self._exporter
Expand All @@ -447,6 +449,7 @@ def test_log_to_envelope_log_complex_body(self):
self.assertEqual(envelope.name, "Microsoft.ApplicationInsights.Message")
self.assertEqual(envelope.data.base_type, "MessageData")
self.assertEqual(envelope.data.base_data.message, json.dumps(self._log_data_complex_body.log_record.body))
self.assertEqual(envelope.tags.get(ContextTagKeys.AI_OPERATION_NAME), "TestOperationName")

def test_log_to_envelope_log_complex_body_not_serializeable(self):
exporter = self._exporter
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 @@ -380,6 +380,7 @@ def test_span_to_envelope_client_http(self):
self.assertEqual(envelope.data.base_data.data, "https://www.wikipedia.org/wiki/Rabbit")

self.assertEqual(envelope.data.base_type, "RemoteDependencyData")
self.assertEqual(envelope.tags[ContextTagKeys.AI_OPERATION_NAME], "GET /wiki/Rabbit")
self.assertEqual(envelope.data.base_data.type, "HTTP")
self.assertEqual(envelope.data.base_data.target, "service")
self.assertEqual(
Expand Down Expand Up @@ -584,6 +585,7 @@ def test_span_to_envelope_client_db(self):
self.assertTrue(envelope.data.base_data.success)

self.assertEqual(envelope.data.base_type, "RemoteDependencyData")
self.assertEqual(envelope.tags[ContextTagKeys.AI_OPERATION_NAME], "test")
self.assertEqual(envelope.data.base_data.type, "db2 system")
self.assertEqual(envelope.data.base_data.target, "service")
self.assertEqual(envelope.data.base_data.data, "SELECT * from test")
Expand Down Expand Up @@ -703,6 +705,7 @@ def test_span_to_envelope_client_rpc(self):
self.assertEqual(envelope.data.base_data.result_code, "0")

self.assertEqual(envelope.data.base_type, "RemoteDependencyData")
self.assertEqual(envelope.tags[ContextTagKeys.AI_OPERATION_NAME], "test")
self.assertEqual(envelope.data.base_data.type, "rpc.system")
self.assertEqual(envelope.data.base_data.target, "service")
self.assertEqual(len(envelope.data.base_data.properties), 0)
Expand Down Expand Up @@ -748,6 +751,7 @@ def test_span_to_envelope_client_messaging(self):
self.assertEqual(envelope.data.base_data.result_code, "0")

self.assertEqual(envelope.data.base_type, "RemoteDependencyData")
self.assertEqual(envelope.tags[ContextTagKeys.AI_OPERATION_NAME], "test")
self.assertEqual(envelope.data.base_data.type, "messaging")
self.assertEqual(envelope.data.base_data.target, "celery")
self.assertEqual(len(envelope.data.base_data.properties), 0)
Expand Down Expand Up @@ -791,6 +795,7 @@ def test_span_to_envelope_client_gen_ai(self):
self.assertEqual(envelope.data.base_data.result_code, "0")

self.assertEqual(envelope.data.base_type, "RemoteDependencyData")
self.assertEqual(envelope.tags[ContextTagKeys.AI_OPERATION_NAME], "test")
self.assertEqual(envelope.data.base_data.type, "GenAI | az.ai.inference")
self.assertEqual(envelope.data.base_data.target, "az.ai.inference")
self.assertEqual(len(envelope.data.base_data.properties), 1)
Expand Down Expand Up @@ -880,6 +885,7 @@ def test_span_to_envelope_client_azure(self):
self.assertEqual(envelope.data.base_data.result_code, "0")

self.assertEqual(envelope.data.base_type, "RemoteDependencyData")
self.assertEqual(envelope.tags[ContextTagKeys.AI_OPERATION_NAME], "test")
self.assertEqual(envelope.data.base_data.type, "Microsoft.EventHub")
self.assertEqual(envelope.data.base_data.target, "test_address/test_destination")
self.assertEqual(len(envelope.data.base_data.properties), 2)
Expand Down Expand Up @@ -924,6 +930,7 @@ def test_span_to_envelope_producer_messaging(self):
self.assertEqual(envelope.data.base_data.result_code, "0")

self.assertEqual(envelope.data.base_type, "RemoteDependencyData")
self.assertEqual(envelope.tags[ContextTagKeys.AI_OPERATION_NAME], "test")
self.assertEqual(envelope.data.base_data.type, "Queue Message | messaging")
self.assertEqual(envelope.data.base_data.target, "celery")
self.assertEqual(len(envelope.data.base_data.properties), 0)
Expand Down Expand Up @@ -978,6 +985,7 @@ def test_span_to_envelope_internal(self):
self.assertTrue(envelope.data.base_data.success)

self.assertEqual(envelope.data.base_type, "RemoteDependencyData")
self.assertEqual(envelope.tags[ContextTagKeys.AI_OPERATION_NAME], "test")
self.assertEqual(envelope.data.base_data.type, "InProc")
self.assertEqual(envelope.data.base_data.result_code, "0")
self.assertEqual(len(envelope.data.base_data.properties), 0)
Expand Down
Loading