Skip to content

Include instrumentation scope #46096

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
rads-1996 wants to merge 8 commits into
base: main
Choose a base branch
from
+12 −2
Open

Include instrumentation scope #46096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e7dd9b6
Add instrumentation scope
rads-1996 Mar 30, 2026
566df3e
Fix property name
rads-1996 Mar 31, 2026
c0d9429
Modify logic
rads-1996 Apr 1, 2026
d46d7ef
Add unit tests and CHANGELOG
rads-1996 Apr 3, 2026
910655c
Update CHANGELOG
rads-1996 Apr 3, 2026
398fd3c
Remove duplicate check
rads-1996 Apr 3, 2026
9e96eab
Fix lint and format
rads-1996 Apr 3, 2026
39a91fd
Addressed comments
rads-1996 Apr 3, 2026
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 @@ -3,6 +3,8 @@
## 1.0.0b51 (Unreleased)

### Features Added
- Add logger name to custom dimensions for Message, Exception and Event telemetry
([#46096](https://github.com/Azure/azure-sdk-for-python/pull/46096))

### Breaking Changes

Expand Down
5 changes: 5 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 @@ -182,6 +182,11 @@ def _convert_log_to_envelope(readable_log_record: ReadableLogRecord) -> Telemetr
stack_trace = log_record.attributes.get(EXCEPTION_STACKTRACE)
severity_level = _get_severity_level(log_record.severity_number)

if readable_log_record and readable_log_record.instrumentation_scope is not None:
instrumentation_scope = readable_log_record.instrumentation_scope
if hasattr(instrumentation_scope, "name") and instrumentation_scope.name is not None:
properties.setdefault("logger_name", str(instrumentation_scope.name))

# Exception telemetry
if exc_type is not None or exc_message is not None:
envelope.name = _EXCEPTION_ENVELOPE_NAME
Expand Down
7 changes: 5 additions & 2 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 @@ -232,7 +232,7 @@ def setUpClass(cls):
},
),
resource=Resource.create(attributes={"asd": "test_resource"}),
instrumentation_scope=InstrumentationScope("test_name"),
instrumentation_scope=InstrumentationScope("custom-event-logger"),
)
cls._exc_data = _logs.ReadWriteLogRecord(
LogRecord(
Expand Down Expand Up @@ -283,7 +283,7 @@ def setUpClass(cls):
},
),
resource=Resource.create(attributes={"asd": "test_resource"}),
instrumentation_scope=InstrumentationScope("test_name"),
instrumentation_scope=InstrumentationScope("blank_exception_logger"),
)
cls._exc_data_empty = _logs.ReadWriteLogRecord(
LogRecord(
Expand Down Expand Up @@ -467,6 +467,7 @@ def test_log_to_envelope_user_fields(self):
self.assertEqual(envelope.tags.get(ContextTagKeys.AI_USER_ID), "test-user")
self.assertNotIn("enduser.id", envelope.data.base_data.properties)
self.assertNotIn("enduser.pseudo.id", envelope.data.base_data.properties)
self.assertEqual(envelope.data.base_data.properties.get("logger_name"), "test_name")

def test_log_to_envelope_log_none(self):
exporter = self._exporter
Expand Down Expand Up @@ -577,6 +578,7 @@ def test_log_to_envelope_exception_with_blank_exception(self):
self.assertEqual(envelope.data.base_data.exceptions[0].message, "test exception")
self.assertTrue(envelope.data.base_data.exceptions[0].has_full_stack)
self.assertEqual(envelope.data.base_data.exceptions[0].stack, "")
self.assertEqual(envelope.data.base_data.properties.get("logger_name"), "blank_exception_logger")

def test_log_to_envelope_event(self):
exporter = self._exporter
Expand Down Expand Up @@ -618,6 +620,7 @@ def test_log_to_envelope_custom_event(self):
self.assertEqual(envelope.data.base_type, "EventData")
self.assertEqual(envelope.data.base_data.name, "event_name")
self.assertEqual(envelope.data.base_data.properties["event_key"], "event_attribute")
self.assertEqual(envelope.data.base_data.properties.get("logger_name"), "custom-event-logger")

def test_log_to_envelope_timestamp(self):
exporter = self._exporter
Expand Down