Skip to content

Commit 28fbc8b

Browse files
authored
Revert "Bug fix for message field on Microsoft.ApplicationInsights.Message" (#43087)
* Revert "Bug fix for message field on Microsoft.ApplicationInsights.Message (#…" This reverts commit 6095433. * Update CHANGELOG to remove extra line
1 parent 8feb731 commit 28fbc8b

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
([#43066](https://github.com/Azure/azure-sdk-for-python/pull/43066))
1010
- OneSettings control plane: Add killswitch + exponential backoff + sdkstats feature control
1111
([#43147](https://github.com/Azure/azure-sdk-for-python/pull/43147))
12-
1312
- Performance Counters
1413
([#43024](https://github.com/Azure/azure-sdk-for-python/pull/43024))
1514

@@ -24,6 +23,8 @@
2423
([#43122](https://github.com/Azure/azure-sdk-for-python/pull/43122))
2524
- Fix spelling for OTEL_PYTHON_EXCLUDED_URLS in samples
2625
([#43141](https://github.com/Azure/azure-sdk-for-python/pull/43141))
26+
- Revert #43060
27+
([#43087](https://github.com/Azure/azure-sdk-for-python/pull/43087))
2728

2829
### Other Changes
2930

sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the MIT License.
33
import json
44
import logging
5-
from typing import Optional, Sequence, Any, Union
5+
from typing import Optional, Sequence, Any
66

77
from opentelemetry._logs.severity import SeverityNumber
88
from opentelemetry.semconv.attributes.exception_attributes import (
@@ -63,7 +63,7 @@ def export(self, batch: Sequence[LogData], **kwargs: Any) -> LogExportResult: #
6363
:return: The result of the export.
6464
:rtype: ~opentelemetry.sdk._logs.export.LogData
6565
"""
66-
envelopes = [envelope for log in batch if (envelope := self._log_to_envelope(log)) is not None]
66+
envelopes = [self._log_to_envelope(log) for log in batch]
6767
try:
6868
result = self._transmit(envelopes)
6969
self._handle_transmit_from_storage(envelopes, result)
@@ -80,10 +80,8 @@ def shutdown(self) -> None:
8080
if self.storage:
8181
self.storage.close()
8282

83-
def _log_to_envelope(self, log_data: LogData) -> Union[TelemetryItem, None]:
83+
def _log_to_envelope(self, log_data: LogData) -> TelemetryItem:
8484
envelope = _convert_log_to_envelope(log_data)
85-
if envelope is None:
86-
return None
8785
envelope.instrumentation_key = self._instrumentation_key
8886
return envelope
8987

@@ -117,7 +115,7 @@ def _log_data_is_event(log_data: LogData) -> bool:
117115

118116

119117
# pylint: disable=protected-access
120-
def _convert_log_to_envelope(log_data: LogData) -> Union[TelemetryItem, None]:
118+
def _convert_log_to_envelope(log_data: LogData) -> TelemetryItem:
121119
log_record = log_data.log_record
122120
time_stamp = log_record.timestamp if log_record.timestamp is not None else log_record.observed_timestamp
123121
envelope = _utils._create_telemetry_item(time_stamp)
@@ -191,9 +189,6 @@ def _convert_log_to_envelope(log_data: LogData) -> Union[TelemetryItem, None]:
191189
severity_level=severity_level, # type: ignore
192190
properties=properties,
193191
)
194-
if len(data.message) == 0:
195-
_logger.warning("Log record body cannot be empty. Skipping export for this log record.")
196-
return None
197192
envelope.data = MonitorBase(base_data=data, base_type="MessageData")
198193

199194
return envelope

sdk/monitor/azure-monitor-opentelemetry-exporter/tests/logs/test_logs.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,16 @@ def test_log_to_envelope_log(self):
408408
def test_log_to_envelope_log_none(self):
409409
exporter = self._exporter
410410
envelope = exporter._log_to_envelope(self._log_data_none)
411-
self.assertEqual(envelope, None)
411+
self.assertEqual(envelope.name, "Microsoft.ApplicationInsights.Message")
412+
self.assertEqual(envelope.data.base_type, "MessageData")
413+
self.assertEqual(envelope.data.base_data.message, "")
412414

413415
def test_log_to_envelope_log_empty(self):
414416
exporter = self._exporter
415417
envelope = exporter._log_to_envelope(self._log_data_empty)
416-
self.assertEqual(envelope, None)
418+
self.assertEqual(envelope.name, "Microsoft.ApplicationInsights.Message")
419+
self.assertEqual(envelope.data.base_type, "MessageData")
420+
self.assertEqual(envelope.data.base_data.message, "")
417421

418422
def test_log_to_envelope_log_complex_body(self):
419423
exporter = self._exporter

0 commit comments

Comments
 (0)