Reviewer suggestions

Author: basepi

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## Unreleased
 
-* Fix for duplicate dotted keys ([#46])
+* Fixed an issue in `StructlogFormatter` caused by a conflict with `event`
+  (used for the log `message`) and `event.dataset` (a field provided by the
+  `elasticapm` integration) ([#46](https://github.com/elastic/ecs-logging-python/pull/46))
 
 ## 1.0.0 (2021-02-08)
 

ecs_logging/_utils.py

@@ -114,7 +114,7 @@ def merge_dicts(from_, into):
         into.setdefault(key, {})
         if isinstance(value, dict) and isinstance(into[key], dict):
             merge_dicts(value, into[key])
-        elif into[key]:
+        elif into[key] != {}:
             raise TypeError(
                 "Type mismatch at key `{}`: merging dicts would replace value `{}` with `{}`. This is likely due to "
                 "dotted keys in the event dict being turned into nested dictionaries, causing a conflict.".format(

tests/conftest.py

@@ -92,6 +92,8 @@ def validator(data_json):
 
 @pytest.fixture
 def apm():
+    if sys.version_info < (3, 6):
+        pytest.skip("elasticapm only supports python 3.6+")
     if sys.version_info[0] >= 3:
         record_factory = logging.getLogRecordFactory()
     apm = elasticapm.Client({"SERVICE_NAME": "apm-service", "DISABLE_SEND": True})

tests/test_apm.py

@@ -27,11 +27,6 @@
 from .compat import StringIO
 
 
-# elasticapm only supports python 3.6+
-if sys.version_info < (3, 6):
-    pytestmark = [pytest.mark.skip]
-
-
 def test_elasticapm_structlog_log_correlation_ecs_fields(spec_validator, apm):
     stream = StringIO()
     logger = structlog.PrintLogger(stream)