From ca8daea8bf0cb1ed941911270c45ec2840da1bfa Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 20 Mar 2024 17:49:08 -0600
Subject: [PATCH 01/28] Remove [test] package from psycopg2 instrumentation
 (#2307)

Fixes #2210
---
 .../pyproject.toml                            |  4 ----
 .../test-requirements.txt                     | 19 +++++++++++++++++++
 tox.ini                                       |  4 ++--
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml b/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml
index a300fa9fdd..26873924e4 100644
--- a/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml
@@ -33,10 +33,6 @@ dependencies = [
 instruments = [
   "psycopg2 >= 2.7.3.1",
 ]
-test = [
-  "opentelemetry-instrumentation-psycopg2[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 psycopg2 = "opentelemetry.instrumentation.psycopg2:Psycopg2Instrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
new file mode 100644
index 0000000000..ade3b5fd26
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
@@ -0,0 +1,19 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+psycopg2==2.9.9
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-dbapi
+-e instrumentation/opentelemetry-instrumentation-psycopg2
diff --git a/tox.ini b/tox.ini
index 7466b54e00..40ddff3f7a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -396,7 +396,7 @@ commands_pre =
 
   psycopg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
 
-  psycopg2: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
+  psycopg2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
 
   pymysql: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
 
@@ -590,10 +590,10 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/test-requirements.txt

From b84d779104b8c511ae7b876f5a9f0db3f21654e6 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Wed, 20 Mar 2024 18:51:55 -0600
Subject: [PATCH 02/28] Remove [test] package from pymongo instrumentation
 (#2269)

Fixes #2212
---
 .../pyproject.toml                            |  4 ----
 .../test-requirements.txt                     | 19 +++++++++++++++++++
 tox.ini                                       |  4 ++--
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml
index 6df765bfe0..eca94e5c6c 100644
--- a/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml
@@ -33,10 +33,6 @@ dependencies = [
 instruments = [
   "pymongo >= 3.1, < 5.0",
 ]
-test = [
-  "opentelemetry-instrumentation-pymongo[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 pymongo = "opentelemetry.instrumentation.pymongo:PymongoInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt
new file mode 100644
index 0000000000..01d48e8dc4
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt
@@ -0,0 +1,19 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+dnspython==2.6.1
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pymongo==4.6.2
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-pymongo
diff --git a/tox.ini b/tox.ini
index 40ddff3f7a..54bd2d19bd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -392,7 +392,7 @@ commands_pre =
   pymemcache-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-3.txt
   pymemcache-4: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
 
-  pymongo: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]
+  pymongo: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt
 
   psycopg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
 
@@ -603,10 +603,10 @@ commands_pre =
   # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install
   # for your OS to install the required dependencies
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt

From 5207a784608717de95805b73dabfdaf934741650 Mon Sep 17 00:00:00 2001
From: Samuel Colvin <s@muelcolvin.com>
Date: Thu, 21 Mar 2024 17:30:54 +0000
Subject: [PATCH 03/28] avoid losing repeated HTTP headers (#2266)

* avoid loosing repeated HTTP headers

* fix fof wsgi, test in falcon

* add changelog

* add more tests

* linting

* fix falcon and flask

* remove unused test

---------

Co-authored-by: Leighton Chen <lechen@microsoft.com>
Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
---
 CHANGELOG.md                                  |  2 +
 .../instrumentation/asgi/__init__.py          | 18 ++++--
 .../tests/test_asgi_custom_headers.py         | 55 +++++++++++++++++++
 .../tests/base_test.py                        | 11 ++++
 .../tests/test_programmatic.py                | 31 +++++++++++
 .../instrumentation/wsgi/__init__.py          |  8 ++-
 .../tests/test_wsgi_middleware.py             | 32 +++++++++++
 7 files changed, 149 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fae8763b7..8797b9992a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2297](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2297))
 - Ensure all http.server.duration metrics have the same description
   ([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2298))
+- Avoid losing repeated HTTP headers
+  ([#2266](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2266))
 
 ## Version 1.23.0/0.44b0 (2024-02-23)
 
diff --git a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py
index d179f4fafa..d28d85f975 100644
--- a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py
@@ -195,7 +195,7 @@ def client_response_hook(span: Span, message: dict):
 import urllib
 from functools import wraps
 from timeit import default_timer
-from typing import Any, Awaitable, Callable, Tuple, cast
+from typing import Any, Awaitable, Callable, Tuple
 
 from asgiref.compatibility import guarantee_single_callable
 
@@ -347,11 +347,17 @@ def collect_custom_headers_attributes(
      - https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/http.md#http-request-and-response-headers
     """
     # Decode headers before processing.
-    headers: dict[str, str] = {
-        _key.decode("utf8"): _value.decode("utf8")
-        for (_key, _value) in scope_or_response_message.get("headers")
-        or cast("list[tuple[bytes, bytes]]", [])
-    }
+    headers: dict[str, str] = {}
+    raw_headers = scope_or_response_message.get("headers")
+    if raw_headers:
+        for _key, _value in raw_headers:
+            key = _key.decode().lower()
+            value = _value.decode()
+            if key in headers:
+                headers[key] += f",{value}"
+            else:
+                headers[key] = value
+
     return sanitize.sanitize_header_values(
         headers,
         header_regexes,
diff --git a/instrumentation/opentelemetry-instrumentation-asgi/tests/test_asgi_custom_headers.py b/instrumentation/opentelemetry-instrumentation-asgi/tests/test_asgi_custom_headers.py
index c50839f72f..7a9c91a3e7 100644
--- a/instrumentation/opentelemetry-instrumentation-asgi/tests/test_asgi_custom_headers.py
+++ b/instrumentation/opentelemetry-instrumentation-asgi/tests/test_asgi_custom_headers.py
@@ -40,6 +40,24 @@ async def http_app_with_custom_headers(scope, receive, send):
     await send({"type": "http.response.body", "body": b"*"})
 
 
+async def http_app_with_repeat_headers(scope, receive, send):
+    message = await receive()
+    assert scope["type"] == "http"
+    if message.get("type") == "http.request":
+        await send(
+            {
+                "type": "http.response.start",
+                "status": 200,
+                "headers": [
+                    (b"Content-Type", b"text/plain"),
+                    (b"custom-test-header-1", b"test-header-value-1"),
+                    (b"custom-test-header-1", b"test-header-value-2"),
+                ],
+            }
+        )
+    await send({"type": "http.response.body", "body": b"*"})
+
+
 async def websocket_app_with_custom_headers(scope, receive, send):
     assert scope["type"] == "websocket"
     while True:
@@ -121,6 +139,25 @@ def test_http_custom_request_headers_in_span_attributes(self):
             if span.kind == SpanKind.SERVER:
                 self.assertSpanHasAttributes(span, expected)
 
+    def test_http_repeat_request_headers_in_span_attributes(self):
+        self.scope["headers"].extend(
+            [
+                (b"custom-test-header-1", b"test-header-value-1"),
+                (b"custom-test-header-1", b"test-header-value-2"),
+            ]
+        )
+        self.seed_app(self.app)
+        self.send_default_request()
+        self.get_all_output()
+        span_list = self.exporter.get_finished_spans()
+        expected = {
+            "http.request.header.custom_test_header_1": (
+                "test-header-value-1,test-header-value-2",
+            ),
+        }
+        span = next(span for span in span_list if span.kind == SpanKind.SERVER)
+        self.assertSpanHasAttributes(span, expected)
+
     def test_http_custom_request_headers_not_in_span_attributes(self):
         self.scope["headers"].extend(
             [
@@ -176,6 +213,24 @@ def test_http_custom_response_headers_in_span_attributes(self):
             if span.kind == SpanKind.SERVER:
                 self.assertSpanHasAttributes(span, expected)
 
+    def test_http_repeat_response_headers_in_span_attributes(self):
+        self.app = otel_asgi.OpenTelemetryMiddleware(
+            http_app_with_repeat_headers,
+            tracer_provider=self.tracer_provider,
+            **self.constructor_params,
+        )
+        self.seed_app(self.app)
+        self.send_default_request()
+        self.get_all_output()
+        span_list = self.exporter.get_finished_spans()
+        expected = {
+            "http.response.header.custom_test_header_1": (
+                "test-header-value-1,test-header-value-2",
+            ),
+        }
+        span = next(span for span in span_list if span.kind == SpanKind.SERVER)
+        self.assertSpanHasAttributes(span, expected)
+
     def test_http_custom_response_headers_not_in_span_attributes(self):
         self.app = otel_asgi.OpenTelemetryMiddleware(
             http_app_with_custom_headers,
diff --git a/instrumentation/opentelemetry-instrumentation-flask/tests/base_test.py b/instrumentation/opentelemetry-instrumentation-flask/tests/base_test.py
index 6117521bb9..3c8073f261 100644
--- a/instrumentation/opentelemetry-instrumentation-flask/tests/base_test.py
+++ b/instrumentation/opentelemetry-instrumentation-flask/tests/base_test.py
@@ -88,6 +88,14 @@ def _custom_response_headers():
         resp.headers["my-secret-header"] = "my-secret-value"
         return resp
 
+    @staticmethod
+    def _repeat_custom_response_headers():
+        headers = {
+            "content-type": "text/plain; charset=utf-8",
+            "my-custom-header": ["my-custom-value-1", "my-custom-header-2"],
+        }
+        return flask.Response("test response", headers=headers)
+
     def _common_initialization(self):
         def excluded_endpoint():
             return "excluded"
@@ -106,6 +114,9 @@ def excluded2_endpoint():
         self.app.route("/test_custom_response_headers")(
             self._custom_response_headers
         )
+        self.app.route("/test_repeat_custom_response_headers")(
+            self._repeat_custom_response_headers
+        )
 
         # pylint: disable=attribute-defined-outside-init
         self.client = Client(self.app, Response)
diff --git a/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py b/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py
index 3bd2f74ba8..dec265907f 100644
--- a/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py
+++ b/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py
@@ -671,6 +671,22 @@ def test_custom_request_header_added_in_server_span(self):
         self.assertEqual(span.kind, trace.SpanKind.SERVER)
         self.assertSpanHasAttributes(span, expected)
 
+    def test_repeat_custom_request_header_added_in_server_span(self):
+        headers = [
+            ("Custom-Test-Header-1", "Test Value 1"),
+            ("Custom-Test-Header-1", "Test Value 2"),
+        ]
+        resp = self.client.get("/hello/123", headers=headers)
+        self.assertEqual(200, resp.status_code)
+        span = self.memory_exporter.get_finished_spans()[0]
+        expected = {
+            "http.request.header.custom_test_header_1": (
+                "Test Value 1, Test Value 2",
+            ),
+        }
+        self.assertEqual(span.kind, trace.SpanKind.SERVER)
+        self.assertSpanHasAttributes(span, expected)
+
     def test_custom_request_header_not_added_in_internal_span(self):
         tracer = trace.get_tracer(__name__)
         with tracer.start_as_current_span("test", kind=trace.SpanKind.SERVER):
@@ -724,6 +740,21 @@ def test_custom_response_header_added_in_server_span(self):
         self.assertEqual(span.kind, trace.SpanKind.SERVER)
         self.assertSpanHasAttributes(span, expected)
 
+    def test_repeat_custom_response_header_added_in_server_span(self):
+        resp = self.client.get("/test_repeat_custom_response_headers")
+        self.assertEqual(resp.status_code, 200)
+        span = self.memory_exporter.get_finished_spans()[0]
+        expected = {
+            "http.response.header.content_type": (
+                "text/plain; charset=utf-8",
+            ),
+            "http.response.header.my_custom_header": (
+                "my-custom-value-1,my-custom-header-2",
+            ),
+        }
+        self.assertEqual(span.kind, trace.SpanKind.SERVER)
+        self.assertSpanHasAttributes(span, expected)
+
     def test_custom_response_header_not_added_in_internal_span(self):
         tracer = trace.get_tracer(__name__)
         with tracer.start_as_current_span("test", kind=trace.SpanKind.SERVER):
diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py
index afa1bf2a55..50d4f03dff 100644
--- a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py
@@ -358,7 +358,6 @@ def collect_custom_request_headers_attributes(environ):
             OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SANITIZE_FIELDS
         )
     )
-
     headers = {
         key[_CARRIER_KEY_PREFIX_LEN:].replace("_", "-"): val
         for key, val in environ.items()
@@ -387,7 +386,12 @@ def collect_custom_response_headers_attributes(response_headers):
     )
     response_headers_dict = {}
     if response_headers:
-        response_headers_dict = dict(response_headers)
+        for key, val in response_headers:
+            key = key.lower()
+            if key in response_headers_dict:
+                response_headers_dict[key] += "," + val
+            else:
+                response_headers_dict[key] = val
 
     return sanitize.sanitize_header_values(
         response_headers_dict,
diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/tests/test_wsgi_middleware.py b/instrumentation/opentelemetry-instrumentation-wsgi/tests/test_wsgi_middleware.py
index d71e584ca8..f74dd67867 100644
--- a/instrumentation/opentelemetry-instrumentation-wsgi/tests/test_wsgi_middleware.py
+++ b/instrumentation/opentelemetry-instrumentation-wsgi/tests/test_wsgi_middleware.py
@@ -115,6 +115,18 @@ def wsgi_with_custom_response_headers(environ, start_response):
     return [b"*"]
 
 
+def wsgi_with_repeat_custom_response_headers(environ, start_response):
+    assert isinstance(environ, dict)
+    start_response(
+        "200 OK",
+        [
+            ("my-custom-header", "my-custom-value-1"),
+            ("my-custom-header", "my-custom-value-2"),
+        ],
+    )
+    return [b"*"]
+
+
 _expected_metric_names = [
     "http.server.active_requests",
     "http.server.duration",
@@ -711,6 +723,26 @@ def test_custom_response_headers_not_added_in_internal_span(self):
             for key, _ in not_expected.items():
                 self.assertNotIn(key, span.attributes)
 
+    @mock.patch.dict(
+        "os.environ",
+        {
+            OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE: "my-custom-header",
+        },
+    )
+    def test_repeat_custom_response_headers_added_in_server_span(self):
+        app = otel_wsgi.OpenTelemetryMiddleware(
+            wsgi_with_repeat_custom_response_headers
+        )
+        response = app(self.environ, self.start_response)
+        self.iterate_response(response)
+        span = self.memory_exporter.get_finished_spans()[0]
+        expected = {
+            "http.response.header.my_custom_header": (
+                "my-custom-value-1,my-custom-value-2",
+            ),
+        }
+        self.assertSpanHasAttributes(span, expected)
+
 
 if __name__ == "__main__":
     unittest.main()

From 74f58219d09dc7927e209f0e769eb713921ce0c5 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:58:12 -0600
Subject: [PATCH 04/28] Remove [test] package from redis instrumentation
 (#2274)

Fixes #2215
---
 .../pyproject.toml                            |  5 -----
 .../test-requirements.txt                     | 19 +++++++++++++++++++
 tox.ini                                       |  6 +++---
 3 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml b/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml
index 8511671ed6..35ca1119fe 100644
--- a/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml
@@ -34,11 +34,6 @@ dependencies = [
 instruments = [
   "redis >= 2.6",
 ]
-test = [
-  "opentelemetry-instrumentation-redis[instruments]",
-  "opentelemetry-sdk ~= 1.3",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 redis = "opentelemetry.instrumentation.redis:RedisInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
new file mode 100644
index 0000000000..90617f72e6
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
@@ -0,0 +1,19 @@
+asgiref==3.7.2
+async-timeout==4.0.3
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+redis==5.0.1
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-redis
diff --git a/tox.ini b/tox.ini
index 54bd2d19bd..e20e855802 100644
--- a/tox.ini
+++ b/tox.ini
@@ -404,7 +404,7 @@ commands_pre =
 
   sqlite3: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
 
-  redis: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-redis[test]
+  redis: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
 
   remoulade: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade[test]
 
@@ -581,7 +581,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
   ; python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis[test]
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt
@@ -687,7 +687,7 @@ deps =
   python-dotenv==0.21.1
   pytz==2024.1
   PyYAML==5.3.1
-  redis==4.6.0
+  redis==5.0.1
   remoulade==3.2.0
   requests==2.25.0
   six==1.16.0

From e7df01a26cf17ecf21cc185c3cfb040a7efd82d3 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 12:15:13 -0600
Subject: [PATCH 05/28] Remove [test] package from remoulade instrumentation
 (#2275)

Fixes #2216
---
 .../pyproject.toml                            |  5 -----
 .../test-requirements.txt                     | 22 +++++++++++++++++++
 tox.ini                                       |  5 +++--
 3 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml b/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml
index b8c9d2709b..3be544b2e1 100644
--- a/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml
@@ -33,11 +33,6 @@ dependencies = [
 instruments = [
   "remoulade >= 0.50",
 ]
-test = [
-  "opentelemetry-instrumentation-remoulade[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-  "opentelemetry-sdk ~= 1.10"
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 remoulade = "opentelemetry.instrumentation.remoulade:RemouladeInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt
new file mode 100644
index 0000000000..c50dfde9b5
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt
@@ -0,0 +1,22 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+prometheus_client==0.20.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+python-dateutil==2.8.2
+pytz==2024.1
+remoulade==3.2.0
+six==1.16.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-remoulade
diff --git a/tox.ini b/tox.ini
index e20e855802..1b75230067 100644
--- a/tox.ini
+++ b/tox.ini
@@ -406,7 +406,7 @@ commands_pre =
 
   redis: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
 
-  remoulade: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade[test]
+  remoulade: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt
 
   requests: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/test-requirements.txt
 
@@ -582,10 +582,10 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
   ; python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt
@@ -679,6 +679,7 @@ deps =
   pymongo==4.6.2
   PyMySQL==0.10.1
   PyNaCl==1.5.0
+  # prerequisite: install unixodbc
   pyodbc==4.0.39
   pyrsistent==0.20.0
   pytest==8.0.2

From 847e8faadc7985655754469f39fc1180a02a89fb Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 13:06:16 -0600
Subject: [PATCH 06/28] Remove [test] package from sklearn instrumentation
 (#2303)

Fixes #2218
---
 .../pyproject.toml                            |  4 ----
 .../test-requirements.txt                     | 22 +++++++++++++++++++
 tox.ini                                       |  4 ++--
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml b/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml
index 28fa247159..3d98977347 100644
--- a/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml
@@ -32,10 +32,6 @@ dependencies = [
 instruments = [
   "scikit-learn ~= 0.24.0",
 ]
-test = [
-  "opentelemetry-instrumentation-sklearn[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 sklearn = "opentelemetry.instrumentation.sklearn:SklearnInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt
new file mode 100644
index 0000000000..fc966b4d6a
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt
@@ -0,0 +1,22 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+joblib==1.3.2
+numpy==1.24.4
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+scikit-learn==0.24.2
+scipy==1.10.1
+threadpoolctl==3.3.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-sklearn
diff --git a/tox.ini b/tox.ini
index 1b75230067..d9f718c10c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -434,7 +434,7 @@ commands_pre =
 
   prometheus: pip install {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write[test]
 
-  sklearn: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
+  sklearn: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt
 
   sqlalchemy-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
   sqlalchemy-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
@@ -580,12 +580,12 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
-  ; python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt
+  ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt

From a892b0b0f31446372e997e8c70d00e7933a20b21 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 13:49:38 -0600
Subject: [PATCH 07/28] Remove [test] package from psycopg instrumentation
 (#2309)

Fixes #2308
---
 .../pyproject.toml                            |  4 ----
 .../test-requirements-0.txt                   | 20 +++++++++++++++++++
 .../test-requirements-1.txt                   | 19 ++++++++++++++++++
 tox.ini                                       |  6 ++++--
 4 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-0.txt
 create mode 100644 instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt

diff --git a/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml
index a5a4da0b59..bc87236ca6 100644
--- a/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml
@@ -34,10 +34,6 @@ dependencies = [
 instruments = [
   "psycopg >= 3.1.0",
 ]
-test = [
-  "opentelemetry-instrumentation-psycopg[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 psycopg = "opentelemetry.instrumentation.psycopg:PsycopgInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-0.txt
new file mode 100644
index 0000000000..4b57cb1ca5
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-0.txt
@@ -0,0 +1,20 @@
+asgiref==3.7.2
+attrs==23.2.0
+backports.zoneinfo==0.2.1
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+psycopg==3.1.18
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-dbapi
+-e instrumentation/opentelemetry-instrumentation-psycopg
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt
new file mode 100644
index 0000000000..d449374047
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt
@@ -0,0 +1,19 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+psycopg==3.1.18
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-dbapi
+-e instrumentation/opentelemetry-instrumentation-psycopg
diff --git a/tox.ini b/tox.ini
index d9f718c10c..46cc0d8f53 100644
--- a/tox.ini
+++ b/tox.ini
@@ -394,7 +394,9 @@ commands_pre =
 
   pymongo: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt
 
-  psycopg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
+  py3{8,9}-test-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-0.txt
+  py3{10,11}-test-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt
+  pypy3-test-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt
 
   psycopg2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
 
@@ -589,11 +591,11 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/test-requirements.txt

From 4107d395cf11030702c9fca7e3ebdfa789bd1c73 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 15:44:53 -0600
Subject: [PATCH 08/28] Remove [test] package from resource-detector-container
 (#2319)

Fixes #2228
---
 .../pyproject.toml                               |  3 ---
 .../test-requirements.txt                        | 16 ++++++++++++++++
 tox.ini                                          |  4 ++--
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 resource/opentelemetry-resource-detector-container/test-requirements.txt

diff --git a/resource/opentelemetry-resource-detector-container/pyproject.toml b/resource/opentelemetry-resource-detector-container/pyproject.toml
index 9cb6685a2a..4ad1df12cd 100644
--- a/resource/opentelemetry-resource-detector-container/pyproject.toml
+++ b/resource/opentelemetry-resource-detector-container/pyproject.toml
@@ -27,9 +27,6 @@ dependencies = [
   "opentelemetry-sdk ~= 1.12",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.entry-points.opentelemetry_resource_detector]
 container = "opentelemetry.resource.detector.container:ContainerResourceDetector"
 
diff --git a/resource/opentelemetry-resource-detector-container/test-requirements.txt b/resource/opentelemetry-resource-detector-container/test-requirements.txt
new file mode 100644
index 0000000000..eee7aaa46d
--- /dev/null
+++ b/resource/opentelemetry-resource-detector-container/test-requirements.txt
@@ -0,0 +1,16 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e resource/opentelemetry-resource-detector-container
diff --git a/tox.ini b/tox.ini
index 46cc0d8f53..293d7ecb95 100644
--- a/tox.ini
+++ b/tox.ini
@@ -456,7 +456,7 @@ commands_pre =
 
   sdkextension-aws: pip install {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
 
-  resource-detector-container: pip install {toxinidir}/resource/opentelemetry-resource-detector-container[test]
+  resource-detector-container: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
 
   http: pip install {toxinidir}/util/opentelemetry-util-http
 ; In order to get a health coverage report,
@@ -618,7 +618,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-richconsole[test]
   # requires snappy headers to be available on the system
   python -m pip install -e {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
-  python -m pip install -e {toxinidir}/resource/opentelemetry-resource-detector-container[test]
+  pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
   python -m pip install -e {toxinidir}/propagator/opentelemetry-propagator-aws-xray[test]
   python -m pip install -e {toxinidir}/propagator/opentelemetry-propagator-ot-trace[test]
   python -m pip install -e {toxinidir}/opentelemetry-distro[test]

From bbcd5eebe3fe9efa28966d44aed1f2fb8e74d206 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 16:10:16 -0600
Subject: [PATCH 09/28] Remove [test] package from
 opentelemetry-resource-detector-azure (#2317)

Fixes #2229
---
 resource/opentelemetry-resource-detector-azure/pyproject.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resource/opentelemetry-resource-detector-azure/pyproject.toml b/resource/opentelemetry-resource-detector-azure/pyproject.toml
index ea4be96948..72260709f9 100644
--- a/resource/opentelemetry-resource-detector-azure/pyproject.toml
+++ b/resource/opentelemetry-resource-detector-azure/pyproject.toml
@@ -27,9 +27,6 @@ dependencies = [
   "opentelemetry-sdk ~= 1.21",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.entry-points.opentelemetry_resource_detector]
 azure_app_service = "opentelemetry.resource.detector.azure.app_service:AzureAppServiceResourceDetector"
 azure_vm = "opentelemetry.resource.detector.azure.vm:AzureVMResourceDetector"

From 1f3bcd6555d1d906abc02a8686a430b29f8e4d12 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 16:38:24 -0600
Subject: [PATCH 10/28] Remove [test] package from propagator-aws-xray (#2320)

Fixes #2230
---
 .../pyproject.toml                            |  3 ---
 .../test-requirements.txt                     | 21 +++++++++++++++++++
 tox.ini                                       |  4 ++--
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 propagator/opentelemetry-propagator-aws-xray/test-requirements.txt

diff --git a/propagator/opentelemetry-propagator-aws-xray/pyproject.toml b/propagator/opentelemetry-propagator-aws-xray/pyproject.toml
index 4ece31fc53..6361de39a0 100644
--- a/propagator/opentelemetry-propagator-aws-xray/pyproject.toml
+++ b/propagator/opentelemetry-propagator-aws-xray/pyproject.toml
@@ -27,9 +27,6 @@ dependencies = [
   "opentelemetry-api ~= 1.12",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.entry-points.opentelemetry_propagator]
 xray = "opentelemetry.propagators.aws:AwsXRayPropagator"
 
diff --git a/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt b/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
new file mode 100644
index 0000000000..b6b197bdcc
--- /dev/null
+++ b/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
@@ -0,0 +1,21 @@
+asgiref==3.7.2
+attrs==23.2.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+Deprecated==1.2.14
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+requests==2.31.0
+tomli==2.0.1
+typing_extensions==4.10.0
+urllib3==2.2.1
+wrapt==1.16.0
+zipp==3.17.0
+-e propagator/opentelemetry-propagator-aws-xray
diff --git a/tox.ini b/tox.ini
index 293d7ecb95..fbaf36139d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -462,7 +462,7 @@ commands_pre =
 ; In order to get a health coverage report,
   propagator-ot-trace: pip install {toxinidir}/propagator/opentelemetry-propagator-ot-trace[test]
 
-  propagator-aws-xray: pip install requests {toxinidir}/propagator/opentelemetry-propagator-aws-xray[test]
+  propagator-aws-xray: pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
 
 ; we have to install packages in editable mode.
   coverage: python {toxinidir}/scripts/eachdist.py install --editable
@@ -619,7 +619,7 @@ commands_pre =
   # requires snappy headers to be available on the system
   python -m pip install -e {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
   pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
-  python -m pip install -e {toxinidir}/propagator/opentelemetry-propagator-aws-xray[test]
+  pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
   python -m pip install -e {toxinidir}/propagator/opentelemetry-propagator-ot-trace[test]
   python -m pip install -e {toxinidir}/opentelemetry-distro[test]
 

From dc62f8de49462f1de1e534c7befc8f2135da264c Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 17:19:34 -0600
Subject: [PATCH 11/28] Remove [test] package from propagator-ot-trace (#2321)

Fixes #2231
---
 .../pyproject.toml                               |  3 ---
 .../test-requirements.txt                        | 16 ++++++++++++++++
 tox.ini                                          |  4 ++--
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 propagator/opentelemetry-propagator-ot-trace/test-requirements.txt

diff --git a/propagator/opentelemetry-propagator-ot-trace/pyproject.toml b/propagator/opentelemetry-propagator-ot-trace/pyproject.toml
index 4b73034617..41f374ee1b 100644
--- a/propagator/opentelemetry-propagator-ot-trace/pyproject.toml
+++ b/propagator/opentelemetry-propagator-ot-trace/pyproject.toml
@@ -28,9 +28,6 @@ dependencies = [
   "opentelemetry-sdk ~= 1.12",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.entry-points.opentelemetry_propagator]
 ottrace = "opentelemetry.propagators.ot_trace:OTTracePropagator"
 
diff --git a/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt b/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt
new file mode 100644
index 0000000000..69c1829a5c
--- /dev/null
+++ b/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt
@@ -0,0 +1,16 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e propagator/opentelemetry-propagator-ot-trace
diff --git a/tox.ini b/tox.ini
index fbaf36139d..26749caaff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -460,7 +460,7 @@ commands_pre =
 
   http: pip install {toxinidir}/util/opentelemetry-util-http
 ; In order to get a health coverage report,
-  propagator-ot-trace: pip install {toxinidir}/propagator/opentelemetry-propagator-ot-trace[test]
+  propagator-ot-trace: pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt
 
   propagator-aws-xray: pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
 
@@ -620,7 +620,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
   pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
   pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
-  python -m pip install -e {toxinidir}/propagator/opentelemetry-propagator-ot-trace[test]
+  pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt
   python -m pip install -e {toxinidir}/opentelemetry-distro[test]
 
 commands =

From 69fbfd608016a66f50f87df429338edc76b70b91 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 17:45:12 -0600
Subject: [PATCH 12/28] Remove [test] package from exporter-richconsole (#2322)

Fixes #2232
---
 .../pyproject.toml                            |  3 ---
 .../test-requirements.txt                     | 21 +++++++++++++++++++
 tox.ini                                       |  4 ++--
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 exporter/opentelemetry-exporter-richconsole/test-requirements.txt

diff --git a/exporter/opentelemetry-exporter-richconsole/pyproject.toml b/exporter/opentelemetry-exporter-richconsole/pyproject.toml
index c8a509f643..9b9e9f3c6d 100644
--- a/exporter/opentelemetry-exporter-richconsole/pyproject.toml
+++ b/exporter/opentelemetry-exporter-richconsole/pyproject.toml
@@ -30,9 +30,6 @@ dependencies = [
   "rich>=10.0.0",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/opentelemetry-exporter-richconsole"
 
diff --git a/exporter/opentelemetry-exporter-richconsole/test-requirements.txt b/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
new file mode 100644
index 0000000000..42d2ec7b4c
--- /dev/null
+++ b/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
@@ -0,0 +1,21 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+flaky==3.7.0
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+markdown-it-py==3.0.0
+mdurl==0.1.2
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+Pygments==2.17.2
+pytest==7.1.3
+pytest-benchmark==4.0.0
+rich==13.7.1
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e exporter/opentelemetry-exporter-richconsole
diff --git a/tox.ini b/tox.ini
index 26749caaff..2a3a575921 100644
--- a/tox.ini
+++ b/tox.ini
@@ -432,7 +432,7 @@ commands_pre =
 
   aiopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt
 
-  richconsole: pip install flaky {toxinidir}/exporter/opentelemetry-exporter-richconsole[test]
+  richconsole: pip install -r {toxinidir}/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
 
   prometheus: pip install {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write[test]
 
@@ -615,7 +615,7 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
-  python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-richconsole[test]
+  pip install -r {toxinidir}/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
   # requires snappy headers to be available on the system
   python -m pip install -e {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
   pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt

From bc734282b9b2f3fd497c295d2b57e1b61d7c3068 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 18:01:24 -0600
Subject: [PATCH 13/28] Remove [test] package from
 exporter-prometheus-remote-write (#2323)

Fixes #2233
---
 .../pyproject.toml                            |  3 ---
 .../test-requirements.txt                     | 24 +++++++++++++++++++
 tox.ini                                       |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml b/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml
index a6dea9a9de..b0006a0682 100644
--- a/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml
+++ b/exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml
@@ -31,9 +31,6 @@ dependencies = [
   "python-snappy ~= 0.6",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/opentelemetry-exporter-prometheus-remote-write"
 
diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
new file mode 100644
index 0000000000..40c4886fd7
--- /dev/null
+++ b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
@@ -0,0 +1,24 @@
+asgiref==3.7.2
+attrs==23.2.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+cramjam==2.8.1
+Deprecated==1.2.14
+idna==3.6
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+protobuf==4.25.3
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+python-snappy==0.7.1
+requests==2.31.0
+tomli==2.0.1
+typing_extensions==4.10.0
+urllib3==2.2.1
+wrapt==1.16.0
+zipp==3.17.0
+-e exporter/opentelemetry-exporter-prometheus-remote-write
diff --git a/tox.ini b/tox.ini
index 2a3a575921..d4c3f66927 100644
--- a/tox.ini
+++ b/tox.ini
@@ -434,7 +434,7 @@ commands_pre =
 
   richconsole: pip install -r {toxinidir}/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
 
-  prometheus: pip install {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write[test]
+  prometheus: pip install -r {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
 
   sklearn: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt
 

From 24c1ccabc5f23023bae80d59005790b1b04743ec Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 19:16:41 -0600
Subject: [PATCH 14/28] Remove [test] package from sdk-extension-aws (#2324)

Fixes #2234
---
 .github/workflows/instrumentations_1.yml         |  2 +-
 docs/index.rst                                   |  2 +-
 .../pyproject.toml                               |  3 ---
 .../test-requirements.txt                        | 16 ++++++++++++++++
 tox.ini                                          | 10 +++++-----
 5 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt

diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
index 978642a7a3..92e13609a2 100644
--- a/.github/workflows/instrumentations_1.yml
+++ b/.github/workflows/instrumentations_1.yml
@@ -31,7 +31,7 @@ jobs:
           - "richconsole"
           - "psycopg"
           - "prometheus-remote-write"
-          - "sdkextension-aws"
+          - "sdk-extension-aws"
           - "propagator-aws-xray"
           - "propagator-ot-trace"
           - "resource-detector-container"
diff --git a/docs/index.rst b/docs/index.rst
index 5203c377e4..e2bf32e12e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -22,7 +22,7 @@ installed separately via pip:
 
     pip install opentelemetry-exporter-{exporter}
     pip install opentelemetry-instrumentation-{instrumentation}
-    pip install opentelemetry-sdk-extension-{sdkextension}
+    pip install opentelemetry-sdk-extension-{sdk-extension}
 
 A complete list of packages can be found at the 
 `Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation>`_
diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/pyproject.toml b/sdk-extension/opentelemetry-sdk-extension-aws/pyproject.toml
index 252f9bb6f7..52259bd52b 100644
--- a/sdk-extension/opentelemetry-sdk-extension-aws/pyproject.toml
+++ b/sdk-extension/opentelemetry-sdk-extension-aws/pyproject.toml
@@ -27,9 +27,6 @@ dependencies = [
   "opentelemetry-sdk ~= 1.12",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.entry-points.opentelemetry_id_generator]
 xray = "opentelemetry.sdk.extension.aws.trace.aws_xray_id_generator:AwsXRayIdGenerator"
 
diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt b/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
new file mode 100644
index 0000000000..e569ade322
--- /dev/null
+++ b/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
@@ -0,0 +1,16 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e sdk-extension/opentelemetry-sdk-extension-aws
diff --git a/tox.ini b/tox.ini
index d4c3f66927..4ceced1210 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,8 +11,8 @@ envlist =
     pypy3-test-resource-detector-container
 
     ; opentelemetry-sdk-extension-aws
-    py3{8,9,10,11}-test-sdkextension-aws
-    pypy3-test-sdkextension-aws
+    py3{8,9,10,11}-test-sdk-extension-aws
+    pypy3-test-sdk-extension-aws
 
     ; opentelemetry-distro
     py3{8,9,10,11}-test-distro
@@ -454,7 +454,7 @@ commands_pre =
   httpx-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-0.txt
   httpx-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
 
-  sdkextension-aws: pip install {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
+  sdk-extension-aws: pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
 
   resource-detector-container: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
 
@@ -518,7 +518,7 @@ commands =
   test-instrumentation-httpx: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/tests {posargs}
   test-instrumentation-asyncio: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/tests {posargs}
   test-util-http: pytest {toxinidir}/util/opentelemetry-util-http/tests {posargs}
-  test-sdkextension-aws: pytest {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests {posargs}
+  test-sdk-extension-aws: pytest {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests {posargs}
   test-resource-detector-container: pytest {toxinidir}/resource/opentelemetry-resource-detector-container/tests {posargs}
   test-propagator-aws: pytest {toxinidir}/propagator/opentelemetry-propagator-aws-xray/tests {posargs}
   test-propagator-ot-trace: pytest {toxinidir}/propagator/opentelemetry-propagator-ot-trace/tests {posargs}
@@ -617,10 +617,10 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
   pip install -r {toxinidir}/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
   # requires snappy headers to be available on the system
-  python -m pip install -e {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws[test]
   pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
   pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
   pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt
+  pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
   python -m pip install -e {toxinidir}/opentelemetry-distro[test]
 
 commands =

From 4bb095e96105dafefe39a18a84c77008cbfe5c8e Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 19:31:51 -0600
Subject: [PATCH 15/28] Remove [test] package from
 opentelemetry-instrumentation (#2327)

Fixes #2235
---
 opentelemetry-instrumentation/pyproject.toml     |  3 ---
 .../test-requirements.txt                        | 16 ++++++++++++++++
 tox.ini                                          |  4 +++-
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 opentelemetry-instrumentation/test-requirements.txt

diff --git a/opentelemetry-instrumentation/pyproject.toml b/opentelemetry-instrumentation/pyproject.toml
index db389544c9..a20b005911 100644
--- a/opentelemetry-instrumentation/pyproject.toml
+++ b/opentelemetry-instrumentation/pyproject.toml
@@ -29,9 +29,6 @@ dependencies = [
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
-[project.optional-dependencies]
-test = []
-
 [project.scripts]
 opentelemetry-bootstrap = "opentelemetry.instrumentation.bootstrap:run"
 opentelemetry-instrument = "opentelemetry.instrumentation.auto_instrumentation:run"
diff --git a/opentelemetry-instrumentation/test-requirements.txt b/opentelemetry-instrumentation/test-requirements.txt
new file mode 100644
index 0000000000..473a423bda
--- /dev/null
+++ b/opentelemetry-instrumentation/test-requirements.txt
@@ -0,0 +1,16 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
diff --git a/tox.ini b/tox.ini
index 4ceced1210..07e94f58d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -323,6 +323,8 @@ commands_pre =
   test: pip install opentelemetry-test-utils[test]@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
   test: pip install {toxinidir}/opentelemetry-instrumentation
 
+  opentelemetry-instrumentation: pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
+
   distro: pip install {toxinidir}/opentelemetry-distro
 
   asgi: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt
@@ -565,11 +567,11 @@ commands_pre =
   python -m pip install {env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
   python -m pip install {env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
   python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test]
-  python -m pip install -e {toxinidir}/opentelemetry-instrumentation[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt
+  pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt

From 35cb8c525498278a64b9f35e597b22d7ce573d84 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 19:59:31 -0600
Subject: [PATCH 16/28] Remove [test] package from distro (#2325)

Fixes #2237
---
 opentelemetry-distro/pyproject.toml        |  1 -
 opentelemetry-distro/test-requirements.txt | 17 +++++++++++++++++
 tox.ini                                    |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 opentelemetry-distro/test-requirements.txt

diff --git a/opentelemetry-distro/pyproject.toml b/opentelemetry-distro/pyproject.toml
index 43c646b1d9..6872aa49c8 100644
--- a/opentelemetry-distro/pyproject.toml
+++ b/opentelemetry-distro/pyproject.toml
@@ -31,7 +31,6 @@ dependencies = [
 otlp = [
   "opentelemetry-exporter-otlp == 1.24.0.dev",
 ]
-test = []
 
 [project.entry-points.opentelemetry_configurator]
 configurator = "opentelemetry.distro:OpenTelemetryConfigurator"
diff --git a/opentelemetry-distro/test-requirements.txt b/opentelemetry-distro/test-requirements.txt
new file mode 100644
index 0000000000..978389dc9a
--- /dev/null
+++ b/opentelemetry-distro/test-requirements.txt
@@ -0,0 +1,17 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e opentelemetry-distro
diff --git a/tox.ini b/tox.ini
index 07e94f58d1..955ea312cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -325,7 +325,7 @@ commands_pre =
 
   opentelemetry-instrumentation: pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
 
-  distro: pip install {toxinidir}/opentelemetry-distro
+  distro: pip install -r {toxinidir}/opentelemetry-distro/test-requirements.txt
 
   asgi: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt
 
@@ -623,7 +623,7 @@ commands_pre =
   pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt
   pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt
   pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt
-  python -m pip install -e {toxinidir}/opentelemetry-distro[test]
+  pip install -r {toxinidir}/opentelemetry-distro/test-requirements.txt
 
 commands =
   python scripts/eachdist.py lint --check-only

From 9cf995c62e2d61f30fc38c20e774e2be6141d4f7 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 20:53:30 -0600
Subject: [PATCH 17/28] Remove [test] package from sqlite3 instrumentation
 (#2277)

Fixes #2220
---
 .../pyproject.toml                             |  3 ---
 .../test-requirements.txt                      | 18 ++++++++++++++++++
 tox.ini                                        |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml b/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml
index 0ccdc2da06..ff881a91ed 100644
--- a/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml
@@ -31,9 +31,6 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = []
-test = [
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 sqlite3 = "opentelemetry.instrumentation.sqlite3:SQLite3Instrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt
new file mode 100644
index 0000000000..16cfb33801
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt
@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-dbapi
+-e instrumentation/opentelemetry-instrumentation-sqlite3
diff --git a/tox.ini b/tox.ini
index 955ea312cd..25571d1ff3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -406,7 +406,7 @@ commands_pre =
 
   pyramid: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
 
-  sqlite3: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
+  sqlite3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt
 
   redis: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
 
@@ -598,11 +598,11 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
   # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install
   # for your OS to install the required dependencies

From 0e66ef6e20f5a53b597d316a86d22edcedcc21b9 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 21:25:18 -0600
Subject: [PATCH 18/28] Remove [test] package from system-metrics
 instrumentation (#2279)

Fixes #2222
---
 .../pyproject.toml                             |  5 +----
 .../test-requirements.txt                      | 18 ++++++++++++++++++
 tox.ini                                        |  4 ++--
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml b/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml
index caf27ec5ab..3c179651d4 100644
--- a/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml
@@ -24,6 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
+  "opentelemetry-instrumentation == 0.45b0.dev",
   "opentelemetry-api ~= 1.11",
   "opentelemetry-sdk ~= 1.11",
   "psutil ~= 5.9",
@@ -33,10 +34,6 @@ dependencies = [
 instruments = [
   "psutil >= 5",
 ]
-test = [
-  "opentelemetry-instrumentation-system-metrics[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 system_metrics = "opentelemetry.instrumentation.system_metrics:SystemMetricsInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt
new file mode 100644
index 0000000000..ee56025d5f
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt
@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+psutil==5.9.8
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-system-metrics
diff --git a/tox.ini b/tox.ini
index 25571d1ff3..c11927c9ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -416,7 +416,7 @@ commands_pre =
 
   starlette: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt
 
-  system-metrics: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics[test]
+  system-metrics: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt
 
   tornado: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
 
@@ -615,9 +615,9 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
   pip install -r {toxinidir}/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt
   # requires snappy headers to be available on the system
   pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
   pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt

From c8889d7211bb48c5f7ae23ac993e5dbd92605307 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 21:39:57 -0600
Subject: [PATCH 19/28] Remove [test] package from tortoiseorm instrumentation
 (#2281)

Fixes #2224
---
 .../pyproject.toml                            |  4 ---
 .../test-requirements.txt                     | 25 +++++++++++++++++++
 tox.ini                                       |  4 +--
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml
index 9d32028bdd..89a906610b 100644
--- a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml
@@ -34,10 +34,6 @@ instruments = [
   "tortoise-orm >= 0.17.0",
   "pydantic >= 1.10.2"
 ]
-test = [
-  "opentelemetry-instrumentation-tortoiseorm[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 tortoiseorm = "opentelemetry.instrumentation.tortoiseorm:TortoiseORMInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt
new file mode 100644
index 0000000000..0fafc56253
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt
@@ -0,0 +1,25 @@
+aiosqlite==0.17.0
+annotated-types==0.6.0
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+iso8601==1.1.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pydantic==2.6.2
+pydantic_core==2.16.3
+pypika-tortoise==0.1.6
+pytest==7.1.3
+pytest-benchmark==4.0.0
+pytz==2024.1
+tomli==2.0.1
+tortoise-orm==0.20.0
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-tortoiseorm
diff --git a/tox.ini b/tox.ini
index c11927c9ba..d6a5e21f89 100644
--- a/tox.ini
+++ b/tox.ini
@@ -420,7 +420,7 @@ commands_pre =
 
   tornado: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
 
-  tortoiseorm: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test]
+  tortoiseorm: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt
 
   jinja2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt
 
@@ -611,13 +611,13 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
   pip install -r {toxinidir}/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt
   # requires snappy headers to be available on the system
   pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
   pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt

From 4360b5f6e8d661f15c2d31a2600a3d27ee72db92 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 21:55:43 -0600
Subject: [PATCH 20/28] Remove [test] package from confluent-kafka
 instrumentation (#2287)

Fixes #2196
---
 .../pyproject.toml                             |  4 +---
 .../test-requirements.txt                      | 18 ++++++++++++++++++
 tox.ini                                        |  4 ++--
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml b/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
index 4ded0836b2..3fd97ce493 100644
--- a/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
@@ -21,6 +21,7 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
 ]
 dependencies = [
+  "opentelemetry-instrumentation == 0.45b0.dev",
   "opentelemetry-api ~= 1.12",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
@@ -29,9 +30,6 @@ dependencies = [
 instruments = [
   "confluent-kafka >= 1.8.2, <= 2.3.0",
 ]
-test = [
-  "opentelemetry-instrumentation-confluent-kafka[instruments]",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 confluent_kafka = "opentelemetry.instrumentation.confluent_kafka:ConfluentKafkaInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
new file mode 100644
index 0000000000..be859a2ce1
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+confluent-kafka==2.3.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-confluent-kafka
diff --git a/tox.ini b/tox.ini
index d6a5e21f89..01f3f55557 100644
--- a/tox.ini
+++ b/tox.ini
@@ -341,7 +341,7 @@ commands_pre =
 
   kafka-python: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt
 
-  confluent-kafka: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
+  confluent-kafka: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
 
   grpc: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt
 
@@ -590,7 +590,6 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt
   ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
@@ -603,6 +602,7 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
   # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install
   # for your OS to install the required dependencies

From 26479c8a34288c0e723633eee2a845571db76afc Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 22:21:36 -0600
Subject: [PATCH 21/28] Remove [test] package from pymysql instrumentation
 (#2272)

Fixes #2272
---
 .../pyproject.toml                            |  4 ----
 .../test-requirements.txt                     | 19 +++++++++++++++++++
 tox.ini                                       |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml
index 4018d29601..9e6028bf64 100644
--- a/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml
@@ -33,10 +33,6 @@ dependencies = [
 instruments = [
   "PyMySQL < 2",
 ]
-test = [
-  "opentelemetry-instrumentation-pymysql[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 pymysql = "opentelemetry.instrumentation.pymysql:PyMySQLInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt
new file mode 100644
index 0000000000..cb6619c5de
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt
@@ -0,0 +1,19 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+PyMySQL==1.1.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-dbapi
+-e instrumentation/opentelemetry-instrumentation-pymysql
diff --git a/tox.ini b/tox.ini
index 01f3f55557..8fc54c7d23 100644
--- a/tox.ini
+++ b/tox.ini
@@ -402,7 +402,7 @@ commands_pre =
 
   psycopg2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
 
-  pymysql: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
+  pymysql: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt
 
   pyramid: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
 

From 86a552ecc8f5525dab2c3ce2242cb0b81b9cc784 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 22:39:20 -0600
Subject: [PATCH 22/28] Remove [test] package from boto3sqs instrumentation
 (#2252)

Fixes #2192
---
 .../pyproject.toml                            |  4 ----
 .../test-requirements.txt                     | 24 +++++++++++++++++++
 tox.ini                                       |  4 ++--
 3 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt

diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
index 89e1e112d8..701c58251a 100644
--- a/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
@@ -34,10 +34,6 @@ dependencies = [
 instruments = [
   "boto3 ~= 1.0",
 ]
-test = [
-  "opentelemetry-instrumentation-boto3sqs[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 boto3 = "opentelemetry.instrumentation.boto3sqs:Boto3SQSInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
new file mode 100644
index 0000000000..2af3346e6d
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
@@ -0,0 +1,24 @@
+asgiref==3.7.2
+attrs==23.2.0
+boto3==1.34.44
+botocore==1.34.44
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+jmespath==1.0.1
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+python-dateutil==2.8.2
+s3transfer==0.10.0
+six==1.16.0
+tomli==2.0.1
+typing_extensions==4.9.0
+urllib3==1.26.18
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-boto3sqs
diff --git a/tox.ini b/tox.ini
index 8fc54c7d23..8b126e6cd0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -353,7 +353,7 @@ commands_pre =
 
   boto: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt
 
-  boto3sqs: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
+  boto3sqs: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
 
   falcon-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt
   falcon-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt
@@ -572,7 +572,6 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt
   pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
@@ -582,6 +581,7 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt

From 96655cefbc8f3dc76fb7357d48f53368890f50ed Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 23:06:44 -0600
Subject: [PATCH 23/28] Remove [test] package from _template (#2329)

Fixes #2328
---
 _template/pyproject.toml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/_template/pyproject.toml b/_template/pyproject.toml
index 55607cc9b1..ca3da89a30 100644
--- a/_template/pyproject.toml
+++ b/_template/pyproject.toml
@@ -31,12 +31,6 @@ dependencies = [
   "opentelemetry-api ~= 1.12",
 ]
 
-[project.optional-dependencies]
-test = [
-  # add any test dependencies here
-  "<REPLACE ME>",
-]
-
 [project.entry-points.opentelemetry_instrumentor]
 # REPLACE ME: the entrypoint for the instrumentor e.g
 # sqlalchemy = "opentelemetry.instrumentation.sqlalchemy:SQLAlchemyInstrumentor"

From ada27842bd4596fb3adb7f5e952aafd114b6b78a Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Thu, 21 Mar 2024 23:31:47 -0600
Subject: [PATCH 24/28] Remove [test] package from pika instrumentation (#2306)

Fixes #2209
---
 .../pyproject.toml                            |  7 +------
 .../test-requirements-0.txt                   | 18 ++++++++++++++++
 .../test-requirements-1.txt                   | 18 ++++++++++++++++
 tox.ini                                       | 21 +++++++++++--------
 4 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt
 create mode 100644 instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt

diff --git a/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml
index b11c9bbffc..487ea012a0 100644
--- a/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml
@@ -24,6 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
+  "opentelemetry-instrumentation == 0.45b0.dev",
   "opentelemetry-api ~= 1.5",
   "packaging >= 20.0",
   "wrapt >= 1.0.0, < 2.0.0",
@@ -33,12 +34,6 @@ dependencies = [
 instruments = [
   "pika >= 0.12.0",
 ]
-test = [
-  "opentelemetry-instrumentation-pika[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-  "pytest",
-  "wrapt >= 1.0.0, < 2.0.0",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 pika = "opentelemetry.instrumentation.pika:PikaInstrumentor"
diff --git a/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt
new file mode 100644
index 0000000000..fb3c6def5a
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt
@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pika==0.13.1
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-pika
diff --git a/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
new file mode 100644
index 0000000000..d3ce673dab
--- /dev/null
+++ b/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pika==1.3.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e instrumentation/opentelemetry-instrumentation-pika
diff --git a/tox.ini b/tox.ini
index 8b126e6cd0..068b5d583e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -258,6 +258,10 @@ envlist =
     pypy3-test-propagator-ot-trace
 
     ; opentelemetry-instrumentation-sio-pika
+    ; The numbers at the end of the environment names
+    ; below mean these dependencies are being used:
+    ; 0: pika>=0.12.0,<1.0.0
+    ; 1: pika>=1.0.0
     py3{8,9,10,11}-test-instrumentation-sio-pika-{0,1}
     pypy3-test-instrumentation-sio-pika-{0,1}
 
@@ -300,8 +304,6 @@ deps =
   coverage: pytest
   coverage: pytest-cov
   grpc: pytest-asyncio
-  sio-pika-0: pika>=0.12.0,<1.0.0
-  sio-pika-1: pika>=1.0.0
 
   ; FIXME: add coverage testing
   ; FIXME: add mypy testing
@@ -317,10 +319,10 @@ commands_pre =
   py3{8,9,10,11}: python -m pip install -U pip setuptools wheel
 ; Install common packages for all the tests. These are not needed in all the
 ; cases but it saves a lot of boilerplate in this file.
-  test: pip install opentelemetry-api[test]@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  test: pip install opentelemetry-semantic-conventions[test]@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-  test: pip install opentelemetry-sdk[test]@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  test: pip install opentelemetry-test-utils[test]@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
+  test: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
+  test: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
+  test: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
+  test: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
   test: pip install {toxinidir}/opentelemetry-instrumentation
 
   opentelemetry-instrumentation: pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
@@ -333,7 +335,8 @@ commands_pre =
   py3{10,11}-test-instrumentation-celery: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
   pypy3-test-instrumentation-celery: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
 
-  sio-pika-{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
+  sio-pika-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt
+  sio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
 
   aio-pika-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
   aio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
@@ -582,7 +585,6 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt
@@ -603,7 +605,8 @@ commands_pre =
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt
   # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install
   # for your OS to install the required dependencies
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt

From ca082a7c523f417d5bb6c682d76667e666946496 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Fri, 22 Mar 2024 23:56:29 +0100
Subject: [PATCH 25/28] elasticsearch: don't set body as db statement for bulk
 requests (#2355)

* elasticsearch: don't set body as db statement for bulk requests

bulk requests can be too big and diverse to make sense as db statement.
Other than that the sanitizer currently only handles dicts so it's
crashing.

Closes #2150

Co-authored-by: Jason Mobarak <git@jason.mobarak.name>
Co-authored-by: Quentin Pradet <quentin.pradet@gmail.com>

* Update CHANGELOG

* Please the linter

---------

Co-authored-by: Jason Mobarak <git@jason.mobarak.name>
Co-authored-by: Quentin Pradet <quentin.pradet@gmail.com>
---
 CHANGELOG.md                                  |  2 ++
 .../instrumentation/elasticsearch/__init__.py |  8 +++--
 .../tests/test_elasticsearch.py               | 34 +++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8797b9992a..7a10579947 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2298))
 - Avoid losing repeated HTTP headers
   ([#2266](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2266))
+- `opentelemetry-instrumentation-elasticsearch` Don't send bulk request body as db statement
+  ([#2355](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2355))
 
 ## Version 1.23.0/0.44b0 (2024-02-23)
 
diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py
index dd72a5235e..0f5056de83 100644
--- a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py
@@ -245,9 +245,11 @@ def wrapper(wrapped, _, args, kwargs):
                 if method:
                     attributes["elasticsearch.method"] = method
                 if body:
-                    attributes[SpanAttributes.DB_STATEMENT] = sanitize_body(
-                        body
-                    )
+                    # Don't set db.statement for bulk requests, as it can be very large
+                    if isinstance(body, dict):
+                        attributes[
+                            SpanAttributes.DB_STATEMENT
+                        ] = sanitize_body(body)
                 if params:
                     attributes["elasticsearch.params"] = str(params)
                 if doc_id:
diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py
index 0c84cf5cd6..6008108d79 100644
--- a/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py
+++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py
@@ -51,6 +51,8 @@
 
 Article = helpers.Article
 
+# pylint: disable=too-many-public-methods
+
 
 @mock.patch(
     "elasticsearch.connection.http_urllib3.Urllib3HttpConnection.perform_request"
@@ -486,3 +488,35 @@ def test_body_sanitization(self, _):
             sanitize_body(json.dumps(sanitization_queries.interval_query)),
             str(sanitization_queries.interval_query_sanitized),
         )
+
+    def test_bulk(self, request_mock):
+        request_mock.return_value = (1, {}, "")
+
+        es = Elasticsearch()
+        es.bulk(
+            [
+                {
+                    "_op_type": "index",
+                    "_index": "sw",
+                    "_doc_type": "_doc",
+                    "_id": 1,
+                    "doc": {"name": "adam"},
+                },
+                {
+                    "_op_type": "index",
+                    "_index": "sw",
+                    "_doc_type": "_doc",
+                    "_id": 1,
+                    "doc": {"name": "adam"},
+                },
+            ]
+        )
+
+        spans_list = self.get_finished_spans()
+        self.assertEqual(len(spans_list), 1)
+        span = spans_list[0]
+
+        # Check version and name in span's instrumentation info
+        self.assertEqualSpanInstrumentationInfo(
+            span, opentelemetry.instrumentation.elasticsearch
+        )

From d06de3f9f135191812aa9390aee1e58d9c053210 Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Fri, 22 Mar 2024 23:15:51 +0000
Subject: [PATCH 26/28] regression-fix: retain httpx.URL type on request.url
 (#2359)

* fix: retain httpx.URL type on request.url

This fixes a regression caused in #2020 where request.url stopped being of `httpx.URL` type, causing issues with request/response hooks.

* Update CHANGELOG.md

* tests: adding assertions to verify request.url on hooks is a httpx.URL

* fixup: adjust check to consider httpx < 0.20.0

* fixup: keep code dry

---------

Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
Co-authored-by: Leighton Chen <lechen@microsoft.com>
Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
---
 CHANGELOG.md                                             | 2 ++
 .../src/opentelemetry/instrumentation/httpx/__init__.py  | 2 +-
 .../tests/test_httpx_integration.py                      | 9 +++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a10579947..0373f30754 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2297](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2297))
 - Ensure all http.server.duration metrics have the same description
   ([#2151](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2298))
+- Fix regression in httpx `request.url` not being of type `httpx.URL` after `0.44b0`
+  ([#2359](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2359))
 - Avoid losing repeated HTTP headers
   ([#2266](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2266))
 - `opentelemetry-instrumentation-elasticsearch` Don't send bulk request body as db statement
diff --git a/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/__init__.py b/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/__init__.py
index 53542e7ef3..e6609157c4 100644
--- a/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/__init__.py
@@ -270,7 +270,7 @@ def _extract_parameters(args, kwargs):
         # In httpx >= 0.20.0, handle_request receives a Request object
         request: httpx.Request = args[0]
         method = request.method.encode()
-        url = remove_url_credentials(str(request.url))
+        url = httpx.URL(remove_url_credentials(str(request.url)))
         headers = request.headers
         stream = request.stream
         extensions = request.extensions
diff --git a/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py b/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py
index b8d7fbb6b6..c3f668cafe 100644
--- a/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py
+++ b/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py
@@ -51,12 +51,18 @@
 HTTP_RESPONSE_BODY = "http.response.body"
 
 
+def _is_url_tuple(request: "RequestInfo"):
+    """Determine if request url format is for httpx versions < 0.20.0."""
+    return isinstance(request[1], tuple) and len(request[1]) == 4
+
+
 def _async_call(coro: typing.Coroutine) -> asyncio.Task:
     loop = asyncio.get_event_loop()
     return loop.run_until_complete(coro)
 
 
 def _response_hook(span, request: "RequestInfo", response: "ResponseInfo"):
+    assert _is_url_tuple(request) or isinstance(request.url, httpx.URL)
     span.set_attribute(
         HTTP_RESPONSE_BODY,
         b"".join(response[2]),
@@ -66,6 +72,7 @@ def _response_hook(span, request: "RequestInfo", response: "ResponseInfo"):
 async def _async_response_hook(
     span: "Span", request: "RequestInfo", response: "ResponseInfo"
 ):
+    assert _is_url_tuple(request) or isinstance(request.url, httpx.URL)
     span.set_attribute(
         HTTP_RESPONSE_BODY,
         b"".join([part async for part in response[2]]),
@@ -73,11 +80,13 @@ async def _async_response_hook(
 
 
 def _request_hook(span: "Span", request: "RequestInfo"):
+    assert _is_url_tuple(request) or isinstance(request.url, httpx.URL)
     url = httpx.URL(request[1])
     span.update_name("GET" + str(url))
 
 
 async def _async_request_hook(span: "Span", request: "RequestInfo"):
+    assert _is_url_tuple(request) or isinstance(request.url, httpx.URL)
     url = httpx.URL(request[1])
     span.update_name("GET" + str(url))
 

From 37aba928d45713842941c7efc992726a79ea7d8a Mon Sep 17 00:00:00 2001
From: Tammy Baylis <96076570+tammy-baylis-swi@users.noreply.github.com>
Date: Fri, 22 Mar 2024 16:46:10 -0700
Subject: [PATCH 27/28] Add cloud.account.id attribute by AwsLambdaInstrumentor
 (#2367)

* Add cloud.account.id attribute by AwsLambdaInstrumentor

* Changelog

* Update test

* lint
---
 CHANGELOG.md                                           |  2 ++
 .../instrumentation/aws_lambda/__init__.py             | 10 ++++++++++
 .../tests/test_aws_lambda_instrumentation_manual.py    |  7 ++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0373f30754..215221302d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2266](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2266))
 - `opentelemetry-instrumentation-elasticsearch` Don't send bulk request body as db statement
   ([#2355](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2355))
+- AwsLambdaInstrumentor sets `cloud.account.id` span attribute
+  ([#2367](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2367))
 
 ## Version 1.23.0/0.44b0 (2024-02-23)
 
diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py
index 130622f8c8..3ec22d4c0e 100644
--- a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py
+++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py
@@ -354,6 +354,16 @@ def _instrumented_lambda_handler_call(  # noqa pylint: disable=too-many-branches
                     lambda_context.aws_request_id,
                 )
 
+                # NOTE: `cloud.account.id` can be parsed from the ARN as the fifth item when splitting on `:`
+                #
+                # See more:
+                # https://github.com/open-telemetry/semantic-conventions/blob/main/docs/faas/aws-lambda.md#all-triggers
+                account_id = lambda_context.invoked_function_arn.split(":")[4]
+                span.set_attribute(
+                    ResourceAttributes.CLOUD_ACCOUNT_ID,
+                    account_id,
+                )
+
             exception = None
             try:
                 result = call_wrapped(*args, **kwargs)
diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py
index 2fa4aafee5..9bf6f47d7b 100644
--- a/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py
+++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py
@@ -54,7 +54,7 @@ def __init__(self, aws_request_id, invoked_function_arn):
 
 MOCK_LAMBDA_CONTEXT = MockLambdaContext(
     aws_request_id="mock_aws_request_id",
-    invoked_function_arn="arn://mock-lambda-function-arn",
+    invoked_function_arn="arn:aws:lambda:us-east-1:123456:function:myfunction:myalias",
 )
 
 MOCK_XRAY_TRACE_ID = 0x5FB7331105E8BB83207FA31D4D9CDB4C
@@ -147,6 +147,11 @@ def test_active_tracing(self):
             {
                 ResourceAttributes.FAAS_ID: MOCK_LAMBDA_CONTEXT.invoked_function_arn,
                 SpanAttributes.FAAS_EXECUTION: MOCK_LAMBDA_CONTEXT.aws_request_id,
+                ResourceAttributes.CLOUD_ACCOUNT_ID: MOCK_LAMBDA_CONTEXT.invoked_function_arn.split(
+                    ":"
+                )[
+                    4
+                ],
             },
         )
 

From 24eadcf63d0d5dd78e38a88c2426439eb6e48e63 Mon Sep 17 00:00:00 2001
From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com>
Date: Thu, 28 Mar 2024 22:25:18 +0100
Subject: [PATCH 28/28] Update version to 1.25.0.dev/0.46b0.dev (#2376)

---
 .github/workflows/instrumentations_0.yml      |  2 +-
 .github/workflows/instrumentations_1.yml      |  2 +-
 .github/workflows/test.yml                    |  2 +-
 CHANGELOG.md                                  |  2 +
 _template/version.py                          |  2 +-
 eachdist.ini                                  |  4 +-
 .../prometheus_remote_write/version.py        |  2 +-
 .../pyproject.toml                            |  2 +-
 .../exporter/richconsole/version.py           |  2 +-
 .../pyproject.toml                            |  2 +-
 .../instrumentation/aio_pika/version.py       |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/aiohttp_client/version.py |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/aiohttp_server/version.py |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/aiopg/version.py          |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/asgi/version.py           |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/asyncio/version.py        |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/asyncpg/version.py        |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/aws_lambda/version.py     |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/boto/version.py           |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/boto3sqs/version.py       |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/botocore/version.py       |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/cassandra/version.py      |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/celery/version.py         |  2 +-
 .../pyproject.toml                            |  2 +-
 .../confluent_kafka/version.py                |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/dbapi/version.py          |  2 +-
 .../pyproject.toml                            | 10 +-
 .../instrumentation/django/version.py         |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/elasticsearch/version.py  |  2 +-
 .../pyproject.toml                            |  8 +-
 .../instrumentation/falcon/version.py         |  2 +-
 .../pyproject.toml                            |  8 +-
 .../instrumentation/fastapi/version.py        |  2 +-
 .../pyproject.toml                            |  8 +-
 .../instrumentation/flask/version.py          |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/grpc/version.py           |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/httpx/version.py          |  2 +-
 .../pyproject.toml                            |  2 +-
 .../instrumentation/jinja2/version.py         |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/kafka/version.py          |  2 +-
 .../pyproject.toml                            |  2 +-
 .../instrumentation/logging/version.py        |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/mysql/version.py          |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/mysqlclient/version.py    |  2 +-
 .../pyproject.toml                            |  2 +-
 .../instrumentation/pika/version.py           |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/psycopg/version.py        |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/psycopg2/version.py       |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/pymemcache/version.py     |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/pymongo/version.py        |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/pymysql/version.py        |  2 +-
 .../pyproject.toml                            |  8 +-
 .../instrumentation/pyramid/version.py        |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/redis/version.py          |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/remoulade/version.py      |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/requests/version.py       |  2 +-
 .../pyproject.toml                            |  2 +-
 .../instrumentation/sklearn/version.py        |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/sqlalchemy/version.py     |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/sqlite3/version.py        |  2 +-
 .../pyproject.toml                            |  8 +-
 .../instrumentation/starlette/version.py      |  2 +-
 .../pyproject.toml                            |  2 +-
 .../instrumentation/system_metrics/version.py |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/tornado/version.py        |  2 +-
 .../pyproject.toml                            |  4 +-
 .../instrumentation/tortoiseorm/version.py    |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/urllib/version.py         |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/urllib3/version.py        |  2 +-
 .../pyproject.toml                            |  6 +-
 .../instrumentation/wsgi/version.py           |  2 +-
 .../pyproject.toml                            | 94 +++++++++---------
 .../contrib-instrumentations/version.py       |  2 +-
 opentelemetry-distro/pyproject.toml           |  4 +-
 .../src/opentelemetry/distro/version.py       |  2 +-
 .../instrumentation/bootstrap_gen.py          | 98 +++++++++----------
 .../opentelemetry/instrumentation/version.py  |  2 +-
 .../propagators/ot_trace/version.py           |  2 +-
 .../resource/detector/container/version.py    |  2 +-
 .../src/opentelemetry/util/http/version.py    |  2 +-
 112 files changed, 272 insertions(+), 270 deletions(-)

diff --git a/.github/workflows/instrumentations_0.yml b/.github/workflows/instrumentations_0.yml
index 5505fce008..256d160640 100644
--- a/.github/workflows/instrumentations_0.yml
+++ b/.github/workflows/instrumentations_0.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: a1253585f66d63e7c05a19f070f3bfe0ab6460c1
+  CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
 
 jobs:
   instrumentations-0:
diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
index 92e13609a2..59db21529a 100644
--- a/.github/workflows/instrumentations_1.yml
+++ b/.github/workflows/instrumentations_1.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: a1253585f66d63e7c05a19f070f3bfe0ab6460c1
+  CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
 
 jobs:
   instrumentations-1:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3bc748551b..10c648e517 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: a1253585f66d63e7c05a19f070f3bfe0ab6460c1
+  CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2
 
 jobs:
   misc:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 215221302d..8ff90e611b 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
 
+## Version 1.24.0/0.45b0 (2024-03-28)
+
 - `opentelemetry-instrumentation-psycopg` Async Instrumentation for psycopg 3.x
   ([#2146](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2146))
 
diff --git a/_template/version.py b/_template/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/_template/version.py
+++ b/_template/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/eachdist.ini b/eachdist.ini
index 8d6bdbb6be..60f1154a83 100644
--- a/eachdist.ini
+++ b/eachdist.ini
@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.24.0.dev
+version=1.25.0.dev
 
 packages=
     opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.45b0.dev
+version=0.46b0.dev
 
 packages=
     all
diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py
+++ b/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/exporter/opentelemetry-exporter-richconsole/pyproject.toml b/exporter/opentelemetry-exporter-richconsole/pyproject.toml
index 9b9e9f3c6d..9fb32c772c 100644
--- a/exporter/opentelemetry-exporter-richconsole/pyproject.toml
+++ b/exporter/opentelemetry-exporter-richconsole/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-sdk ~= 1.12",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "rich>=10.0.0",
 ]
 
diff --git a/exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py b/exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py
+++ b/exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
index e79dac2866..73c10fffce 100644
--- a/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
@@ -25,7 +25,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.5",
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py b/instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py
+++ b/instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
index b7c0e52b7c..17b92b2cf8 100644
--- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py
index f7a124c7b8..604195c10e 100644
--- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py
+++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
index 3ea2340d89..f85cfd6e39 100644
--- a/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
     "opentelemetry-api ~= 1.12",
-    "opentelemetry-instrumentation == 0.45b0.dev",
-    "opentelemetry-semantic-conventions == 0.45b0.dev",
-    "opentelemetry-util-http == 0.45b0.dev",
+    "opentelemetry-instrumentation == 0.46b0.dev",
+    "opentelemetry-semantic-conventions == 0.46b0.dev",
+    "opentelemetry-util-http == 0.46b0.dev",
     "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py b/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py
+++ b/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
index b6c54b658b..4a01639d37 100644
--- a/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py
+++ b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml
index 81c83b07e9..a4072bac7d 100644
--- a/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml
@@ -26,9 +26,9 @@ classifiers = [
 dependencies = [
   "asgiref ~= 3.0",
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py
+++ b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml
index 5354ea3cb4..540da184be 100644
--- a/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.14",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-test-utils == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-test-utils == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/version.py b/instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/version.py
+++ b/instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml
index a1ec427a88..6cdd2e7294 100644
--- a/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py b/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
+++ b/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml b/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
index 70e1169eff..3088c47dbe 100644
--- a/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
@@ -21,9 +21,9 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
   "opentelemetry-propagator-aws-xray == 1.0.1",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py
+++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml
index dd4dd690e8..87a323f996 100644
--- a/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-boto/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py
+++ b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml b/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
index 701c58251a..2da67c9848 100644
--- a/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py b/instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py
+++ b/instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml b/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
index d6584078ed..7b0b34d255 100644
--- a/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "opentelemetry-propagator-aws-xray == 1.0.1",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py
+++ b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml b/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml
index c320f70aa9..85f187922e 100644
--- a/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/version.py b/instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/version.py
+++ b/instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml b/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml
index e789b54b3f..7b0027425f 100644
--- a/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-celery/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py
+++ b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml b/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
index 3fd97ce493..9baeaeb40e 100644
--- a/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
@@ -21,7 +21,7 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
   "opentelemetry-api ~= 1.12",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/version.py b/instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/version.py
+++ b/instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml
index 5ae0f09376..e726768535 100644
--- a/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
index 6340c1adfb..17627b21dc 100644
--- a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
+++ b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
 
 _instruments = tuple()
diff --git a/instrumentation/opentelemetry-instrumentation-django/pyproject.toml b/instrumentation/opentelemetry-instrumentation-django/pyproject.toml
index 65be04cb69..c8869d7b29 100644
--- a/instrumentation/opentelemetry-instrumentation-django/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-django/pyproject.toml
@@ -25,15 +25,15 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-wsgi == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-wsgi == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
 asgi = [
-  "opentelemetry-instrumentation-asgi == 0.45b0.dev",
+  "opentelemetry-instrumentation-asgi == 0.46b0.dev",
 ]
 instruments = [
   "django >= 1.10",
diff --git a/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py b/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py
+++ b/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml b/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml
index 987cfb17c1..659366181a 100644
--- a/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py
+++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml b/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml
index dab9534bf9..93787a010d 100644
--- a/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml
@@ -25,10 +25,10 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-wsgi == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-wsgi == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
   "packaging >= 20.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py b/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py
+++ b/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml
index 89f1c77e43..0e11179de2 100644
--- a/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml
@@ -25,10 +25,10 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-asgi == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-asgi == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py b/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py
+++ b/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml b/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml
index 8e0dd1f858..2bc1335a51 100644
--- a/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-flask/pyproject.toml
@@ -25,10 +25,10 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-wsgi == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-wsgi == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
   "packaging >= 21.0",
   "importlib-metadata >= 4.0",
 ]
diff --git a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py
+++ b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml b/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml
index 056592dd42..750f76270a 100644
--- a/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
   "opentelemetry-sdk ~= 1.12",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py
+++ b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml b/instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml
index 1a4da4a520..e4e5575d96 100644
--- a/instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/version.py b/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/version.py
+++ b/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml b/instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml
index 9bde62464a..6284496ebd 100644
--- a/instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml
@@ -25,7 +25,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py b/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py
+++ b/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml b/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml
index ba04c2467e..580c076a82 100644
--- a/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.5",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry/instrumentation/kafka/version.py b/instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry/instrumentation/kafka/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry/instrumentation/kafka/version.py
+++ b/instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry/instrumentation/kafka/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-logging/pyproject.toml b/instrumentation/opentelemetry-instrumentation-logging/pyproject.toml
index 45e29c7026..57572ce634 100644
--- a/instrumentation/opentelemetry-instrumentation-logging/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-logging/pyproject.toml
@@ -25,7 +25,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py b/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py
index 6340c1adfb..17627b21dc 100644
--- a/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py
+++ b/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
 
 _instruments = tuple()
diff --git a/instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml b/instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml
index f3c673c3d2..481748c007 100644
--- a/instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py b/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py
+++ b/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml b/instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml
index 7646a9be2b..c9db02e22f 100644
--- a/instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-mysqlclient/src/opentelemetry/instrumentation/mysqlclient/version.py b/instrumentation/opentelemetry-instrumentation-mysqlclient/src/opentelemetry/instrumentation/mysqlclient/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-mysqlclient/src/opentelemetry/instrumentation/mysqlclient/version.py
+++ b/instrumentation/opentelemetry-instrumentation-mysqlclient/src/opentelemetry/instrumentation/mysqlclient/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml
index 487ea012a0..a41b7297a8 100644
--- a/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-pika/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
   "opentelemetry-api ~= 1.5",
   "packaging >= 20.0",
   "wrapt >= 1.0.0, < 2.0.0",
diff --git a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/version.py b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/version.py
+++ b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml b/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml
index bc87236ca6..d2328035fb 100644
--- a/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml
@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg/src/opentelemetry/instrumentation/psycopg/version.py b/instrumentation/opentelemetry-instrumentation-psycopg/src/opentelemetry/instrumentation/psycopg/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-psycopg/src/opentelemetry/instrumentation/psycopg/version.py
+++ b/instrumentation/opentelemetry-instrumentation-psycopg/src/opentelemetry/instrumentation/psycopg/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml b/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml
index 26873924e4..399d5dc466 100644
--- a/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py
+++ b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml
index e37f566b0b..f7f3bc1905 100644
--- a/instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py b/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py
+++ b/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml
index eca94e5c6c..7c1c8a03a5 100644
--- a/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py
+++ b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml
index 9e6028bf64..858fea62fa 100644
--- a/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py
+++ b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml
index 4f6577d4a8..49a61287f6 100644
--- a/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml
@@ -25,10 +25,10 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-wsgi == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-wsgi == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/version.py b/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/version.py
+++ b/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml b/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml
index 35ca1119fe..76b049b7c8 100644
--- a/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-redis/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "wrapt >= 1.12.1",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py
+++ b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml b/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml
index 3be544b2e1..ba23cc0b0a 100644
--- a/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-remoulade/src/opentelemetry/instrumentation/remoulade/version.py b/instrumentation/opentelemetry-instrumentation-remoulade/src/opentelemetry/instrumentation/remoulade/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-remoulade/src/opentelemetry/instrumentation/remoulade/version.py
+++ b/instrumentation/opentelemetry-instrumentation-remoulade/src/opentelemetry/instrumentation/remoulade/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml b/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml
index ce83ca93ac..6252ab3de9 100644
--- a/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/version.py b/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/version.py
+++ b/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml b/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml
index 3d98977347..ebda48982a 100644
--- a/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml
@@ -25,7 +25,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/version.py b/instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/version.py
index f7a124c7b8..604195c10e 100644
--- a/instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/version.py
+++ b/instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml b/instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml
index bf5759e57b..338606aa6e 100644
--- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
   "packaging >= 21.0",
   "wrapt >= 1.11.2",
 ]
diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py
+++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml b/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml
index ff881a91ed..05bda3d1d0 100644
--- a/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py
index 6340c1adfb..17627b21dc 100644
--- a/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py
+++ b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
 
 _instruments = tuple()
diff --git a/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml b/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml
index a73d5b0455..69805b660c 100644
--- a/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml
@@ -25,10 +25,10 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-instrumentation-asgi == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-instrumentation-asgi == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/version.py b/instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/version.py
+++ b/instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml b/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml
index 3c179651d4..fe60ca1251 100644
--- a/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
   "opentelemetry-api ~= 1.11",
   "opentelemetry-sdk ~= 1.11",
   "psutil ~= 5.9",
diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/version.py b/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/version.py
+++ b/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml b/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml
index e56a566410..ea1c48f011 100644
--- a/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-tornado/pyproject.toml
@@ -24,9 +24,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/version.py b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/version.py
+++ b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml
index 89a906610b..62e5da5b54 100644
--- a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml
@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-tortoiseorm/src/opentelemetry/instrumentation/tortoiseorm/version.py b/instrumentation/opentelemetry-instrumentation-tortoiseorm/src/opentelemetry/instrumentation/tortoiseorm/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-tortoiseorm/src/opentelemetry/instrumentation/tortoiseorm/version.py
+++ b/instrumentation/opentelemetry-instrumentation-tortoiseorm/src/opentelemetry/instrumentation/tortoiseorm/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml b/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml
index 08a0f90aca..1011912a53 100644
--- a/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py b/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py
index 6340c1adfb..17627b21dc 100644
--- a/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py
+++ b/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
 
 _instruments = tuple()
diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/pyproject.toml b/instrumentation/opentelemetry-instrumentation-urllib3/pyproject.toml
index 628cb46554..b5fafc0fe9 100644
--- a/instrumentation/opentelemetry-instrumentation-urllib3/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-urllib3/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 
diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/version.py b/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/version.py
+++ b/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml
index 69b0e7ff41..e3e8bca651 100644
--- a/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml
+++ b/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml
@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
-  "opentelemetry-semantic-conventions == 0.45b0.dev",
-  "opentelemetry-util-http == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
+  "opentelemetry-semantic-conventions == 0.46b0.dev",
+  "opentelemetry-util-http == 0.46b0.dev",
 ]
 
 [project.optional-dependencies]
diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py
+++ b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/opentelemetry-contrib-instrumentations/pyproject.toml b/opentelemetry-contrib-instrumentations/pyproject.toml
index 1cd2c37625..60d1d6740e 100644
--- a/opentelemetry-contrib-instrumentations/pyproject.toml
+++ b/opentelemetry-contrib-instrumentations/pyproject.toml
@@ -28,53 +28,53 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-    "opentelemetry-instrumentation-aio-pika==0.45b0.dev",
-    "opentelemetry-instrumentation-aiohttp-client==0.45b0.dev",
-    "opentelemetry-instrumentation-aiohttp-server==0.45b0.dev",
-    "opentelemetry-instrumentation-aiopg==0.45b0.dev",
-    "opentelemetry-instrumentation-asgi==0.45b0.dev",
-    "opentelemetry-instrumentation-asyncio==0.45b0.dev",
-    "opentelemetry-instrumentation-asyncpg==0.45b0.dev",
-    "opentelemetry-instrumentation-aws-lambda==0.45b0.dev",
-    "opentelemetry-instrumentation-boto==0.45b0.dev",
-    "opentelemetry-instrumentation-boto3sqs==0.45b0.dev",
-    "opentelemetry-instrumentation-botocore==0.45b0.dev",
-    "opentelemetry-instrumentation-cassandra==0.45b0.dev",
-    "opentelemetry-instrumentation-celery==0.45b0.dev",
-    "opentelemetry-instrumentation-confluent-kafka==0.45b0.dev",
-    "opentelemetry-instrumentation-dbapi==0.45b0.dev",
-    "opentelemetry-instrumentation-django==0.45b0.dev",
-    "opentelemetry-instrumentation-elasticsearch==0.45b0.dev",
-    "opentelemetry-instrumentation-falcon==0.45b0.dev",
-    "opentelemetry-instrumentation-fastapi==0.45b0.dev",
-    "opentelemetry-instrumentation-flask==0.45b0.dev",
-    "opentelemetry-instrumentation-grpc==0.45b0.dev",
-    "opentelemetry-instrumentation-httpx==0.45b0.dev",
-    "opentelemetry-instrumentation-jinja2==0.45b0.dev",
-    "opentelemetry-instrumentation-kafka-python==0.45b0.dev",
-    "opentelemetry-instrumentation-logging==0.45b0.dev",
-    "opentelemetry-instrumentation-mysql==0.45b0.dev",
-    "opentelemetry-instrumentation-mysqlclient==0.45b0.dev",
-    "opentelemetry-instrumentation-pika==0.45b0.dev",
-    "opentelemetry-instrumentation-psycopg==0.45b0.dev",
-    "opentelemetry-instrumentation-psycopg2==0.45b0.dev",
-    "opentelemetry-instrumentation-pymemcache==0.45b0.dev",
-    "opentelemetry-instrumentation-pymongo==0.45b0.dev",
-    "opentelemetry-instrumentation-pymysql==0.45b0.dev",
-    "opentelemetry-instrumentation-pyramid==0.45b0.dev",
-    "opentelemetry-instrumentation-redis==0.45b0.dev",
-    "opentelemetry-instrumentation-remoulade==0.45b0.dev",
-    "opentelemetry-instrumentation-requests==0.45b0.dev",
-    "opentelemetry-instrumentation-sklearn==0.45b0.dev",
-    "opentelemetry-instrumentation-sqlalchemy==0.45b0.dev",
-    "opentelemetry-instrumentation-sqlite3==0.45b0.dev",
-    "opentelemetry-instrumentation-starlette==0.45b0.dev",
-    "opentelemetry-instrumentation-system-metrics==0.45b0.dev",
-    "opentelemetry-instrumentation-tornado==0.45b0.dev",
-    "opentelemetry-instrumentation-tortoiseorm==0.45b0.dev",
-    "opentelemetry-instrumentation-urllib==0.45b0.dev",
-    "opentelemetry-instrumentation-urllib3==0.45b0.dev",
-    "opentelemetry-instrumentation-wsgi==0.45b0.dev",
+    "opentelemetry-instrumentation-aio-pika==0.46b0.dev",
+    "opentelemetry-instrumentation-aiohttp-client==0.46b0.dev",
+    "opentelemetry-instrumentation-aiohttp-server==0.46b0.dev",
+    "opentelemetry-instrumentation-aiopg==0.46b0.dev",
+    "opentelemetry-instrumentation-asgi==0.46b0.dev",
+    "opentelemetry-instrumentation-asyncio==0.46b0.dev",
+    "opentelemetry-instrumentation-asyncpg==0.46b0.dev",
+    "opentelemetry-instrumentation-aws-lambda==0.46b0.dev",
+    "opentelemetry-instrumentation-boto==0.46b0.dev",
+    "opentelemetry-instrumentation-boto3sqs==0.46b0.dev",
+    "opentelemetry-instrumentation-botocore==0.46b0.dev",
+    "opentelemetry-instrumentation-cassandra==0.46b0.dev",
+    "opentelemetry-instrumentation-celery==0.46b0.dev",
+    "opentelemetry-instrumentation-confluent-kafka==0.46b0.dev",
+    "opentelemetry-instrumentation-dbapi==0.46b0.dev",
+    "opentelemetry-instrumentation-django==0.46b0.dev",
+    "opentelemetry-instrumentation-elasticsearch==0.46b0.dev",
+    "opentelemetry-instrumentation-falcon==0.46b0.dev",
+    "opentelemetry-instrumentation-fastapi==0.46b0.dev",
+    "opentelemetry-instrumentation-flask==0.46b0.dev",
+    "opentelemetry-instrumentation-grpc==0.46b0.dev",
+    "opentelemetry-instrumentation-httpx==0.46b0.dev",
+    "opentelemetry-instrumentation-jinja2==0.46b0.dev",
+    "opentelemetry-instrumentation-kafka-python==0.46b0.dev",
+    "opentelemetry-instrumentation-logging==0.46b0.dev",
+    "opentelemetry-instrumentation-mysql==0.46b0.dev",
+    "opentelemetry-instrumentation-mysqlclient==0.46b0.dev",
+    "opentelemetry-instrumentation-pika==0.46b0.dev",
+    "opentelemetry-instrumentation-psycopg==0.46b0.dev",
+    "opentelemetry-instrumentation-psycopg2==0.46b0.dev",
+    "opentelemetry-instrumentation-pymemcache==0.46b0.dev",
+    "opentelemetry-instrumentation-pymongo==0.46b0.dev",
+    "opentelemetry-instrumentation-pymysql==0.46b0.dev",
+    "opentelemetry-instrumentation-pyramid==0.46b0.dev",
+    "opentelemetry-instrumentation-redis==0.46b0.dev",
+    "opentelemetry-instrumentation-remoulade==0.46b0.dev",
+    "opentelemetry-instrumentation-requests==0.46b0.dev",
+    "opentelemetry-instrumentation-sklearn==0.46b0.dev",
+    "opentelemetry-instrumentation-sqlalchemy==0.46b0.dev",
+    "opentelemetry-instrumentation-sqlite3==0.46b0.dev",
+    "opentelemetry-instrumentation-starlette==0.46b0.dev",
+    "opentelemetry-instrumentation-system-metrics==0.46b0.dev",
+    "opentelemetry-instrumentation-tornado==0.46b0.dev",
+    "opentelemetry-instrumentation-tortoiseorm==0.46b0.dev",
+    "opentelemetry-instrumentation-urllib==0.46b0.dev",
+    "opentelemetry-instrumentation-urllib3==0.46b0.dev",
+    "opentelemetry-instrumentation-wsgi==0.46b0.dev",
 ]
 
 [project.urls]
diff --git a/opentelemetry-contrib-instrumentations/src/opentelemetry/contrib-instrumentations/version.py b/opentelemetry-contrib-instrumentations/src/opentelemetry/contrib-instrumentations/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/opentelemetry-contrib-instrumentations/src/opentelemetry/contrib-instrumentations/version.py
+++ b/opentelemetry-contrib-instrumentations/src/opentelemetry/contrib-instrumentations/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/opentelemetry-distro/pyproject.toml b/opentelemetry-distro/pyproject.toml
index 6872aa49c8..0cec60a63f 100644
--- a/opentelemetry-distro/pyproject.toml
+++ b/opentelemetry-distro/pyproject.toml
@@ -23,13 +23,13 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.45b0.dev",
+  "opentelemetry-instrumentation == 0.46b0.dev",
   "opentelemetry-sdk ~= 1.13",
 ]
 
 [project.optional-dependencies]
 otlp = [
-  "opentelemetry-exporter-otlp == 1.24.0.dev",
+  "opentelemetry-exporter-otlp == 1.25.0.dev",
 ]
 
 [project.entry-points.opentelemetry_configurator]
diff --git a/opentelemetry-distro/src/opentelemetry/distro/version.py b/opentelemetry-distro/src/opentelemetry/distro/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/opentelemetry-distro/src/opentelemetry/distro/version.py
+++ b/opentelemetry-distro/src/opentelemetry/distro/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
index 3591581c97..30a41b924a 100644
--- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
+++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
@@ -18,179 +18,179 @@
 libraries = [
     {
         "library": "aio_pika >= 7.2.0, < 10.0.0",
-        "instrumentation": "opentelemetry-instrumentation-aio-pika==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-aio-pika==0.46b0.dev",
     },
     {
         "library": "aiohttp ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.46b0.dev",
     },
     {
         "library": "aiohttp ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiohttp-server==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-aiohttp-server==0.46b0.dev",
     },
     {
         "library": "aiopg >= 0.13.0, < 2.0.0",
-        "instrumentation": "opentelemetry-instrumentation-aiopg==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-aiopg==0.46b0.dev",
     },
     {
         "library": "asgiref ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-asgi==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-asgi==0.46b0.dev",
     },
     {
         "library": "asyncpg >= 0.12.0",
-        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.46b0.dev",
     },
     {
         "library": "boto~=2.0",
-        "instrumentation": "opentelemetry-instrumentation-boto==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-boto==0.46b0.dev",
     },
     {
         "library": "boto3 ~= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-boto3sqs==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-boto3sqs==0.46b0.dev",
     },
     {
         "library": "botocore ~= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-botocore==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-botocore==0.46b0.dev",
     },
     {
         "library": "cassandra-driver ~= 3.25",
-        "instrumentation": "opentelemetry-instrumentation-cassandra==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-cassandra==0.46b0.dev",
     },
     {
         "library": "scylla-driver ~= 3.25",
-        "instrumentation": "opentelemetry-instrumentation-cassandra==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-cassandra==0.46b0.dev",
     },
     {
         "library": "celery >= 4.0, < 6.0",
-        "instrumentation": "opentelemetry-instrumentation-celery==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-celery==0.46b0.dev",
     },
     {
         "library": "confluent-kafka >= 1.8.2, <= 2.3.0",
-        "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.46b0.dev",
     },
     {
         "library": "django >= 1.10",
-        "instrumentation": "opentelemetry-instrumentation-django==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-django==0.46b0.dev",
     },
     {
         "library": "elasticsearch >= 2.0",
-        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.46b0.dev",
     },
     {
         "library": "falcon >= 1.4.1, < 3.1.2",
-        "instrumentation": "opentelemetry-instrumentation-falcon==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-falcon==0.46b0.dev",
     },
     {
         "library": "fastapi ~= 0.58",
-        "instrumentation": "opentelemetry-instrumentation-fastapi==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-fastapi==0.46b0.dev",
     },
     {
         "library": "flask >= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-flask==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-flask==0.46b0.dev",
     },
     {
         "library": "grpcio ~= 1.27",
-        "instrumentation": "opentelemetry-instrumentation-grpc==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-grpc==0.46b0.dev",
     },
     {
         "library": "httpx >= 0.18.0",
-        "instrumentation": "opentelemetry-instrumentation-httpx==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-httpx==0.46b0.dev",
     },
     {
         "library": "jinja2 >= 2.7, < 4.0",
-        "instrumentation": "opentelemetry-instrumentation-jinja2==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-jinja2==0.46b0.dev",
     },
     {
         "library": "kafka-python >= 2.0",
-        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.46b0.dev",
     },
     {
         "library": "mysql-connector-python ~= 8.0",
-        "instrumentation": "opentelemetry-instrumentation-mysql==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-mysql==0.46b0.dev",
     },
     {
         "library": "mysqlclient < 3",
-        "instrumentation": "opentelemetry-instrumentation-mysqlclient==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-mysqlclient==0.46b0.dev",
     },
     {
         "library": "pika >= 0.12.0",
-        "instrumentation": "opentelemetry-instrumentation-pika==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-pika==0.46b0.dev",
     },
     {
         "library": "psycopg >= 3.1.0",
-        "instrumentation": "opentelemetry-instrumentation-psycopg==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-psycopg==0.46b0.dev",
     },
     {
         "library": "psycopg2 >= 2.7.3.1",
-        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.46b0.dev",
     },
     {
         "library": "pymemcache >= 1.3.5, < 5",
-        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.46b0.dev",
     },
     {
         "library": "pymongo >= 3.1, < 5.0",
-        "instrumentation": "opentelemetry-instrumentation-pymongo==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-pymongo==0.46b0.dev",
     },
     {
         "library": "PyMySQL < 2",
-        "instrumentation": "opentelemetry-instrumentation-pymysql==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-pymysql==0.46b0.dev",
     },
     {
         "library": "pyramid >= 1.7",
-        "instrumentation": "opentelemetry-instrumentation-pyramid==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-pyramid==0.46b0.dev",
     },
     {
         "library": "redis >= 2.6",
-        "instrumentation": "opentelemetry-instrumentation-redis==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-redis==0.46b0.dev",
     },
     {
         "library": "remoulade >= 0.50",
-        "instrumentation": "opentelemetry-instrumentation-remoulade==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-remoulade==0.46b0.dev",
     },
     {
         "library": "requests ~= 2.0",
-        "instrumentation": "opentelemetry-instrumentation-requests==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-requests==0.46b0.dev",
     },
     {
         "library": "scikit-learn ~= 0.24.0",
-        "instrumentation": "opentelemetry-instrumentation-sklearn==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-sklearn==0.46b0.dev",
     },
     {
         "library": "sqlalchemy",
-        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.46b0.dev",
     },
     {
         "library": "starlette ~= 0.13.0",
-        "instrumentation": "opentelemetry-instrumentation-starlette==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-starlette==0.46b0.dev",
     },
     {
         "library": "psutil >= 5",
-        "instrumentation": "opentelemetry-instrumentation-system-metrics==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-system-metrics==0.46b0.dev",
     },
     {
         "library": "tornado >= 5.1.1",
-        "instrumentation": "opentelemetry-instrumentation-tornado==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-tornado==0.46b0.dev",
     },
     {
         "library": "tortoise-orm >= 0.17.0",
-        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.46b0.dev",
     },
     {
         "library": "pydantic >= 1.10.2",
-        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.46b0.dev",
     },
     {
         "library": "urllib3 >= 1.0.0, < 3.0.0",
-        "instrumentation": "opentelemetry-instrumentation-urllib3==0.45b0.dev",
+        "instrumentation": "opentelemetry-instrumentation-urllib3==0.46b0.dev",
     },
 ]
 default_instrumentations = [
-    "opentelemetry-instrumentation-asyncio==0.45b0.dev",
-    "opentelemetry-instrumentation-aws-lambda==0.45b0.dev",
-    "opentelemetry-instrumentation-dbapi==0.45b0.dev",
-    "opentelemetry-instrumentation-logging==0.45b0.dev",
-    "opentelemetry-instrumentation-sqlite3==0.45b0.dev",
-    "opentelemetry-instrumentation-urllib==0.45b0.dev",
-    "opentelemetry-instrumentation-wsgi==0.45b0.dev",
+    "opentelemetry-instrumentation-asyncio==0.46b0.dev",
+    "opentelemetry-instrumentation-aws-lambda==0.46b0.dev",
+    "opentelemetry-instrumentation-dbapi==0.46b0.dev",
+    "opentelemetry-instrumentation-logging==0.46b0.dev",
+    "opentelemetry-instrumentation-sqlite3==0.46b0.dev",
+    "opentelemetry-instrumentation-urllib==0.46b0.dev",
+    "opentelemetry-instrumentation-wsgi==0.46b0.dev",
 ]
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py
+++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/version.py b/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/version.py
+++ b/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/resource/opentelemetry-resource-detector-container/src/opentelemetry/resource/detector/container/version.py b/resource/opentelemetry-resource-detector-container/src/opentelemetry/resource/detector/container/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/resource/opentelemetry-resource-detector-container/src/opentelemetry/resource/detector/container/version.py
+++ b/resource/opentelemetry-resource-detector-container/src/opentelemetry/resource/detector/container/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/util/opentelemetry-util-http/src/opentelemetry/util/http/version.py b/util/opentelemetry-util-http/src/opentelemetry/util/http/version.py
index 2b23bc4994..ff4933b20b 100644
--- a/util/opentelemetry-util-http/src/opentelemetry/util/http/version.py
+++ b/util/opentelemetry-util-http/src/opentelemetry/util/http/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"