@@ -121,6 +121,18 @@ def test_trace_context_injection_with_log_correlation_instrument_arg(self):
121121 span_id , trace_id , trace_sampled
122122 )
123123
124+ def test_no_trace_context_injection_by_default (self ):
125+ with self .tracer .start_as_current_span ("s1" ):
126+ with self .caplog .at_level (level = logging .INFO ):
127+ logger = logging .getLogger ("test logger" )
128+ logger .info ("hello" )
129+ self .assertEqual (len (self .caplog .records ), 1 )
130+ record = self .caplog .records [0 ]
131+ self .assertFalse (hasattr (record , "otelServiceName" ))
132+ self .assertFalse (hasattr (record , "otelSpanID" ))
133+ self .assertFalse (hasattr (record , "otelTraceID" ))
134+ self .assertFalse (hasattr (record , "otelTraceSampled" ))
135+
124136 def test_trace_context_injection_without_span (self ):
125137 LoggingInstrumentor ().uninstrument ()
126138 LoggingInstrumentor ().instrument (set_logging_format = True )
@@ -184,9 +196,9 @@ def test_log_hook(self):
184196 logger .info ("hello" )
185197 self .assertEqual (len (self .caplog .records ), 1 )
186198 record = self .caplog .records [0 ]
199+ self .assertFalse (hasattr (record , "otelServiceName" ))
187200 self .assertFalse (hasattr (record , "otelSpanID" ))
188201 self .assertFalse (hasattr (record , "otelTraceID" ))
189- self .assertFalse (hasattr (record , "otelServiceName" ))
190202 self .assertFalse (hasattr (record , "otelTraceSampled" ))
191203 self .assertEqual (
192204 record .custom_user_attribute_from_log_hook , "some-value"
@@ -224,9 +236,9 @@ def test_uninstrumented(self):
224236 logger .info ("hello" )
225237 self .assertEqual (len (self .caplog .records ), 1 )
226238 record = self .caplog .records [0 ]
239+ self .assertFalse (hasattr (record , "otelServiceName" ))
227240 self .assertFalse (hasattr (record , "otelSpanID" ))
228241 self .assertFalse (hasattr (record , "otelTraceID" ))
229- self .assertFalse (hasattr (record , "otelServiceName" ))
230242 self .assertFalse (hasattr (record , "otelTraceSampled" ))
231243
232244 def test_no_op_tracer_provider (self ):
0 commit comments