Remove [test] package from flask instrumentation

Fixes open-telemetry#2126

Author: ocelotl

instrumentation/opentelemetry-instrumentation-flask/pyproject.toml

@@ -34,14 +34,8 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "werkzeug < 3.0.0",
   "flask >= 1.0",
 ]
-test = [
-  "opentelemetry-instrumentation-flask[instruments]",
-  "markupsafe==2.1.2",
-  "opentelemetry-test-utils == 0.44b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 flask = "opentelemetry.instrumentation.flask:FlaskInstrumentor"

instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt

@@ -0,0 +1,6 @@
+flask==2.1.3
+werkzeug==2.3.8
+-e ../../../opentelemetry-instrumentation
+-e ../../../util/opentelemetry-util-http
+-e ../../../instrumentation/opentelemetry-instrumentation-wsgi
+-e ../../../instrumentation/opentelemetry-instrumentation-flask

instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt

@@ -0,0 +1,6 @@
+flask==2.2.0
+werkzeug==2.3.8
+-e ../../../opentelemetry-instrumentation
+-e ../../../util/opentelemetry-util-http
+-e ../../../instrumentation/opentelemetry-instrumentation-wsgi
+-e ../../../instrumentation/opentelemetry-instrumentation-flask

instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt

@@ -0,0 +1,6 @@
+flask==3.0.2
+werkzeug==3.0.1
+-e ../../../opentelemetry-instrumentation
+-e ../../../util/opentelemetry-util-http
+-e ../../../instrumentation/opentelemetry-instrumentation-wsgi
+-e ../../../instrumentation/opentelemetry-instrumentation-flask

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -84,10 +84,6 @@
         "library": "fastapi ~= 0.58",
         "instrumentation": "opentelemetry-instrumentation-fastapi==0.44b0.dev",
     },
-    {
-        "library": "werkzeug < 3.0.0",
-        "instrumentation": "opentelemetry-instrumentation-flask==0.44b0.dev",
-    },
     {
         "library": "flask >= 1.0",
         "instrumentation": "opentelemetry-instrumentation-flask==0.44b0.dev",

tox.ini

@@ -83,9 +83,9 @@ envlist =
     pypy3-test-instrumentation-fastapi
 
     ; opentelemetry-instrumentation-flask
-    py3{8,9,10,11}-test-instrumentation-flask-{213,220}
-    py3{8,9,10,11}-test-instrumentation-flask-{300}
-    pypy3-test-instrumentation-flask-{213,220}
+    py3{8,9,10,11}-test-instrumentation-flask-{0,1}
+    py3{8,9,10,11}-test-instrumentation-flask-{2}
+    pypy3-test-instrumentation-flask-{0,1}
 
     ; opentelemetry-instrumentation-urllib
     py3{8,9,10,11}-test-instrumentation-urllib
@@ -268,12 +268,6 @@ deps =
   falcon-1: falcon ==1.4.1
   falcon-2: falcon >=2.0.0,<3.0.0
   falcon-3: falcon >=3.0.0,<4.0.0
-  flask-213: Flask ==2.1.3
-  flask-213: Werkzeug <3.0.0
-  flask-220: Flask ==2.2.0
-  flask-220: Werkzeug <3.0.0
-  flask-300: Flask >=3.0.0
-  flask-300: Werkzeug >=3.0.0
   grpc: pytest-asyncio
   sqlalchemy-11: sqlalchemy>=1.1,<1.2
   sqlalchemy-14: aiosqlite
@@ -323,7 +317,7 @@ changedir =
   test-instrumentation-elasticsearch-{2,5,6}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests
   test-instrumentation-falcon-{1,2,3}: instrumentation/opentelemetry-instrumentation-falcon/tests
   test-instrumentation-fastapi: instrumentation/opentelemetry-instrumentation-fastapi/tests
-  test-instrumentation-flask-{213,220,300}: instrumentation/opentelemetry-instrumentation-flask/tests
+  test-instrumentation-flask-{0,1,2}: instrumentation/opentelemetry-instrumentation-flask/tests
   test-instrumentation-urllib: instrumentation/opentelemetry-instrumentation-urllib/tests
   test-instrumentation-urllib3v-{1,2}: instrumentation/opentelemetry-instrumentation-urllib3/tests
   test-instrumentation-grpc: instrumentation/opentelemetry-instrumentation-grpc/tests
@@ -386,8 +380,8 @@ commands_pre =
 
   grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
 
-  falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
-  wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
+  falcon-{1,2,3},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
+  wsgi,falcon-{1,2,3},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
   asgi,django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
 
   asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
@@ -401,7 +395,9 @@ commands_pre =
 
   falcon-{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
 
-  flask-{213,220,300}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
+  flask-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt
+  flask-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt
+  flask-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt
 
   urllib: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib[test]
 
@@ -540,7 +536,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
+  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]