apache-airflow-providers-openlineage 2.1.3__tar.gz → 2.2.0__tar.gz

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-openlineage
-Version: 2.1.3
+Version: 2.2.0
 Summary: Provider package apache-airflow-providers-openlineage for Apache Airflow
 Keywords: airflow-provider,openlineage,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -24,11 +24,11 @@ Requires-Dist: apache-airflow>=2.9.0
 Requires-Dist: apache-airflow-providers-common-sql>=1.20.0
 Requires-Dist: apache-airflow-providers-common-compat>=1.4.0
 Requires-Dist: attrs>=22.2
-Requires-Dist: openlineage-integration-common>=1.24.2
-Requires-Dist: openlineage-python>=1.24.2
+Requires-Dist: openlineage-integration-common>=1.31.0
+Requires-Dist: openlineage-python>=1.31.0
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.3/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.3
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.2.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.2.0
 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
@@ -59,7 +59,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-openlineage``
 
-Release: ``2.1.3``
+Release: ``2.2.0``
 
 
 `OpenLineage <https://openlineage.io/>`__
@@ -72,7 +72,7 @@ This is a provider package for ``openlineage`` provider. All classes for this pr
 are in ``airflow.providers.openlineage`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.2.0/>`_.
 
 Installation
 ------------
@@ -93,8 +93,8 @@ PIP package                                 Version required
 ``apache-airflow-providers-common-sql``     ``>=1.20.0``
 ``apache-airflow-providers-common-compat``  ``>=1.4.0``
 ``attrs``                                   ``>=22.2``
-``openlineage-integration-common``          ``>=1.24.2``
-``openlineage-python``                      ``>=1.24.2``
+``openlineage-integration-common``          ``>=1.31.0``
+``openlineage-python``                      ``>=1.31.0``
 ==========================================  ==================
 
 Cross provider package dependencies
@@ -118,5 +118,5 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.2.0/changelog.html>`_.
 

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-openlineage``
 
-Release: ``2.1.3``
+Release: ``2.2.0``
 
 
 `OpenLineage <https://openlineage.io/>`__
@@ -36,7 +36,7 @@ This is a provider package for ``openlineage`` provider. All classes for this pr
 are in ``airflow.providers.openlineage`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.2.0/>`_.
 
 Installation
 ------------
@@ -57,8 +57,8 @@ PIP package                                 Version required
 ``apache-airflow-providers-common-sql``     ``>=1.20.0``
 ``apache-airflow-providers-common-compat``  ``>=1.4.0``
 ``attrs``                                   ``>=22.2``
-``openlineage-integration-common``          ``>=1.24.2``
-``openlineage-python``                      ``>=1.24.2``
+``openlineage-integration-common``          ``>=1.31.0``
+``openlineage-python``                      ``>=1.31.0``
 ==========================================  ==================
 
 Cross provider package dependencies
@@ -82,4 +82,4 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.2.0/changelog.html>`_.

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/docs/changelog.rst

@@ -26,6 +26,26 @@
 Changelog
 ---------
 
+2.2.0
+.....
+
+Features
+~~~~~~~~
+
+* ``feat: Add support for task's manual state change notification in OpenLineage listener (#49040)``
+* ``feat: Explicitly propagate airflow logging level to OL client (#49108)``
+* ``feat: Add owner_links in DAG object in airflow facet (#49085)``
+
+Misc
+~~~~
+
+* ``gate import behind Airflow 2 path (#49209)``
+* ``remove superfluous else block (#49199)``
+* ``chore: Update requirement for openlineage client to >=1.31.0 (#49083)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+
 2.1.3
 .....
 

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/docs/commits.rst

@@ -34,14 +34,31 @@ For high-level changelog, see :doc:`package information including changelog <ind
 
 
 
+2.2.0
+.....
+
+Latest change: 2025-04-14
+
+==================================================================================================  ===========  ==================================================================================================
+Commit                                                                                              Committed    Subject
+==================================================================================================  ===========  ==================================================================================================
+`c447ad303b <https://github.com/apache/airflow/commit/c447ad303b9b206dd56062b837ac92e6b7ea30eb>`__  2025-04-14   ``gate import behind Airflow 2 path (#49209)``
+`cb295c351a <https://github.com/apache/airflow/commit/cb295c351a016c0a10cab07f2a628b865cff3ca3>`__  2025-04-14   ``remove superfluous else block (#49199)``
+`b487617969 <https://github.com/apache/airflow/commit/b487617969679b81d6480ff3256f3b4d13c5700d>`__  2025-04-11   ``feat: Add support for task's manual state change notification in OpenLineage listener (#49040)``
+`6bd5354718 <https://github.com/apache/airflow/commit/6bd535471819074f74b0c3a3251a823be24c61b0>`__  2025-04-11   ``feat: Explicitly propagate airflow logging level to OL client (#49108)``
+`0936d76aa6 <https://github.com/apache/airflow/commit/0936d76aa6a09dd826ee4f0f3c095c9892a918ac>`__  2025-04-11   ``chore: Update requirement for openlineage client to >=1.31.0 (#49083)``
+`b7b25d6206 <https://github.com/apache/airflow/commit/b7b25d620621f1e8a93eed1bd137e7e50b867fca>`__  2025-04-10   ``feat: Add owner_links in DAG object in airflow facet (#49085)``
+==================================================================================================  ===========  ==================================================================================================
+
 2.1.3
 .....
 
-Latest change: 2025-04-09
+Latest change: 2025-04-10
 
 ==================================================================================================  ===========  ==================================================================================
 Commit                                                                                              Committed    Subject
 ==================================================================================================  ===========  ==================================================================================
+`4a8567b20b <https://github.com/apache/airflow/commit/4a8567b20bdd6555cbdc936d6674bf4fa390b0d5>`__  2025-04-10   ``Prepare docs for Apr 2nd wave of providers (#49051)``
 `e84c177f74 <https://github.com/apache/airflow/commit/e84c177f747f728ae52eeaa2c665ef6a4627c5af>`__  2025-04-09   ``Move ObjectStoragePath and attach to Task SDK (#48906)``
 `ad2e80d299 <https://github.com/apache/airflow/commit/ad2e80d2997dc46ca175a39a0a8b8c216361323f>`__  2025-04-08   ``tests: verify openlineage airflow models serialization (#47915)``
 `7b2ec33c7a <https://github.com/apache/airflow/commit/7b2ec33c7ad4998d9c9735b79593fcdcd3b9dd1f>`__  2025-04-08   ``Remove unnecessary entries in get_provider_info and update the schema (#48849)``

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/docs/guides/developer.rst

@@ -504,15 +504,23 @@ Marquez can help you pinpoint which facets are not being formed properly so you
 
 Debug settings
 ^^^^^^^^^^^^^^
-For debugging purposes, ensure that the `Airflow logging level <https://airflow.apache.org/docs/apache-airflow/stable/configurations-ref.html#logging-level>`_
-is set to ``DEBUG`` and that the :ref:`debug_mode <options:debug_mode>` is enabled for OpenLineage integration.
-This will increase the detail in Airflow logs and include additional environmental information in OpenLineage events.
+For debugging purposes, ensure that both `Airflow logging level <https://airflow.apache.org/docs/apache-airflow/stable/configurations-ref.html#logging-level>`_
+and `OpenLineage client logging level <https://openlineage.io/docs/client/python#environment-variables>`_ is set to ``DEBUG``.
+The latest provider auto-syncs Airflow's logging level with the OpenLineage client, removing the need for manual configuration.
+
+For DebugFacet, containing additional information (e.g., list of all packages installed), to be appended to all OL events
+enable :ref:`debug_mode <options:debug_mode>` for OpenLineage integration.
+
+Keep in mind that enabling these settings will increase the detail in Airflow logs (which will increase their size) and
+add extra information to OpenLineage events. It's recommended to use them temporarily, primarily for debugging purposes.
 
 When seeking help with debugging, always try to provide the following:
 
 -    Airflow scheduler logs with the logging level set to DEBUG
 -    Airflow worker logs (task logs) with the logging level set to DEBUG
 -    OpenLineage events with debug_mode enabled
+-    Information about Airflow version and OpenLineage provider version
+-    Information about any custom modifications made to the deployment environment where the Airflow is running
 
 
 Where can I learn more?

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/docs/index.rst

@@ -81,7 +81,7 @@ apache-airflow-providers-openlineage package
 `OpenLineage <https://openlineage.io/>`__
 
 
-Release: 2.1.3
+Release: 2.2.0
 
 Provider package
 ----------------
@@ -108,8 +108,8 @@ PIP package                                 Version required
 ``apache-airflow-providers-common-sql``     ``>=1.20.0``
 ``apache-airflow-providers-common-compat``  ``>=1.4.0``
 ``attrs``                                   ``>=22.2``
-``openlineage-integration-common``          ``>=1.24.2``
-``openlineage-python``                      ``>=1.24.2``
+``openlineage-integration-common``          ``>=1.31.0``
+``openlineage-python``                      ``>=1.31.0``
 ==========================================  ==================
 
 Cross provider package dependencies
@@ -138,5 +138,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-openlineage 2.1.3 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.1.3.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.1.3.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.1.3.tar.gz.sha512>`__)
-* `The apache-airflow-providers-openlineage 2.1.3 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.1.3-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.1.3-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.1.3-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-openlineage 2.2.0 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.2.0.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.2.0.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.2.0.tar.gz.sha512>`__)
+* `The apache-airflow-providers-openlineage 2.2.0 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.2.0-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.2.0-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_openlineage-2.2.0-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/provider.yaml

@@ -22,9 +22,10 @@ description: |
   `OpenLineage <https://openlineage.io/>`__
 
 state: ready
-source-date-epoch: 1744282175
+source-date-epoch: 1744792298
 # note that those versions are maintained by release manager - do not update them manually
 versions:
+  - 2.2.0
   - 2.1.3
   - 2.1.2
   - 2.1.1

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-openlineage"
-version = "2.1.3"
+version = "2.2.0"
 description = "Provider package apache-airflow-providers-openlineage for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -61,8 +61,8 @@ dependencies = [
     "apache-airflow-providers-common-sql>=1.20.0",
     "apache-airflow-providers-common-compat>=1.4.0",
     "attrs>=22.2",
-    "openlineage-integration-common>=1.24.2",
-    "openlineage-python>=1.24.2",
+    "openlineage-integration-common>=1.31.0",
+    "openlineage-python>=1.31.0",
 ]
 
 [dependency-groups]
@@ -105,8 +105,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-openlineage/2.1.3"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.3/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.2.0"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.2.0/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_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/src/airflow/providers/openlineage/__init__.py

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

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/src/airflow/providers/openlineage/extractors/manager.py

@@ -298,12 +298,11 @@ class ExtractorManager(LoggingMixin):
 
         if isinstance(obj, Dataset):
             return obj
-        elif isinstance(obj, Table):
+        if isinstance(obj, Table):
             return ExtractorManager.convert_to_ol_dataset_from_table(obj)
-        elif isinstance(obj, File):
+        if isinstance(obj, File):
             return ExtractorManager.convert_to_ol_dataset_from_object_storage_uri(obj.url)
-        else:
-            return None
+        return None
 
     def validate_task_metadata(self, task_metadata) -> OperatorLineage | None:
         try:

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/src/airflow/providers/openlineage/plugins/adapter.py

@@ -16,6 +16,7 @@
 # under the License.
 from __future__ import annotations
 
+import os
 import traceback
 from contextlib import ExitStack
 from typing import TYPE_CHECKING
@@ -36,6 +37,7 @@ from openlineage.client.facet_v2 import (
 )
 from openlineage.client.uuid import generate_static_uuid
 
+from airflow.configuration import conf as airflow_conf
 from airflow.providers.openlineage import __version__ as OPENLINEAGE_PROVIDER_VERSION, conf
 from airflow.providers.openlineage.utils.utils import (
     OpenLineageRedactor,
@@ -81,6 +83,11 @@ class OpenLineageAdapter(LoggingMixin):
 
     def get_or_create_openlineage_client(self) -> OpenLineageClient:
         if not self._client:
+            # If not already set explicitly - propagate airflow logging level to OpenLineage client
+            airflow_core_log_level = airflow_conf.get("logging", "logging_level", fallback="INFO")
+            if not os.getenv("OPENLINEAGE_CLIENT_LOGGING") and airflow_core_log_level != "INFO":
+                os.environ["OPENLINEAGE_CLIENT_LOGGING"] = airflow_core_log_level
+
             config = self.get_openlineage_config()
             if config:
                 self.log.debug(
@@ -102,8 +109,7 @@ class OpenLineageAdapter(LoggingMixin):
         if openlineage_config_path:
             config = self._read_yaml_config(openlineage_config_path)
             return config
-        else:
-            self.log.debug("OpenLineage config_path configuration not found.")
+        self.log.debug("OpenLineage config_path configuration not found.")
 
         # Second, try to get transport config
         transport_config = conf.transport()

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/src/airflow/providers/openlineage/plugins/listener.py

@@ -28,9 +28,9 @@ from setproctitle import getproctitle, setproctitle
 
 from airflow import settings
 from airflow.listeners import hookimpl
-from airflow.models import DagRun
+from airflow.models import DagRun, TaskInstance
 from airflow.providers.openlineage import conf
-from airflow.providers.openlineage.extractors import ExtractorManager
+from airflow.providers.openlineage.extractors import ExtractorManager, OperatorLineage
 from airflow.providers.openlineage.plugins.adapter import OpenLineageAdapter, RunState
 from airflow.providers.openlineage.utils.utils import (
     AIRFLOW_V_2_10_PLUS,
@@ -53,7 +53,6 @@ from airflow.utils.state import TaskInstanceState
 from airflow.utils.timeout import timeout
 
 if TYPE_CHECKING:
-    from airflow.models import TaskInstance
     from airflow.sdk.execution_time.task_runner import RuntimeTaskInstance
     from airflow.settings import Session
 
@@ -235,10 +234,18 @@ class OpenLineageListener:
 
         @hookimpl
         def on_task_instance_success(
-            self, previous_state: TaskInstanceState, task_instance: RuntimeTaskInstance
+            self, previous_state: TaskInstanceState, task_instance: RuntimeTaskInstance | TaskInstance
         ) -> None:
             self.log.debug("OpenLineage listener got notification about task instance success")
 
+            if isinstance(task_instance, TaskInstance):
+                self._on_task_instance_manual_state_change(
+                    ti=task_instance,
+                    dagrun=task_instance.dag_run,
+                    ti_state=TaskInstanceState.SUCCESS,
+                )
+                return
+
             context = task_instance.get_template_context()
             task = context["task"]
             if TYPE_CHECKING:
@@ -338,10 +345,20 @@ class OpenLineageListener:
         def on_task_instance_failed(
             self,
             previous_state: TaskInstanceState,
-            task_instance: TaskInstance,
+            task_instance: RuntimeTaskInstance | TaskInstance,
             error: None | str | BaseException,
         ) -> None:
             self.log.debug("OpenLineage listener got notification about task instance failure")
+
+            if isinstance(task_instance, TaskInstance):
+                self._on_task_instance_manual_state_change(
+                    ti=task_instance,
+                    dagrun=task_instance.dag_run,
+                    ti_state=TaskInstanceState.FAILED,
+                    error=error,
+                )
+                return
+
             context = task_instance.get_template_context()
             task = context["task"]
             if TYPE_CHECKING:
@@ -457,6 +474,60 @@ class OpenLineageListener:
 
         self._execute(on_failure, "on_failure", use_fork=True)
 
+    def _on_task_instance_manual_state_change(
+        self,
+        ti: TaskInstance,
+        dagrun: DagRun,
+        ti_state: TaskInstanceState,
+        error: None | str | BaseException = None,
+    ) -> None:
+        self.log.debug("`_on_task_instance_manual_state_change` was called with state: `%s`.", ti_state)
+        end_date = timezone.utcnow()
+
+        @print_warning(self.log)
+        def on_state_change():
+            date = dagrun.logical_date or dagrun.run_after
+            parent_run_id = self.adapter.build_dag_run_id(
+                dag_id=dagrun.dag_id,
+                logical_date=date,
+                clear_number=dagrun.clear_number,
+            )
+
+            task_uuid = self.adapter.build_task_instance_run_id(
+                dag_id=dagrun.dag_id,
+                task_id=ti.task_id,
+                try_number=ti.try_number,
+                logical_date=date,
+                map_index=ti.map_index,
+            )
+
+            adapter_kwargs = {
+                "run_id": task_uuid,
+                "job_name": get_job_name(ti),
+                "parent_job_name": dagrun.dag_id,
+                "parent_run_id": parent_run_id,
+                "end_time": end_date.isoformat(),
+                "task": OperatorLineage(),
+                "run_facets": get_airflow_debug_facet(),
+            }
+
+            if ti_state == TaskInstanceState.FAILED:
+                event_type = RunState.FAIL.value.lower()
+                redacted_event = self.adapter.fail_task(**adapter_kwargs, error=error)
+            elif ti_state == TaskInstanceState.SUCCESS:
+                event_type = RunState.COMPLETE.value.lower()
+                redacted_event = self.adapter.complete_task(**adapter_kwargs)
+            else:
+                raise ValueError(f"Unsupported ti_state: `{ti_state}`.")
+
+            operator_name = ti.operator.lower()
+            Stats.gauge(
+                f"ol.event.size.{event_type}.{operator_name}",
+                len(Serde.to_json(redacted_event).encode("utf-8")),
+            )
+
+        self._execute(on_state_change, "on_state_change", use_fork=True)
+
     def _execute(self, callable, callable_name: str, use_fork: bool = False):
         if use_fork:
             self._fork_execute(callable, callable_name)

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/src/airflow/providers/openlineage/utils/spark.py

@@ -111,7 +111,7 @@ def _get_transport_information_as_spark_properties() -> dict:
             props = _format_transport(props, http_transport, name)
         return props
 
-    elif transport.kind == "http":
+    if transport.kind == "http":
         return _format_transport({}, _get_transport_information(transport), None)
 
     log.info(

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/src/airflow/providers/openlineage/utils/utils.py

@@ -54,7 +54,9 @@ from airflow.providers.openlineage.version_compat import AIRFLOW_V_2_10_PLUS, AI
 from airflow.sensors.base import BaseSensorOperator
 from airflow.serialization.serialized_objects import SerializedBaseOperator
 from airflow.utils.module_loading import import_string
-from airflow.utils.session import NEW_SESSION, provide_session
+
+if not AIRFLOW_V_3_0_PLUS:
+    from airflow.utils.session import NEW_SESSION, provide_session
 
 try:
     from airflow.sdk import BaseOperator as SdkBaseOperator
@@ -195,40 +197,41 @@ def is_selective_lineage_enabled(obj: DAG | BaseOperator | MappedOperator | SdkB
         return True
     if isinstance(obj, DAG):
         return is_dag_lineage_enabled(obj)
-    elif isinstance(obj, (BaseOperator, MappedOperator, SdkBaseOperator)):
+    if isinstance(obj, (BaseOperator, MappedOperator, SdkBaseOperator)):
         return is_task_lineage_enabled(obj)
-    else:
-        raise TypeError("is_selective_lineage_enabled can only be used on DAG or Operator objects")
+    raise TypeError("is_selective_lineage_enabled can only be used on DAG or Operator objects")
 
 
-@provide_session
-def is_ti_rescheduled_already(ti: TaskInstance, session=NEW_SESSION):
-    from sqlalchemy import exists
+if not AIRFLOW_V_3_0_PLUS:
 
-    if not isinstance(ti.task, BaseSensorOperator):
-        return False
+    @provide_session
+    def is_ti_rescheduled_already(ti: TaskInstance, session=NEW_SESSION):
+        from sqlalchemy import exists
 
-    if not ti.task.reschedule:
-        return False
-    if AIRFLOW_V_3_0_PLUS:
+        if not isinstance(ti.task, BaseSensorOperator):
+            return False
+
+        if not ti.task.reschedule:
+            return False
+        if AIRFLOW_V_3_0_PLUS:
+            return (
+                session.query(
+                    exists().where(TaskReschedule.ti_id == ti.id, TaskReschedule.try_number == ti.try_number)
+                ).scalar()
+                is True
+            )
         return (
             session.query(
-                exists().where(TaskReschedule.ti_id == ti.id, TaskReschedule.try_number == ti.try_number)
+                exists().where(
+                    TaskReschedule.dag_id == ti.dag_id,
+                    TaskReschedule.task_id == ti.task_id,
+                    TaskReschedule.run_id == ti.run_id,
+                    TaskReschedule.map_index == ti.map_index,
+                    TaskReschedule.try_number == ti.try_number,
+                )
             ).scalar()
             is True
         )
-    return (
-        session.query(
-            exists().where(
-                TaskReschedule.dag_id == ti.dag_id,
-                TaskReschedule.task_id == ti.task_id,
-                TaskReschedule.run_id == ti.run_id,
-                TaskReschedule.map_index == ti.map_index,
-                TaskReschedule.try_number == ti.try_number,
-            )
-        ).scalar()
-        is True
-    )
 
 
 class InfoJsonEncodable(dict):
@@ -322,6 +325,7 @@ class DagInfo(InfoJsonEncodable):
         "description",
         "fileloc",
         "owner",
+        "owner_links",
         "schedule_interval",  # For Airflow 2.
         "timetable_summary",  # For Airflow 3.
         "start_date",
@@ -713,7 +717,7 @@ class OpenLineageRedactor(SecretsMasker):
                                 ),
                             )
                     return item
-                elif is_json_serializable(item) and hasattr(item, "__dict__"):
+                if is_json_serializable(item) and hasattr(item, "__dict__"):
                     for dict_key, subval in item.__dict__.items():
                         if type(subval).__name__ == "Proxy":
                             return "<<non-redactable: Proxy>>"
@@ -729,8 +733,7 @@ class OpenLineageRedactor(SecretsMasker):
                                 ),
                             )
                     return item
-                else:
-                    return super()._redact(item, name, depth, max_depth)
+                return super()._redact(item, name, depth, max_depth)
         except Exception as exc:
             log.warning("Unable to redact %r. Error was: %s: %s", item, type(exc).__name__, exc)
         return item

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/tests/system/openlineage/operator.py

@@ -82,7 +82,7 @@ def env_var(var: str, default: str | None = None) -> str:
     """
     if var in os.environ:
         return os.environ[var]
-    elif default is not None:
+    if default is not None:
         return default
     raise ValueError(f"Env var required but not provided: '{var}'")
 
@@ -166,7 +166,7 @@ def match(expected, result, env: Environment) -> bool:
                 return True
             log.error("Rendered value %s does not equal 'true' or %s", rendered, result)
             return False
-        elif expected != result:
+        if expected != result:
             log.error("Expected value %s does not equal result %s", expected, result)
             return False
     elif expected != result:

{apache_airflow_providers_openlineage-2.1.3 → apache_airflow_providers_openlineage-2.2.0}/tests/unit/openlineage/plugins/test_adapter.py

@@ -61,6 +61,21 @@ from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
 pytestmark = pytest.mark.db_test
 
 
+@pytest.mark.parametrize(
+    "env_vars, expected_logging",
+    [
+        ({"AIRFLOW__LOGGING__LOGGING_LEVEL": "DEBUG"}, "DEBUG"),
+        ({"AIRFLOW__LOGGING__LOGGING_LEVEL": "INFO"}, None),
+        ({}, None),  # When no value is provided, default should be INFO and propagation is skipped.
+    ],
+)
+def test_create_client_logging_propagation(env_vars, expected_logging):
+    with patch.dict(os.environ, env_vars, clear=True):
+        assert os.getenv("OPENLINEAGE_CLIENT_LOGGING") is None
+        OpenLineageAdapter().get_or_create_openlineage_client()
+        assert os.getenv("OPENLINEAGE_CLIENT_LOGGING") == expected_logging
+
+
 @patch.dict(
     os.environ,
     {"OPENLINEAGE_URL": "http://ol-api:5000", "OPENLINEAGE_API_KEY": "api-key"},