Skip to content

Commit

Permalink
Merge branch 'master' into ivoanjo/remove-test-unstable-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
ivoanjo committed Jun 13, 2024
2 parents 91c884c + 66a74aa commit b8c91f0
Show file tree
Hide file tree
Showing 3,176 changed files with 170,872 additions and 170,989 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
194 changes: 12 additions & 182 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@ test_containers:
GRPC_RUBY_BUILD_PROCS: 6
DD_INSTRUMENTATION_TELEMETRY_ENABLED: false
DD_REMOTE_CONFIGURATION_ENABLED: false
TEST_REDIS_OLD_HOST: redis_old
TEST_OPENSEARCH_HOST: opensearch
TEST_OPENSEARCH_PORT: 9200
DD_AGENT_HOST: testagent
DD_TRACE_AGENT_PORT: 9126
DDTRACE_CI: true
DATADOG_GEM_CI: true
- &container_parameters_environment
- *container_base_environment
- TEST_DATADOG_INTEGRATION: 1
Expand Down Expand Up @@ -98,10 +97,6 @@ test_containers:
- &container_redis
image: redis:6.2
- &redis_port 6379
- &container_redis_old # `qless` is still using this older version of redis
image: redis:3.0
name: redis_old
- &redis_old_port 6379
- &container_mongo
image: mongo:3.5
- &mongo_port 27017
Expand Down Expand Up @@ -217,7 +212,7 @@ step_get_test_agent_trace_check_results: &step_get_test_agent_trace_check_result
RESPONSE=$(curl -s -w "\n%{http_code}" -o response.txt http://testagent:9126/test/trace_check/failures)
RESPONSE_CODE=$(echo "$RESPONSE" | awk 'END {print $NF}')
if [[ $RESPONSE_CODE -eq 200 ]]; then
echo "All APM Test Agent Check Traces returned successful! (HTTP 200)"
echo "APM Test Agent Check Traces Summary Results:"
Expand Down Expand Up @@ -261,9 +256,9 @@ orbs:
- *step_compute_bundle_checksum
- restore_cache:
keys:
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}
- *check_exact_bundle_cache_hit
- *step_bundle_install
- when:
Expand All @@ -283,7 +278,7 @@ orbs:
paths:
- /app
- save_cache:
key: bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
key: bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
paths:
- /usr/local/bundle
build_and_test_integration:
Expand Down Expand Up @@ -324,7 +319,6 @@ orbs:
- *container_opensearch
- *container_elasticsearch
- *container_redis
- *container_redis_old
- *container_mongo
- *container_memcached
- *container_testagent
Expand All @@ -335,7 +329,7 @@ orbs:
- '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
- restore_cache:
keys:
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- run:
name: Set coverage report directory
command: |
Expand All @@ -355,8 +349,6 @@ orbs:
port: *elasticsearch_port
- docker-wait:
port: *redis_port
- docker-wait:
port: *redis_old_port
- docker-wait:
port: *mongo_port
- docker-wait:
Expand All @@ -372,26 +364,6 @@ orbs:
root: .
paths:
- coverage
benchmark:
<<: *test_job_default
docker:
- <<: *container_base
- *container_postgres
- *container_redis
- *container_testagent
steps:
- restore_cache:
keys:
- '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
- restore_cache:
keys:
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- run:
name: Run Benchmark
command: bundle exec appraisal rails5-postgres-sidekiq ruby benchmarks/sidekiq_test.rb 2>&1 1> /dev/null | tee benchmark_results.csv
- run:
name: Run Benchmark without ddtracer
command: rm -f lib/ddtrace.rb && bundle exec appraisal rails5-postgres-sidekiq ruby benchmarks/sidekiq_test.rb 2>&1 1> /dev/null | tee benchmark_results.csv
lint:
<<: *test_job_default
steps:
Expand All @@ -400,7 +372,7 @@ orbs:
- '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
- restore_cache:
keys:
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- *step_rubocop
coverage:
<<: *test_job_default
Expand All @@ -410,7 +382,7 @@ orbs:
- '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
- restore_cache:
keys:
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- attach_workspace:
at: /tmp/workspace
- run:
Expand All @@ -432,7 +404,7 @@ orbs:
- '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
- restore_cache:
keys:
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
- attach_workspace:
at: /tmp/workspace
- run:
Expand Down Expand Up @@ -470,26 +442,6 @@ orbs:

job_configuration:
# MRI
- &config-2_1
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-2.1.10'
image: ghcr.io/datadog/dd-trace-rb/ruby:2.1.10-dd
resource_class_to_use: medium+
- &config-2_2
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-2.2.10'
image: ghcr.io/datadog/dd-trace-rb/ruby:2.2.10-dd
resource_class_to_use: medium+
- &config-2_3
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-2.3.8'
image: ghcr.io/datadog/dd-trace-rb/ruby:2.3.8-dd
resource_class_to_use: medium+
- &config-2_4
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-2.4.10'
image: ghcr.io/datadog/dd-trace-rb/ruby:2.4.10-dd
resource_class_to_use: medium+
- &config-2_5
<<: *filters_all_branches_and_tags
ruby_version: 'ruby-2.5.9'
Expand Down Expand Up @@ -553,10 +505,6 @@ workflows:
<<: *config-2_7-small
name: coverage
requires:
- test-2.1
- test-2.2
- test-2.3
- test-2.4
- test-2.5
- test-2.6
- test-2.7
Expand All @@ -576,39 +524,19 @@ workflows:
branches:
only: /bump_to_version_.*/
# Integration
- orb/build_and_test_integration:
name: build_and_test_integration-2.1
integration_apps: 'rack'
ruby_version: '2.1'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.2
integration_apps: 'rack'
ruby_version: '2.2'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.3
integration_apps: 'rack'
ruby_version: '2.3'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.4
integration_apps: 'rack'
ruby_version: '2.4'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.5
integration_apps: 'rack rails-five rails-six'
ruby_version: '2.5'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.6
integration_apps: 'rack rails-five rails-six sinatra2-classic sinatra2-modular'
integration_apps: 'rack rails-five rails-six sinatra2-classic sinatra2-modular hanami'
ruby_version: '2.6'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.7
integration_apps: 'rack rails-five rails-six rails-seven sinatra2-classic sinatra2-modular'
integration_apps: 'rack rails-five rails-six rails-seven sinatra2-classic sinatra2-modular hanami'
ruby_version: '2.7'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
Expand All @@ -634,43 +562,6 @@ workflows:
# ⬆️ **Note**: If add/remove test apps above, remember to also copy-paste the changes to the "edge" workflow further down the file.
#
# ADD NEW RUBIES HERE
- orb/build:
<<: *config-2_1
name: build-2.1
- orb/test:
<<: *config-2_1
name: test-2.1
requires:
- build-2.1
- orb/build:
<<: *config-2_2
name: build-2.2
- orb/test:
<<: *config-2_2
name: test-2.2
requires:
- build-2.2
- orb/build:
<<: *config-2_3
name: build-2.3
- orb/test:
<<: *config-2_3
name: test-2.3
requires:
- build-2.3
- orb/benchmark:
<<: *config-2_3
name: benchmark-2.3
requires:
- build-2.3
- orb/build:
<<: *config-2_4
name: build-2.4
- orb/test:
<<: *config-2_4
name: test-2.4
requires:
- build-2.4
- orb/build:
<<: *config-2_5
name: build-2.5
Expand Down Expand Up @@ -757,26 +648,6 @@ workflows:
- master
jobs:
# Integration
- orb/build_and_test_integration:
name: build_and_test_integration-2.1
integration_apps: 'rack'
ruby_version: '2.1'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.2
integration_apps: 'rack'
ruby_version: '2.2'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.3
integration_apps: 'rack rails-five'
ruby_version: '2.3'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.4
integration_apps: 'rack rails-five'
ruby_version: '2.4'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.5
integration_apps: 'rack rails-five rails-six'
Expand Down Expand Up @@ -813,47 +684,6 @@ workflows:
ruby_version: '3.3'
<<: *filters_all_branches_and_tags
# ADD NEW RUBIES HERE
- orb/build:
<<: *config-2_1
name: build-2.1
edge: true
- orb/test:
<<: *config-2_1
name: test-2.1
requires:
- build-2.1
- orb/build:
<<: *config-2_2
name: build-2.2
edge: true
- orb/test:
<<: *config-2_2
name: test-2.2
requires:
- build-2.2
- orb/build:
<<: *config-2_3
name: build-2.3
edge: true
- orb/test:
<<: *config-2_3
name: test-2.3
requires:
- build-2.3
- orb/benchmark:
<<: *config-2_3
name: benchmark-2.3
requires:
- build-2.3
- orb/build:
<<: *config-2_4
name: build-2.4
edge: true
- orb/test:
<<: *config-2_4
name: test-2.4
requires:
- build-2.4
- orb/build:
<<: *config-2_5
name: build-2.5
Expand Down
Loading

0 comments on commit b8c91f0

Please sign in to comment.