Skip to content

Commit

Permalink
Merge branch 'master' into feat-Sampling-Propagation
Browse files Browse the repository at this point in the history
  • Loading branch information
marcotc committed Nov 7, 2022
2 parents 8937ec9 + f4791d1 commit f58ccad
Show file tree
Hide file tree
Showing 546 changed files with 16,424 additions and 7,808 deletions.
51 changes: 32 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ test_containers:
- DD_APM_ENABLED=true
- DD_BIND_HOST=0.0.0.0
- DD_API_KEY=00000000000000000000000000000000
- DD_HOSTNAME=dd-trace-rb-ci
- &agent_port 8126

check_exact_bundle_cache_hit: &check_exact_bundle_cache_hit
Expand Down Expand Up @@ -518,7 +519,7 @@ job_configuration:
- &config-3_2
<<: *filters_all_branches_and_tags
ruby_version: '3.2'
image: ivoanjo/docker-library:ddtrace_rb_3_2_0_preview1
image: ivoanjo/docker-library:ddtrace_rb_3_2_0_preview2
resource_class_to_use: medium+
# ADD NEW RUBIES HERE
- &config-jruby-9_2_8_0 # Test with older 9.2 release because 9.2.9.0 changed behavior, see https://github.com/DataDog/dd-trace-rb/pull/1409
Expand Down Expand Up @@ -630,14 +631,14 @@ workflows:
integration_apps: 'rack rails-six rails-seven sinatra2-classic sinatra2-modular'
ruby_version: '3.1'
<<: *filters_all_branches_and_tags
# TODO: Re-enable once 3.2 testing is green!
# - orb/build_and_test_integration:
# name: build_and_test_integration-3.2
# integration_apps: 'rack rails-six rails-seven'
# ruby_version: '3.2'
# <<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-3.2
integration_apps: 'rack rails-six rails-seven sinatra2-classic sinatra2-modular'
ruby_version: '3.2'
<<: *filters_all_branches_and_tags
# ⬆️ **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
# MRI
- orb/build:
<<: *config-2_1
name: build-2.1
Expand Down Expand Up @@ -842,35 +843,34 @@ workflows:
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-2.6
integration_apps: 'rack rails-five rails-six'
integration_apps: 'rack rails-five rails-six sinatra2-classic sinatra2-modular'
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'
integration_apps: 'rack rails-five rails-six rails-seven sinatra2-classic sinatra2-modular'
ruby_version: '2.7'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-3.0
integration_apps: 'rack rails-six rails-seven'
integration_apps: 'rack rails-six rails-seven sinatra2-classic sinatra2-modular'
ruby_version: '3.0'
<<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-3.1
integration_apps: 'rack rails-six rails-seven'
integration_apps: 'rack rails-six rails-seven sinatra2-classic sinatra2-modular'
ruby_version: '3.1'
<<: *filters_all_branches_and_tags
# TODO: Re-enable once 3.2 testing is green!
# - orb/build_and_test_integration:
# name: build_and_test_integration-3.2
# integration_apps: 'rack rails-six rails-seven'
# ruby_version: '3.2'
# <<: *filters_all_branches_and_tags
- orb/build_and_test_integration:
name: build_and_test_integration-3.2
integration_apps: 'rack rails-six rails-seven sinatra2-classic sinatra2-modular'
ruby_version: '3.2'
<<: *filters_all_branches_and_tags
# ADD NEW RUBIES HERE
# MRI
- orb/build:
<<: *config-2_1
name: build-2.1
edge: true
- orb/test:
<<: *config-2_1
name: test-2.1
Expand All @@ -879,6 +879,7 @@ workflows:
- orb/build:
<<: *config-2_2
name: build-2.2
edge: true
- orb/test:
<<: *config-2_2
name: test-2.2
Expand All @@ -887,6 +888,7 @@ workflows:
- orb/build:
<<: *config-2_3
name: build-2.3
edge: true
- orb/test:
<<: *config-2_3
name: test-2.3
Expand All @@ -900,6 +902,7 @@ workflows:
- orb/build:
<<: *config-2_4
name: build-2.4
edge: true
- orb/test:
<<: *config-2_4
name: test-2.4
Expand All @@ -908,6 +911,7 @@ workflows:
- orb/build:
<<: *config-2_5
name: build-2.5
edge: true
- orb/test:
<<: *config-2_5
name: test-2.5
Expand All @@ -916,6 +920,7 @@ workflows:
- orb/build:
<<: *config-2_6
name: build-2.6
edge: true
- orb/test:
<<: *config-2_6
name: test-2.6
Expand All @@ -924,6 +929,7 @@ workflows:
- orb/build:
<<: *config-2_7
name: build-2.7
edge: true
- orb/test:
<<: *config-2_7
name: test-2.7
Expand All @@ -932,6 +938,7 @@ workflows:
- orb/build:
<<: *config-3_0
name: build-3.0
edge: true
- orb/test:
<<: *config-3_0
name: test-3.0
Expand All @@ -940,6 +947,7 @@ workflows:
- orb/build:
<<: *config-3_1
name: build-3.1
edge: true
- orb/test:
<<: *config-3_1
name: test-3.1
Expand All @@ -948,6 +956,7 @@ workflows:
- orb/build:
<<: *config-3_2
name: build-3.2
edge: true
# TODO: Re-enable once 3.2 testing is green!
# - orb/test:
# <<: *config-3_2
Expand All @@ -958,6 +967,7 @@ workflows:
- orb/build:
<<: *config-jruby-9_2_8_0
name: build-jruby-9.2.8.0
edge: true
- orb/test:
<<: *config-jruby-9_2_8_0
name: test-jruby-9.2.8.0
Expand All @@ -966,6 +976,7 @@ workflows:
- orb/build:
<<: *config-jruby-9_2-latest
name: build-jruby-9.2-latest
edge: true
- orb/test:
<<: *config-jruby-9_2-latest
name: test-jruby-9.2-latest
Expand All @@ -974,6 +985,7 @@ workflows:
- orb/build:
<<: *config-jruby-9_3-latest
name: build-jruby-9.3-latest
edge: true
- orb/test:
<<: *config-jruby-9_3-latest
name: test-jruby-9.3-latest
Expand All @@ -984,6 +996,7 @@ workflows:
# - orb/build:
# <<: *config-truffleruby-21_0_0
# name: build-truffleruby-21.0.0
# edge: true
# - orb/test:
# <<: *config-truffleruby-21_0_0
# name: test-truffleruby-21.0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This image supports multiple platforms, see README for build instructions

FROM ruby:3.2.0-preview1-bullseye
FROM ruby:3.2.0-preview2-bullseye

# Make apt non-interactive
RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
Expand Down
45 changes: 45 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Configuration for GitHub Action `.github/workflows/pull-request-labeler.yml`.
# See https://github.com/marketplace/actions/labeler for more information.

core:
- any: [ 'lib/datadog/core/**' ]

# Only documentation changes
docs:
- all: [ '**/*.md' ]

# Only test changes
dev/testing:
- all: [ '{spec/**,integration/**,benchmarks/**,sorbet/**}' ]

# Changes to Profiling
profiling:
- any: [ '{lib/datadog/profiling/**,ext/ddtrace_profiling_loader/**,ext/ddtrace_profiling_native_extension/**}' ]

# Changes to CI-App
ci-app:
- any: [ 'lib/datadog/ci/**' ]

# Changes to ASM
appsec:
- any: [ 'lib/datadog/appsec/**' ]

# Changes to Tracing
tracing:
- any: [ 'lib/datadog/tracing/**' ]

# Changes to Tracing integrations
integrations:
- any: [ '{lib/datadog/tracing/contrib/**,lib/datadog/appsec/contrib/**}' ]

# Only repository GitHub changes
dev/github:
- all: [ '.github/**' ]

# Only repository CI changes
dev/ci:
- all: [ '{.circleci/**,.gitlab-ci.yml}' ]

# Version bump pull request
release:
- all: [ '{CHANGELOG.md,lib/ddtrace/version.rb}' ]
16 changes: 16 additions & 0 deletions .github/workflows/pull-request-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Pull Request Labeler"
on:
- pull_request_target

jobs:
triage:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: kachkaev/labeler@d89797c51d07680aec17049cc6790e9d323d9a93 # actions/labeler@v4 + https://github.com/actions/labeler/pull/316
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler.yml
dot: true # From https://github.com/actions/labeler/pull/316
6 changes: 3 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ AllCops:
- 'lib/datadog/**/vendor/**/*.rb'
- 'integration/apps/*/bin/*'
- 'integration/apps/*/Gemfile'
- 'integration/apps/hanami/Rakefile'
- 'lib/datadog/profiling/pprof/pprof_pb.rb'
- 'spec/**/**/interesting_backtrace_helper.rb' # This file needs quite a few bizarre code patterns by design
NewCops: disable # Don't allow new cops to be enabled implicitly.
Expand Down Expand Up @@ -61,7 +62,7 @@ Style/NumericLiterals:
Enabled: false

Metrics/ClassLength:
Max: 140
Enabled: false

Metrics/BlockLength:
Max: 42
Expand All @@ -70,8 +71,7 @@ Metrics/BlockLength:
- spec/**/*

Metrics/ModuleLength:
Exclude:
- spec/**/*
Enabled: false

Metrics/ParameterLists:
Enabled: false
Expand Down
Loading

0 comments on commit f58ccad

Please sign in to comment.