apache-airflow-providers-elasticsearch 6.3.0__tar.gz → 6.3.1rc1__tar.gz

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-elasticsearch
-Version: 6.3.0
+Version: 6.3.1rc1
 Summary: Provider package apache-airflow-providers-elasticsearch for Apache Airflow
 Keywords: airflow-provider,elasticsearch,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
 Maintainer-email: Apache Software Foundation <dev@airflow.apache.org>
-Requires-Python: ~=3.9
+Requires-Python: ~=3.10
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -15,17 +15,16 @@ Classifier: Intended Audience :: System Administrators
 Classifier: Framework :: Apache Airflow
 Classifier: Framework :: Apache Airflow :: Provider
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow>=2.10.0
-Requires-Dist: apache-airflow-providers-common-sql>=1.27.0
+Requires-Dist: apache-airflow>=2.10.0rc1
+Requires-Dist: apache-airflow-providers-common-sql>=1.27.0rc1
 Requires-Dist: elasticsearch>=8.10,<9
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.0
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -56,7 +55,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-elasticsearch``
 
-Release: ``6.3.0``
+Release: ``6.3.1``
 
 
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
@@ -69,7 +68,7 @@ This is a provider package for ``elasticsearch`` provider. All classes for this
 are in ``airflow.providers.elasticsearch`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/>`_.
 
 Installation
 ------------
@@ -78,7 +77,7 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-elasticsearch``
 
-The package supports the following python versions: 3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12
 
 Requirements
 ------------
@@ -111,5 +110,5 @@ Dependent package
 ============================================================================================================  ==============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/changelog.html>`_.
 

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-elasticsearch``
 
-Release: ``6.3.0``
+Release: ``6.3.1``
 
 
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
@@ -36,7 +36,7 @@ This is a provider package for ``elasticsearch`` provider. All classes for this
 are in ``airflow.providers.elasticsearch`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/>`_.
 
 Installation
 ------------
@@ -45,7 +45,7 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-elasticsearch``
 
-The package supports the following python versions: 3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12
 
 Requirements
 ------------
@@ -78,4 +78,4 @@ Dependent package
 ============================================================================================================  ==============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/changelog.html>`_.

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/docs/changelog.rst

@@ -27,6 +27,21 @@
 Changelog
 ---------
 
+6.3.1
+.....
+
+Misc
+~~~~
+
+* ``Move 'BaseHook' implementation to task SDK (#51873)``
+* ``Provider Migration: Update elasticsearch for Airflow 3.0 compatibility (#52628)``
+* ``Disable UP038 ruff rule and revert mandatory 'X | Y' in insintance checks (#52644)``
+* ``Drop support for Python 3.9 (#52072)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Removed pytestmark db_test from the elasticsearch providers tests (#52139)``
+
 6.3.0
 .....
 

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/docs/index.rst

@@ -79,7 +79,7 @@ apache-airflow-providers-elasticsearch package
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
 
 
-Release: 6.3.0
+Release: 6.3.1
 
 Provider package
 ----------------
@@ -132,5 +132,5 @@ Downloading official packages
 You can download officially released packages and verify their checksums and signatures from the
 `Official Apache Download site <https://downloads.apache.org/airflow/providers/>`_
 
-* `The apache-airflow-providers-elasticsearch 6.3.0 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.0.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.0.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.0.tar.gz.sha512>`__)
-* `The apache-airflow-providers-elasticsearch 6.3.0 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.0-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.0-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.0-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-elasticsearch 6.3.1 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.1.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.1.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.1.tar.gz.sha512>`__)
+* `The apache-airflow-providers-elasticsearch 6.3.1 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.1-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.1-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.1-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/provider.yaml

@@ -22,12 +22,13 @@ description: |
     `Elasticsearch <https://www.elastic.co/elasticsearch>`__
 
 state: ready
-source-date-epoch: 1747132714
+source-date-epoch: 1751473399
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 6.3.1
   - 6.3.0
   - 6.2.2
   - 6.2.1

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-elasticsearch"
-version = "6.3.0"
+version = "6.3.1rc1"
 description = "Provider package apache-airflow-providers-elasticsearch for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -44,21 +44,20 @@ classifiers = [
     "Framework :: Apache Airflow",
     "Framework :: Apache Airflow :: Provider",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Topic :: System :: Monitoring",
 ]
-requires-python = "~=3.9"
+requires-python = "~=3.10"
 
 # The dependencies should be modified in place in the generated file.
 # Any change in the dependencies is preserved when the file is regenerated
 # Make sure to run ``breeze static-checks --type update-providers-dependencies --all-files``
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
-    "apache-airflow>=2.10.0",
-    "apache-airflow-providers-common-sql>=1.27.0",
+    "apache-airflow>=2.10.0rc1",
+    "apache-airflow-providers-common-sql>=1.27.0rc1",
     "elasticsearch>=8.10,<9",
 ]
 
@@ -98,8 +97,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.0"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.0/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/src/airflow/providers/elasticsearch/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "6.3.0"
+__version__ = "6.3.1"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.10.0"

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/src/airflow/providers/elasticsearch/hooks/elasticsearch.py

@@ -20,14 +20,18 @@ from __future__ import annotations
 from collections.abc import Iterable, Mapping
 from copy import deepcopy
 from functools import cached_property
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
 from urllib import parse
 
 from elasticsearch import Elasticsearch
 
-from airflow.hooks.base import BaseHook
 from airflow.providers.common.sql.hooks.sql import DbApiHook
 
+try:
+    from airflow.sdk import BaseHook
+except ImportError:
+    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
+
 if TYPE_CHECKING:
     from elastic_transport import ObjectApiResponse
 
@@ -179,8 +183,8 @@ class ElasticsearchSQLHook(DbApiHook):
         conn = self.connection
 
         conn_args = {
-            "host": conn.host,
-            "port": conn.port,
+            "host": cast("str", conn.host),
+            "port": cast("int", conn.port),
             "user": conn.login or None,
             "password": conn.password or None,
             "scheme": conn.schema or "http",
@@ -191,7 +195,7 @@ class ElasticsearchSQLHook(DbApiHook):
         if conn_args.get("http_compress", False):
             conn_args["http_compress"] = bool(conn_args["http_compress"])
 
-        return connect(**conn_args)
+        return connect(**conn_args)  # type: ignore[arg-type]
 
     def get_uri(self) -> str:
         conn = self.connection
@@ -199,7 +203,7 @@ class ElasticsearchSQLHook(DbApiHook):
         login = ""
         if conn.login:
             login = f"{conn.login}:{conn.password}@"
-        host = conn.host
+        host = conn.host or ""
         if conn.port is not None:
             host += f":{conn.port}"
         uri = f"{conn.conn_type}+{conn.schema}://{login}{host}/"

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/src/airflow/providers/elasticsearch/log/es_task_handler.py

@@ -27,8 +27,9 @@ import shutil
 import sys
 import time
 from collections import defaultdict
+from collections.abc import Callable
 from operator import attrgetter
-from typing import TYPE_CHECKING, Any, Callable, Literal
+from typing import TYPE_CHECKING, Any, Literal
 from urllib.parse import quote, urlparse
 
 # Using `from elasticsearch import *` would break elasticsearch mocking used in unit test.
@@ -44,7 +45,7 @@ from airflow.providers.elasticsearch.log.es_json_formatter import (
     ElasticsearchJSONFormatter,
 )
 from airflow.providers.elasticsearch.log.es_response import ElasticSearchResponse, Hit
-from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS
+from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS, EsLogMsgType
 from airflow.utils import timezone
 from airflow.utils.log.file_task_handler import FileTaskHandler
 from airflow.utils.log.logging_mixin import ExternalLoggingMixin, LoggingMixin
@@ -56,15 +57,6 @@ if TYPE_CHECKING:
 
     from airflow.models.taskinstance import TaskInstance, TaskInstanceKey
 
-if AIRFLOW_V_3_0_PLUS:
-    from typing import Union
-
-    from airflow.utils.log.file_task_handler import StructuredLogMessage
-
-    EsLogMsgType = Union[list[StructuredLogMessage], str]
-else:
-    EsLogMsgType = list[tuple[str, str]]  # type: ignore[misc]
-
 
 LOG_LINE_DEFAULTS = {"exc_text": "", "stack_info": ""}
 # Elasticsearch hosted log type

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/src/airflow/providers/elasticsearch/version_compat.py

@@ -33,3 +33,10 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 
 
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
+
+if AIRFLOW_V_3_0_PLUS:
+    from airflow.utils.log.file_task_handler import StructuredLogMessage
+
+    EsLogMsgType = list[StructuredLogMessage] | str
+else:
+    EsLogMsgType = list[tuple[str, str]]  # type: ignore[misc]

{apache_airflow_providers_elasticsearch-6.3.0 → apache_airflow_providers_elasticsearch-6.3.1rc1}/tests/unit/elasticsearch/log/test_es_task_handler.py

@@ -51,8 +51,6 @@ from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
 from unit.elasticsearch.log.elasticmock import elasticmock
 from unit.elasticsearch.log.elasticmock.utilities import SearchFailedException
 
-pytestmark = pytest.mark.db_test
-
 ES_PROVIDER_YAML_FILE = AIRFLOW_PROVIDERS_ROOT_PATH / "elasticsearch" / "provider.yaml"
 
 
@@ -202,6 +200,7 @@ class TestElasticsearchTaskHandler:
         )
         assert handler.index_patterns == patterns
 
+    @pytest.mark.db_test
     def test_read(self, ti):
         ts = pendulum.now()
         logs, metadatas = self.es_task_handler.read(
@@ -227,6 +226,7 @@ class TestElasticsearchTaskHandler:
         assert metadata["offset"] == "1"
         assert timezone.parse(metadata["last_log_timestamp"]) > ts
 
+    @pytest.mark.db_test
     def test_read_with_patterns(self, ti):
         ts = pendulum.now()
         with mock.patch.object(self.es_task_handler, "index_patterns", new="test_*,other_*"):
@@ -253,6 +253,7 @@ class TestElasticsearchTaskHandler:
         assert metadata["offset"] == "1"
         assert timezone.parse(metadata["last_log_timestamp"]) > ts
 
+    @pytest.mark.db_test
     def test_read_with_patterns_no_match(self, ti):
         ts = pendulum.now()
         with mock.patch.object(self.es_task_handler, "index_patterns", new="test_other_*,test_another_*"):
@@ -276,6 +277,7 @@ class TestElasticsearchTaskHandler:
         # last_log_timestamp won't change if no log lines read.
         assert timezone.parse(metadata["last_log_timestamp"]) == ts
 
+    @pytest.mark.db_test
     def test_read_with_missing_index(self, ti):
         ts = pendulum.now()
         with mock.patch.object(self.es_task_handler, "index_patterns", new="nonexistent,test_*"):
@@ -286,6 +288,7 @@ class TestElasticsearchTaskHandler:
                     {"offset": 0, "last_log_timestamp": str(ts), "end_of_log": False},
                 )
 
+    @pytest.mark.db_test
     @pytest.mark.parametrize("seconds", [3, 6])
     def test_read_missing_logs(self, seconds, create_task_instance):
         """
@@ -330,6 +333,7 @@ class TestElasticsearchTaskHandler:
             assert metadatas[0]["offset"] == "0"
             assert timezone.parse(metadatas[0]["last_log_timestamp"]) == ts
 
+    @pytest.mark.db_test
     def test_read_with_match_phrase_query(self, ti):
         similar_log_id = (
             f"{TestElasticsearchTaskHandler.TASK_ID}-"
@@ -374,6 +378,7 @@ class TestElasticsearchTaskHandler:
         assert metadata["offset"] == "1"
         assert timezone.parse(metadata["last_log_timestamp"]) > ts
 
+    @pytest.mark.db_test
     def test_read_with_none_metadata(self, ti):
         logs, metadatas = self.es_task_handler.read(ti, 1)
         if AIRFLOW_V_3_0_PLUS:
@@ -395,6 +400,7 @@ class TestElasticsearchTaskHandler:
         assert metadata["offset"] == "1"
         assert timezone.parse(metadata["last_log_timestamp"]) < pendulum.now()
 
+    @pytest.mark.db_test
     def test_read_nonexistent_log(self, ti):
         ts = pendulum.now()
         # In ElasticMock, search is going to return all documents with matching index
@@ -420,6 +426,7 @@ class TestElasticsearchTaskHandler:
         # last_log_timestamp won't change if no log lines read.
         assert timezone.parse(metadata["last_log_timestamp"]) == ts
 
+    @pytest.mark.db_test
     def test_read_with_empty_metadata(self, ti):
         ts = pendulum.now()
         logs, metadatas = self.es_task_handler.read(ti, 1, {})
@@ -466,6 +473,7 @@ class TestElasticsearchTaskHandler:
         # if not last_log_timestamp is provided.
         assert timezone.parse(metadata["last_log_timestamp"]) > ts
 
+    @pytest.mark.db_test
     def test_read_timeout(self, ti):
         ts = pendulum.now().subtract(minutes=5)
 
@@ -498,6 +506,7 @@ class TestElasticsearchTaskHandler:
         assert str(offset) == metadata["offset"]
         assert timezone.parse(metadata["last_log_timestamp"]) == ts
 
+    @pytest.mark.db_test
     def test_read_as_download_logs(self, ti):
         ts = pendulum.now()
         logs, metadatas = self.es_task_handler.read(
@@ -529,6 +538,7 @@ class TestElasticsearchTaskHandler:
         assert metadata["offset"] == "1"
         assert timezone.parse(metadata["last_log_timestamp"]) > ts
 
+    @pytest.mark.db_test
     def test_read_raises(self, ti):
         with mock.patch.object(self.es_task_handler.log, "exception") as mock_exception:
             with mock.patch.object(self.es_task_handler.client, "search") as mock_execute:
@@ -552,10 +562,12 @@ class TestElasticsearchTaskHandler:
         assert metadata["offset"] == "0"
         assert not metadata["end_of_log"]
 
+    @pytest.mark.db_test
     def test_set_context(self, ti):
         self.es_task_handler.set_context(ti)
         assert self.es_task_handler.mark_end_on_close
 
+    @pytest.mark.db_test
     def test_set_context_w_json_format_and_write_stdout(self, ti):
         formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
         self.es_task_handler.formatter = formatter
@@ -563,6 +575,7 @@ class TestElasticsearchTaskHandler:
         self.es_task_handler.json_format = True
         self.es_task_handler.set_context(ti)
 
+    @pytest.mark.db_test
     def test_read_with_json_format(self, ti):
         ts = pendulum.now()
         formatter = logging.Formatter(
@@ -592,6 +605,7 @@ class TestElasticsearchTaskHandler:
         else:
             assert logs[0][0][1] == expected_message
 
+    @pytest.mark.db_test
     def test_read_with_json_format_with_custom_offset_and_host_fields(self, ti):
         ts = pendulum.now()
         formatter = logging.Formatter(
@@ -624,6 +638,7 @@ class TestElasticsearchTaskHandler:
         else:
             assert logs[0][0][1] == expected_message
 
+    @pytest.mark.db_test
     def test_read_with_custom_offset_and_host_fields(self, ti):
         ts = pendulum.now()
         # Delete the existing log entry as it doesn't have the new offset and host fields
@@ -648,6 +663,7 @@ class TestElasticsearchTaskHandler:
         else:
             assert self.test_message == logs[0][0][1]
 
+    @pytest.mark.db_test
     def test_close(self, ti):
         formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
         self.es_task_handler.formatter = formatter
@@ -664,6 +680,7 @@ class TestElasticsearchTaskHandler:
             assert log_line.endswith(self.end_of_log_mark.strip())
         assert self.es_task_handler.closed
 
+    @pytest.mark.db_test
     def test_close_no_mark_end(self, ti):
         ti.raw = True
         self.es_task_handler.set_context(ti)
@@ -674,6 +691,7 @@ class TestElasticsearchTaskHandler:
             assert self.end_of_log_mark not in log_file.read()
         assert self.es_task_handler.closed
 
+    @pytest.mark.db_test
     def test_close_closed(self, ti):
         self.es_task_handler.closed = True
         self.es_task_handler.set_context(ti)
@@ -683,6 +701,7 @@ class TestElasticsearchTaskHandler:
         ) as log_file:
             assert len(log_file.read()) == 0
 
+    @pytest.mark.db_test
     def test_close_with_no_handler(self, ti):
         self.es_task_handler.set_context(ti)
         self.es_task_handler.handler = None
@@ -693,6 +712,7 @@ class TestElasticsearchTaskHandler:
             assert len(log_file.read()) == 0
         assert self.es_task_handler.closed
 
+    @pytest.mark.db_test
     def test_close_with_no_stream(self, ti):
         self.es_task_handler.set_context(ti)
         self.es_task_handler.handler.stream = None
@@ -712,6 +732,7 @@ class TestElasticsearchTaskHandler:
             assert self.end_of_log_mark in log_file.read()
         assert self.es_task_handler.closed
 
+    @pytest.mark.db_test
     def test_render_log_id(self, ti):
         assert self.es_task_handler._render_log_id(ti, 1) == self.LOG_ID
 
@@ -722,6 +743,7 @@ class TestElasticsearchTaskHandler:
         clean_logical_date = self.es_task_handler._clean_date(datetime(2016, 7, 8, 9, 10, 11, 12))
         assert clean_logical_date == "2016_07_08T09_10_11_000012"
 
+    @pytest.mark.db_test
     @pytest.mark.parametrize(
         "json_format, es_frontend, expected_url",
         [
@@ -781,6 +803,7 @@ class TestElasticsearchTaskHandler:
         self.es_task_handler.frontend = frontend
         assert self.es_task_handler.supports_external_link == expected
 
+    @pytest.mark.db_test
     @mock.patch("sys.__stdout__", new_callable=StringIO)
     def test_dynamic_offset(self, stdout_mock, ti, time_machine):
         # arrange
@@ -843,6 +866,7 @@ class TestElasticsearchTaskHandler:
             filename_template=None,
         )
 
+    @pytest.mark.db_test
     def test_write_to_es(self, ti):
         self.es_task_handler.write_to_es = True
         self.es_task_handler.json_format = True