From 546c88ef1c0f6abf86453b0bc92c17f224b668cf Mon Sep 17 00:00:00 2001 From: Ashutosh Goel Date: Thu, 10 Feb 2022 13:58:15 +0530 Subject: [PATCH 1/2] Changing supported version of tornado to 6.0 --- docs-requirements.txt | 2 +- instrumentation/README.md | 2 +- .../src/opentelemetry/instrumentation/tornado/package.py | 2 +- .../src/opentelemetry/instrumentation/bootstrap_gen.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index 1a5f7d0cb0..0f4d2a0019 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -34,6 +34,6 @@ PyMySQL~=0.9.3 pyramid>=1.7 redis>=2.6 sqlalchemy>=1.0 -tornado>=5.1.1 +tornado>=6.0 ddtrace>=0.34.0 httpx>=0.18.0 diff --git a/instrumentation/README.md b/instrumentation/README.md index 1421653a70..080247688b 100644 --- a/instrumentation/README.md +++ b/instrumentation/README.md @@ -33,7 +33,7 @@ | [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy | | [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 | | [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 | -| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 5.1.1 | +| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 6.0 | | [opentelemetry-instrumentation-urllib](./opentelemetry-instrumentation-urllib) | urllib | | [opentelemetry-instrumentation-urllib3](./opentelemetry-instrumentation-urllib3) | urllib3 >= 1.0.0, < 2.0.0 | | [opentelemetry-instrumentation-wsgi](./opentelemetry-instrumentation-wsgi) | wsgi | \ No newline at end of file diff --git a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/package.py b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/package.py index 195980dd07..9766d0ba34 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/package.py +++ b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/package.py @@ -13,4 +13,4 @@ # limitations under the License. -_instruments = ("tornado >= 5.1.1",) +_instruments = ("tornado >= 6.0",) diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py index c3905787ff..3edf9cd19c 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py @@ -129,7 +129,7 @@ "instrumentation": "opentelemetry-instrumentation-starlette==0.28b1", }, "tornado": { - "library": "tornado >= 5.1.1", + "library": "tornado >= 6.0", "instrumentation": "opentelemetry-instrumentation-tornado==0.28b1", }, "urllib3": { From c69b27eb18b2ff631a67bb428a9defe5d47081d2 Mon Sep 17 00:00:00 2001 From: Ashutosh Goel Date: Thu, 10 Feb 2022 14:19:45 +0530 Subject: [PATCH 2/2] Updating changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fad0c2fc7..ff5c0119b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `opentelemetry-instrumentation-wsgi` WSGI: Conditionally create SERVER spans ([#903](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/903)) +- `opentelemetry-instrumentation-tornado` Supported version of tornado changed to 6.0 + ([#909](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/909)) + ### Fixed - `opentelemetry-instrumentation-logging` retrieves service name defensively.