Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into cbeauchesne/crash-inv…
Browse files Browse the repository at this point in the history
…estigation

# Conflicts:
#	.github/workflows/requirements-locks.yml
  • Loading branch information
juanjux committed Jul 24, 2024
2 parents 12b8d5a + 8a4c26c commit e412b7b
Show file tree
Hide file tree
Showing 344 changed files with 6,417 additions and 4,529 deletions.
1 change: 1 addition & 0 deletions .circleci/config.templ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@ jobs:
pattern: "datastreams"

tracer:
parallelism: 10
<<: *contrib_job_large
steps:
- run_test:
Expand Down
27 changes: 26 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
32 changes: 32 additions & 0 deletions .github/workflows/requirements-locks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Test Requirements Lockfiles Check
on:
push:
branches:
- main
pull_request:
types: [opened, reopened, synchronize]
jobs:
validate:
name: Check requirements lockfiles
runs-on: ubuntu-latest
container: ghcr.io/datadog/dd-trace-py/testrunner:latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Fixup git permissions
# https://github.com/actions/checkout/issues/766
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 3.12

- name: Install Dependencies
run: pip install --upgrade pip && pip install riot

- name: Generate riot locks
run: scripts/compile-and-prune-test-requirements

- name: Check git diff
run: scripts/check-diff '.riot/requirements/' 'Mismatches found between .riot/requirements/*.txt and riotfile.py. Run scripts/compile-and-prune-test-requirements and commit the result.'
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
61 changes: 0 additions & 61 deletions .riot/requirements/104310d.txt

This file was deleted.

86 changes: 0 additions & 86 deletions .riot/requirements/1070785.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
29 changes: 29 additions & 0 deletions .riot/requirements/10bdae9.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --no-annotate .riot/requirements/10bdae9.in
#
attrs==23.2.0
blinker==1.8.2
click==7.1.2
coverage[toml]==7.5.4
flask==1.1.4
flask-caching==1.10.1
hypothesis==6.45.0
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==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
python-memcached==1.62
redis==5.0.7
sortedcontainers==2.4.0
werkzeug==1.0.1
Loading

0 comments on commit e412b7b

Please sign in to comment.