remove int

DataDog · Feb 6, 2025 · df6760c · df6760c
1 parent caf312e
commit df6760c
Show file tree

Hide file tree

Showing 38 changed files with 4 additions and 1,597 deletions.
diff --git a/.riot/requirements/1761702.txt b/.riot/requirements/1761702.txt
diff --git a/.riot/requirements/1cc7b0e.txt b/.riot/requirements/1cc7b0e.txt
diff --git a/.riot/requirements/1f1e9b4.txt b/.riot/requirements/1f1e9b4.txt
diff --git a/.riot/requirements/9b8251b.txt b/.riot/requirements/9b8251b.txt
diff --git a/.riot/requirements/fda8aa6.txt b/.riot/requirements/fda8aa6.txt
diff --git a/ddtrace/_monkey.py b/ddtrace/_monkey.py
@@ -93,7 +93,6 @@
     "pyodbc": True,
     "fastapi": True,
     "dogpile_cache": True,
-    "yaaredis": True,
     "asyncpg": True,
     "aws_lambda": True,  # patch only in AWS Lambda environments
     "azure_functions": True,

diff --git a/ddtrace/contrib/_yaaredis.py b/ddtrace/contrib/_yaaredis.py
diff --git a/ddtrace/contrib/internal/yaaredis/patch.py b/ddtrace/contrib/internal/yaaredis/patch.py
diff --git a/docs/index.rst b/docs/index.rst
@@ -182,8 +182,6 @@ contacting support.
 +--------------------------------------------------+---------------+----------------+
 | :ref:`wsgi`                                      | \*            | No             |
 +--------------------------------------------------+---------------+----------------+
-| :ref:`yaaredis`                                  | >= 2.0.0      | Yes            |
-+--------------------------------------------------+---------------+----------------+
 
 
 .. [1] Libraries that are automatically instrumented when the

diff --git a/docs/integrations.rst b/docs/integrations.rst
@@ -505,12 +505,6 @@ Vertica
 ^^^^^^^
 .. automodule:: ddtrace.contrib._vertica
 
-.. _yaaredis:
-
-yaaredis
-^^^^^^^^
-.. automodule:: ddtrace.contrib._yaaredis
-
 .. _wsgi:
 
 WSGI

diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
@@ -315,4 +315,3 @@ workflow
 Wrapt
 wsgi
 xfail
-yaaredis
diff --git a/lib-injection/sources/min_compatible_versions.csv b/lib-injection/sources/min_compatible_versions.csv
@@ -191,6 +191,5 @@ webtest,0
 werkzeug,<1.0
 wheel,0
 xmltodict,>=0.12
-yaaredis,~=2.0.0
 yarl,~=1.0
 zeep,0
diff --git a/min_compatible_versions.csv b/min_compatible_versions.csv
@@ -192,6 +192,5 @@ webtest,0
 werkzeug,<1.0
 wheel,0
 xmltodict,>=0.12
-yaaredis,~=2.0.0
 yarl,~=1.0
 zeep,0
diff --git a/releasenotes/notes/remove-yaaredis-095441532392e12f.yaml b/releasenotes/notes/remove-yaaredis-095441532392e12f.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    yaaredis: Removes the yaaredis integration from ``ddtrace``. For yaaredis support pin ddtrace to an older version.
diff --git a/riotfile.py b/riotfile.py
@@ -2091,25 +2091,6 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
                 "pytest-randomly": latest,
             },
         ),
-        Venv(
-            name="yaaredis",
-            command="pytest {cmdargs} tests/contrib/yaaredis",
-            pkgs={
-                "pytest-asyncio": "==0.21.1",
-                "pytest-randomly": latest,
-            },
-            venvs=[
-                Venv(
-                    pys=select_pys(min_version="3.8", max_version="3.9"),
-                    pkgs={"yaaredis": ["~=2.0.0", latest]},
-                ),
-                Venv(
-                    # yaaredis added support for Python 3.10 in 3.0
-                    pys="3.10",
-                    pkgs={"yaaredis": latest},
-                ),
-            ],
-        ),
         Venv(
             name="sanic",
             command="pytest {cmdargs} tests/contrib/sanic",

diff --git a/supported_versions_output.json b/supported_versions_output.json
@@ -305,11 +305,5 @@
         "minimum_tracer_supported": "1.71.1",
         "max_tracer_supported": "1.71.1",
         "auto-instrumented": true
-    },
-    {
-        "integration": "yaaredis",
-        "minimum_tracer_supported": "2.0.4",
-        "max_tracer_supported": "3.0.0",
-        "auto-instrumented": true
     }
 ]
diff --git a/supported_versions_table.csv b/supported_versions_table.csv
@@ -49,4 +49,3 @@ tornado *,4.5.3,6.4,False
 urllib3,1.24.3,2.2.3,False
 valkey,6.0.0,6.0.2,True
 vertexai,1.71.1,1.71.1,True
-yaaredis,2.0.4,3.0.0,True
-Original file line number
+Diff line change
@@ Expand Up / @@ -182,8 +182,6 @@ contacting support. @@
     +--------------------------------------------------+---------------+----------------+
     | :ref:`wsgi`                                      | \*            | No             |
     +--------------------------------------------------+---------------+----------------+
-    | :ref:`yaaredis`                                  | >= 2.0.0      | Yes            |
-    +--------------------------------------------------+---------------+----------------+
     .. [1] Libraries that are automatically instrumented when the
@@ Expand Down @@