Merge branch 'main' into yunkim/langchain-fix-flaky

.circleci/config.templ.yml

@@ -572,6 +572,7 @@ jobs:
           pattern: "datastreams"
 
   tracer:
+    parallelism: 10
     <<: *contrib_job_large
     steps:
       - run_test:

.github/CODEOWNERS

@@ -19,8 +19,10 @@ releasenotes/                       @DataDog/apm-python
 tests/snapshots/                    @DataDog/apm-python
 riotfile.py                         @DataDog/apm-python
 .riot/requirements/                 @DataDog/apm-python
+CHANGELOG.md                        @DataDog/apm-python
+README.md                           @DataDog/apm-python
 
-# Core
+# Core / Language Platform
 tests/internal                      @DataDog/apm-core-python
 tests/lib-injection                 @DataDog/apm-core-python
 tests/opentelemetry                 @DataDog/apm-core-python
@@ -62,6 +64,7 @@ tests/internal/test_module.py       @DataDog/debugger-python @DataDog/apm-core-p
 tests/internal/symbol_db/           @DataDog/debugger-python
 
 # ASM
+benchmarks/appsec*                  @DataDog/asm-python
 ddtrace/appsec/                     @DataDog/asm-python
 ddtrace/settings/asm.py             @DataDog/asm-python
 ddtrace/contrib/subprocess/         @DataDog/asm-python
@@ -117,6 +120,28 @@ mypy.ini                            @DataDog/python-guild  @DataDog/apm-core-pyt
 ddtrace/internal/_file_queue.py     @DataDog/python-guild
 ddtrace/internal/_unpatched.py      @DataDog/python-guild
 ddtrace/internal/compat.py          @DataDog/python-guild  @DataDog/apm-core-python
+ddtrace/settings/config.py          @DataDog/python-guild  @DataDog/apm-sdk-api-python
 tests/utils.py                      @DataDog/python-guild
 tests/.suitespec.json               @DataDog/python-guild  @DataDog/apm-core-python
 tests/suitespec.py                  @DataDog/python-guild  @DataDog/apm-core-python
+
+# API SDK
+ddtrace/_trace/                                    @DataDog/apm-sdk-api-python
+ddtrace/opentelemetry/                             @DataDog/apm-sdk-api-python
+ddtrace/opentracer/                             @DataDog/apm-sdk-api-python
+ddtrace/propagation/                               @DataDog/apm-sdk-api-python
+ddtrace/filters.py                                 @DataDog/apm-sdk-api-python
+ddtrace/pin.py                                     @DataDog/apm-sdk-api-python
+ddtrace/sampler.py                                 @DataDog/apm-sdk-api-python
+ddtrace/sampling_rule.py                           @DataDog/apm-sdk-api-python
+ddtrace/internal/sampling.py                       @DataDog/apm-sdk-api-python
+ddtrace/internal/tracemethods.py                   @DataDog/apm-sdk-api-python
+ddttace/settings/_otel_remapper.py                 @DataDog/apm-sdk-api-python
+tests/integration/test_priority_sampling.py        @DataDog/apm-sdk-api-python
+tests/integration/test_propagation.py              @DataDog/apm-sdk-api-python
+tests/test_sampling.py                             @DataDog/apm-sdk-api-python
+tests/test_tracemethods.py                         @DataDog/apm-sdk-api-python
+tests/opentelemetry/                               @DataDog/apm-sdk-api-python
+tests/tracer/                                      @DataDog/apm-sdk-api-python
+# Override because order matters
+tests/tracer/test_ci.py                            @DataDog/ci-app-libraries

.github/workflows/requirements-locks.yml

@@ -20,7 +20,7 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Set python interpreters
-        run: pyenv global 3.10 3.7 3.8 3.9 3.11
+        run: pyenv global 3.10 3.7 3.8 3.9 3.11 3.12
 
       - name: Install Dependencies
         run: pip install --upgrade pip && pip install riot

.gitlab/benchmarks.yml

@@ -33,6 +33,7 @@ variables:
     UPSTREAM_COMMIT_SHA: $CI_COMMIT_SHA # The commit revision the project is built for.
     KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-py
     FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
+    CARGO_NET_GIT_FETCH_WITH_CLI: "true" # use system git binary to pull git dependencies
 
 benchmarks-pr-comment:
   stage: benchmarks-pr-comment

.riot/requirements/103f817.txt → .riot/requirements/1026e4e.txt

@@ -2,30 +2,30 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/103f817.in
+#    pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1026e4e.in
 #
 aiohttp==3.8.6
 aiohttp-jinja2==1.5.1
 aiosignal==1.3.1
 async-timeout==4.0.3
 asynctest==0.13.0
-attrs==23.1.0
+attrs==23.2.0
 charset-normalizer==3.3.2
 coverage[toml]==7.2.7
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
 frozenlist==1.3.3
 hypothesis==6.45.0
-idna==3.6
+idna==3.7
 importlib-metadata==6.7.0
 iniconfig==2.0.0
-jinja2==3.1.2
-markupsafe==2.1.3
+jinja2==3.1.4
+markupsafe==2.1.5
 mock==5.1.0
-multidict==6.0.4
+multidict==6.0.5
 opentracing==2.4.0
-packaging==23.2
+packaging==24.0
 pluggy==1.2.0
-pytest==7.4.3
+pytest==7.4.4
 pytest-aiohttp==1.0.5
 pytest-asyncio==0.21.1
 pytest-cov==4.1.0

.riot/requirements/17d7a61.txt → .riot/requirements/1092157.txt

@@ -2,29 +2,29 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/17d7a61.in
+#    pip-compile --no-annotate .riot/requirements/1092157.in
 #
 attrs==23.2.0
-coverage[toml]==7.5.1
+coverage[toml]==7.6.0
 gevent==24.2.1
 greenlet==3.0.3
 httpretty==1.1.4
 hypothesis==6.45.0
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.0
+packaging==24.1
 pluggy==1.5.0
-pyfakefs==5.5.0
-pytest==8.2.1
-pytest-asyncio==0.21.2
+pyfakefs==5.6.0
+pytest==8.2.2
+pytest-asyncio==0.23.7
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0
 python-json-logger==2.0.7
 sortedcontainers==2.4.0
 zope-event==5.0
-zope-interface==6.4
+zope-interface==6.4.post2
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

.riot/requirements/17a929f.txt → .riot/requirements/10bdae9.txt

@@ -2,31 +2,28 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/17a929f.in
+#    pip-compile --no-annotate .riot/requirements/10bdae9.in
 #
 attrs==23.2.0
-certifi==2023.11.17
-charset-normalizer==3.3.2
+blinker==1.8.2
 click==7.1.2
-coverage[toml]==7.4.0
+coverage[toml]==7.5.4
 flask==1.1.4
-gunicorn==21.2.0
-httpretty==1.0.5
+flask-caching==1.10.1
 hypothesis==6.45.0
-idna==3.6
 iniconfig==2.0.0
 itsdangerous==1.1.0
 jinja2==2.11.3
 markupsafe==1.1.1
 mock==5.1.0
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.2.2
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
-requests==2.31.0
+python-memcached==1.62
+redis==5.0.7
 sortedcontainers==2.4.0
-urllib3==2.1.0
 werkzeug==1.0.1