Skip to content

AzMon exporter: Serialize complex log bodies to json and set dependency type to gen_ai.system instead of N/A #37694

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
lmolkova merged 9 commits into from
Oct 29, 2024
Merged

AzMon exporter: Serialize complex log bodies to json and set dependency type to gen_ai.system instead of N/A #37694

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ba71e60
Serialize complex log bodies to json and support gen_ai.system
Oct 2, 2024
2d62bba
Address review feedback
Oct 24, 2024
b7917b2
fix tests
Oct 24, 2024
ed46711
CHANgELOG
Oct 24, 2024
f848d1a
cleanups
Oct 24, 2024
5a1ce36
black and mypy
Oct 29, 2024
16543af
black and mypy
Oct 29, 2024
e18f991
pylint
Oct 29, 2024
64884b2
pylint
Oct 29, 2024
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
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
Liudmila Molkova committed Oct 29, 2024
commit b7917b28d492f5805a03811ca242c4ff9f7789fe
2 changes: 1 addition & 1 deletion ...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 @@ -213,7 +213,7 @@ def _map_body_to_message(log_body: Any) -> str:

try:
return json.dumps(log_body)[:32768]
except Exception:
except:
return str(log_body)[:32768]

def _is_ignored_attribute(key: str) -> bool:
Expand Down
30 changes: 27 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 @@ -44,7 +44,7 @@ def func(*_args, **_kwargs):

class NotSerializeableClass:
def __str__(self) -> str:
"This class is not serializeable"
return "This class is not serializeable"


# pylint: disable=import-error
Expand Down Expand Up @@ -184,6 +184,23 @@ def setUpClass(cls):
),
InstrumentationScope("test_name"),
)
cls._log_data_event_complex_body_not_serializeable = _logs.LogData(
_logs.LogRecord(
timestamp = 1646865018558419456,
trace_id = 125960616039069540489478540494783893221,
span_id = 2909973987304607650,
severity_text = "INFO",
trace_flags = None,
severity_number = SeverityNumber.INFO,
body = NotSerializeableClass(),
resource = Resource.create(attributes={"asd":"test_resource"}),
attributes={
"event_key": "event_attribute",
_APPLICATION_INSIGHTS_EVENT_MARKER_ATTRIBUTE: True,
},
),
InstrumentationScope("test_name"),
)
cls._exc_data = _logs.LogData(
_logs.LogRecord(
timestamp = 1646865018558419456,
Expand Down Expand Up @@ -415,6 +432,13 @@ def test_log_to_envelope_log_complex_body(self):
self.assertEqual(envelope.data.base_type, 'MessageData')
self.assertEqual(envelope.data.base_data.message, json.dumps(self._log_data_complex_body.log_record.body))

def test_log_to_envelope_log_complex_body_not_serializeable(self):
exporter = self._exporter
envelope = exporter._log_to_envelope(self._log_data_complex_body_not_serializeable)
self.assertEqual(envelope.name, 'Microsoft.ApplicationInsights.Message')
self.assertEqual(envelope.data.base_type, 'MessageData')
self.assertEqual(envelope.data.base_data.message, str(self._log_data_complex_body_not_serializeable.log_record.body))

def test_log_to_envelope_exception_with_string_message(self):
exporter = self._exporter
envelope = exporter._log_to_envelope(self._exc_data)
Expand Down Expand Up @@ -497,8 +521,8 @@ def test_log_to_envelope_event_complex_body(self):

def test_log_to_envelope_event_complex_body_not_serializeable(self):
exporter = self._exporter
envelope = exporter._log_to_envelope(self._log_data_complex_body_not_serializeable)
record = self._log_data_complex_body_not_serializeable.log_record
envelope = exporter._log_to_envelope(self._log_data_event_complex_body_not_serializeable)
record = self._log_data_event_complex_body_not_serializeable.log_record
self.assertEqual(envelope.name, 'Microsoft.ApplicationInsights.Event')
self.assertEqual(envelope.time, ns_to_iso_str(record.timestamp))
self.assertEqual(envelope.data.base_type, 'EventData')
Expand Down