From b83dedb7710a88d030e39179ed3869530da42788 Mon Sep 17 00:00:00 2001
From: Colton Myers <colton.myers@gmail.com>
Date: Thu, 14 Oct 2021 11:41:03 -0600
Subject: [PATCH] Remove event.dataset from integration with elastic-apm (#69)

* Remove event.dataset

* Remove python 3.5 support

* CHANGELOG
---
 .ci/Jenkinsfile                   | 2 +-
 CHANGELOG.md                      | 4 ++++
 ecs_logging/_stdlib.py            | 1 -
 noxfile.py                        | 2 +-
 pyproject.toml                    | 3 +--
 tests/test_apm.py                 | 4 ----
 tests/test_structlog_formatter.py | 2 --
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index a0f1e05..7853df8 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
         axes {
           axis {
             name 'VERSION'
-            values '2.7', '3.5', '3.6', '3.7', '3.8'
+            values '2.7', '3.6', '3.7', '3.8'
           }
         }
         stages {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 142fa31..ba2dc39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+* Remove python 3.5 support [#69]
+
 ## 1.0.2 (2021-09-22)
 
 * Fix an signature mismatch between `StdLibFormatter` and `logging.Formatter`,
diff --git a/ecs_logging/_stdlib.py b/ecs_logging/_stdlib.py
index 3582d3b..da0358c 100644
--- a/ecs_logging/_stdlib.py
+++ b/ecs_logging/_stdlib.py
@@ -227,7 +227,6 @@ def format_to_ecs(self, record):
         )
         extras.setdefault("trace.id", extras.pop("elasticapm_trace_id", None))
         extras.setdefault("service.name", extras.pop("elasticapm_service_name", None))
-        extras.setdefault("event.dataset", extras.pop("elasticapm_event_dataset", None))
 
         # Merge in any keys that were set within 'extra={...}'
         for field, value in extras.items():
diff --git a/noxfile.py b/noxfile.py
index a57e026..1f989bf 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -32,7 +32,7 @@ def tests_impl(session):
     )
 
 
-@nox.session(python=["2.7", "3.5", "3.6", "3.7", "3.8"])
+@nox.session(python=["2.7", "3.6", "3.7", "3.8"])
 def test(session):
     tests_impl(session)
 
diff --git a/pyproject.toml b/pyproject.toml
index 242fea9..fd0ba16 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,6 @@ classifiers = [
   "Programming Language :: Python :: 2",
   "Programming Language :: Python :: 2.7",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.5",
   "Programming Language :: Python :: 3.6",
   "Programming Language :: Python :: 3.7",
   "Programming Language :: Python :: 3.8",
@@ -27,7 +26,7 @@ classifiers = [
 requires = [
   "backports.functools-lru-cache; python_version < '3.3'"
 ]
-requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [tool.flit.metadata.requires-extra]
 develop = [
diff --git a/tests/test_apm.py b/tests/test_apm.py
index a96ca4c..2d8c8b4 100644
--- a/tests/test_apm.py
+++ b/tests/test_apm.py
@@ -56,7 +56,6 @@ def test_elasticapm_structlog_log_correlation_ecs_fields(spec_validator, apm):
         "trace": {"id": trace_id},
         "transaction": {"id": transaction_id},
         "service": {"name": "apm-service"},
-        "event": {"dataset": "apm-service"},
     }
 
 
@@ -100,7 +99,6 @@ def test_elastic_apm_stdlib_no_filter_log_correlation_ecs_fields(apm):
         "trace": {"id": trace_id},
         "transaction": {"id": transaction_id},
         "service": {"name": "apm-service"},
-        "event": {"dataset": "apm-service"},
     }
 
 
@@ -145,7 +143,6 @@ def test_elastic_apm_stdlib_with_filter_log_correlation_ecs_fields(apm):
         "trace": {"id": trace_id},
         "transaction": {"id": transaction_id},
         "service": {"name": "apm-service"},
-        "event": {"dataset": "apm-service"},
     }
 
 
@@ -191,5 +188,4 @@ def test_elastic_apm_stdlib_exclude_fields(apm):
         "message": "test message",
         "trace": {"id": trace_id},
         "service": {"name": "apm-service"},
-        "event": {"dataset": "apm-service"},
     }
diff --git a/tests/test_structlog_formatter.py b/tests/test_structlog_formatter.py
index a8790a0..26ebcac 100644
--- a/tests/test_structlog_formatter.py
+++ b/tests/test_structlog_formatter.py
@@ -31,7 +31,6 @@ def __repr__(self):
 def make_event_dict():
     return {
         "event": "test message",
-        "event.dataset": "agent",
         "log.logger": "logger-name",
         "foo": "bar",
         "baz": NotSerializable(),
@@ -56,7 +55,6 @@ def test_event_dict_formatted(time, spec_validator):
         '"message":"test message",'
         '"baz":"<NotSerializable>",'
         '"ecs":{"version":"1.6.0"},'
-        '"event":{"dataset":"agent"},'
         '"foo":"bar",'
         '"log":{"logger":"logger-name"}}'
     )