From f9ea61cfd8a991adec22325f28357f9ff02ef32f Mon Sep 17 00:00:00 2001 From: Michael Manganiello Date: Tue, 22 Dec 2020 20:48:23 -0300 Subject: [PATCH] Celery: Add support for new major version 5.x (#266) --- CHANGELOG.md | 2 ++ .../opentelemetry-instrumentation-celery/setup.cfg | 4 ++-- tox.ini | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a381043d8..13c76278b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.16b1...HEAD) ### Added +- `opentelemetry-instrumentation-celery` Add support for Celery version 5.x + ([#266](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/266)) - `opentelemetry-instrumentation-urllib` Add urllib instrumentation ([#222](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/222)) - `opentelemetry-exporter-datadog` Add fields method diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg index 691e6035c..b12587fd7 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg @@ -39,14 +39,14 @@ package_dir= =src packages=find_namespace: install_requires = + celery >= 4.0, < 6.0 opentelemetry-api == 0.17.dev0 opentelemetry-instrumentation == 0.17.dev0 - celery ~= 4.0 [options.extras_require] test = pytest - celery ~= 4.0 + celery >= 4.0, < 6.0 opentelemetry-test == 0.17.dev0 [options.packages.find] diff --git a/tox.ini b/tox.ini index 9265b68a0..a2d680151 100644 --- a/tox.ini +++ b/tox.ini @@ -351,7 +351,7 @@ deps = aiopg >= 0.13.0 sqlalchemy ~= 1.3.16 redis ~= 3.3.11 - celery ~= 4.0, != 4.4.4 + celery[pytest] >= 4.0, < 6.0 protobuf>=3.13.0 requests==2.25.0 changedir =