Skip to content

Commit

Permalink
chore(yaaredis): remove yaaredis support (#12226)
Browse files Browse the repository at this point in the history
With `ddtrace>=3.0` the implementation details of the yaaredis
integration is internal to the tracer. We can remove this integration
without introducing a breaking change.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met 
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
  • Loading branch information
mabdinur authored Feb 7, 2025
1 parent fa18def commit 6a06f77
Show file tree
Hide file tree
Showing 38 changed files with 4 additions and 1,597 deletions.
23 changes: 0 additions & 23 deletions .riot/requirements/1761702.txt

This file was deleted.

25 changes: 0 additions & 25 deletions .riot/requirements/1cc7b0e.txt

This file was deleted.

25 changes: 0 additions & 25 deletions .riot/requirements/1f1e9b4.txt

This file was deleted.

25 changes: 0 additions & 25 deletions .riot/requirements/9b8251b.txt

This file was deleted.

25 changes: 0 additions & 25 deletions .riot/requirements/fda8aa6.txt

This file was deleted.

1 change: 0 additions & 1 deletion ddtrace/_monkey.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
67 changes: 0 additions & 67 deletions ddtrace/contrib/_yaaredis.py

This file was deleted.

91 changes: 0 additions & 91 deletions ddtrace/contrib/internal/yaaredis/patch.py

This file was deleted.

2 changes: 0 additions & 2 deletions docs/index.rst
Original file line number Diff 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
6 changes: 0 additions & 6 deletions docs/integrations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -505,12 +505,6 @@ Vertica
^^^^^^^
.. automodule:: ddtrace.contrib._vertica

.. _yaaredis:

yaaredis
^^^^^^^^
.. automodule:: ddtrace.contrib._yaaredis

.. _wsgi:

WSGI
Expand Down
1 change: 0 additions & 1 deletion docs/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -315,4 +315,3 @@ workflow
Wrapt
wsgi
xfail
yaaredis
1 change: 0 additions & 1 deletion lib-injection/sources/min_compatible_versions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,5 @@ webtest,0
werkzeug,<1.0
wheel,0
xmltodict,>=0.12
yaaredis,~=2.0.0
yarl,~=1.0
zeep,0
1 change: 0 additions & 1 deletion min_compatible_versions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,5 @@ webtest,0
werkzeug,<1.0
wheel,0
xmltodict,>=0.12
yaaredis,~=2.0.0
yarl,~=1.0
zeep,0
4 changes: 4 additions & 0 deletions releasenotes/notes/remove-yaaredis-095441532392e12f.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
upgrade:
- |
yaaredis: Removes the yaaredis integration from ``ddtrace``. For yaaredis support pin ddtrace to an older version.
19 changes: 0 additions & 19 deletions riotfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 0 additions & 6 deletions supported_versions_output.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
1 change: 0 additions & 1 deletion supported_versions_table.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit 6a06f77

Please sign in to comment.