@@ -266,6 +266,7 @@ def test_logging_filter_no_span(elasticapm_client):
266
266
f .filter (record )
267
267
assert record .elasticapm_transaction_id == transaction .id
268
268
assert record .elasticapm_service_name == transaction .tracer .config .service_name
269
+ assert record .elasticapm_service_environment == transaction .tracer .config .environment
269
270
assert record .elasticapm_trace_id == transaction .trace_parent .trace_id
270
271
assert record .elasticapm_span_id is None
271
272
assert record .elasticapm_labels
@@ -289,6 +290,7 @@ def test_logging_filter_span(elasticapm_client):
289
290
f .filter (record )
290
291
assert record .elasticapm_transaction_id == transaction .id
291
292
assert record .elasticapm_service_name == transaction .tracer .config .service_name
293
+ assert record .elasticapm_service_environment == transaction .tracer .config .environment
292
294
assert record .elasticapm_trace_id == transaction .trace_parent .trace_id
293
295
assert record .elasticapm_span_id == span .id
294
296
assert record .elasticapm_labels
@@ -304,6 +306,7 @@ def test_logging_filter_span(elasticapm_client):
304
306
f .filter (record )
305
307
assert record .elasticapm_transaction_id == transaction .id
306
308
assert record .elasticapm_service_name == transaction .tracer .config .service_name
309
+ assert record .elasticapm_service_environment == transaction .tracer .config .environment
307
310
assert record .elasticapm_trace_id == transaction .trace_parent .trace_id
308
311
assert record .elasticapm_span_id is None
309
312
assert record .elasticapm_labels
@@ -317,6 +320,7 @@ def test_structlog_processor_span(elasticapm_client):
317
320
new_dict = structlog_processor (None , None , event_dict )
318
321
assert new_dict ["transaction.id" ] == transaction .id
319
322
assert new_dict ["service.name" ] == transaction .tracer .config .service_name
323
+ assert new_dict ["service.environment" ] == transaction .tracer .config .environment
320
324
assert new_dict ["trace.id" ] == transaction .trace_parent .trace_id
321
325
assert new_dict ["span.id" ] == span .id
322
326
@@ -331,6 +335,7 @@ def test_structlog_processor_span(elasticapm_client):
331
335
new_dict = structlog_processor (None , None , event_dict )
332
336
assert new_dict ["transaction.id" ] == transaction .id
333
337
assert new_dict ["service.name" ] == transaction .tracer .config .service_name
338
+ assert new_dict ["service.environment" ] == transaction .tracer .config .environment
334
339
assert new_dict ["trace.id" ] == transaction .trace_parent .trace_id
335
340
assert "span.id" not in new_dict
336
341
@@ -346,6 +351,7 @@ def test_automatic_log_record_factory_install(elasticapm_client):
346
351
record = record_factory (__name__ , logging .DEBUG , __file__ , 252 , "dummy_msg" , [], None )
347
352
assert record .elasticapm_transaction_id == transaction .id
348
353
assert record .elasticapm_service_name == transaction .tracer .config .service_name
354
+ assert record .elasticapm_service_environment == transaction .tracer .config .environment
349
355
assert record .elasticapm_trace_id == transaction .trace_parent .trace_id
350
356
assert record .elasticapm_span_id == span .id
351
357
assert record .elasticapm_labels
@@ -358,11 +364,13 @@ def test_formatter():
358
364
assert "| elasticapm" in formatted_record
359
365
assert hasattr (record , "elasticapm_transaction_id" )
360
366
assert hasattr (record , "elasticapm_service_name" )
367
+ assert hasattr (record , "elasticapm_service_environment" )
361
368
record = logging .LogRecord (__name__ , logging .DEBUG , __file__ , 252 , "dummy_msg" , [], None )
362
369
formatted_time = formatter .formatTime (record )
363
370
assert formatted_time
364
371
assert hasattr (record , "elasticapm_transaction_id" )
365
372
assert hasattr (record , "elasticapm_service_name" )
373
+ assert hasattr (record , "elasticapm_service_environment" )
366
374
367
375
368
376
def test_logging_handler_no_client (recwarn ):
0 commit comments