Skip to content

Migrate datadog provider to common.compat #57074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaxil merged 6 commits into from
Oct 23, 2025
Merged

Migrate datadog provider to common.compat #57074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f74b30b
Migrate remaining providers to common.compat compatibility layer in d…
0lai0 Oct 22, 2025
ee603c0
Merge branch 'apache:main' into airflow-57018-datadog
0lai0 Oct 22, 2025
1cd0652
Merge branch 'main' into airflow-57018-datadog
0lai0 Oct 22, 2025
939ba7c
Merge branch 'main' into airflow-57018-datadog
0lai0 Oct 23, 2025
9d0bac5
fix datadog static check
0lai0 Oct 23, 2025
ed407df
Apply suggestion from @kaxil
kaxil Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions providers/datadog/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ requires-python = ">=3.10"
# 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-compat>=1.8.0",
"datadog>=0.50.0",
]

Expand All @@ -66,6 +67,7 @@ dev = [
"apache-airflow",
"apache-airflow-task-sdk",
"apache-airflow-devel-common",
"apache-airflow-providers-common-compat",
# Additional devel dependencies (do not remove this line and add extra development dependencies)
]

Expand Down
2 changes: 1 addition & 1 deletion providers/datadog/src/airflow/providers/datadog/hooks/datadog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from datadog import api, initialize

from airflow.exceptions import AirflowException
from airflow.providers.datadog.version_compat import BaseHook
from airflow.providers.common.compat.sdk import BaseHook
from airflow.utils.log.logging_mixin import LoggingMixin


Expand Down
4 changes: 2 additions & 2 deletions providers/datadog/src/airflow/providers/datadog/sensors/datadog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
from datadog import api

from airflow.exceptions import AirflowException
from airflow.providers.common.compat.sdk import BaseSensorOperator
from airflow.providers.datadog.hooks.datadog import DatadogHook
from airflow.providers.datadog.version_compat import BaseSensorOperator

if TYPE_CHECKING:
from airflow.providers.datadog.version_compat import Context
from airflow.providers.common.compat.sdk import Context


class DatadogSensor(BaseSensorOperator):
Expand Down
15 changes: 0 additions & 15 deletions providers/datadog/src/airflow/providers/datadog/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,7 @@ 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.sdk import BaseSensorOperator
from airflow.sdk.definitions.context import Context
else:
from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef]
from airflow.utils.context import Context

__all__ = [
"AIRFLOW_V_3_0_PLUS",
"AIRFLOW_V_3_1_PLUS",
"BaseHook",
"BaseSensorOperator",
"Context",
]