diff --git a/CHANGELOG.md b/CHANGELOG.md index 51c1880f6..aa3f9704d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.3.0-0.22b0...HEAD) +- Include Flask 2.0 as compatible with existing flask instrumentation + ([#545](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/545)) ### Changed - `opentelemetry-instrumentation-tornado` properly instrument work done in tornado on_finish method. diff --git a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/package.py b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/package.py index eaa1ed37f..b08156420 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/package.py +++ b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/package.py @@ -13,4 +13,4 @@ # limitations under the License. -_instruments = ("flask ~= 1.0",) +_instruments = ("flask >= 1.0, < 3.0",) diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py index 5e747136a..5d6694acd 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py @@ -61,7 +61,7 @@ libraries = { "instrumentation": "opentelemetry-instrumentation-fastapi==0.23.dev0", }, "flask": { - "library": "flask ~= 1.0", + "library": "flask >= 1.0, < 3.0", "instrumentation": "opentelemetry-instrumentation-flask==0.23.dev0", }, "grpcio": {