apache-airflow-providers-elasticsearch 6.3.1__tar.gz → 6.3.2__tar.gz

{apache_airflow_providers_elasticsearch-6.3.1 → apache_airflow_providers_elasticsearch-6.3.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-elasticsearch
-Version: 6.3.1
+Version: 6.3.2
 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.10
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -18,13 +18,14 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow>=2.10.0
 Requires-Dist: apache-airflow-providers-common-sql>=1.27.0
 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.1/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.2/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.2
 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
@@ -55,8 +56,9 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-elasticsearch``
 
-Release: ``6.3.1``
+Release: ``6.3.2``
 
+Release Date: ``|PypiReleaseDate|``
 
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
 
@@ -68,7 +70,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.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.2/>`_.
 
 Installation
 ------------
@@ -77,7 +79,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.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12,3.13
 
 Requirements
 ------------
@@ -110,5 +112,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.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.2/changelog.html>`_.
 

{apache_airflow_providers_elasticsearch-6.3.1 → apache_airflow_providers_elasticsearch-6.3.2}/README.rst

@@ -23,8 +23,9 @@
 
 Package ``apache-airflow-providers-elasticsearch``
 
-Release: ``6.3.1``
+Release: ``6.3.2``
 
+Release Date: ``|PypiReleaseDate|``
 
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
 
@@ -36,7 +37,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.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.2/>`_.
 
 Installation
 ------------
@@ -45,7 +46,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.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12,3.13
 
 Requirements
 ------------
@@ -78,4 +79,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.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.2/changelog.html>`_.

{apache_airflow_providers_elasticsearch-6.3.1 → apache_airflow_providers_elasticsearch-6.3.2}/docs/changelog.rst

@@ -27,6 +27,31 @@
 Changelog
 ---------
 
+6.3.2
+.....
+
+Bug Fixes
+~~~~~~~~~
+
+* ``Make Elasticsearch/OpensearchTaskHandler to render log well (#53639)``
+* ``Resolve OOM When Reading Large Logs in Webserver (#49470)``
+
+Misc
+~~~~
+
+* ``fix mypy unreachable code warnings for elasticsearch provider (#53464)``
+* ``Add Python 3.13 support for Airflow. (#46891)``
+* ``Cleanup mypy ignore in elasticsearch provider where possible (#53277)``
+* ``Remove type ignore across codebase after mypy upgrade (#53243)``
+* ``Make elasticsearch provider compatible with mypy 1.16.1 (#53109)``
+* ``Remove upper-binding for "python-requires" (#52980)``
+* ``Temporarily switch to use >=,< pattern instead of '~=' (#52967)``
+* ``Move all BaseHook usages to version_compat in Elastic Search (#52805)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Deprecate decorators from Core (#53629)``
+
 6.3.1
 .....
 

{apache_airflow_providers_elasticsearch-6.3.1 → apache_airflow_providers_elasticsearch-6.3.2}/docs/index.rst

@@ -79,7 +79,9 @@ apache-airflow-providers-elasticsearch package
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
 
 
-Release: 6.3.1
+Release: 6.3.2
+
+Release Date: ``|PypiReleaseDate|``
 
 Provider package
 ----------------
@@ -132,5 +134,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.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>`__)
+* `The apache-airflow-providers-elasticsearch 6.3.2 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.2.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.2.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.2.tar.gz.sha512>`__)
+* `The apache-airflow-providers-elasticsearch 6.3.2 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.2-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.2-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_elasticsearch-6.3.2-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_elasticsearch-6.3.1 → apache_airflow_providers_elasticsearch-6.3.2}/provider.yaml

@@ -22,12 +22,13 @@ description: |
     `Elasticsearch <https://www.elastic.co/elasticsearch>`__
 
 state: ready
-source-date-epoch: 1751473399
+source-date-epoch: 1753690618
 # 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.2
   - 6.3.1
   - 6.3.0
   - 6.2.2

{apache_airflow_providers_elasticsearch-6.3.1 → apache_airflow_providers_elasticsearch-6.3.2}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-elasticsearch"
-version = "6.3.1"
+version = "6.3.2"
 description = "Provider package apache-airflow-providers-elasticsearch for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -47,9 +47,10 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: System :: Monitoring",
 ]
-requires-python = "~=3.10"
+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
@@ -97,8 +98,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.1"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.2"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.2/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.1/src/airflow/providers → apache_airflow_providers_elasticsearch-6.3.2/src/airflow}/__init__.py

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

{apache_airflow_providers_elasticsearch-6.3.1/tests/system → apache_airflow_providers_elasticsearch-6.3.2/src/airflow/providers}/__init__.py

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

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

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

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

@@ -26,11 +26,7 @@ from urllib import parse
 from elasticsearch import Elasticsearch
 
 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]
+from airflow.providers.elasticsearch.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from elastic_transport import ObjectApiResponse

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

@@ -29,7 +29,7 @@ import time
 from collections import defaultdict
 from collections.abc import Callable
 from operator import attrgetter
-from typing import TYPE_CHECKING, Any, Literal
+from typing import TYPE_CHECKING, Any, Literal, cast
 from urllib.parse import quote, urlparse
 
 # Using `from elasticsearch import *` would break elasticsearch mocking used in unit test.
@@ -56,6 +56,7 @@ if TYPE_CHECKING:
     from datetime import datetime
 
     from airflow.models.taskinstance import TaskInstance, TaskInstanceKey
+    from airflow.utils.log.file_task_handler import LogMetadata
 
 
 LOG_LINE_DEFAULTS = {"exc_text": "", "stack_info": ""}
@@ -66,6 +67,7 @@ LOG_LINE_DEFAULTS = {"exc_text": "", "stack_info": ""}
 # not exist, the task handler should use the log_id_template attribute instead.
 USE_PER_RUN_LOG_ID = hasattr(DagRun, "get_log_template")
 
+TASK_LOG_FIELDS = ["timestamp", "event", "level", "chan", "logger"]
 
 VALID_ES_CONFIG_KEYS = set(inspect.signature(elasticsearch.Elasticsearch.__init__).parameters.keys())
 # Remove `self` from the valid set of kwargs
@@ -159,11 +161,11 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
         es_kwargs = es_kwargs or {}
         if es_kwargs == "default_es_kwargs":
             es_kwargs = get_es_kwargs_from_config()
-        host = self.format_url(host)
+        self.host = self.format_url(host)
         super().__init__(base_log_folder)
         self.closed = False
 
-        self.client = elasticsearch.Elasticsearch(host, **es_kwargs)
+        self.client = elasticsearch.Elasticsearch(self.host, **es_kwargs)
         # in airflow.cfg, host of elasticsearch has to be http://dockerhostXxxx:9200
 
         self.frontend = frontend
@@ -184,7 +186,7 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
         )
 
         self.formatter: logging.Formatter
-        self.handler: logging.FileHandler | logging.StreamHandler  # type: ignore[assignment]
+        self.handler: logging.FileHandler | logging.StreamHandler | None = None
         self._doc_type_map: dict[Any, Any] = {}
         self._doc_type: list[Any] = []
 
@@ -286,7 +288,7 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
     def _group_logs_by_host(self, response: ElasticSearchResponse) -> dict[str, list[Hit]]:
         grouped_logs = defaultdict(list)
         for hit in response:
-            key = getattr_nested(hit, self.host_field, None) or "default_host"
+            key = getattr_nested(hit, self.host_field, None) or self.host
             grouped_logs[key].append(hit)
         return grouped_logs
 
@@ -294,8 +296,8 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
         return True
 
     def _read(
-        self, ti: TaskInstance, try_number: int, metadata: dict | None = None
-    ) -> tuple[EsLogMsgType, dict]:
+        self, ti: TaskInstance, try_number: int, metadata: LogMetadata | None = None
+    ) -> tuple[EsLogMsgType, LogMetadata]:
         """
         Endpoint for streaming log.
 
@@ -306,7 +308,9 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
         :return: a list of tuple with host and log documents, metadata.
         """
         if not metadata:
-            metadata = {"offset": 0}
+            # LogMetadata(TypedDict) is used as type annotation for log_reader; added ignore to suppress mypy error
+            metadata = {"offset": 0}  # type: ignore[assignment]
+        metadata = cast("LogMetadata", metadata)
         if "offset" not in metadata:
             metadata["offset"] = 0
 
@@ -346,7 +350,9 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
                     "Otherwise, the logs for this task instance may have been removed."
                 )
                 if AIRFLOW_V_3_0_PLUS:
-                    return missing_log_message, metadata
+                    from airflow.utils.log.file_task_handler import StructuredLogMessage
+
+                    return [StructuredLogMessage(event=missing_log_message)], metadata
                 return [("", missing_log_message)], metadata  # type: ignore[list-item]
             if (
                 # Assume end of log after not receiving new log for N min,
@@ -375,11 +381,16 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
                         sources=[host for host in logs_by_host.keys()],
                     ),  # type: ignore[call-arg]
                     StructuredLogMessage(event="::endgroup::"),
-                ]  # type: ignore[misc]
+                ]
 
+                # Flatten all hits, filter to only desired fields, and construct StructuredLogMessage objects
                 message = header + [
-                    StructuredLogMessage(event=concat_logs(hits)) for hits in logs_by_host.values()
-                ]  # type: ignore[misc]
+                    StructuredLogMessage(
+                        **{k: v for k, v in hit.to_dict().items() if k.lower() in TASK_LOG_FIELDS}
+                    )
+                    for hits in logs_by_host.values()
+                    for hit in hits
+                ]
             else:
                 message = [
                     (host, concat_logs(hits))  # type: ignore[misc]
@@ -421,7 +432,7 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
 
         index_patterns = self._get_index_patterns(ti)
         try:
-            max_log_line = self.client.count(index=index_patterns, query=query)["count"]  # type: ignore
+            max_log_line = self.client.count(index=index_patterns, query=query)["count"]
         except NotFoundError as e:
             self.log.exception("The target index pattern %s does not exist", index_patterns)
             raise e
@@ -508,7 +519,7 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
 
         # Reopen the file stream, because FileHandler.close() would be called
         # first in logging.shutdown() and the stream in it would be set to None.
-        if self.handler.stream is None or self.handler.stream.closed:  # type: ignore[attr-defined]
+        if self.handler.stream is None or self.handler.stream.closed:
             self.handler.stream = self.handler._open()  # type: ignore[union-attr]
 
         # Mark the end of file using end of log mark,

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

@@ -33,10 +33,18 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 
 
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
+AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
+
+if AIRFLOW_V_3_1_PLUS:
+    from airflow.sdk import BaseHook
+else:
+    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
 
 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]
+    EsLogMsgType = list[tuple[str, str]]  # type: ignore[assignment,misc]
+
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook", "EsLogMsgType"]

{apache_airflow_providers_elasticsearch-6.3.1/tests/unit → apache_airflow_providers_elasticsearch-6.3.2/tests/system}/__init__.py

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

{apache_airflow_providers_elasticsearch-6.3.1 → apache_airflow_providers_elasticsearch-6.3.2}/tests/system/elasticsearch/example_elasticsearch_query.py

@@ -24,10 +24,17 @@ import os
 from datetime import datetime
 
 from airflow import models
-from airflow.decorators import task
 from airflow.providers.elasticsearch.hooks.elasticsearch import ElasticsearchPythonHook, ElasticsearchSQLHook
 from airflow.providers.standard.operators.python import PythonOperator
 
+from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
+
+if AIRFLOW_V_3_0_PLUS:
+    from airflow.sdk import task
+else:
+    # Airflow 2 path
+    from airflow.decorators import task  # type: ignore[attr-defined,no-redef]
+
 ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID")
 DAG_ID = "elasticsearch_dag"
 CONN_ID = "elasticsearch_default"
@@ -64,7 +71,6 @@ def use_elasticsearch_hook():
 
 # [END howto_elasticsearch_python_hook]
 
-
 with models.DAG(
     DAG_ID,
     schedule="@once",

{apache_airflow_providers_elasticsearch-6.3.1/src/airflow → apache_airflow_providers_elasticsearch-6.3.2/tests/unit}/__init__.py

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

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

@@ -117,7 +117,12 @@ class TestElasticsearchTaskHandler:
         self.index_name = "test_index"
         self.doc_type = "log"
         self.test_message = "some random stuff"
-        self.body = {"message": self.test_message, "log_id": self.LOG_ID, "offset": 1}
+        self.body = {
+            "message": self.test_message,
+            "log_id": self.LOG_ID,
+            "offset": 1,
+            "event": self.test_message,
+        }
         self.es.index(index=self.index_name, doc_type=self.doc_type, body=self.body, id=1)
 
     def teardown_method(self):
@@ -208,8 +213,9 @@ class TestElasticsearchTaskHandler:
         )
 
         if AIRFLOW_V_3_0_PLUS:
+            logs = list(logs)
             assert logs[0].event == "::group::Log message source details"
-            assert logs[0].sources == ["default_host"]
+            assert logs[0].sources == ["http://localhost:9200"]
             assert logs[1].event == "::endgroup::"
             assert logs[2].event == "some random stuff"
 
@@ -235,8 +241,9 @@ class TestElasticsearchTaskHandler:
             )
 
         if AIRFLOW_V_3_0_PLUS:
+            logs = list(logs)
             assert logs[0].event == "::group::Log message source details"
-            assert logs[0].sources == ["default_host"]
+            assert logs[0].sources == ["http://localhost:9200"]
             assert logs[1].event == "::endgroup::"
             assert logs[2].event == "some random stuff"
 
@@ -304,10 +311,11 @@ class TestElasticsearchTaskHandler:
         ts = pendulum.now().add(seconds=-seconds)
         logs, metadatas = self.es_task_handler.read(ti, 1, {"offset": 0, "last_log_timestamp": str(ts)})
         if AIRFLOW_V_3_0_PLUS:
+            logs = list(logs)
             if seconds > 5:
                 # we expect a log not found message when checking began more than 5 seconds ago
                 expected_pattern = r"^\*\*\* Log .* not found in Elasticsearch.*"
-                assert re.match(expected_pattern, logs) is not None
+                assert re.match(expected_pattern, logs[0].event) is not None
                 assert metadatas["end_of_log"] is True
             else:
                 # we've "waited" less than 5 seconds so it should not be "end of log" and should be no log message
@@ -360,8 +368,9 @@ class TestElasticsearchTaskHandler:
             },
         )
         if AIRFLOW_V_3_0_PLUS:
+            logs = list(logs)
             assert logs[0].event == "::group::Log message source details"
-            assert logs[0].sources == ["default_host"]
+            assert logs[0].sources == ["http://localhost:9200"]
             assert logs[1].event == "::endgroup::"
             assert logs[2].event == "some random stuff"
 
@@ -382,8 +391,9 @@ class TestElasticsearchTaskHandler:
     def test_read_with_none_metadata(self, ti):
         logs, metadatas = self.es_task_handler.read(ti, 1)
         if AIRFLOW_V_3_0_PLUS:
+            logs = list(logs)
             assert logs[0].event == "::group::Log message source details"
-            assert logs[0].sources == ["default_host"]
+            assert logs[0].sources == ["http://localhost:9200"]
             assert logs[1].event == "::endgroup::"
             assert logs[2].event == "some random stuff"
 
@@ -431,8 +441,9 @@ class TestElasticsearchTaskHandler:
         ts = pendulum.now()
         logs, metadatas = self.es_task_handler.read(ti, 1, {})
         if AIRFLOW_V_3_0_PLUS:
+            logs = list(logs)
             assert logs[0].event == "::group::Log message source details"
-            assert logs[0].sources == ["default_host"]
+            assert logs[0].sources == ["http://localhost:9200"]
             assert logs[1].event == "::endgroup::"
             assert logs[2].event == "some random stuff"
 
@@ -520,8 +531,9 @@ class TestElasticsearchTaskHandler:
             },
         )
         if AIRFLOW_V_3_0_PLUS:
+            logs = list(logs)
             assert logs[0].event == "::group::Log message source details"
-            assert logs[0].sources == ["default_host"]
+            assert logs[0].sources == ["http://localhost:9200"]
             assert logs[1].event == "::endgroup::"
             assert logs[2].event == "some random stuff"
 
@@ -586,6 +598,7 @@ class TestElasticsearchTaskHandler:
 
         self.body = {
             "message": self.test_message,
+            "event": self.test_message,
             "log_id": f"{self.DAG_ID}-{self.TASK_ID}-2016_01_01T00_00_00_000000-1",
             "offset": 1,
             "asctime": "2020-12-24 19:25:00,962",
@@ -599,11 +612,13 @@ class TestElasticsearchTaskHandler:
         logs, _ = self.es_task_handler.read(
             ti, 1, {"offset": 0, "last_log_timestamp": str(ts), "end_of_log": False}
         )
-        expected_message = "[2020-12-24 19:25:00,962] {taskinstance.py:851} INFO - some random stuff - "
         if AIRFLOW_V_3_0_PLUS:
-            assert logs[2].event == expected_message
+            logs = list(logs)
+            assert logs[2].event == self.test_message
         else:
-            assert logs[0][0][1] == expected_message
+            assert (
+                logs[0][0][1] == "[2020-12-24 19:25:00,962] {taskinstance.py:851} INFO - some random stuff - "
+            )
 
     @pytest.mark.db_test
     def test_read_with_json_format_with_custom_offset_and_host_fields(self, ti):
@@ -618,6 +633,7 @@ class TestElasticsearchTaskHandler:
 
         self.body = {
             "message": self.test_message,
+            "event": self.test_message,
             "log_id": f"{self.DAG_ID}-{self.TASK_ID}-2016_01_01T00_00_00_000000-1",
             "log": {"offset": 1},
             "host": {"name": "somehostname"},
@@ -632,11 +648,13 @@ class TestElasticsearchTaskHandler:
         logs, _ = self.es_task_handler.read(
             ti, 1, {"offset": 0, "last_log_timestamp": str(ts), "end_of_log": False}
         )
-        expected_message = "[2020-12-24 19:25:00,962] {taskinstance.py:851} INFO - some random stuff - "
         if AIRFLOW_V_3_0_PLUS:
-            assert logs[2].event == expected_message
+            logs = list(logs)
+            assert logs[2].event == self.test_message
         else:
-            assert logs[0][0][1] == expected_message
+            assert (
+                logs[0][0][1] == "[2020-12-24 19:25:00,962] {taskinstance.py:851} INFO - some random stuff - "
+            )
 
     @pytest.mark.db_test
     def test_read_with_custom_offset_and_host_fields(self, ti):
@@ -649,6 +667,7 @@ class TestElasticsearchTaskHandler:
 
         self.body = {
             "message": self.test_message,
+            "event": self.test_message,
             "log_id": self.LOG_ID,
             "log": {"offset": 1},
             "host": {"name": "somehostname"},
@@ -661,7 +680,7 @@ class TestElasticsearchTaskHandler:
         if AIRFLOW_V_3_0_PLUS:
             pass
         else:
-            assert self.test_message == logs[0][0][1]
+            assert logs[0][0][1] == "some random stuff"
 
     @pytest.mark.db_test
     def test_close(self, ti):