Merge branch 'master' into unix-socket-memcache-fix

Author: basepi

CHANGELOG.asciidoc

@@ -41,8 +41,8 @@ endif::[]
 [float]
 ===== Bug fixes
 
- * Ensure that Prometheus histograms are encoded correctly for APM Server {pull}1354[#1354]
- * Fix structlog processor to correctly populate ECS-compatible `event.dataset` {pull}1352[#1352]
+* Ensure that Prometheus histograms are encoded correctly for APM Server {pull}1354[#1354]
+* Remove problematic (and duplicate) `event.dataset` from logging integrations {pull}1365[#1365]
 
 [[release-notes-6.x]]
 === Python Agent version 6.x

elasticapm/handlers/logging.py

@@ -231,15 +231,12 @@ def _add_attributes_to_log_record(record):
     client = get_client()
     service_name = client.config.service_name if client else None
     record.elasticapm_service_name = service_name
-    event_dataset = f"{client.config.service_name}" if client else None
-    record.elasticapm_event_dataset = event_dataset
 
     record.elasticapm_labels = {
         "transaction.id": transaction_id,
         "trace.id": trace_id,
         "span.id": span_id,
         "service.name": service_name,
-        "event.dataset": event_dataset,
     }
 
     return record

elasticapm/handlers/structlog.py

@@ -57,7 +57,6 @@ def structlog_processor(logger, method_name, event_dict):
     client = get_client()
     if client:
         event_dict["service.name"] = client.config.service_name
-        event_dict["event"] = {"dataset": f"{client.config.service_name}"}
     if transaction and transaction.trace_parent:
         event_dict["trace.id"] = transaction.trace_parent.trace_id
     span = execution_context.get_span()

tests/handlers/logging/logging_tests.py

@@ -269,7 +269,6 @@ def test_structlog_processor_no_span(elasticapm_client):
     new_dict = structlog_processor(None, None, event_dict)
     assert new_dict["transaction.id"] == transaction.id
     assert new_dict["trace.id"] == transaction.trace_parent.trace_id
-    assert new_dict["event"]["dataset"] == "myapp"
     assert "span.id" not in new_dict