Merge branch 'main' into emmett.butler/kinesis-propagation-refactor

.github/CODEOWNERS

@@ -10,6 +10,7 @@ ddtrace/internal/schema/            @DataDog/apm-core-python @DataDog/apm-framew
 tests/contrib/                      @DataDog/apm-core-python @DataDog/apm-framework-integrations
 tests/internal/peer_service         @DataDog/apm-core-python @DataDog/apm-framework-integrations
 tests/internal/service_name         @DataDog/apm-core-python @DataDog/apm-framework-integrations
+tests/contrib/grpc                  @DataDog/apm-framework-integrations @DataDog/asm-python
 
 # Files which can be approved by anyone
 # DEV: This helps not requiring apm-core-python to review new files added

.github/workflows/test_frameworks.yml

@@ -432,7 +432,7 @@ jobs:
         if: needs.needs-run.outputs.outcome == 'success'
         run: cat debugger-expl.txt
 
-  starlette-testsuite-0_17_1:
+  starlette-testsuite-0_37_1:
     runs-on: "ubuntu-latest"
     needs: needs-run
     env:
@@ -449,35 +449,27 @@ jobs:
         if: needs.needs-run.outputs.outcome == 'success'
         with:
           python-version: '3.9'
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: needs.needs-run.outputs.outcome == 'success'
         with:
           path: ddtrace
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: needs.needs-run.outputs.outcome == 'success'
         with:
           repository: encode/starlette
-          ref: 0.17.1
+          ref: 0.37.1
           path: starlette
       - name: Install ddtrace
         if: needs.needs-run.outputs.outcome == 'success'
         run: pip install ../ddtrace
       - name: Install dependencies
         if: needs.needs-run.outputs.outcome == 'success'
         run: scripts/install
-      # with urllib3 2.0 we are seeing IncompleteRead errors, pinning while investigating root issue.
-      - name: Pin urllib3
-        if: needs.needs-run.outputs.outcome == 'success'
-        run: pip install urllib3==1.26.15
-      # with trio 0.24.0 we are seeing AttributeErrors, pinning while investigating root issue.
-      - name: Pin trio
-        if: needs.needs-run.outputs.outcome == 'success'
-        run: pip install trio==0.23.2
       #Parameters for keyword expression skip 3 failing tests that are expected due to asserting on headers. The errors are because our context propagation headers are being added
       #test_staticfiles_with_invalid_dir_permissions_returns_401 fails with and without ddtrace enabled
       - name: Run tests
         if: needs.needs-run.outputs.outcome == 'success'
-        run: pytest -W ignore --ddtrace-patch-all tests -k 'not test_request_headers and not test_subdomain_route and not test_websocket_headers and not test_staticfiles_with_invalid_dir_permissions_returns_401'
+        run: pytest -W ignore --ddtrace-patch-all tests -k 'not test_request_headers and not test_subdomain_route and not test_websocket_headers and not test_staticfiles_with_invalid_dir_permissions_returns_401 and not test_contextvars[asyncio-CustomMiddlewareUsingBaseHTTPMiddleware]'
       - name: Debugger exploration results
         if: needs.needs-run.outputs.outcome == 'success'
         run: cat debugger-expl.txt

.riot/requirements/bf032ea.txt → .riot/requirements/1a3fc04.txt

@@ -2,29 +2,32 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/bf032ea.in
+#    pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1a3fc04.in
 #
 astunparse==1.6.3
-attrs==23.1.0
-certifi==2023.11.17
+attrs==23.2.0
+certifi==2024.2.2
 cffi==1.15.1
 charset-normalizer==3.3.2
 coverage[toml]==7.2.7
-cryptography==41.0.7
+cryptography==42.0.5
 exceptiongroup==1.2.0
+googleapis-common-protos==1.63.0
 greenlet==3.0.3
+grpcio==1.62.1
 hypothesis==6.45.0
 idna==3.6
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==23.2
+packaging==24.0
 pluggy==1.2.0
+protobuf==4.24.4
 psycopg2-binary==2.9.9
 pycparser==2.21
-pycryptodome==3.19.0
-pytest==7.4.3
+pycryptodome==3.20.0
+pytest==7.4.4
 pytest-cov==4.1.0
 pytest-mock==3.11.1
 requests==2.31.0

.riot/requirements/1ce89c8.txt

@@ -0,0 +1,38 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/1ce89c8.in
+#
+astunparse==1.6.3
+attrs==23.2.0
+certifi==2024.2.2
+cffi==1.16.0
+charset-normalizer==3.3.2
+coverage[toml]==7.4.4
+cryptography==42.0.5
+googleapis-common-protos==1.63.0
+greenlet==3.0.3
+grpcio==1.62.1
+hypothesis==6.45.0
+idna==3.6
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.0
+pluggy==1.4.0
+protobuf==4.25.3
+psycopg2-binary==2.9.9
+pycparser==2.22
+pycryptodome==3.20.0
+pytest==8.1.1
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+requests==2.31.0
+simplejson==3.19.2
+six==1.16.0
+sortedcontainers==2.4.0
+sqlalchemy==2.0.22
+typing-extensions==4.11.0
+urllib3==2.2.1
+wheel==0.43.0

.riot/requirements/43b3aa8.txt

@@ -0,0 +1,38 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/43b3aa8.in
+#
+astunparse==1.6.3
+attrs==23.2.0
+certifi==2024.2.2
+cffi==1.16.0
+charset-normalizer==3.3.2
+coverage[toml]==7.4.4
+cryptography==42.0.5
+googleapis-common-protos==1.63.0
+greenlet==3.0.3
+grpcio==1.62.1
+hypothesis==6.45.0
+idna==3.6
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.0
+pluggy==1.4.0
+protobuf==4.25.3
+psycopg2-binary==2.9.9
+pycparser==2.22
+pycryptodome==3.20.0
+pytest==8.1.1
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+requests==2.31.0
+simplejson==3.19.2
+six==1.16.0
+sortedcontainers==2.4.0
+sqlalchemy==2.0.22
+typing-extensions==4.11.0
+urllib3==2.2.1
+wheel==0.43.0

.riot/requirements/1b57ac2.txt → .riot/requirements/60a424f.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/1b57ac2.in
+#    pip-compile --no-annotate .riot/requirements/60a424f.in
 #
 aiosqlite==0.17.0
 attrs==23.2.0
@@ -16,7 +16,7 @@ coverage[toml]==7.4.4
 ddsketch==3.0.1
 deprecated==1.2.14
 envier==0.5.1
-flask==3.0.2
+flask==3.0.3
 greenlet==3.0.3
 hypothesis==6.45.0
 idna==3.6
@@ -34,6 +34,7 @@ peewee==3.17.1
 pluggy==1.4.0
 pony==0.7.17
 protobuf==5.26.1
+pycryptodome==3.20.0
 pypika-tortoise==0.1.6
 pytest==8.1.1
 pytest-cov==5.0.0
@@ -45,9 +46,9 @@ sortedcontainers==2.4.0
 sqlalchemy==2.0.29
 sqlparse==0.4.4
 tortoise-orm==0.20.0
-typing-extensions==4.10.0
+typing-extensions==4.11.0
 urllib3==2.2.1
-werkzeug==3.0.1
+werkzeug==3.0.2
 wrapt==1.16.0
 xmltodict==0.13.0
 zipp==3.18.1

.riot/requirements/3fb7b68.txt → .riot/requirements/c14fe8f.txt

@@ -2,36 +2,39 @@
 # This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/3fb7b68.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/c14fe8f.in
 #
 astunparse==1.6.3
-attrs==23.1.0
-certifi==2023.11.17
+attrs==23.2.0
+certifi==2024.2.2
 cffi==1.16.0
 charset-normalizer==3.3.2
-coverage[toml]==7.3.4
-cryptography==41.0.7
+coverage[toml]==7.4.4
+cryptography==42.0.5
 exceptiongroup==1.2.0
+googleapis-common-protos==1.63.0
 greenlet==3.0.3
+grpcio==1.62.1
 hypothesis==6.45.0
 idna==3.6
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
+packaging==24.0
+pluggy==1.4.0
+protobuf==4.25.3
 psycopg2-binary==2.9.9
-pycparser==2.21
-pycryptodome==3.19.0
-pytest==7.4.3
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+pycparser==2.22
+pycryptodome==3.20.0
+pytest==8.1.1
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 requests==2.31.0
 simplejson==3.19.2
 six==1.16.0
 sortedcontainers==2.4.0
 sqlalchemy==2.0.22
 tomli==2.0.1
-typing-extensions==4.9.0
-urllib3==2.1.0
-wheel==0.42.0
+typing-extensions==4.11.0
+urllib3==2.2.1
+wheel==0.43.0

.riot/requirements/5a026e6.txt → .riot/requirements/e561a1c.txt

@@ -2,36 +2,39 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/5a026e6.in
+#    pip-compile --no-annotate .riot/requirements/e561a1c.in
 #
 astunparse==1.6.3
-attrs==23.1.0
-certifi==2023.11.17
+attrs==23.2.0
+certifi==2024.2.2
 cffi==1.16.0
 charset-normalizer==3.3.2
-coverage[toml]==7.3.4
-cryptography==41.0.7
+coverage[toml]==7.4.4
+cryptography==42.0.5
 exceptiongroup==1.2.0
+googleapis-common-protos==1.63.0
 greenlet==3.0.3
+grpcio==1.62.1
 hypothesis==6.45.0
 idna==3.6
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
+packaging==24.0
+pluggy==1.4.0
+protobuf==4.25.3
 psycopg2-binary==2.9.9
-pycparser==2.21
-pycryptodome==3.19.0
-pytest==7.4.3
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+pycparser==2.22
+pycryptodome==3.20.0
+pytest==8.1.1
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 requests==2.31.0
 simplejson==3.19.2
 six==1.16.0
 sortedcontainers==2.4.0
 sqlalchemy==2.0.22
 tomli==2.0.1
-typing-extensions==4.9.0
-urllib3==2.1.0
-wheel==0.42.0
+typing-extensions==4.11.0
+urllib3==2.2.1
+wheel==0.43.0