Skip to content

Commit 5268f45

Browse files
rads-1996rads-1996
authored
Fixes LogDeprecated warnings - LogDeprecatedInitWarning: LogRecord init with trace_id, span_id, and/or trace_flags is deprecated since 1.35.0. Use context instead (#44090)
* Fixes the LogDeprecated warnings - LogDeprecatedInitWarning: LogRecord init with trace_id, span_id, and/or trace_flags is deprecated since 1.35.0. Use context instead * Update CHANGELOG * Fix space issue
1 parent e1c6c3f commit 5268f45

File tree

3 files changed

+108
-86
lines changed

3 files changed

+108
-86
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
### Breaking Changes
88

99
### Bugs Fixed
10+
- Fixes LogDeprecated warnings - `LogDeprecatedInitWarning: LogRecord init with trace_id, span_id, and/or trace_flags is deprecated since 1.35.0. Use context instead`
11+
([#44090](https://github.com/Azure/azure-sdk-for-python/pull/44090))
12+
1013
- Fixes issue #43442: SyntaxWarning: 'return' in a 'finally' block in azure-monitor-opentelemetry-exporter with Python 3.14
1114
([#44053](https://github.com/Azure/azure-sdk-for-python/pull/44053))
1215

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

Lines changed: 40 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from opentelemetry.sdk.resources import Resource
2020
from opentelemetry.sdk._logs.export import LogExportResult
2121
from opentelemetry._logs.severity import SeverityNumber
22+
from opentelemetry.trace import set_span_in_context, SpanContext, NonRecordingSpan
2223

2324
from azure.monitor.opentelemetry.exporter.export._base import ExportResult
2425
from azure.monitor.opentelemetry.exporter.export.logs._exporter import (
@@ -63,13 +64,19 @@ def setUpClass(cls):
6364
os.environ["APPINSIGHTS_INSTRUMENTATIONKEY"] = "1234abcd-5678-4efa-8abc-1234567890ab"
6465
os.environ["APPLICATIONINSIGHTS_STATSBEAT_DISABLED_ALL"] = "true"
6566
cls._exporter = cls._exporter_class()
67+
span_context = SpanContext(
68+
trace_id=125960616039069540489478540494783893221,
69+
span_id=2909973987304607650,
70+
trace_flags=None,
71+
is_remote=False,
72+
)
73+
span = NonRecordingSpan(span_context)
74+
ctx = set_span_in_context(span)
6675
cls._log_data = _logs.LogData(
6776
_logs.LogRecord(
6877
timestamp=1646865018558419456,
69-
trace_id=125960616039069540489478540494783893221,
70-
span_id=2909973987304607650,
78+
context=ctx,
7179
severity_text="WARNING",
72-
trace_flags=None,
7380
severity_number=SeverityNumber.WARN,
7481
body="Test message",
7582
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -80,10 +87,8 @@ def setUpClass(cls):
8087
cls._log_data_empty = _logs.LogData(
8188
_logs.LogRecord(
8289
timestamp=1646865018558419456,
83-
trace_id=125960616039069540489478540494783893221,
84-
span_id=2909973987304607650,
90+
context=ctx,
8591
severity_text="WARNING",
86-
trace_flags=None,
8792
severity_number=SeverityNumber.WARN,
8893
body="",
8994
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -94,10 +99,8 @@ def setUpClass(cls):
9499
cls._log_data_none = _logs.LogData(
95100
_logs.LogRecord(
96101
timestamp=1646865018558419456,
97-
trace_id=125960616039069540489478540494783893221,
98-
span_id=2909973987304607650,
102+
context=ctx,
99103
severity_text="WARNING",
100-
trace_flags=None,
101104
severity_number=SeverityNumber.WARN,
102105
body=None,
103106
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -108,10 +111,8 @@ def setUpClass(cls):
108111
cls._log_data_complex_body = _logs.LogData(
109112
_logs.LogRecord(
110113
timestamp=1646865018558419456,
111-
trace_id=125960616039069540489478540494783893221,
112-
span_id=2909973987304607650,
114+
context=ctx,
113115
severity_text="WARNING",
114-
trace_flags=None,
115116
severity_number=SeverityNumber.WARN,
116117
body={"foo": {"bar": "baz", "qux": 42}},
117118
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -122,10 +123,8 @@ def setUpClass(cls):
122123
cls._log_data_complex_body_not_serializeable = _logs.LogData(
123124
_logs.LogRecord(
124125
timestamp=1646865018558419456,
125-
trace_id=125960616039069540489478540494783893221,
126-
span_id=2909973987304607650,
126+
context=ctx,
127127
severity_text="WARNING",
128-
trace_flags=None,
129128
severity_number=SeverityNumber.WARN,
130129
body=NotSerializeableClass(),
131130
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -136,10 +135,8 @@ def setUpClass(cls):
136135
cls._log_data_empty_with_whitespaces = _logs.LogData(
137136
_logs.LogRecord(
138137
timestamp=1646865018558419456,
139-
trace_id=125960616039069540489478540494783893221,
140-
span_id=2909973987304607650,
138+
context=ctx,
141139
severity_text="WARNING",
142-
trace_flags=None,
143140
severity_number=SeverityNumber.WARN,
144141
body=" ",
145142
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -150,10 +147,8 @@ def setUpClass(cls):
150147
cls._log_data_event = _logs.LogData(
151148
_logs.LogRecord(
152149
timestamp=1646865018558419456,
153-
trace_id=125960616039069540489478540494783893221,
154-
span_id=2909973987304607650,
150+
context=ctx,
155151
severity_text="INFO",
156-
trace_flags=None,
157152
severity_number=SeverityNumber.INFO,
158153
body="Test Event",
159154
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -167,10 +162,8 @@ def setUpClass(cls):
167162
cls._log_data_event_complex_body = _logs.LogData(
168163
_logs.LogRecord(
169164
timestamp=1646865018558419456,
170-
trace_id=125960616039069540489478540494783893221,
171-
span_id=2909973987304607650,
165+
context=ctx,
172166
severity_text="INFO",
173-
trace_flags=None,
174167
severity_number=SeverityNumber.INFO,
175168
body={"foo": {"bar": "baz", "qux": 42}},
176169
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -184,10 +177,7 @@ def setUpClass(cls):
184177
cls._log_data_event_complex_body_not_serializeable = _logs.LogData(
185178
_logs.LogRecord(
186179
timestamp=1646865018558419456,
187-
trace_id=125960616039069540489478540494783893221,
188-
span_id=2909973987304607650,
189180
severity_text="INFO",
190-
trace_flags=None,
191181
severity_number=SeverityNumber.INFO,
192182
body=NotSerializeableClass(),
193183
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -201,10 +191,8 @@ def setUpClass(cls):
201191
cls._log_data_custom_event = _logs.LogData(
202192
_logs.LogRecord(
203193
timestamp=1646865018558419456,
204-
trace_id=125960616039069540489478540494783893221,
205-
span_id=2909973987304607650,
194+
context=ctx,
206195
severity_text="INFO",
207-
trace_flags=None,
208196
severity_number=SeverityNumber.INFO,
209197
body="Test Event",
210198
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -219,10 +207,8 @@ def setUpClass(cls):
219207
cls._exc_data = _logs.LogData(
220208
_logs.LogRecord(
221209
timestamp=1646865018558419456,
222-
trace_id=125960616039069540489478540494783893221,
223-
span_id=2909973987304607650,
210+
context=ctx,
224211
severity_text="EXCEPTION",
225-
trace_flags=None,
226212
severity_number=SeverityNumber.FATAL,
227213
body="Test message",
228214
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -238,10 +224,8 @@ def setUpClass(cls):
238224
cls._exc_data_with_exc_body = _logs.LogData(
239225
_logs.LogRecord(
240226
timestamp=1646865018558419456,
241-
trace_id=125960616039069540489478540494783893221,
242-
span_id=2909973987304607650,
227+
context=ctx,
243228
severity_text="EXCEPTION",
244-
trace_flags=None,
245229
severity_number=SeverityNumber.FATAL,
246230
body=Exception("test exception message"),
247231
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -257,10 +241,8 @@ def setUpClass(cls):
257241
cls._exc_data_blank_exception = _logs.LogData(
258242
_logs.LogRecord(
259243
timestamp=1646865018558419456,
260-
trace_id=125960616039069540489478540494783893221,
261-
span_id=2909973987304607650,
244+
context=ctx,
262245
severity_text="EXCEPTION",
263-
trace_flags=None,
264246
severity_number=SeverityNumber.FATAL,
265247
body="test exception",
266248
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -271,10 +253,8 @@ def setUpClass(cls):
271253
cls._exc_data_empty = _logs.LogData(
272254
_logs.LogRecord(
273255
timestamp=1646865018558419456,
274-
trace_id=125960616039069540489478540494783893221,
275-
span_id=2909973987304607650,
256+
context=ctx,
276257
severity_text="EXCEPTION",
277-
trace_flags=None,
278258
severity_number=SeverityNumber.FATAL,
279259
body="",
280260
resource=Resource.create(attributes={"asd": "test_resource"}),
@@ -586,13 +566,19 @@ def test_log_to_envelope_synthetic_source(self):
586566
"service.instance.id": "testServiceInstanceId",
587567
}
588568
)
569+
span_context = SpanContext(
570+
trace_id=125960616039069540489478540494783893221,
571+
span_id=2909973987304607650,
572+
trace_flags=None,
573+
is_remote=False,
574+
)
575+
span = NonRecordingSpan(span_context)
576+
ctx = set_span_in_context(span)
589577
log_data = _logs.LogData(
590578
_logs.LogRecord(
591579
timestamp=1646865018558419456,
592-
trace_id=125960616039069540489478540494783893221,
593-
span_id=2909973987304607650,
580+
context=ctx,
594581
severity_text="WARNING",
595-
trace_flags=None,
596582
severity_number=SeverityNumber.WARN,
597583
body="Test message",
598584
resource=resource,
@@ -618,13 +604,19 @@ def test_log_to_envelope_synthetic_load_always_on(self):
618604
"service.instance.id": "testServiceInstanceId",
619605
}
620606
)
607+
span_context = SpanContext(
608+
trace_id=125960616039069540489478540494783893221,
609+
span_id=2909973987304607650,
610+
trace_flags=None,
611+
is_remote=False,
612+
)
613+
span = NonRecordingSpan(span_context)
614+
ctx = set_span_in_context(span)
621615
log_data = _logs.LogData(
622616
_logs.LogRecord(
623617
timestamp=1646865018558419456,
624-
trace_id=125960616039069540489478540494783893221,
625-
span_id=2909973987304607650,
618+
context=ctx,
626619
severity_text="WARNING",
627-
trace_flags=None,
628620
severity_number=SeverityNumber.WARN,
629621
body="Test message",
630622
resource=resource,

0 commit comments

Comments
 (0)