Skip to content

Commit

Permalink
Merge branch 'main' into upgrade-tornado-version
Browse files Browse the repository at this point in the history
  • Loading branch information
taegyunkim authored Sep 6, 2024
2 parents 59ff716 + dafd6db commit 3c53120
Show file tree
Hide file tree
Showing 439 changed files with 8,706 additions and 7,689 deletions.
275 changes: 0 additions & 275 deletions .circleci/config.templ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -646,33 +646,6 @@ jobs:
snapshot: true
docker_services: 'httpbin_local'

asgi:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'asgi$'

tornado:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'tornado'

bottle:
<<: *contrib_job_small
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'bottle'

cassandra:
<<: *contrib_job
docker:
Expand Down Expand Up @@ -708,14 +681,6 @@ jobs:
- run_test:
pattern: 'celery'

cherrypy:
<<: *machine_executor
parallelism: 2
steps:
- run_test:
pattern: 'cherrypy'
snapshot: true

consul:
<<: *contrib_job_small
docker:
Expand All @@ -726,15 +691,6 @@ jobs:
- run_test:
pattern: 'consul'

dogpile_cache:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'dogpile_cache'

elasticsearch:
<<: *machine_executor
parallelism: 17
Expand All @@ -744,15 +700,6 @@ jobs:
snapshot: true
docker_services: 'elasticsearch opensearch'

falcon:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'falcon'

django:
<<: *machine_executor
parallelism: 4
Expand Down Expand Up @@ -798,47 +745,6 @@ jobs:
pattern: "flask"
docker_services: "memcached redis"

gevent:
<<: *contrib_job_small
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'gevent'

graphene:
<<: *machine_executor
steps:
- run_test:
pattern: "graphene"
snapshot: true

graphql:
<<: *machine_executor
parallelism: 6
steps:
- run_test:
pattern: "graphql"
snapshot: true

grpc:
<<: *machine_executor
parallelism: 2
steps:
- run_test:
pattern: "grpc"
snapshot: true

gunicorn:
<<: *machine_executor
parallelism: 8
steps:
- run_test:
pattern: "gunicorn"
snapshot: true
docker_services: 'ddagent'

httplib:
<<: *machine_executor
steps:
Expand All @@ -865,15 +771,6 @@ jobs:
snapshot: true
docker_services: "mariadb"

molten:
<<: *contrib_job_small
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'molten'

mysqlconnector:
<<: *contrib_job
docker:
Expand Down Expand Up @@ -933,13 +830,6 @@ jobs:
env: 'pytest_plugin_v2'
snapshot: true

unittest:
<<: *machine_executor
steps:
- run_test:
pattern: 'unittest'
snapshot: true

asynctest:
executor: ddtrace_dev
steps:
Expand Down Expand Up @@ -974,31 +864,6 @@ jobs:
- run_test:
pattern: "pymongo"

pynamodb:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: "pynamodb"

pyodbc:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'pyodbc'

pyramid:
<<: *machine_executor
steps:
- run_test:
pattern: 'pyramid'
snapshot: true

requests:
<<: *contrib_job
docker:
Expand All @@ -1009,37 +874,6 @@ jobs:
- run_test:
pattern: "requests"

sanic:
<<: *machine_executor
parallelism: 4
steps:
- run_test:
pattern: "sanic"
snapshot: true

snowflake:
<<: *machine_executor
parallelism: 4
steps:
- run_test:
pattern: "snowflake"
snapshot: true

starlette:
<<: *machine_executor
parallelism: 2
steps:
- run_test:
pattern: "starlette"
snapshot: true

structlog:
<<: *machine_executor
steps:
- run_test:
pattern: 'structlog'
snapshot: true

sqlalchemy:
<<: *contrib_job_small
docker:
Expand Down Expand Up @@ -1093,72 +927,6 @@ jobs:
wait: postgres
pattern: 'aiopg'

aredis:
<<: *machine_executor
steps:
- run_test:
docker_services: 'redis'
pattern: 'aredis$'
snapshot: true

yaaredis:
<<: *machine_executor
steps:
- run_test:
docker_services: 'redis'
pattern: 'yaaredis$'
snapshot: true

redis:
<<: *machine_executor
parallelism: 5
steps:
- run_test:
docker_services: 'redis rediscluster'
pattern: 'redis$'
snapshot: true

rediscluster:
<<: *machine_executor
steps:
- run_test:
pattern: 'rediscluster'
docker_services: 'rediscluster'
snapshot: true

rq:
<<: *machine_executor
parallelism: 2
steps:
- run_test:
pattern: "rq"
snapshot: true
docker_services: "redis"

urllib3:
<<: *machine_executor
steps:
- run_test:
pattern: 'urllib3'
snapshot: true
docker_services: "httpbin_local"

wsgi:
<<: *machine_executor
steps:
- run_test:
pattern: "wsgi"
snapshot: true

kafka:
<<: *machine_executor
parallelism: 4
steps:
- run_test:
pattern: 'kafka'
snapshot: true
docker_services: 'kafka'

kombu:
<<: *contrib_job
docker:
Expand All @@ -1170,33 +938,6 @@ jobs:
wait: rabbitmq
pattern: 'kombu'

jinja2:
<<: *contrib_job_small
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'jinja2'

mako:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'mako'

algoliasearch:
<<: *contrib_job
docker:
- image: *ddtrace_dev_image
- *testagent
steps:
- run_test:
pattern: 'algoliasearch'

langchain:
<<: *machine_executor
parallelism: 6
Expand Down Expand Up @@ -1240,22 +981,6 @@ jobs:
- store_artifacts:
path: /tmp/docs

slotscheck:
executor: python310
steps:
- checkout
- setup_rust
- setup_hatch
- run: hatch run slotscheck:_

conftests:
executor: python310
steps:
- checkout
- setup_rust
- setup_hatch
- run: hatch run meta-testing:meta-testing

requires_pre_check: &requires_pre_check
requires:
- pre_check
Expand Down
4 changes: 3 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ tests/contrib/pytest @DataDog/ci-app-libraries
tests/contrib/pytest_bdd @DataDog/ci-app-libraries
tests/contrib/unittest_plugin @DataDog/ci-app-libraries
ddtrace/ext/ci.py @DataDog/ci-app-libraries
ddtrace/ext/ci_visibility @DataDog/ci-app-libraries
ddtrace/ext/test_visibility @DataDog/ci-app-libraries
ddtrace/ext/test.py @DataDog/ci-app-libraries
ddtrace/internal/ci_visibility @DataDog/ci-app-libraries
ddtrace/internal/test_visibility @DataDog/ci-app-libraries
ddtrace/internal/codeowners.py @DataDog/apm-core-python @datadog/ci-app-libraries
ddtrace/internal/coverage @DataDog/apm-core-python @datadog/ci-app-libraries
tests/internal/test_codeowners.py @datadog/ci-app-libraries
Expand Down Expand Up @@ -112,6 +113,7 @@ ddtrace/profiling @DataDog/profiling-python
ddtrace/settings/profiling.py @DataDog/profiling-python
ddtrace/internal/datadog/profiling @DataDog/profiling-python
tests/profiling @DataDog/profiling-python
tests/profiling-v2 @DataDog/profiling-python
.gitlab/tests/profiling.yml @DataDog/profiling-python

# MLObs
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ jobs:
backport:
name: Backport
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
# Only react to merged PRs for security reasons.
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
if: >
Expand Down
Loading

0 comments on commit 3c53120

Please sign in to comment.