diff --git a/.circleci/config.yml b/.circleci/config.yml index ffdd286681c..0f366f45637 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,7 @@ test_containers: 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 @@ -256,9 +256,9 @@ orbs: - *step_compute_bundle_checksum - restore_cache: keys: - - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} - - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}- - - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/ddtrace/version.rb" }} + - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} + - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}- + - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/datadog/version.rb" }} - *check_exact_bundle_cache_hit - *step_bundle_install - when: @@ -278,7 +278,7 @@ orbs: paths: - /app - save_cache: - key: bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} + key: bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} paths: - /usr/local/bundle build_and_test_integration: @@ -329,7 +329,7 @@ orbs: - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<>-{{ .Environment.CIRCLE_SHA1 }}' - restore_cache: keys: - - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} + - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} - run: name: Set coverage report directory command: | @@ -372,7 +372,7 @@ orbs: - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<>-{{ .Environment.CIRCLE_SHA1 }}' - restore_cache: keys: - - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} + - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} - *step_rubocop coverage: <<: *test_job_default @@ -382,7 +382,7 @@ orbs: - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<>-{{ .Environment.CIRCLE_SHA1 }}' - restore_cache: keys: - - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} + - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} - attach_workspace: at: /tmp/workspace - run: @@ -404,7 +404,7 @@ orbs: - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<>-{{ .Environment.CIRCLE_SHA1 }}' - restore_cache: keys: - - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} + - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }} - attach_workspace: at: /tmp/workspace - run: diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 3ad5383a752..b66ea2a0307 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -19,12 +19,12 @@ assignees: '' Code snippets, log messages, screenshots and sample apps are encouraged! --> -**How does `ddtrace` help you?** - +**How does `datadog` help you?** + **Environment** -* **ddtrace version:** +* **datadog version:** * **Configuration block (`Datadog.configure ...`):** * **Ruby version:** * **Operating system:** diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 22e472d84d0..65f5adfae7f 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -19,5 +19,5 @@ assignees: '' **Additional context** -**How does `ddtrace` help you?** - +**How does `datadog` help you?** + diff --git a/.github/labeler.yml b/.github/labeler.yml index 9ee792b8654..0682e28f7bd 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -42,4 +42,4 @@ dev/ci: # Version bump pull request release: - - all: [ '{CHANGELOG.md,lib/ddtrace/version.rb}' ] + - all: [ '{CHANGELOG.md,lib/datadog/version.rb}' ] diff --git a/.github/workflows/build-gem.yml b/.github/workflows/build-gem.yml index 9b56d8cd372..0a31da95e27 100644 --- a/.github/workflows/build-gem.yml +++ b/.github/workflows/build-gem.yml @@ -50,10 +50,10 @@ jobs: if: ${{ matrix.type != 'final' }} run: | # Patch in GEM_HOST - sed ddtrace.gemspec -i -e "s,^\([\t ]*spec\.metadata\['allowed_push_host'\]\) *= *,\1 = \'${GEM_HOST}\' # ," + sed datadog.gemspec -i -e "s,^\([\t ]*spec\.metadata\['allowed_push_host'\]\) *= *,\1 = \'${GEM_HOST}\' # ," # Test result - cat ddtrace.gemspec | grep -e allowed_push_host + cat datadog.gemspec | grep -e allowed_push_host - name: Build gem run: bundle exec rake build - name: List gem @@ -62,7 +62,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: 'ddtrace-gem-${{ matrix.type }}-gha${{ github.run_id }}-g${{ github.sha }}' + name: 'datadog-gem-${{ matrix.type }}-gha${{ github.run_id }}-g${{ github.sha }}' path: 'pkg/*.gem' test: strategy: @@ -79,7 +79,7 @@ jobs: - name: Download artifact uses: actions/download-artifact@v3 with: - name: 'ddtrace-gem-${{ matrix.type }}-gha${{ github.run_id }}-g${{ github.sha }}' + name: 'datadog-gem-${{ matrix.type }}-gha${{ github.run_id }}-g${{ github.sha }}' path: 'pkg' - name: List gem run: | @@ -105,7 +105,7 @@ jobs: - name: Download artifact uses: actions/download-artifact@v3 with: - name: 'ddtrace-gem-${{ matrix.type }}-gha${{ github.run_id }}-g${{ github.sha }}' + name: 'datadog-gem-${{ matrix.type }}-gha${{ github.run_id }}-g${{ github.sha }}' path: 'pkg' - name: List gem run: | diff --git a/.github/workflows/lib-injection.yml b/.github/workflows/lib-injection.yml index 73bccaf8cab..308cc1457d1 100644 --- a/.github/workflows/lib-injection.yml +++ b/.github/workflows/lib-injection.yml @@ -21,7 +21,7 @@ jobs: push: true tags: ghcr.io/datadog/dd-trace-rb/dd-lib-ruby-init:${{ github.sha }} platforms: 'linux/amd64,linux/arm64/v8' - build-args: DDTRACE_RUBY_SHA=${{ github.sha }} + build-args: DATADOG_RUBY_GEM_SHA=${{ github.sha }} context: ./lib-injection test: @@ -76,8 +76,8 @@ jobs: path: system-tests - name: Overwrite auto inject script with commit SHA run: | - sed -i "s~~${{github.sha}}~g" lib-injection/auto_inject.rb - sed -i "s~~~g" lib-injection/auto_inject.rb + sed -i "s~~${{github.sha}}~g" lib-injection/auto_inject.rb + sed -i "s~~~g" lib-injection/auto_inject.rb - name: Build app run: | cp -r system-tests/lib-injection/build/docker/ruby/lib_injection_rails_app system-tests/lib-injection/build/docker/ruby/${{matrix.variant}} diff --git a/.github/workflows/release-lib-injection.yml b/.github/workflows/release-lib-injection.yml index 8ffe99570e9..43c9ec24746 100644 --- a/.github/workflows/release-lib-injection.yml +++ b/.github/workflows/release-lib-injection.yml @@ -28,6 +28,6 @@ jobs: push: true tags: ghcr.io/datadog/dd-trace-rb/dd-lib-ruby-init:${{ steps.version.outputs.version }} platforms: 'linux/amd64,linux/arm64/v8' - build-args: DDTRACE_RUBY_VERSION=${{ steps.version.outputs.version }} + build-args: DATADOG_RUBY_GEM_VERSION=${{ steps.version.outputs.version }} context: ./lib-injection diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index c5781ef9dc3..9fb9a285c58 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -25,6 +25,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'DataDog/system-tests' + ref: 'tonycthsu/ruby-datadog-rename' - name: Pull released image run: | docker pull ghcr.io/datadog/dd-trace-rb/system-tests/${{ matrix.image }}:latest @@ -78,6 +79,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'DataDog/system-tests' + ref: 'tonycthsu/ruby-datadog-rename' - name: Checkout dd-trace-rb uses: actions/checkout@v4 with: @@ -200,6 +202,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'DataDog/system-tests' + ref: 'tonycthsu/ruby-datadog-rename' - name: Pull agent image run: | docker pull ghcr.io/datadog/dd-trace-rb/system-tests/agent:gha${{ github.run_id }}-g${{ github.sha }} @@ -268,6 +271,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'DataDog/system-tests' + ref: 'tonycthsu/ruby-datadog-rename' - name: Retrieve logs uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/test-head.yaml b/.github/workflows/test-head.yaml index f933e5ab5cc..f01f50d0d54 100644 --- a/.github/workflows/test-head.yaml +++ b/.github/workflows/test-head.yaml @@ -17,7 +17,7 @@ jobs: # bundler appears to match both prerelease and release rubies when we # want the former only. relax the constraint to allow any version for # head rubies - - run: sed -i~ -e '/spec\.required_ruby_version/d' ddtrace.gemspec + - run: sed -i~ -e '/spec\.required_ruby_version/d' datadog.gemspec - uses: ruby/setup-ruby@31a7f6d628878b80bc63375a93ae079ec50a1601 # v1.143.0 with: ruby-version: ${{ matrix.ruby }} @@ -27,7 +27,7 @@ jobs: continue-on-error: true - run: bundle exec rake spec:contrib continue-on-error: true - # A few contrib jobs that `ddtrace` already includes their gem in the global Gemfile. + # A few contrib jobs that `datadog` already includes their gem in the global Gemfile. # We technically don't need appraisal to run them, thus are easy candidates for early testing. - run: bundle exec rake spec:rake continue-on-error: true diff --git a/.github/workflows/test-macos.yaml b/.github/workflows/test-macos.yaml index f415ce7e454..87d4c10f6ea 100644 --- a/.github/workflows/test-macos.yaml +++ b/.github/workflows/test-macos.yaml @@ -34,7 +34,7 @@ jobs: # want the former only. relax the constraint to allow any version for # head rubies - if: ${{ matrix.ruby == 'head' }} - run: sed -i~ -e '/spec\.required_ruby_version/d' ddtrace.gemspec + run: sed -i~ -e '/spec\.required_ruby_version/d' datadog.gemspec - uses: ruby/setup-ruby@7d546f4868fb108ed378764d873683f920672ae2 # v1.149.0 with: ruby-version: ${{ matrix.ruby }} diff --git a/.github/workflows/test-yjit.yaml b/.github/workflows/test-yjit.yaml index 0b1e39fac0a..fe9d7c0e83d 100644 --- a/.github/workflows/test-yjit.yaml +++ b/.github/workflows/test-yjit.yaml @@ -23,7 +23,7 @@ jobs: # want the former only. relax the constraint to allow any version for # head rubies - if: ${{ matrix.ruby == 'head' }} - run: sed -i~ -e '/spec\.required_ruby_version/d' ddtrace.gemspec + run: sed -i~ -e '/spec\.required_ruby_version/d' datadog.gemspec - uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 with: ruby-version: ${{ matrix.ruby }} diff --git a/.github/workflows/update-gemfiles.yml b/.github/workflows/update-gemfiles.yml index 17d61cd72cf..95269bf3f85 100644 --- a/.github/workflows/update-gemfiles.yml +++ b/.github/workflows/update-gemfiles.yml @@ -50,12 +50,12 @@ jobs: # Files that declare the dependency tree - Gemfile - Appraisals - - ddtrace.gemspec + - datadog.gemspec # Files that control gemfile generation - tasks/appraisal.rake - .github/workflows/update-gemfiles.yml # The gem version is present in all lock files - - lib/ddtrace/version.rb + - lib/datadog/version.rb # In case the generated files were updated manually or in a merge commit - appraisal/** - gemfiles/** diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0e71fe2e05..e875070142a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,12 +91,12 @@ build-gem: .gitlab/patch_gem_version.sh glci $CI_JOB_ID $CI_COMMIT_REF_NAME $CI_COMMIT_SHA fi - bundle install && bundle exec rake build - - mkdir -p tmp && ruby -Ilib -rddtrace/version -e 'puts Gem::Version.new(DDTrace::VERSION::STRING).to_s' >> tmp/version.txt + - mkdir -p tmp && ruby -Ilib -rdatadog/version -e 'puts Gem::Version.new(Datadog::VERSION::STRING).to_s' >> tmp/version.txt artifacts: paths: - pkg - tmp - - lib/ddtrace/version.rb + - lib/datadog/version.rb .install-dependencies: parallel: @@ -107,13 +107,13 @@ build-gem: - build-gem script: - export RUBY_PACKAGE_VERSION=$(cat tmp/version.txt) - - export DDTRACE_GEM_LOCATION=$(readlink -f pkg/ddtrace-*.gem) - - ruby .gitlab/install_ddtrace_deps.rb + - export DATADOG_GEM_LOCATION=$(readlink -f pkg/datadog-*.gem) + - ruby .gitlab/install_datadog_deps.rb artifacts: paths: - pkg - tmp - - lib/ddtrace/version.rb + - lib/datadog/version.rb install-dependencies-amd64: extends: .install-dependencies diff --git a/.gitlab/benchmarks.yml b/.gitlab/benchmarks.yml index 323c4cd8f07..5efa09c71dc 100644 --- a/.gitlab/benchmarks.yml +++ b/.gitlab/benchmarks.yml @@ -31,6 +31,8 @@ variables: DD_TRACE_DEBUG: "false" DD_RUNTIME_METRICS_ENABLED: "true" + # DEV: This variable is consumed by the reliability environment + # (TODO) Update this variable to reflect "DATADOG" instead of "DDTRACE" as a name? DD_RELENV_DDTRACE_COMMIT_ID: $CI_COMMIT_SHORT_SHA K6_OPTIONS_NORMAL_OPERATION_RATE: 30 diff --git a/.gitlab/check_gem_presence.sh b/.gitlab/check_gem_presence.sh index 919cce066e7..2e68fe4829f 100755 --- a/.gitlab/check_gem_presence.sh +++ b/.gitlab/check_gem_presence.sh @@ -10,7 +10,7 @@ interval=60 # Retry after 60 seconds attempt=1 while [ $attempt -le $max_attempts ]; do - output=$(gem search ddtrace -e -v $RUBY_PACKAGE_VERSION | { grep $RUBY_PACKAGE_VERSION || :; }) + output=$(gem search datadog -e -v $RUBY_PACKAGE_VERSION | { grep $RUBY_PACKAGE_VERSION || :; }) if [ -z "$output" ] then echo "Attempt ${attempt}/${max_attempts}: Not found yet." diff --git a/.gitlab/install_ddtrace_deps.rb b/.gitlab/install_datadog_deps.rb similarity index 91% rename from .gitlab/install_ddtrace_deps.rb rename to .gitlab/install_datadog_deps.rb index 8ed7a55c889..0d01e476db6 100755 --- a/.gitlab/install_ddtrace_deps.rb +++ b/.gitlab/install_datadog_deps.rb @@ -18,7 +18,7 @@ File.open(gemfile_file_path, 'w') do |file| file.write("source 'https://rubygems.org'\n") - file.write("gem 'ddtrace', '#{ENV.fetch('RUBY_PACKAGE_VERSION')}', path: '#{current_path}'") + file.write("gem 'datadog', '#{ENV.fetch('RUBY_PACKAGE_VERSION')}', path: '#{current_path}'") end puts '=== Reading Gemfile ===' @@ -59,11 +59,11 @@ gem_install_cmd << "--install-dir #{versioned_path} " # Install `ffi` gem with its built-in `libffi` native extension instead of using system's `libffi` gem_install_cmd << '-- --disable-system-libffi ' - when 'ddtrace' - # Install `ddtrace` gem locally without its profiling native extension + when 'datadog' + # Install `datadog` gem locally without its profiling native extension env['DD_PROFILING_NO_EXTENSION'] = 'true' gem_install_cmd = - "gem install --local #{ENV.fetch('DDTRACE_GEM_LOCATION')} "\ + "gem install --local #{ENV.fetch('DATADOG_GEM_LOCATION')} "\ '--no-document '\ '--ignore-dependencies '\ "--install-dir #{versioned_path} " diff --git a/.gitlab/patch_gem_version.sh b/.gitlab/patch_gem_version.sh index c5f7c639eee..0dd709f58d8 100755 --- a/.gitlab/patch_gem_version.sh +++ b/.gitlab/patch_gem_version.sh @@ -30,11 +30,11 @@ BUILD="b${git_branch_hash}.${1}${2}.g${git_short_sha}" echo BUILD="${BUILD}" # Patch in components -sed lib/ddtrace/version.rb -i -e "s/^\([\t ]*PRE\) *= */\1 = \'${PRE}\' # /" -sed lib/ddtrace/version.rb -i -e "s/^\([\t ]*BUILD\) *= */\1 = \'${BUILD}\' # /" +sed lib/datadog/version.rb -i -e "s/^\([\t ]*PRE\) *= */\1 = \'${PRE}\' # /" +sed lib/datadog/version.rb -i -e "s/^\([\t ]*BUILD\) *= */\1 = \'${BUILD}\' # /" # Test result -cat lib/ddtrace/version.rb | grep -e PRE -e BUILD +cat lib/datadog/version.rb | grep -e PRE -e BUILD -ruby -Ilib -rddtrace/version -e 'puts DDTrace::VERSION::STRING' -ruby -Ilib -rddtrace/version -e 'puts Gem::Version.new(DDTrace::VERSION::STRING).to_s' +ruby -Ilib -rdatadog/version -e 'puts Datadog::VERSION::STRING' +ruby -Ilib -rdatadog/version -e 'puts Gem::Version.new(Datadog::VERSION::STRING).to_s' diff --git a/.rubocop.yml b/.rubocop.yml index b3e744063f9..a26c044da4c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -17,7 +17,6 @@ AllCops: - 'Rakefile' Exclude: - 'Appraisals' - - 'lib/ddtrace/**/vendor/**/*.rb' - 'lib/datadog/**/vendor/**/*.rb' - 'integration/apps/*/bin/*' - 'integration/apps/*/Gemfile' @@ -344,10 +343,6 @@ RSpec/AnyInstance: Enabled: false # Enforces strict matching of example class with spec file name. -# This does not work for our current namespacing as our gem is called -# `ddtrace` while our namespace is `::Datadog`. -# It would have to either be `ddtrace` + `::DDTrace` or -# `datadog` + `::Datadog`. RSpec/FilePath: Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 5cc84ab623b..99797623fbf 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -57,12 +57,12 @@ Naming/FileName: - 'lib/datadog/tracing/contrib/rails/middlewares.rb' - 'lib/datadog/tracing/contrib/rails/railtie.rb' - 'lib/datadog/tracing/propagation/http.rb' - - 'lib/ddtrace.rb' - - 'lib/ddtrace/auto_instrument.rb' - - 'lib/ddtrace/auto_instrument_base.rb' - - 'lib/ddtrace/profiling/preload.rb' - - 'lib/ddtrace/transport/ext.rb' - - 'lib/ddtrace/version.rb' + - 'lib/datadog.rb' + - 'lib/datadog/auto_instrument.rb' + - 'lib/datadog/auto_instrument_base.rb' + - 'lib/datadog/profiling/preload.rb' + - 'lib/datadog/transport/ext.rb' + - 'lib/datadog/version.rb' # Offense count: 1 RSpec/IteratedExpectation: diff --git a/.simplecov b/.simplecov index edab486a4e5..3a0bedf1a4c 100644 --- a/.simplecov +++ b/.simplecov @@ -4,8 +4,8 @@ SimpleCov.enable_coverage :branch if RUBY_VERSION >= '2.5.0' # Categorize SimpleCov report, for easier reading -SimpleCov.add_group 'contrib', '/lib/ddtrace/contrib' -SimpleCov.add_group 'transport', '/lib/ddtrace/transport' +SimpleCov.add_group 'contrib', '/lib/datadog/tracing/contrib' +SimpleCov.add_group 'transport', '/lib/datadog/core/transport' SimpleCov.add_group 'spec', '/spec/' # Exclude code not maintained by this project diff --git a/.yardopts b/.yardopts index bc40efe4e4a..44580af3ef2 100644 --- a/.yardopts +++ b/.yardopts @@ -1,4 +1,4 @@ ---title "ddtrace x.y.z documentation" +--title "datadog x.y.z documentation" --markup markdown --markup-provider redcarpet --readme docs/GettingStarted.md diff --git a/Appraisals b/Appraisals index c03a52932c2..c0f94387fab 100644 --- a/Appraisals +++ b/Appraisals @@ -1,6 +1,6 @@ lib = File.expand_path('lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'ddtrace/version' +require 'datadog/version' module DisableBundleCheck def check_command diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f0ad26a34fa..b723fdb4152 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ You may submit bug reports concerning the Datadog tracing library for Ruby by [o - Errors (with stack traces) or warnings received - Any details you can share about your configuration including: - Ruby version & platform - - `ddtrace` version + - `datadog` version - Versions of any other relevant gems (or a `Gemfile.lock` if available) - Any configuration settings for the trace library (e.g. `initializers/datadog.rb`) diff --git a/Gemfile b/Gemfile index 4bbd40af0a1..7ddc8ea0041 100644 --- a/Gemfile +++ b/Gemfile @@ -91,7 +91,7 @@ end # Optional extensions # TODO: Move this to Appraisals? -# dogstatsd v5, but lower than 5.2, has possible memory leak with ddtrace. +# dogstatsd v5, but lower than 5.2, has possible memory leak with datadog. # @see https://github.com/DataDog/dogstatsd-ruby/issues/182 gem 'dogstatsd-ruby', '>= 3.3.0', '!= 5.0.0', '!= 5.0.1', '!= 5.1.0' diff --git a/README.md b/README.md index 30888660b39..2f7092d44cf 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ # Datadog Trace Client -[![Gem](https://img.shields.io/gem/v/ddtrace)](https://rubygems.org/gems/ddtrace/) +[![Gem](https://img.shields.io/gem/v/datadog)](https://rubygems.org/gems/datadog/) [![codecov](https://codecov.io/gh/DataDog/dd-trace-rb/branch/master/graph/badge.svg)](https://app.codecov.io/gh/DataDog/dd-trace-rb/branch/master) [![YARD documentation](https://img.shields.io/badge/YARD-documentation-blue)][api docs] -``ddtrace`` is Datadog’s tracing client for Ruby. It is used to trace requests as they flow across web servers, -databases and microservices so that developers have great visibility into bottlenecks and troublesome requests. +``datadog`` is Datadog's client library for Ruby. It includes a suite of tools which provide visibility into the performance and security of Ruby applications, to enable Ruby developers to identify bottlenecks and other issues. ## Getting started @@ -24,8 +23,3 @@ For contributing, checkout the [contribution guidelines][contribution docs] and [APM glossary]: https://docs.datadoghq.com/tracing/glossary/ [contribution docs]: https://github.com/DataDog/dd-trace-rb/blob/master/CONTRIBUTING.md [development docs]: https://github.com/DataDog/dd-trace-rb/blob/master/docs/DevelopmentGuide.md - -## Special thanks - -* [Mike Fiedler](https://github.com/miketheman) for working on a number of Datadog Ruby projects, as well as graciously - gifting control of the `datadog` gem diff --git a/Rakefile b/Rakefile index 8709c648680..273130e01ea 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,5 @@ require 'bundler/gem_tasks' -require 'ddtrace/version' +require 'datadog/version' require 'rubocop/rake_task' if Gem.loaded_specs.key? 'rubocop' require 'rspec/core/rake_task' require 'rake/extensiontask' @@ -340,7 +340,7 @@ namespace :spec do end RSpec::Core::RakeTask.new(:benchmark) do |t, args| - t.pattern = 'spec/ddtrace/benchmark/**/*_spec.rb' + t.pattern = 'spec/datadog/benchmark/**/*_spec.rb' t.rspec_opts = args.to_a.join(' ') end @@ -413,7 +413,7 @@ namespace :spec do desc '' # "Explicitly hiding from `rake -T`" RSpec::Core::RakeTask.new(:autoinstrument) do |t, args| - t.pattern = 'spec/ddtrace/auto_instrument_spec.rb' + t.pattern = 'spec/datadog/auto_instrument_spec.rb' t.rspec_opts = args.to_a.join(' ') end @@ -584,7 +584,7 @@ YARD::Rake::YardocTask.new(:docs) do |t| # as `.yardopts` can be read by external YARD tools, like the # hot-reload YARD server `yard server --reload`. - t.options += ['--title', "ddtrace #{DDTrace::VERSION::STRING} documentation"] + t.options += ['--title', "datadog #{Datadog::VERSION::STRING} documentation"] end # Jobs are parallelized if running in CI. diff --git a/Steepfile b/Steepfile index bf60b345809..5693df92f1d 100644 --- a/Steepfile +++ b/Steepfile @@ -1,4 +1,4 @@ -target :ddtrace do +target :datadog do signature 'sig' check 'lib/' @@ -574,10 +574,9 @@ target :ddtrace do ignore 'lib/datadog/tracing/workers.rb' ignore 'lib/datadog/tracing/workers/trace_writer.rb' ignore 'lib/datadog/tracing/writer.rb' - ignore 'lib/ddtrace/auto_instrument.rb' - ignore 'lib/ddtrace/auto_instrument_base.rb' - ignore 'lib/ddtrace/transport/ext.rb' - ignore 'lib/ddtrace/version.rb' + ignore 'lib/datadog/auto_instrument.rb' + ignore 'lib/datadog/auto_instrument_base.rb' + ignore 'lib/datadog/version.rb' # References `RubyVM::YJIT`, which does not have type information. ignore 'lib/datadog/core/environment/yjit.rb' diff --git a/benchmarks/Dockerfile b/benchmarks/Dockerfile index 6f3b1d64b9e..ea9f6cb8151 100644 --- a/benchmarks/Dockerfile +++ b/benchmarks/Dockerfile @@ -35,7 +35,7 @@ ENV BUNDLE_SILENCE_ROOT_WARNING 1 # Reinstall a recent version of the trace to help Docker cache dependencies. # Bump this version periodically. -RUN gem install ddtrace -v 1.20.0 +RUN gem install datadog -v 1.20.0 WORKDIR /app diff --git a/benchmarks/dogstatsd_reporter.rb b/benchmarks/dogstatsd_reporter.rb index f80bc4aaa10..615db2a4d19 100644 --- a/benchmarks/dogstatsd_reporter.rb +++ b/benchmarks/dogstatsd_reporter.rb @@ -1,4 +1,4 @@ -require 'ddtrace' +require 'datadog' require 'datadog/statsd' require 'benchmark/ips' require 'securerandom' diff --git a/benchmarks/profiler_http_transport.rb b/benchmarks/profiler_http_transport.rb index 7a9b90ecd58..871ec568c5c 100644 --- a/benchmarks/profiler_http_transport.rb +++ b/benchmarks/profiler_http_transport.rb @@ -4,7 +4,7 @@ return unless __FILE__ == $PROGRAM_NAME || VALIDATE_BENCHMARK_MODE require 'benchmark/ips' -require 'ddtrace' +require 'datadog' require 'pry' require 'securerandom' require 'socket' diff --git a/benchmarks/profiler_memory_sample_serialize.rb b/benchmarks/profiler_memory_sample_serialize.rb index 486283c776c..8ea0c96a4f7 100644 --- a/benchmarks/profiler_memory_sample_serialize.rb +++ b/benchmarks/profiler_memory_sample_serialize.rb @@ -4,7 +4,7 @@ return unless __FILE__ == $PROGRAM_NAME || VALIDATE_BENCHMARK_MODE require 'benchmark/ips' -require 'ddtrace' +require 'datadog' require 'pry' require_relative 'dogstatsd_reporter' diff --git a/benchmarks/profiler_sample_loop_v2.rb b/benchmarks/profiler_sample_loop_v2.rb index 13649759b8f..a61120c964c 100644 --- a/benchmarks/profiler_sample_loop_v2.rb +++ b/benchmarks/profiler_sample_loop_v2.rb @@ -4,7 +4,7 @@ return unless __FILE__ == $PROGRAM_NAME || VALIDATE_BENCHMARK_MODE require 'benchmark/ips' -require 'ddtrace' +require 'datadog' require 'pry' require_relative 'dogstatsd_reporter' diff --git a/benchmarks/profiler_sample_serialize.rb b/benchmarks/profiler_sample_serialize.rb index 6e2edde4dbf..341546f3d32 100644 --- a/benchmarks/profiler_sample_serialize.rb +++ b/benchmarks/profiler_sample_serialize.rb @@ -4,7 +4,7 @@ return unless __FILE__ == $PROGRAM_NAME || VALIDATE_BENCHMARK_MODE require 'benchmark/ips' -require 'ddtrace' +require 'datadog' require 'pry' require_relative 'dogstatsd_reporter' diff --git a/benchmarks/tracing_trace.rb b/benchmarks/tracing_trace.rb index 1b7dbecb670..5750d356612 100644 --- a/benchmarks/tracing_trace.rb +++ b/benchmarks/tracing_trace.rb @@ -6,7 +6,7 @@ require 'benchmark/ips' require 'open3' -require 'ddtrace' +require 'datadog' class TracingTraceBenchmark module NoopWriter @@ -180,25 +180,28 @@ def benchmark_propagation_trace_context end def benchmark_gem_loading - # This benchmark needs to be run in a clean environment where ddtrace is not loaded yet - output, status = Open3.capture2e('ruby', stdin_data: <<-RUBY) - raise "Datadog is already loaded" if defined?(::Datadog) + # This benchmark needs to be run in a clean environment where datadog is not loaded yet + output, status = Open3.capture2e('bundle', 'exec', 'ruby', stdin_data: <<-RUBY) + raise "Datadog is already loaded" if defined?(::Datadog::Core) - VALIDATE_BENCHMARK_MODE = ENV['VALIDATE_BENCHMARK'] == 'true' + lib = File.expand_path('../lib', '#{__dir__}') + $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) + + VALIDATE_BENCHMARK_MODE = #{VALIDATE_BENCHMARK_MODE} require 'benchmark/ips' - + Benchmark.ips do |x| # Gem loading is quite slower than the other microbenchmarks benchmark_time = VALIDATE_BENCHMARK_MODE ? { time: 0.001, warmup: 0 } : { time: 60, warmup: 5 } x.config(**benchmark_time) - + x.report("Gem loading") do - pid = fork { require 'ddtrace' } - + pid = fork { require 'datadog' } + _, status = Process.wait2(pid) raise unless status.success? end - + x.save! "#{__FILE__}-results.json" unless VALIDATE_BENCHMARK_MODE x.compare! end diff --git a/ddtrace.gemspec b/datadog.gemspec similarity index 75% rename from ddtrace.gemspec rename to datadog.gemspec index a58a1c008f4..e036d12a22b 100644 --- a/ddtrace.gemspec +++ b/datadog.gemspec @@ -2,22 +2,26 @@ lib = File.expand_path('lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'ddtrace/version' +# DEV: Loading gem files here is undesirable because it pollutes the application namesspace. +# DEV: In this case, `bundle exec ruby -e 'puts defined?(Datadog)'` will return `constant` +# DEV: even though `require 'datadog'` wasn't executed. But only the version file was loaded. +# DEV: We should avoid loading gem files to fetch the version here. +require 'datadog/version' Gem::Specification.new do |spec| - spec.name = 'ddtrace' - spec.version = DDTrace::VERSION::STRING - spec.required_ruby_version = [">= #{DDTrace::VERSION::MINIMUM_RUBY_VERSION}", - "< #{DDTrace::VERSION::MAXIMUM_RUBY_VERSION}"] + spec.name = 'datadog' + spec.version = Datadog::VERSION::STRING + spec.required_ruby_version = [">= #{Datadog::VERSION::MINIMUM_RUBY_VERSION}", + "< #{Datadog::VERSION::MAXIMUM_RUBY_VERSION}"] spec.required_rubygems_version = '>= 2.0.0' spec.authors = ['Datadog, Inc.'] spec.email = ['dev@datadoghq.com'] spec.summary = 'Datadog tracing code for your Ruby applications' spec.description = <<-DESC.gsub(/^\s+/, '') - ddtrace is Datadog's tracing client for Ruby. It is used to trace requests - as they flow across web servers, databases and microservices so that developers - have great visiblity into bottlenecks and troublesome requests. + datadog is Datadog's client library for Ruby. It includes a suite of tools + which provide visibility into the performance and security of Ruby applications, + to enable Ruby developers to identify bottlenecks and other issues. DESC spec.homepage = 'https://github.com/DataDog/dd-trace-rb' diff --git a/docker-compose.yml b/docker-compose.yml index e07b507375e..6b55c053c61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: TEST_PRESTO_HOST: presto TEST_PRESTO_PORT: 8080 TEST_REDIS_HOST: redis - DDTRACE_CI: 'true' + DATADOG_GEM_CI: 'true' stdin_open: true tty: true volumes: @@ -116,7 +116,7 @@ services: TEST_OPENSEARCH_PORT: 9200 TEST_POSTGRES_HOST: postgres TEST_REDIS_HOST: redis - DDTRACE_CI: 'true' + DATADOG_GEM_CI: 'true' stdin_open: true tty: true volumes: diff --git a/docs/AutoInstrumentation.md b/docs/AutoInstrumentation.md index 77b690df364..be56a2af0a5 100644 --- a/docs/AutoInstrumentation.md +++ b/docs/AutoInstrumentation.md @@ -1,6 +1,6 @@ # Auto Instrumentation -`ddtrace` can automatically instrument all available libraries, without requiring the manual setup of each one. +`datadog` can automatically instrument all available libraries, without requiring the manual setup of each one. ## Rails @@ -8,7 +8,7 @@ Add the following to your `Gemfile`/`gems.rb` file: ```ruby source 'https://rubygems.org' -gem 'ddtrace', require: 'ddtrace/auto_instrument' +gem 'datadog', require: 'datadog/auto_instrument' ``` ## Hanami @@ -17,12 +17,12 @@ Add the following to your `Gemfile`/`gems.rb` file: ```ruby source 'https://rubygems.org' -gem 'ddtrace', require: 'ddtrace/auto_instrument' +gem 'datadog', require: 'datadog/auto_instrument' ``` ## Ruby -Require `'ddtrace/auto_instrument'` after all gems that you'd like to instrument have been loaded: +Require `'datadog/auto_instrument'` after all gems that you'd like to instrument have been loaded: ```ruby # Example libraries with supported integrations @@ -30,16 +30,16 @@ require 'sinatra' require 'faraday' require 'redis' -require 'ddtrace/auto_instrument' +require 'datadog/auto_instrument' ``` ## Additional configuration You can reconfigure, override, or disable any specific integration settings by adding -a [`Datadog.configure`](GettingStarted.md#integration-instrumentation) call after `ddtrace/auto_instrument` is activated. +a [`Datadog.configure`](GettingStarted.md#integration-instrumentation) call after `datadog/auto_instrument` is activated. ## Custom integrations Custom integrations that want to support auto instrumentation need to be registered (e.g. invoke their {Datadog::Tracing::Contrib::Registerable::ClassMethods#register_as} method) before -the tracer requires `'ddtrace/auto_instrument'`. +the tracer requires `'datadog/auto_instrument'`. diff --git a/docs/DevelopmentGuide.md b/docs/DevelopmentGuide.md index 6b7f84fd210..62dc9a82f7f 100644 --- a/docs/DevelopmentGuide.md +++ b/docs/DevelopmentGuide.md @@ -87,7 +87,7 @@ $ bundle exec rake test:main **For integrations** -Integrations which interact with dependencies not listed in the `ddtrace` gemspec will need to load these dependencies to run their tests. Each test task could consist of multiple spec tasks which are executed with different groups of dependencies (likely against different versions or variations). +Integrations which interact with dependencies not listed in the `datadog` gemspec will need to load these dependencies to run their tests. Each test task could consist of multiple spec tasks which are executed with different groups of dependencies (likely against different versions or variations). To get a list of the test tasks, run `bundle exec rake -T test` @@ -164,11 +164,11 @@ Test leaked 1 thread: "Datadog::Workers::AsyncTransport integration tests" Ensure all threads are terminated when test finishes: 1: # (Thread) Thread Creation Site: - ./dd-trace-rb/spec/ddtrace/workers_integration_spec.rb:245:in 'new' - ./dd-trace-rb/spec/ddtrace/workers_integration_spec.rb:245:in 'block (4 levels) in ' + ./dd-trace-rb/spec/datadog/tracing/workers_integration_spec.rb:245:in 'new' + ./dd-trace-rb/spec/datadog/tracing/workers_integration_spec.rb:245:in 'block (4 levels) in ' Thread Backtrace: - ./dd-trace-rb/spec/ddtrace/workers_integration_spec.rb:262:in 'sleep' - .dd-trace-rb/spec/ddtrace/workers_integration_spec.rb:262:in 'block (5 levels) in ' + ./dd-trace-rb/spec/datadog/tracing/workers_integration_spec.rb:262:in 'sleep' + .dd-trace-rb/spec/datadog/tracing/workers_integration_spec.rb:262:in 'block (5 levels) in ' ./dd-trace-rb/spec/spec_helper.rb:147:in 'block in initialize' ``` @@ -212,7 +212,7 @@ Integrations are extensions to the trace library that add support for external d Some general guidelines for adding new integrations: - - An integration can either be added directly to `dd-trace-rb`, or developed as its own gem that depends on `ddtrace`. + - An integration can either be added directly to `dd-trace-rb`, or developed as its own gem that depends on `datadog`. - Integrations should implement the configuration API for easy, consistent implementation. (See existing integrations as examples of this.) - All new integrations require documentation, unit/integration tests written in RSpec, and passing CI builds. - It's highly encouraged to share screenshots or other demos of how the new integration looks and works. diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md index 072983be20f..26b6dc025a1 100644 --- a/docs/GettingStarted.md +++ b/docs/GettingStarted.md @@ -1,7 +1,6 @@ # Datadog Ruby Trace Client -`ddtrace` is Datadog’s tracing client for Ruby. It is used to trace requests as they flow across web servers, -databases and microservices so that developers have high visibility into bottlenecks and troublesome requests. +`datadog` is Datadog's client library for Ruby. It includes a suite of tools which provide visibility into the performance and security of Ruby applications, to enable Ruby developers to identify bottlenecks and other issues. ## Getting started @@ -20,7 +19,7 @@ To contribute, check out the [contribution guidelines][contribution docs] and [d [visualization docs]: https://docs.datadoghq.com/tracing/glossary/ [contribution docs]: https://github.com/DataDog/dd-trace-rb/blob/master/CONTRIBUTING.md [development docs]: https://github.com/DataDog/dd-trace-rb/blob/master/docs/DevelopmentGuide.md -[yard docs]: https://www.rubydoc.info/gems/ddtrace/ +[yard docs]: https://www.rubydoc.info/gems/datadog/ ## Compatibility requirements @@ -36,7 +35,7 @@ Adding tracing to your Ruby application only takes a few quick steps: ### Setup the Datadog Agent for tracing -Before installing `ddtrace`, [install the Datadog Agent](https://docs.datadoghq.com/agent/), to which `ddtrace` will send trace data. +Before installing `datadog`, [install the Datadog Agent](https://docs.datadoghq.com/agent/), to which `datadog` will send trace data. Then configure the Datadog Agent to accept traces. To do this, either: @@ -82,11 +81,11 @@ OR #### Rails or Hanami applications -1. Add the `ddtrace` gem to your Gemfile: +1. Add the `datadog` gem to your Gemfile: ```ruby source 'https://rubygems.org' - gem 'ddtrace', require: 'ddtrace/auto_instrument' + gem 'datadog', require: 'datadog/auto_instrument' ``` 2. Install the gem with `bundle install` @@ -109,16 +108,16 @@ OR If your application does not use the supported gems (Rails or Hanami) above, you can set it up as follows: -1. Add the `ddtrace` gem to your Gemfile: +1. Add the `datadog` gem to your Gemfile: ```ruby source 'https://rubygems.org' - gem 'ddtrace' + gem 'datadog' ``` 2. Install the gem with `bundle install` 3. `require` any [supported libraries or frameworks](#integration-instrumentation) that should be instrumented. -4. Add `require 'ddtrace/auto_instrument'` to your application. _Note:_ This must be done _after_ requiring any supported libraries or frameworks. +4. Add `require 'datadog/auto_instrument'` to your application. _Note:_ This must be done _after_ requiring any supported libraries or frameworks. ```ruby # Example frameworks and libraries @@ -126,7 +125,7 @@ If your application does not use the supported gems (Rails or Hanami) above, you require 'faraday' require 'redis' - require 'ddtrace/auto_instrument' + require 'datadog/auto_instrument' ``` 5. Add a configuration block to your application: @@ -145,11 +144,11 @@ If your application does not use the supported gems (Rails or Hanami) above, you #### Configuring OpenTelemetry -You can send OpenTelemetry traces directly to the Datadog Agent (without `ddtrace`) by using OTLP. Check out our documentation on [OTLP ingest in the Datadog Agent](https://docs.datadoghq.com/tracing/setup_overview/open_standards/#otlp-ingest-in-datadog-agent) for details. +You can send OpenTelemetry traces directly to the Datadog Agent (without `datadog`) by using OTLP. Check out our documentation on [OTLP ingest in the Datadog Agent](https://docs.datadoghq.com/tracing/setup_overview/open_standards/#otlp-ingest-in-datadog-agent) for details. ### Connect your application to the Datadog Agent -By default, `ddtrace` will connect to the Agent using the first available settings in the listed priority: +By default, `datadog` will connect to the Agent using the first available settings in the listed priority: 1. Via any explicitly provided configuration settings (hostname/port/transport) 2. Via Unix Domain Socket (UDS) located at `/var/run/datadog/apm.socket` @@ -305,7 +304,7 @@ The Action Cable integration traces broadcast messages and channel actions. You can enable it through `Datadog.configure`: ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :action_cable @@ -319,7 +318,8 @@ The Action Mailer integration provides tracing for Rails 5 ActionMailer actions. You can enable it through `Datadog.configure`: ```ruby -require 'ddtrace' +require 'datadog' + Datadog.configure do |c| c.tracing.instrument :action_mailer, **options end @@ -337,7 +337,7 @@ Most of the time, Action Pack is set up as part of Rails, but it can be activate ```ruby require 'actionpack' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :action_pack @@ -350,7 +350,7 @@ Most of the time, Action View is set up as part of Rails, but it can be activate ```ruby require 'actionview' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :action_view, **options @@ -369,7 +369,7 @@ Most of the time, Active Job is set up as part of Rails, but it can be activated ```ruby require 'active_job' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :active_job @@ -384,7 +384,7 @@ The Active Model Serializers integration traces the `serialize` event for versio ```ruby require 'active_model_serializers' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :active_model_serializers @@ -402,7 +402,7 @@ Most of the time, Active Record is set up as part of a web framework (Rails, Sin require 'tmpdir' require 'sqlite3' require 'active_record' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :active_record, **options @@ -493,7 +493,7 @@ Most of the time, Active Support is set up as part of Rails, but it can be activ ```ruby require 'activesupport' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :active_support, **options @@ -515,7 +515,7 @@ The AWS integration will trace every interaction (e.g. API calls) with AWS servi ```ruby require 'aws-sdk' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :aws, **options @@ -570,7 +570,7 @@ Dalli integration will trace all calls to your `memcached` server: ```ruby require 'dalli' -require 'ddtrace' +require 'datadog' # Configure default Dalli tracing behavior Datadog.configure do |c| @@ -597,7 +597,7 @@ The DelayedJob integration uses lifecycle hooks to trace the job executions and You can enable it through `Datadog.configure`: ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :delayed_job, **options @@ -616,7 +616,7 @@ The Elasticsearch integration will trace any call to `perform_request` in the `C ```ruby require 'elasticsearch/transport' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :elasticsearch, **options @@ -643,7 +643,7 @@ Datadog.configure_onto(client.transport, **options) The `ethon` integration will trace any HTTP request through `Easy` or `Multi` objects. Note that this integration also supports `Typhoeus` library which is based on `Ethon`. ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :ethon, **options @@ -667,11 +667,11 @@ end ### Excon -The `excon` integration is available through the `ddtrace` middleware: +The `excon` integration is available through the `datadog` middleware: ```ruby require 'excon' -require 'ddtrace' +require 'datadog' # Configure default Excon tracing behavior Datadog.configure do |c| @@ -726,11 +726,11 @@ Where `options` is a Hash that contains any of the parameters listed in the tabl ### Faraday -The `faraday` integration is available through the `ddtrace` middleware: +The `faraday` integration is available through the `datadog` middleware: ```ruby require 'faraday' -require 'ddtrace' +require 'datadog' # Configure default Faraday tracing behavior Datadog.configure do |c| @@ -745,7 +745,7 @@ end # In case you want to override the global configuration for a certain client instance connection = Faraday.new('https://example.com') do |builder| - builder.use(:ddtrace, **options) + builder.use(:datadog_tracing, **options) builder.adapter Faraday.default_adapter end @@ -772,7 +772,7 @@ To activate your integration, use the `Datadog.configure` method before defining ```ruby # api.rb require 'grape' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :grape, **options @@ -850,7 +850,7 @@ To setup your integration, use the `Datadog.configure` method like so: ```ruby require 'grpc' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :grpc, **options @@ -899,7 +899,7 @@ The integration will ensure that the `configured_interceptor` establishes a uniq The `hanami` integration will instrument routing, action and render for your hanami application. To enable the `hanami` instrumentation, it is recommended to auto instrument with ``` -gem 'ddtrace', require: 'ddtrace/auto_instrument' +gem 'datadog', require: 'datadog/auto_instrument' ``` and create an initializer file in your `config/initializers` folder: @@ -923,7 +923,7 @@ The http.rb integration will trace any HTTP call using the Http.rb gem. ```ruby require 'http' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :httprb, **options # optionally, specify a different service name for hostnames matching a regex @@ -950,7 +950,7 @@ The httpclient integration will trace any HTTP call using the httpclient gem. ```ruby require 'httpclient' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :httpclient, **options # optionally, specify a different service name for hostnames matching a regex @@ -973,10 +973,10 @@ end ### httpx -`httpx` maintains its [own integration with `ddtrace`](https://honeyryderchuck.gitlab.io/httpx/wiki/Datadog-Adapter): +`httpx` maintains its [own integration with `datadog`](https://honeyryderchuck.gitlab.io/httpx/wiki/Datadog-Adapter): ```ruby -require "ddtrace" +require "datadog" require "httpx/adapters/datadog" Datadog.configure do |c| @@ -999,7 +999,7 @@ You can enable it through `Datadog.configure`: ```ruby require 'active_support/notifications' # required to enable 'ruby-kafka' instrumentation require 'kafka' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :kafka @@ -1012,7 +1012,7 @@ The integration traces any `Command` that is sent from the [MongoDB Ruby Driver] ```ruby require 'mongo' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :mongo, **options @@ -1072,7 +1072,7 @@ The MySQL2 integration traces any SQL command sent through `mysql2` gem. ```ruby require 'mysql2' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :mysql2, **options @@ -1097,7 +1097,7 @@ The Net/HTTP integration will trace any HTTP call using the standard lib Net::HT ```ruby require 'net/http' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :http, **options @@ -1140,7 +1140,7 @@ The OpenSearch integration will trace any call to `perform_request` in the `Clie ```ruby require 'opensearch' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :opensearch, **options @@ -1173,7 +1173,7 @@ The PG integration traces SQL commands sent through the `pg` gem via: ```ruby require 'pg' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :pg, **options @@ -1195,7 +1195,7 @@ The Presto integration traces any SQL command sent through `presto-client` gem. ```ruby require 'presto-client' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :presto, **options @@ -1228,7 +1228,7 @@ The Que integration is a middleware which will trace job executions. You can enable it through `Datadog.configure`: ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :que, **options @@ -1251,7 +1251,7 @@ The Racecar integration provides tracing for Racecar jobs. You can enable it through `Datadog.configure`: ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :racecar, **options @@ -1272,7 +1272,7 @@ This integration is automatically activated with web frameworks like Rails. If y ```ruby # config.ru example -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :rack, **options @@ -1370,7 +1370,7 @@ To enable the Rails instrumentation, create an initializer file in your `config/ ```ruby # config/initializers/datadog.rb -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :rails, **options @@ -1411,7 +1411,7 @@ To activate Rake task tracing, add the following to your `Rakefile`: ```ruby # At the top of your Rakefile: require 'rake' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :rake, tasks: ['my_task'], **options @@ -1473,7 +1473,7 @@ The Redis integration will trace simple calls as well as pipelines. ```ruby require 'redis' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :redis, **options @@ -1498,7 +1498,7 @@ With Redis version >= 5: ```ruby require 'redis' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :redis # Enabling integration instrumentation is still required @@ -1517,7 +1517,7 @@ With a standalone `RedisClient`: ```ruby require "redis-client" -require "ddtrace" +require "datadog" redis = RedisClient.config(custom: { datadog: { service_name: "my-custom-redis" } }).new_client @@ -1532,7 +1532,7 @@ With Redis version < 5: ```ruby require 'redis' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :redis # Enabling integration instrumentation is still required @@ -1592,7 +1592,7 @@ To add tracing to a Resque job: ```ruby require 'resque' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :resque, **options @@ -1607,11 +1607,11 @@ end ### Rest Client -The `rest-client` integration is available through the `ddtrace` middleware: +The `rest-client` integration is available through the `datadog` middleware: ```ruby require 'rest_client' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :rest_client, **options @@ -1635,7 +1635,7 @@ The **Roda** integration can be enabled through `Datadog.configure`. It is recom ```ruby require "roda" -require "ddtrace" +require "datadog" class SampleApp < Roda use Datadog::Tracing::Contrib::Rack::TraceMiddleware @@ -1666,7 +1666,7 @@ The Sequel integration traces queries made to your database. ```ruby require 'sequel' -require 'ddtrace' +require 'datadog' # Connect to database database = Sequel.sqlite @@ -1712,7 +1712,7 @@ The Shoryuken integration is a server-side middleware which will trace job execu You can enable it through `Datadog.configure`: ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :shoryuken, **options @@ -1733,7 +1733,7 @@ The Sidekiq integration is a client-side & server-side middleware which will tra You can enable it through `Datadog.configure`: ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :sidekiq, **options @@ -1752,13 +1752,13 @@ end The Sinatra integration traces requests and template rendering. -To start using the tracing client, make sure you import `ddtrace` and `instrument :sinatra` after either `sinatra` or `sinatra/base`, and before you define your application/routes: +To start using the tracing client, make sure you import `datadog` and `instrument :sinatra` after either `sinatra` or `sinatra/base`, and before you define your application/routes: #### Classic application ```ruby require 'sinatra' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :sinatra, **options @@ -1773,7 +1773,7 @@ end ```ruby require 'sinatra/base' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :sinatra, **options @@ -1811,7 +1811,7 @@ The Sneakers integration is a server-side middleware which will trace job execut You can enable it through `Datadog.configure`: ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :sneakers, **options @@ -1833,7 +1833,7 @@ The Stripe integration traces Stripe API requests. You can enable it through `Datadog.configure`: ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :stripe, **options @@ -1851,7 +1851,7 @@ end The `sucker_punch` integration traces all scheduled jobs: ```ruby -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :sucker_punch @@ -1867,7 +1867,7 @@ The trilogy integration traces any SQL command sent through the `trilogy` gem. ```ruby require 'trilogy' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.tracing.instrument :trilogy, **options @@ -1886,7 +1886,7 @@ client.query("SELECT * FROM users WHERE group='x'") ## Additional configuration -To change the default behavior of `ddtrace`, you can use, in order of priority, with 1 being the highest: +To change the default behavior of `datadog`, you can use, in order of priority, with 1 being the highest: 1. [Remote Configuration](https://docs.datadoghq.com/agent/remote_config). 2. Options set inside a `Datadog.configure` block, e.g.: @@ -1950,7 +1950,7 @@ For example, if `tracing.sampling.default_rate` is configured by [Remote Configu By default, all logs are processed by the default Ruby logger. When using Rails, you should see the messages in your application log file. -Datadog client log messages are marked with `[ddtrace]` so you should be able to isolate them from other messages. +Datadog client log messages are marked with `[datadog]` so you should be able to isolate them from other messages. Additionally, it is possible to override the default logger and replace it by a custom one. This is done using the `log` setting. @@ -2016,7 +2016,7 @@ You can enable this via `diagnostics.startup_logs.enabled = true` or `DD_TRACE_S Datadog.configure { |c| c.diagnostics.startup_logs.enabled = true } ``` -By default, this will be activated whenever `ddtrace` detects the application is running in a non-development environment. +By default, this will be activated whenever `datadog` detects the application is running in a non-development environment. ### Sampling @@ -2266,7 +2266,7 @@ end **Activating distributed tracing for integrations** -Many integrations included in `ddtrace` support distributed tracing. Distributed tracing is enabled by default in Agent v7 and most versions of Agent v6. If needed, you can activate distributed tracing with configuration settings. +Many integrations included in `datadog` support distributed tracing. Distributed tracing is enabled by default in Agent v7 and most versions of Agent v6. If needed, you can activate distributed tracing with configuration settings. - If your application receives requests from services with distributed tracing activated, you must activate distributed tracing on the integrations that handle these requests (e.g. Rails) - If your application send requests to services with distributed tracing activated, you must activate distributed tracing on the integrations that send these requests (e.g. Faraday) @@ -2421,7 +2421,7 @@ If a trace is not active and the application environment & version is not config An example of this in practice: ```ruby -require 'ddtrace' +require 'datadog' require 'logger' ENV['DD_ENV'] = 'production' @@ -2445,7 +2445,7 @@ Datadog::Tracing.trace('my.operation') { logger.warn('This is a traced operation ### Configuring the transport layer -By default, `ddtrace` will connect to the Agent using the first available settings in the listed priority: +By default, `datadog` will connect to the Agent using the first available settings in the listed priority: 1. Through any explicitly provided configuration settings (hostname/port/transport) 2. Through Unix Domain Socket (UDS) located at `/var/run/datadog/apm.socket` @@ -2545,7 +2545,7 @@ To configure runtime metrics, add the following configuration: ```ruby # config/initializers/datadog.rb require 'datadog/statsd' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| # To enable runtime metrics collection, set `true`. Defaults to `false` @@ -2583,7 +2583,7 @@ In addition, all metrics include the following tags: ### Profiling -`ddtrace` can produce profiles that measure method-level application resource usage within production environments. These profiles can give insight into resources spent in Ruby code outside of existing trace instrumentation. +`datadog` can produce profiles that measure method-level application resource usage within production environments. These profiles can give insight into resources spent in Ruby code outside of existing trace instrumentation. **Setup** @@ -2631,7 +2631,7 @@ For any further questions or to report an occurrence of this issue, please [reac ### Resque workers hang on exit -Resque's default of forking a process per job can, in rare situations, result in resque processes hanging on exit when instrumented with ddtrace. +Resque's default of forking a process per job can, in rare situations, result in resque processes hanging on exit when instrumented with `datadog`. As a workaround, we recommend setting the `FORK_PER_JOB` environment variable to `false` to disable this behavior. diff --git a/docs/OpenTelemetry.md b/docs/OpenTelemetry.md index 2c289a94875..156a9c0f4e5 100644 --- a/docs/OpenTelemetry.md +++ b/docs/OpenTelemetry.md @@ -8,17 +8,17 @@ If you are interested in using this feature experimentally, please contact the d **Supported tracing frameworks**: -| Type | Documentation | ddtrace version | Gem version support | +| Type | Documentation | datadog version | Gem version support | | ------------- | ---------------------------------------------------- | --------------- | ------------------- | | OpenTelemetry | https://github.com/open-telemetry/opentelemetry-ruby | 1.9.0+ | >= 1.1.0 | ## Configuring OpenTelemetry -1. Add the `ddtrace` gem to your Gemfile: +1. Add the `datadog` gem to your Gemfile: ```ruby source 'https://rubygems.org' - gem 'ddtrace' + gem 'datadog' ``` 1. Install the gem with `bundle install` @@ -60,11 +60,11 @@ There are a few limitations to OpenTelemetry Tracing when the APM integration is | [Span processors](https://opentelemetry.io/docs/reference/specification/trace/sdk/#span-processor) | Unsupported | | N/A | | | [Span Exporters](https://opentelemetry.io/docs/reference/specification/trace/sdk/#span-exporter) | Unsupported | | N/A | | | `OpenTelemetry.logger` | Special | `OpenTelemetry.logger` is set to the same object as `Datadog.logger`. | Configure through [Custom logging](#custom-logging). | | -| Trace/span [ID generators](https://opentelemetry.io/docs/reference/specification/trace/sdk/#id-generators) | Special | ID generation is performed by `ddtrace`. | N/A | | +| Trace/span [ID generators](https://opentelemetry.io/docs/reference/specification/trace/sdk/#id-generators) | Special | ID generation is performed by `datadog`. | N/A | | ## Exporting OpenTelemetry-only traces -You can send OpenTelemetry traces directly to the Datadog agent (without `ddtrace`) by using [OTLP](https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-otlp/latest). +You can send OpenTelemetry traces directly to the Datadog agent (without `datadog`) by using [OTLP](https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-exporter-otlp/latest). Check out our documentation on [OTLP ingest in the Datadog Agent](https://docs.datadoghq.com/tracing/setup_overview/open_standards/#otlp-ingest-in-datadog-agent) for details. Datadog APM spans will not be sent through the OTLP exporter. diff --git a/docs/ProfilingDevelopment.md b/docs/ProfilingDevelopment.md index e6e425d1b79..c12c8b80734 100644 --- a/docs/ProfilingDevelopment.md +++ b/docs/ProfilingDevelopment.md @@ -2,7 +2,7 @@ This file contains development notes specific to the continuous profiler. -For a more practical view of getting started with development of `ddtrace`, see . +For a more practical view of getting started with development of `datadog`, see . ## Profiling components high-level view @@ -37,7 +37,7 @@ flow: 1. <../lib/datadog/profiling/preload.rb> triggers the creation of the profiler instance by calling the method `Datadog::Profiling.start_if_enabled` 2. Creation of the profiler instance is handled by `Datadog::Configuration`, which triggers the configuration of all - `ddtrace` components in `#build_components` + `datadog` components in `#build_components` 3. Inside `Datadog::Components`, the `build_profiler_component` method gets called 4. The `Setup` task activates our extensions (`Datadog::Profiling::Ext::Forking`) 5. The `build_profiler_component` method then creates and wires up the Profiler as such: diff --git a/docs/PublicApi.md b/docs/PublicApi.md index ed9325af4eb..60ed064f931 100644 --- a/docs/PublicApi.md +++ b/docs/PublicApi.md @@ -1,14 +1,14 @@ # Public API -`ddtrace` respects [Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html). +`datadog` respects [Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html). Classes, modules, and methods marked as part of the public API will not introduce breaking changes outside of a major version release. Objects that belong to the public API are marked with the `@public_api` YARD documentation tag. -When navigating [`ddtrace`'s YARD documentation](https://rubydoc.info/gems/ddtrace), public API +When navigating [`datadog`'s YARD documentation](https://rubydoc.info/gems/datadog), public API objects will have an explicit banner informing the user that they are part of the public API contract. Objects not marked with the `@public_api` tag are not part of the public API contract, and thus -considered internal to `ddtrace`. These objects can receive breaking changes in minor and patch +considered internal to `datadog`. These objects can receive breaking changes in minor and patch releases. diff --git a/docs/UpgradeGuide.md b/docs/UpgradeGuide.md index eeb446aff56..9237ec0c10f 100644 --- a/docs/UpgradeGuide.md +++ b/docs/UpgradeGuide.md @@ -1,4 +1,4 @@ -# Upgrading ddtrace +# Upgrading datadog # From 0.x to 1.0 diff --git a/ext/datadog_profiling_loader/extconf.rb b/ext/datadog_profiling_loader/extconf.rb index 626439168c1..49cf06fdb54 100644 --- a/ext/datadog_profiling_loader/extconf.rb +++ b/ext/datadog_profiling_loader/extconf.rb @@ -24,11 +24,11 @@ def add_compiler_flag(flag) # Because we can't control what compiler versions our customers use, shipping with -Werror by default is a no-go. # But we can enable it in CI, so that we quickly spot any new warnings that just got introduced. -add_compiler_flag '-Werror' if ENV['DDTRACE_CI'] == 'true' +add_compiler_flag '-Werror' if ENV['DATADOG_GEM_CI'] == 'true' # Older gcc releases may not default to C99 and we need to ask for this. This is also used: # * by upstream Ruby -- search for gnu99 in the codebase -# * by msgpack, another ddtrace dependency +# * by msgpack, another datadog gem dependency # (https://github.com/msgpack/msgpack-ruby/blob/18ce08f6d612fe973843c366ac9a0b74c4e50599/ext/msgpack/extconf.rb#L8) add_compiler_flag '-std=gnu99' diff --git a/ext/datadog_profiling_native_extension/extconf.rb b/ext/datadog_profiling_native_extension/extconf.rb index b9914ef7a4e..5c106770b76 100644 --- a/ext/datadog_profiling_native_extension/extconf.rb +++ b/ext/datadog_profiling_native_extension/extconf.rb @@ -26,7 +26,7 @@ def skip_building_extension!(reason) if fail_install_if_missing_extension require 'mkmf' Logging.message( - '[ddtrace] Failure cause: ' \ + '[datadog] Failure cause: ' \ "#{Datadog::Profiling::NativeExtensionHelpers::Supported.render_skipped_reason_file(**reason)}\n" ) else @@ -43,19 +43,19 @@ def skip_building_extension!(reason) $stderr.puts( %( +------------------------------------------------------------------------------+ -| ** Preparing to build the ddtrace profiling native extension... ** | +| ** Preparing to build the datadog profiling native extension... ** | | | | If you run into any failures during this step, you can set the | | `DD_PROFILING_NO_EXTENSION` environment variable to `true` e.g. | | `$ DD_PROFILING_NO_EXTENSION=true bundle install` to skip this step. | | | | If you disable this extension, the Datadog Continuous Profiler will | -| not be available, but all other ddtrace features will work fine! | +| not be available, but all other datadog features will work fine! | | | | If you needed to use this, please tell us why on | | so we can fix it :\) | | | -| Thanks for using ddtrace! You rock! | +| Thanks for using datadog! You rock! | +------------------------------------------------------------------------------+ ) @@ -65,9 +65,9 @@ def skip_building_extension!(reason) # that may fail on an environment not properly setup for building Ruby extensions. require 'mkmf' -Logging.message("[ddtrace] Using compiler:\n") +Logging.message("[datadog] Using compiler:\n") xsystem("#{CONFIG['CC']} -v") -Logging.message("[ddtrace] End of compiler information\n") +Logging.message("[datadog] End of compiler information\n") # mkmf on modern Rubies actually has an append_cflags that does something similar # (see https://github.com/ruby/ruby/pull/5760), but as usual we need a bit more boilerplate to deal with legacy Rubies @@ -81,11 +81,11 @@ def add_compiler_flag(flag) # Because we can't control what compiler versions our customers use, shipping with -Werror by default is a no-go. # But we can enable it in CI, so that we quickly spot any new warnings that just got introduced. -add_compiler_flag '-Werror' if ENV['DDTRACE_CI'] == 'true' +add_compiler_flag '-Werror' if ENV['DATADOG_GEM_CI'] == 'true' # Older gcc releases may not default to C99 and we need to ask for this. This is also used: # * by upstream Ruby -- search for gnu99 in the codebase -# * by msgpack, another ddtrace dependency +# * by msgpack, another datadog gem dependency # (https://github.com/msgpack/msgpack-ruby/blob/18ce08f6d612fe973843c366ac9a0b74c4e50599/ext/msgpack/extconf.rb#L8) add_compiler_flag '-std=gnu99' @@ -205,11 +205,11 @@ def add_compiler_flag(flag) # If we got here, libdatadog is available and loaded ENV['PKG_CONFIG_PATH'] = "#{ENV['PKG_CONFIG_PATH']}:#{Libdatadog.pkgconfig_folder}" -Logging.message("[ddtrace] PKG_CONFIG_PATH set to #{ENV['PKG_CONFIG_PATH'].inspect}\n") +Logging.message("[datadog] PKG_CONFIG_PATH set to #{ENV['PKG_CONFIG_PATH'].inspect}\n") $stderr.puts("Using libdatadog #{Libdatadog::VERSION} from #{Libdatadog.pkgconfig_folder}") unless pkg_config('datadog_profiling_with_rpath') - Logging.message("[ddtrace] Ruby detected the pkg-config command is #{$PKGCONFIG.inspect}\n") + Logging.message("[datadog] Ruby detected the pkg-config command is #{$PKGCONFIG.inspect}\n") skip_building_extension!( if Datadog::Profiling::NativeExtensionHelpers::Supported.pkg_config_missing? @@ -231,7 +231,7 @@ def add_compiler_flag(flag) $LDFLAGS += \ ' -Wl,-rpath,$$$\\\\{ORIGIN\\}/' \ "#{Datadog::Profiling::NativeExtensionHelpers.libdatadog_folder_relative_to_native_lib_folder}" -Logging.message("[ddtrace] After pkg-config $LDFLAGS were set to: #{$LDFLAGS.inspect}\n") +Logging.message("[datadog] After pkg-config $LDFLAGS were set to: #{$LDFLAGS.inspect}\n") # Tag the native extension library with the Ruby version and Ruby platform. # This makes it easier for development (avoids "oops I forgot to rebuild when I switched my Ruby") and ensures that diff --git a/ext/datadog_profiling_native_extension/http_transport.c b/ext/datadog_profiling_native_extension/http_transport.c index a5308a0b2a5..1ef2ee10b94 100644 --- a/ext/datadog_profiling_native_extension/http_transport.c +++ b/ext/datadog_profiling_native_extension/http_transport.c @@ -376,7 +376,7 @@ static void interrupt_exporter_call(void *cancel_token) { } static VALUE ddtrace_version(void) { - VALUE ddtrace_module = rb_const_get(rb_cObject, rb_intern("DDTrace")); + VALUE ddtrace_module = rb_const_get(rb_cObject, rb_intern("Datadog")); ENFORCE_TYPE(ddtrace_module, T_MODULE); VALUE version_module = rb_const_get(ddtrace_module, rb_intern("VERSION")); ENFORCE_TYPE(version_module, T_MODULE); diff --git a/ext/datadog_profiling_native_extension/native_extension_helpers.rb b/ext/datadog_profiling_native_extension/native_extension_helpers.rb index 2d267343429..a544b3ca101 100644 --- a/ext/datadog_profiling_native_extension/native_extension_helpers.rb +++ b/ext/datadog_profiling_native_extension/native_extension_helpers.rb @@ -21,7 +21,7 @@ def self.fail_install_if_missing_extension? ENV[ENV_FAIL_INSTALL_IF_MISSING_EXTENSION].to_s.strip.downcase == 'true' end - # Used as an workaround for a limitation with how dynamic linking works in environments where ddtrace and + # Used as an workaround for a limitation with how dynamic linking works in environments where the datadog gem and # libdatadog are moved after the extension gets compiled. # # Because the libddpprof native library is installed on a non-standard system path, in order for it to be @@ -31,10 +31,10 @@ def self.fail_install_if_missing_extension? # This runpath gets hardcoded at native library linking time. You can look at it using the `readelf` tool in # Linux: e.g. `readelf -d datadog_profiling_native_extension.2.7.3_x86_64-linux.so`. # - # In older versions of ddtrace, we only set as runpath an absolute path to libdatadog. + # In older versions of the datadog gem, we only set as runpath an absolute path to libdatadog. # (This gets set automatically by the call # to `pkg_config('datadog_profiling_with_rpath')` in `extconf.rb`). This worked fine as long as libdatadog was **NOT** - # moved from the folder it was present at ddtrace installation/linking time. + # moved from the folder it was present at datadog gem installation/linking time. # # Unfortunately, environments such as Heroku and AWS Elastic Beanstalk move gems around in the filesystem after # installation. Thus, the profiling native extension could not be loaded in these environments @@ -107,7 +107,7 @@ def self.failure_banner_for(reason:, suggested:, fail_install:) else [ 'The Datadog Continuous Profiler will not be available,', - 'but all other ddtrace features will work fine!', + 'but all other datadog features will work fine!', ] end @@ -213,7 +213,7 @@ def self.pkg_config_missing?(command: $PKGCONFIG) # rubocop:disable Style/Global private_class_method def self.on_truffleruby? truffleruby_not_supported = explain_issue( - 'TruffleRuby is not supported by the ddtrace gem.', + 'TruffleRuby is not supported by the datadog gem.', suggested: GET_IN_TOUCH, ) @@ -221,7 +221,7 @@ def self.pkg_config_missing?(command: $PKGCONFIG) # rubocop:disable Style/Global end # See https://docs.datadoghq.com/tracing/setup_overview/setup/ruby/#microsoft-windows-support for current - # state of Windows support in ddtrace. + # state of Windows support in the datadog gem. private_class_method def self.on_windows? windows_not_supported = explain_issue( 'Microsoft Windows is not supported by the Datadog Continuous Profiler.', diff --git a/gemfiles/jruby_9.2_activesupport.gemfile.lock b/gemfiles/jruby_9.2_activesupport.gemfile.lock index aaba403ab34..bd1c3362d8c 100644 --- a/gemfiles/jruby_9.2_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -226,7 +226,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) grape json-schema (< 3) diff --git a/gemfiles/jruby_9.2_aws.gemfile.lock b/gemfiles/jruby_9.2_aws.gemfile.lock index 376df0321a6..42b2bb93c3f 100644 --- a/gemfiles/jruby_9.2_aws.gemfile.lock +++ b/gemfiles/jruby_9.2_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1540,7 +1540,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_contrib.gemfile.lock b/gemfiles/jruby_9.2_contrib.gemfile.lock index ed238f456ac..c37dbcbab21 100644 --- a/gemfiles/jruby_9.2_contrib.gemfile.lock +++ b/gemfiles/jruby_9.2_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -173,7 +173,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_contrib_old.gemfile.lock b/gemfiles/jruby_9.2_contrib_old.gemfile.lock index efcd33d52fe..60f62cf845b 100644 --- a/gemfiles/jruby_9.2_contrib_old.gemfile.lock +++ b/gemfiles/jruby_9.2_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -129,7 +129,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) faraday (= 0.17) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_core_old.gemfile.lock b/gemfiles/jruby_9.2_core_old.gemfile.lock index 1790a71c52a..49003f56956 100644 --- a/gemfiles/jruby_9.2_core_old.gemfile.lock +++ b/gemfiles/jruby_9.2_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -115,7 +115,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock index 3103aed5a62..35e275e29a0 100644 --- a/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock +++ b/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock index 460ba980fd7..e64a7cdc32f 100644 --- a/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock +++ b/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_graphql_1.13.gemfile.lock b/gemfiles/jruby_9.2_graphql_1.13.gemfile.lock index dd126dd9970..e2cb2420222 100644 --- a/gemfiles/jruby_9.2_graphql_1.13.gemfile.lock +++ b/gemfiles/jruby_9.2_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -116,7 +116,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) graphql (~> 1.13.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock b/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock index 4b574f8002d..ee085471df3 100644 --- a/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock +++ b/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -116,7 +116,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) graphql (~> 2.0.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_hanami_1.gemfile.lock b/gemfiles/jruby_9.2_hanami_1.gemfile.lock index 3f1d24f1941..e5a687429e2 100644 --- a/gemfiles/jruby_9.2_hanami_1.gemfile.lock +++ b/gemfiles/jruby_9.2_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -219,7 +219,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) hanami (~> 1) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_http.gemfile.lock b/gemfiles/jruby_9.2_http.gemfile.lock index ac56aa71ad6..47b4f6a14db 100644 --- a/gemfiles/jruby_9.2_http.gemfile.lock +++ b/gemfiles/jruby_9.2_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -171,7 +171,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon (< 0.15.0) excon diff --git a/gemfiles/jruby_9.2_multi_rack_app.gemfile.lock b/gemfiles/jruby_9.2_multi_rack_app.gemfile.lock index 656dc160e47..ba9a5b6cf61 100644 --- a/gemfiles/jruby_9.2_multi_rack_app.gemfile.lock +++ b/gemfiles/jruby_9.2_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -280,7 +280,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) grape json-schema (< 3) diff --git a/gemfiles/jruby_9.2_opensearch_2.gemfile.lock b/gemfiles/jruby_9.2_opensearch_2.gemfile.lock index 1c0d553ca85..07d580c6c81 100644 --- a/gemfiles/jruby_9.2_opensearch_2.gemfile.lock +++ b/gemfiles/jruby_9.2_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_opensearch_3.gemfile.lock b/gemfiles/jruby_9.2_opensearch_3.gemfile.lock index 1359b686fbd..49a66cd1088 100644 --- a/gemfiles/jruby_9.2_opensearch_3.gemfile.lock +++ b/gemfiles/jruby_9.2_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -144,7 +144,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_opentracing.gemfile.lock b/gemfiles/jruby_9.2_opentracing.gemfile.lock index 0a0da470320..b8e71ef15f0 100644 --- a/gemfiles/jruby_9.2_opentracing.gemfile.lock +++ b/gemfiles/jruby_9.2_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -116,7 +116,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_rack_1.gemfile.lock b/gemfiles/jruby_9.2_rack_1.gemfile.lock index 29ebce3eacb..9873eaefe8b 100644 --- a/gemfiles/jruby_9.2_rack_1.gemfile.lock +++ b/gemfiles/jruby_9.2_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -118,7 +118,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_rack_2.gemfile.lock b/gemfiles/jruby_9.2_rack_2.gemfile.lock index 81055e86c13..7e20900853f 100644 --- a/gemfiles/jruby_9.2_rack_2.gemfile.lock +++ b/gemfiles/jruby_9.2_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -118,7 +118,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_rack_3.gemfile.lock b/gemfiles/jruby_9.2_rack_3.gemfile.lock index 65f55a26beb..518b3fdfde0 100644 --- a/gemfiles/jruby_9.2_rack_3.gemfile.lock +++ b/gemfiles/jruby_9.2_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -118,7 +118,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock index 076297818c1..dfae0518ef9 100644 --- a/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -229,7 +229,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock index d976ca9c4f2..ba1d380f4be 100644 --- a/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -249,7 +249,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock index 46cb21a4b74..38201aeab02 100644 --- a/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -254,7 +254,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock index 8276293c67e..8af79524764 100644 --- a/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -266,7 +266,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock index 26ac4d70d9a..af2a4eb2bfa 100644 --- a/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -256,7 +256,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock index 0dbad1014d8..a014fe3ce2e 100644 --- a/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -248,7 +248,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock index abc143be645..4ad6c1a43c8 100644 --- a/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -248,7 +248,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock index f5aa0ef377c..0bb2ff889b5 100644 --- a/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -268,7 +268,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock index 0db5c0e21da..d13f5d6770c 100644 --- a/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -273,7 +273,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock index 90bd32565ed..5e44726ab8f 100644 --- a/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -274,7 +274,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock index 12d0fa3538b..9444b3104ed 100644 --- a/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -267,7 +267,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock index 8234d1e37d7..eeb3de7368a 100644 --- a/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -245,7 +245,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock index 68ab865f6d8..a6dbfef2df6 100644 --- a/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -265,7 +265,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock index 76744634fbb..9d439e684c4 100644 --- a/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -270,7 +270,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock index 7bc8be92e63..c38c9ba3b49 100644 --- a/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -282,7 +282,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock index 79d87c8580d..9577bb03a67 100644 --- a/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -272,7 +272,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock index 7c3e3dc130b..1730eb84ff8 100644 --- a/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.2_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -264,7 +264,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) i18n (= 1.8.7) json-schema (< 3) diff --git a/gemfiles/jruby_9.2_redis_3.gemfile.lock b/gemfiles/jruby_9.2_redis_3.gemfile.lock index 19c288a7f14..23db9748ed6 100644 --- a/gemfiles/jruby_9.2_redis_3.gemfile.lock +++ b/gemfiles/jruby_9.2_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -116,7 +116,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_redis_4.gemfile.lock b/gemfiles/jruby_9.2_redis_4.gemfile.lock index 8e35f9cd1a8..11a6bb669e0 100644 --- a/gemfiles/jruby_9.2_redis_4.gemfile.lock +++ b/gemfiles/jruby_9.2_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -116,7 +116,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_redis_5.gemfile.lock b/gemfiles/jruby_9.2_redis_5.gemfile.lock index 7a2d370d5e1..fc91a4be4fb 100644 --- a/gemfiles/jruby_9.2_redis_5.gemfile.lock +++ b/gemfiles/jruby_9.2_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -120,7 +120,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_relational_db.gemfile.lock b/gemfiles/jruby_9.2_relational_db.gemfile.lock index a476c564919..832f9aefada 100644 --- a/gemfiles/jruby_9.2_relational_db.gemfile.lock +++ b/gemfiles/jruby_9.2_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock index a902a1eddb1..cef17f0e5cb 100644 --- a/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock +++ b/gemfiles/jruby_9.2_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -137,7 +137,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock index 379d14e6ba7..4e9e4c1af79 100644 --- a/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock +++ b/gemfiles/jruby_9.2_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -141,7 +141,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.2_sinatra.gemfile.lock b/gemfiles/jruby_9.2_sinatra.gemfile.lock index 17627d27035..1f40772f25e 100644 --- a/gemfiles/jruby_9.2_sinatra.gemfile.lock +++ b/gemfiles/jruby_9.2_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -131,7 +131,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_activesupport.gemfile.lock b/gemfiles/jruby_9.3_activesupport.gemfile.lock index a736f3cf261..b6ca818083f 100644 --- a/gemfiles/jruby_9.3_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.3_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -260,7 +260,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) grape json-schema (< 3) diff --git a/gemfiles/jruby_9.3_aws.gemfile.lock b/gemfiles/jruby_9.3_aws.gemfile.lock index 3fa74e0eca6..2129f3946a5 100644 --- a/gemfiles/jruby_9.3_aws.gemfile.lock +++ b/gemfiles/jruby_9.3_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1573,7 +1573,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_contrib.gemfile.lock b/gemfiles/jruby_9.3_contrib.gemfile.lock index 1fb841e4161..f90b852452b 100644 --- a/gemfiles/jruby_9.3_contrib.gemfile.lock +++ b/gemfiles/jruby_9.3_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -203,7 +203,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_contrib_old.gemfile.lock b/gemfiles/jruby_9.3_contrib_old.gemfile.lock index ba32648e4c4..87b31a077a1 100644 --- a/gemfiles/jruby_9.3_contrib_old.gemfile.lock +++ b/gemfiles/jruby_9.3_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) faraday (= 0.17) json-schema (< 3) diff --git a/gemfiles/jruby_9.3_core_old.gemfile.lock b/gemfiles/jruby_9.3_core_old.gemfile.lock index 1d8c889ae90..c0c4ef32ca8 100644 --- a/gemfiles/jruby_9.3_core_old.gemfile.lock +++ b/gemfiles/jruby_9.3_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -148,7 +148,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock index 4c6aff750a2..8b4c3484a08 100644 --- a/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock +++ b/gemfiles/jruby_9.3_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -182,7 +182,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) json-schema (< 3) diff --git a/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock index b893c1fbec1..ed3305437da 100644 --- a/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock +++ b/gemfiles/jruby_9.3_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -163,7 +163,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) json-schema (< 3) diff --git a/gemfiles/jruby_9.3_graphql_1.13.gemfile.lock b/gemfiles/jruby_9.3_graphql_1.13.gemfile.lock index c82c83006cf..d172b2e458e 100644 --- a/gemfiles/jruby_9.3_graphql_1.13.gemfile.lock +++ b/gemfiles/jruby_9.3_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) graphql (~> 1.13.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.3_graphql_2.0.gemfile.lock b/gemfiles/jruby_9.3_graphql_2.0.gemfile.lock index 7e32e6be67e..9b7ca45e416 100644 --- a/gemfiles/jruby_9.3_graphql_2.0.gemfile.lock +++ b/gemfiles/jruby_9.3_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) graphql (~> 2.0.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.3_hanami_1.gemfile.lock b/gemfiles/jruby_9.3_hanami_1.gemfile.lock index 7bec53fc317..cf992a8e86f 100644 --- a/gemfiles/jruby_9.3_hanami_1.gemfile.lock +++ b/gemfiles/jruby_9.3_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -246,7 +246,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) hanami (~> 1) json-schema (< 3) diff --git a/gemfiles/jruby_9.3_http.gemfile.lock b/gemfiles/jruby_9.3_http.gemfile.lock index 455fb4b56fc..8e1deffac57 100644 --- a/gemfiles/jruby_9.3_http.gemfile.lock +++ b/gemfiles/jruby_9.3_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -184,7 +184,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon excon diff --git a/gemfiles/jruby_9.3_multi_rack_app.gemfile.lock b/gemfiles/jruby_9.3_multi_rack_app.gemfile.lock index cc834226429..d59861c9adc 100644 --- a/gemfiles/jruby_9.3_multi_rack_app.gemfile.lock +++ b/gemfiles/jruby_9.3_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -307,7 +307,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) grape json-schema (< 3) diff --git a/gemfiles/jruby_9.3_opensearch_2.gemfile.lock b/gemfiles/jruby_9.3_opensearch_2.gemfile.lock index e34e529a22c..f8bfd579452 100644 --- a/gemfiles/jruby_9.3_opensearch_2.gemfile.lock +++ b/gemfiles/jruby_9.3_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -163,7 +163,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_opensearch_3.gemfile.lock b/gemfiles/jruby_9.3_opensearch_3.gemfile.lock index 55f9866006b..83593beeb53 100644 --- a/gemfiles/jruby_9.3_opensearch_3.gemfile.lock +++ b/gemfiles/jruby_9.3_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_opentracing.gemfile.lock b/gemfiles/jruby_9.3_opentracing.gemfile.lock index da9e3b667c1..582e9e96161 100644 --- a/gemfiles/jruby_9.3_opentracing.gemfile.lock +++ b/gemfiles/jruby_9.3_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_rack_1.gemfile.lock b/gemfiles/jruby_9.3_rack_1.gemfile.lock index fb6031b2eaf..7b3ae16c333 100644 --- a/gemfiles/jruby_9.3_rack_1.gemfile.lock +++ b/gemfiles/jruby_9.3_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -151,7 +151,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_rack_2.gemfile.lock b/gemfiles/jruby_9.3_rack_2.gemfile.lock index 062af26c1ec..24fd7256601 100644 --- a/gemfiles/jruby_9.3_rack_2.gemfile.lock +++ b/gemfiles/jruby_9.3_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -151,7 +151,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_rack_3.gemfile.lock b/gemfiles/jruby_9.3_rack_3.gemfile.lock index f586c7c2967..422c858b72f 100644 --- a/gemfiles/jruby_9.3_rack_3.gemfile.lock +++ b/gemfiles/jruby_9.3_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -151,7 +151,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock index 05c1564eccc..d20ad1ddbfa 100644 --- a/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -275,7 +275,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock index d6cb91694d0..7976f1540c4 100644 --- a/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -275,7 +275,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock index f4eced63cef..b3475f71787 100644 --- a/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -276,7 +276,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock index 823be984c85..aa4ed9d65cb 100644 --- a/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -292,7 +292,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock index 97ffea30c87..d6bb0cdc943 100644 --- a/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -282,7 +282,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock index d5132f099ce..c466e9555e4 100644 --- a/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.3_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -274,7 +274,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock index 1439c4797ba..e29494d2ea5 100644 --- a/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -294,7 +294,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock index ca7ab9071ed..f6d3e24c41b 100644 --- a/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -294,7 +294,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock index fd7ba99f597..eb9ca46ef4b 100644 --- a/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -295,7 +295,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock index 100c3305d25..7479b236376 100644 --- a/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -300,7 +300,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock index d97c84ff4cd..a519cbbc2d2 100644 --- a/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.3_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -293,7 +293,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock b/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock index b1856f81627..de15505ffd1 100644 --- a/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -291,7 +291,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock index ba66c679e25..5fb0fff3b32 100644 --- a/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -291,7 +291,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock index bfa35077cf6..aba477b3e05 100644 --- a/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -292,7 +292,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock index 4a77c046eb0..d66501c1750 100644 --- a/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -308,7 +308,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock index 4e523b9250b..f62e82266fb 100644 --- a/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -298,7 +298,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock b/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock index b9cc20ae23c..2b106b9db6f 100644 --- a/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.3_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -290,7 +290,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_redis_3.gemfile.lock b/gemfiles/jruby_9.3_redis_3.gemfile.lock index 54de76872a3..f723fa88b75 100644 --- a/gemfiles/jruby_9.3_redis_3.gemfile.lock +++ b/gemfiles/jruby_9.3_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_redis_4.gemfile.lock b/gemfiles/jruby_9.3_redis_4.gemfile.lock index 3f1e7cbbdc3..3b767045f2e 100644 --- a/gemfiles/jruby_9.3_redis_4.gemfile.lock +++ b/gemfiles/jruby_9.3_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_redis_5.gemfile.lock b/gemfiles/jruby_9.3_redis_5.gemfile.lock index c4465d126ef..53aa424393a 100644 --- a/gemfiles/jruby_9.3_redis_5.gemfile.lock +++ b/gemfiles/jruby_9.3_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -153,7 +153,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_relational_db.gemfile.lock b/gemfiles/jruby_9.3_relational_db.gemfile.lock index 7b2664efc05..0b26e251bbf 100644 --- a/gemfiles/jruby_9.3_relational_db.gemfile.lock +++ b/gemfiles/jruby_9.3_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -186,7 +186,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock index c633cbd0ac0..39827bc83d4 100644 --- a/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock +++ b/gemfiles/jruby_9.3_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -170,7 +170,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock index dbfd45fec64..11a92d9ca4e 100644 --- a/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock +++ b/gemfiles/jruby_9.3_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -170,7 +170,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.3_sinatra.gemfile.lock b/gemfiles/jruby_9.3_sinatra.gemfile.lock index 5f71528c968..ac96e255e92 100644 --- a/gemfiles/jruby_9.3_sinatra.gemfile.lock +++ b/gemfiles/jruby_9.3_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -164,7 +164,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_activesupport.gemfile.lock b/gemfiles/jruby_9.4_activesupport.gemfile.lock index 2f548559542..9e2e6a00d8b 100644 --- a/gemfiles/jruby_9.4_activesupport.gemfile.lock +++ b/gemfiles/jruby_9.4_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -257,7 +257,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) grape json-schema (< 3) diff --git a/gemfiles/jruby_9.4_aws.gemfile.lock b/gemfiles/jruby_9.4_aws.gemfile.lock index af9536b352e..81951e09785 100644 --- a/gemfiles/jruby_9.4_aws.gemfile.lock +++ b/gemfiles/jruby_9.4_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1574,7 +1574,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_contrib.gemfile.lock b/gemfiles/jruby_9.4_contrib.gemfile.lock index 42882a40bbe..0f266fac08b 100644 --- a/gemfiles/jruby_9.4_contrib.gemfile.lock +++ b/gemfiles/jruby_9.4_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -206,7 +206,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_contrib_old.gemfile.lock b/gemfiles/jruby_9.4_contrib_old.gemfile.lock index f09e9f40b12..14b8381665c 100644 --- a/gemfiles/jruby_9.4_contrib_old.gemfile.lock +++ b/gemfiles/jruby_9.4_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_core_old.gemfile.lock b/gemfiles/jruby_9.4_core_old.gemfile.lock index 8cff3d8bc33..380f5eddfc8 100644 --- a/gemfiles/jruby_9.4_core_old.gemfile.lock +++ b/gemfiles/jruby_9.4_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -148,7 +148,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock index 5b062cc74cc..b0a77934ccf 100644 --- a/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock +++ b/gemfiles/jruby_9.4_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -183,7 +183,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) json-schema (< 3) diff --git a/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock index d91f8e23e7c..bdbbdca55f5 100644 --- a/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock +++ b/gemfiles/jruby_9.4_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -164,7 +164,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) json-schema (< 3) diff --git a/gemfiles/jruby_9.4_graphql_1.13.gemfile.lock b/gemfiles/jruby_9.4_graphql_1.13.gemfile.lock index 68db5dc3cca..0d3ceeb173a 100644 --- a/gemfiles/jruby_9.4_graphql_1.13.gemfile.lock +++ b/gemfiles/jruby_9.4_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -150,7 +150,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) graphql (~> 1.13.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.4_graphql_2.0.gemfile.lock b/gemfiles/jruby_9.4_graphql_2.0.gemfile.lock index 73c41ea6572..913f14168df 100644 --- a/gemfiles/jruby_9.4_graphql_2.0.gemfile.lock +++ b/gemfiles/jruby_9.4_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -150,7 +150,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) graphql (~> 2.0.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.4_graphql_2.1.gemfile.lock b/gemfiles/jruby_9.4_graphql_2.1.gemfile.lock index faa7ab3b8e6..72576f2f387 100644 --- a/gemfiles/jruby_9.4_graphql_2.1.gemfile.lock +++ b/gemfiles/jruby_9.4_graphql_2.1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -151,7 +151,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) graphql (~> 2.1.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.4_graphql_2.2.gemfile.lock b/gemfiles/jruby_9.4_graphql_2.2.gemfile.lock index 1412c478f6d..c043f91e44b 100644 --- a/gemfiles/jruby_9.4_graphql_2.2.gemfile.lock +++ b/gemfiles/jruby_9.4_graphql_2.2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -151,7 +151,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) graphql (~> 2.2.0) json-schema (< 3) diff --git a/gemfiles/jruby_9.4_http.gemfile.lock b/gemfiles/jruby_9.4_http.gemfile.lock index 5706c623c6f..7c6af47be37 100644 --- a/gemfiles/jruby_9.4_http.gemfile.lock +++ b/gemfiles/jruby_9.4_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -185,7 +185,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon excon diff --git a/gemfiles/jruby_9.4_multi_rack_app.gemfile.lock b/gemfiles/jruby_9.4_multi_rack_app.gemfile.lock index bb88d53685c..99d0b166a88 100644 --- a/gemfiles/jruby_9.4_multi_rack_app.gemfile.lock +++ b/gemfiles/jruby_9.4_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -325,7 +325,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) grape json-schema (< 3) diff --git a/gemfiles/jruby_9.4_opensearch_2.gemfile.lock b/gemfiles/jruby_9.4_opensearch_2.gemfile.lock index b088d093484..a126a4eb136 100644 --- a/gemfiles/jruby_9.4_opensearch_2.gemfile.lock +++ b/gemfiles/jruby_9.4_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -164,7 +164,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_opensearch_3.gemfile.lock b/gemfiles/jruby_9.4_opensearch_3.gemfile.lock index 57c44636908..1dc133dd166 100644 --- a/gemfiles/jruby_9.4_opensearch_3.gemfile.lock +++ b/gemfiles/jruby_9.4_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -159,7 +159,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_opentracing.gemfile.lock b/gemfiles/jruby_9.4_opentracing.gemfile.lock index 72f3779e8b0..dcb698660d6 100644 --- a/gemfiles/jruby_9.4_opentracing.gemfile.lock +++ b/gemfiles/jruby_9.4_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -150,7 +150,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_rack_1.gemfile.lock b/gemfiles/jruby_9.4_rack_1.gemfile.lock index 1af94973da4..70106e23539 100644 --- a/gemfiles/jruby_9.4_rack_1.gemfile.lock +++ b/gemfiles/jruby_9.4_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -152,7 +152,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_rack_2.gemfile.lock b/gemfiles/jruby_9.4_rack_2.gemfile.lock index 790b04a4c8b..c1e31c82a3a 100644 --- a/gemfiles/jruby_9.4_rack_2.gemfile.lock +++ b/gemfiles/jruby_9.4_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -152,7 +152,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_rack_3.gemfile.lock b/gemfiles/jruby_9.4_rack_3.gemfile.lock index 1de084b22f0..efd2a23bb46 100644 --- a/gemfiles/jruby_9.4_rack_3.gemfile.lock +++ b/gemfiles/jruby_9.4_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -152,7 +152,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock index 6b2c8f03063..d2c24664322 100644 --- a/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -294,7 +294,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock index 1a3004743f4..1dab8fd772d 100644 --- a/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -294,7 +294,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock index d929e31e0ac..aa6c5f1c71f 100644 --- a/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -295,7 +295,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock index 98bc52b019b..53cec1bf810 100644 --- a/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -308,7 +308,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) lograge (~> 0.11) diff --git a/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock index 453bac07954..2d331392a3b 100644 --- a/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/jruby_9.4_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -293,7 +293,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_redis_3.gemfile.lock b/gemfiles/jruby_9.4_redis_3.gemfile.lock index 6e6380d12b3..d8fd5467e1d 100644 --- a/gemfiles/jruby_9.4_redis_3.gemfile.lock +++ b/gemfiles/jruby_9.4_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_redis_4.gemfile.lock b/gemfiles/jruby_9.4_redis_4.gemfile.lock index 03cbc628651..01a9f6d90f0 100644 --- a/gemfiles/jruby_9.4_redis_4.gemfile.lock +++ b/gemfiles/jruby_9.4_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -149,7 +149,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_redis_5.gemfile.lock b/gemfiles/jruby_9.4_redis_5.gemfile.lock index 72e8dab32ba..deb3dadc46a 100644 --- a/gemfiles/jruby_9.4_redis_5.gemfile.lock +++ b/gemfiles/jruby_9.4_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -153,7 +153,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_relational_db.gemfile.lock b/gemfiles/jruby_9.4_relational_db.gemfile.lock index e5dc1700957..3cef45990ff 100644 --- a/gemfiles/jruby_9.4_relational_db.gemfile.lock +++ b/gemfiles/jruby_9.4_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -184,7 +184,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock b/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock index 13b81f40f8c..e72da81fb13 100644 --- a/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock +++ b/gemfiles/jruby_9.4_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -170,7 +170,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock b/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock index c4966a0f617..8d44dd51d08 100644 --- a/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock +++ b/gemfiles/jruby_9.4_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -174,7 +174,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/jruby_9.4_sinatra.gemfile.lock b/gemfiles/jruby_9.4_sinatra.gemfile.lock index a1a3dafd700..e2f4482726e 100644 --- a/gemfiles/jruby_9.4_sinatra.gemfile.lock +++ b/gemfiles/jruby_9.4_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -164,7 +164,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) json-schema (< 3) memory_profiler (~> 0.9) diff --git a/gemfiles/ruby_2.5_activesupport.gemfile.lock b/gemfiles/ruby_2.5_activesupport.gemfile.lock index 3cac3ba57a5..4a714aaace1 100644 --- a/gemfiles/ruby_2.5_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.5_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -238,7 +238,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_aws.gemfile.lock b/gemfiles/ruby_2.5_aws.gemfile.lock index 2691c66f7c9..9a4465b3a28 100644 --- a/gemfiles/ruby_2.5_aws.gemfile.lock +++ b/gemfiles/ruby_2.5_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1549,7 +1549,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_contrib.gemfile.lock b/gemfiles/ruby_2.5_contrib.gemfile.lock index 44fe362051b..3ce24a1a287 100644 --- a/gemfiles/ruby_2.5_contrib.gemfile.lock +++ b/gemfiles/ruby_2.5_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -192,7 +192,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_contrib_old.gemfile.lock b/gemfiles/ruby_2.5_contrib_old.gemfile.lock index cfedc1d1f65..c5a9b02e3b1 100644 --- a/gemfiles/ruby_2.5_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.5_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -178,7 +178,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) faraday (= 0.17) diff --git a/gemfiles/ruby_2.5_core_old.gemfile.lock b/gemfiles/ruby_2.5_core_old.gemfile.lock index 244517e259a..6149fe6630a 100644 --- a/gemfiles/ruby_2.5_core_old.gemfile.lock +++ b/gemfiles/ruby_2.5_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -124,7 +124,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock index 8c11c9478a7..1d17bb6b1ab 100644 --- a/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock +++ b/gemfiles/ruby_2.5_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock b/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock index 08d598aba35..e7e270ae595 100644 --- a/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock +++ b/gemfiles/ruby_2.5_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.5_graphql_1.12.gemfile.lock b/gemfiles/ruby_2.5_graphql_1.12.gemfile.lock index 1a9e753da6e..ad65692a209 100644 --- a/gemfiles/ruby_2.5_graphql_1.12.gemfile.lock +++ b/gemfiles/ruby_2.5_graphql_1.12.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -125,7 +125,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_graphql_1.13.gemfile.lock b/gemfiles/ruby_2.5_graphql_1.13.gemfile.lock index 1355e4f4a39..55ea63fa9ad 100644 --- a/gemfiles/ruby_2.5_graphql_1.13.gemfile.lock +++ b/gemfiles/ruby_2.5_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -125,7 +125,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_graphql_2.0.gemfile.lock b/gemfiles/ruby_2.5_graphql_2.0.gemfile.lock index 48b28ac073c..1d520faadd6 100644 --- a/gemfiles/ruby_2.5_graphql_2.0.gemfile.lock +++ b/gemfiles/ruby_2.5_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -125,7 +125,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_hanami_1.gemfile.lock b/gemfiles/ruby_2.5_hanami_1.gemfile.lock index dec3cf53765..78154d6225e 100644 --- a/gemfiles/ruby_2.5_hanami_1.gemfile.lock +++ b/gemfiles/ruby_2.5_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -228,7 +228,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_http.gemfile.lock b/gemfiles/ruby_2.5_http.gemfile.lock index 9a520aaada7..b9db1b6ff64 100644 --- a/gemfiles/ruby_2.5_http.gemfile.lock +++ b/gemfiles/ruby_2.5_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -183,7 +183,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon excon diff --git a/gemfiles/ruby_2.5_multi_rack_app.gemfile.lock b/gemfiles/ruby_2.5_multi_rack_app.gemfile.lock index 625b5d9fd3e..5ee760bea2a 100644 --- a/gemfiles/ruby_2.5_multi_rack_app.gemfile.lock +++ b/gemfiles/ruby_2.5_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -293,7 +293,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_opensearch_2.gemfile.lock b/gemfiles/ruby_2.5_opensearch_2.gemfile.lock index 09dfd150577..8d366cd8f2d 100644 --- a/gemfiles/ruby_2.5_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_2.5_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_opensearch_3.gemfile.lock b/gemfiles/ruby_2.5_opensearch_3.gemfile.lock index 61bfa8a05ab..f596d59a011 100644 --- a/gemfiles/ruby_2.5_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_2.5_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -153,7 +153,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_opentracing.gemfile.lock b/gemfiles/ruby_2.5_opentracing.gemfile.lock index a77991bfb80..54a200d0c5d 100644 --- a/gemfiles/ruby_2.5_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.5_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -125,7 +125,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rack_1.gemfile.lock b/gemfiles/ruby_2.5_rack_1.gemfile.lock index 287183dfdf2..28e99fafcaf 100644 --- a/gemfiles/ruby_2.5_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.5_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -127,7 +127,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rack_2.gemfile.lock b/gemfiles/ruby_2.5_rack_2.gemfile.lock index 60acdaac103..7401d6d5999 100644 --- a/gemfiles/ruby_2.5_rack_2.gemfile.lock +++ b/gemfiles/ruby_2.5_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -127,7 +127,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rack_3.gemfile.lock b/gemfiles/ruby_2.5_rack_3.gemfile.lock index 0f63825f90d..d200814c5b6 100644 --- a/gemfiles/ruby_2.5_rack_3.gemfile.lock +++ b/gemfiles/ruby_2.5_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -127,7 +127,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails4_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails4_mysql2.gemfile.lock index cbaeecce59f..33af2d0b983 100644 --- a/gemfiles/ruby_2.5_rails4_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5_rails4_mysql2.gemfile.lock @@ -67,7 +67,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -250,7 +250,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails4_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails4_postgres.gemfile.lock index 14624b5ca92..50d998eba72 100644 --- a/gemfiles/ruby_2.5_rails4_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5_rails4_postgres.gemfile.lock @@ -67,7 +67,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -250,7 +250,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails4_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails4_postgres_redis.gemfile.lock index 565c63d828b..f95bb716e32 100644 --- a/gemfiles/ruby_2.5_rails4_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5_rails4_postgres_redis.gemfile.lock @@ -67,7 +67,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -267,7 +267,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails4_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails4_postgres_sidekiq.gemfile.lock index 71746435368..176656db5a7 100644 --- a/gemfiles/ruby_2.5_rails4_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5_rails4_postgres_sidekiq.gemfile.lock @@ -64,7 +64,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -260,7 +260,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails4_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails4_semantic_logger.gemfile.lock index a861a22c1d0..0c62539db1e 100644 --- a/gemfiles/ruby_2.5_rails4_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5_rails4_semantic_logger.gemfile.lock @@ -67,7 +67,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -249,7 +249,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock index eb2fe89401c..7c1d034f60f 100644 --- a/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -236,7 +236,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock index f98dc2bd5e6..27728be82ac 100644 --- a/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -256,7 +256,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock index cdabfe153c1..ea84feadf97 100644 --- a/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -261,7 +261,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock index e47e4af21f9..70bb8adaff3 100644 --- a/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -273,7 +273,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock index 7a240b8a8d0..32486378375 100644 --- a/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -263,7 +263,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock index 0b90d671ed2..6b6f1be40f4 100644 --- a/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -255,7 +255,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock index 682bdbe9d9d..8dc211ff784 100644 --- a/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -255,7 +255,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock index 6074856f584..aa8bd0a8627 100644 --- a/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -275,7 +275,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock index 810a9fa0824..b4a095bb8d8 100644 --- a/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -280,7 +280,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock index f7396bfc129..5a186017a56 100644 --- a/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -281,7 +281,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock index ab06ee284ed..be48c43954d 100644 --- a/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -274,7 +274,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock index 5a2222100b6..41706393793 100644 --- a/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -252,7 +252,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock index 39f347d529b..51c89f87a2b 100644 --- a/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -272,7 +272,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock index ad2c17ee667..e548fee209c 100644 --- a/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -277,7 +277,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock index 721d9656790..9b16d984957 100644 --- a/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -289,7 +289,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock index 56d17f35854..c9dec200a32 100644 --- a/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -279,7 +279,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock index ce610a9d1f9..05c32126520 100644 --- a/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.5_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -271,7 +271,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_redis_3.gemfile.lock b/gemfiles/ruby_2.5_redis_3.gemfile.lock index ecc21660313..dae5bb6d0ee 100644 --- a/gemfiles/ruby_2.5_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.5_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -125,7 +125,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_redis_4.gemfile.lock b/gemfiles/ruby_2.5_redis_4.gemfile.lock index d6af52d0d98..a84fc4e8710 100644 --- a/gemfiles/ruby_2.5_redis_4.gemfile.lock +++ b/gemfiles/ruby_2.5_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -125,7 +125,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_redis_5.gemfile.lock b/gemfiles/ruby_2.5_redis_5.gemfile.lock index f6b892f2b69..664946a08ce 100644 --- a/gemfiles/ruby_2.5_redis_5.gemfile.lock +++ b/gemfiles/ruby_2.5_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -129,7 +129,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_relational_db.gemfile.lock b/gemfiles/ruby_2.5_relational_db.gemfile.lock index 9b91b7c98e6..154ebd8054d 100644 --- a/gemfiles/ruby_2.5_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.5_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -152,7 +152,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock index c25c006c58d..419df8cc663 100644 --- a/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.5_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -146,7 +146,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock index c0ee316f9af..f66893846c6 100644 --- a/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.5_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -150,7 +150,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.5_sinatra.gemfile.lock b/gemfiles/ruby_2.5_sinatra.gemfile.lock index c8b60679012..ceca447c6f9 100644 --- a/gemfiles/ruby_2.5_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.5_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -140,7 +140,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_activesupport.gemfile.lock b/gemfiles/ruby_2.6_activesupport.gemfile.lock index 8ff75820d37..e1700a3568c 100644 --- a/gemfiles/ruby_2.6_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.6_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -273,7 +273,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_aws.gemfile.lock b/gemfiles/ruby_2.6_aws.gemfile.lock index f28e4b88091..51b58e1fd23 100644 --- a/gemfiles/ruby_2.6_aws.gemfile.lock +++ b/gemfiles/ruby_2.6_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1584,7 +1584,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_contrib.gemfile.lock b/gemfiles/ruby_2.6_contrib.gemfile.lock index c5cf91e74cf..1aa9e650658 100644 --- a/gemfiles/ruby_2.6_contrib.gemfile.lock +++ b/gemfiles/ruby_2.6_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -224,7 +224,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_contrib_old.gemfile.lock b/gemfiles/ruby_2.6_contrib_old.gemfile.lock index 5105daf1942..d955bdd8373 100644 --- a/gemfiles/ruby_2.6_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.6_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -211,7 +211,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) faraday (= 0.17) diff --git a/gemfiles/ruby_2.6_core_old.gemfile.lock b/gemfiles/ruby_2.6_core_old.gemfile.lock index 77d682eec05..fe7116a4a3a 100644 --- a/gemfiles/ruby_2.6_core_old.gemfile.lock +++ b/gemfiles/ruby_2.6_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock index 5a5ec94b6d7..524e9ab1879 100644 --- a/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock +++ b/gemfiles/ruby_2.6_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -193,7 +193,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock b/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock index af546ff6861..ba6a77f730b 100644 --- a/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock +++ b/gemfiles/ruby_2.6_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -174,7 +174,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.6_graphql_1.12.gemfile.lock b/gemfiles/ruby_2.6_graphql_1.12.gemfile.lock index d7c7b31f19a..1d560f00517 100644 --- a/gemfiles/ruby_2.6_graphql_1.12.gemfile.lock +++ b/gemfiles/ruby_2.6_graphql_1.12.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -160,7 +160,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_graphql_1.13.gemfile.lock b/gemfiles/ruby_2.6_graphql_1.13.gemfile.lock index 9b74ff60c64..0c1dc5a6e55 100644 --- a/gemfiles/ruby_2.6_graphql_1.13.gemfile.lock +++ b/gemfiles/ruby_2.6_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -160,7 +160,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_graphql_2.0.gemfile.lock b/gemfiles/ruby_2.6_graphql_2.0.gemfile.lock index 8e1b671d4c2..8e9e58abc8d 100644 --- a/gemfiles/ruby_2.6_graphql_2.0.gemfile.lock +++ b/gemfiles/ruby_2.6_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -160,7 +160,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_hanami_1.gemfile.lock b/gemfiles/ruby_2.6_hanami_1.gemfile.lock index dd23bfb3661..84560933471 100644 --- a/gemfiles/ruby_2.6_hanami_1.gemfile.lock +++ b/gemfiles/ruby_2.6_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -255,7 +255,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_http.gemfile.lock b/gemfiles/ruby_2.6_http.gemfile.lock index 73a891ea846..dc5a202a587 100644 --- a/gemfiles/ruby_2.6_http.gemfile.lock +++ b/gemfiles/ruby_2.6_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -198,7 +198,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon excon diff --git a/gemfiles/ruby_2.6_multi_rack_app.gemfile.lock b/gemfiles/ruby_2.6_multi_rack_app.gemfile.lock index 6b952687831..a32d711e72d 100644 --- a/gemfiles/ruby_2.6_multi_rack_app.gemfile.lock +++ b/gemfiles/ruby_2.6_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -320,7 +320,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_opensearch_2.gemfile.lock b/gemfiles/ruby_2.6_opensearch_2.gemfile.lock index 273d289b151..45c4c73b25f 100644 --- a/gemfiles/ruby_2.6_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_2.6_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -174,7 +174,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_opensearch_3.gemfile.lock b/gemfiles/ruby_2.6_opensearch_3.gemfile.lock index 98679c8b60d..447bafd7fce 100644 --- a/gemfiles/ruby_2.6_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_2.6_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -169,7 +169,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_opentelemetry.gemfile.lock b/gemfiles/ruby_2.6_opentelemetry.gemfile.lock index 06169166243..e68278debbf 100755 --- a/gemfiles/ruby_2.6_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_2.6_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -169,7 +169,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_opentracing.gemfile.lock b/gemfiles/ruby_2.6_opentracing.gemfile.lock index bfa39c31648..6f83c593b2a 100644 --- a/gemfiles/ruby_2.6_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.6_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -160,7 +160,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rack_1.gemfile.lock b/gemfiles/ruby_2.6_rack_1.gemfile.lock index a2c5deaeb3c..0209433b448 100644 --- a/gemfiles/ruby_2.6_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.6_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rack_2.gemfile.lock b/gemfiles/ruby_2.6_rack_2.gemfile.lock index ad814a0b956..fbf906b4d74 100644 --- a/gemfiles/ruby_2.6_rack_2.gemfile.lock +++ b/gemfiles/ruby_2.6_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rack_3.gemfile.lock b/gemfiles/ruby_2.6_rack_3.gemfile.lock index 1fd26b1c0de..a748da60441 100644 --- a/gemfiles/ruby_2.6_rack_3.gemfile.lock +++ b/gemfiles/ruby_2.6_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock index e0d3f74113f..df04170f362 100644 --- a/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -281,7 +281,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock index 85e687a3b26..a697dbb7831 100644 --- a/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -281,7 +281,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock index 863f8034e05..cc85f21b178 100644 --- a/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -282,7 +282,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock index 72b52d264ab..5cefae01b66 100644 --- a/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -298,7 +298,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock index 6c7f6ba07be..0bce76c8575 100644 --- a/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -288,7 +288,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock index 94e1ebf7fc0..e43ed57c44d 100644 --- a/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.6_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -280,7 +280,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock index fc1ffd99bfd..bfaafe2f511 100644 --- a/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -300,7 +300,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock index 8acd3719581..83bc3d0e1fa 100644 --- a/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -300,7 +300,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock index 37b8820813c..64c244094eb 100644 --- a/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -301,7 +301,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock index 5a87dd27437..b4490bb985a 100644 --- a/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -306,7 +306,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock index 4c3d72008fe..fa134673d5c 100644 --- a/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.6_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -299,7 +299,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock index a28859615c3..451aa0c3147 100644 --- a/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -297,7 +297,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock index 7ad1533020c..7eb2b5b7339 100644 --- a/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -297,7 +297,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock index adaf8bedc30..4a74bd036fc 100644 --- a/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -298,7 +298,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock index 8f64a0c4129..6fb7bced2f3 100644 --- a/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -314,7 +314,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock index ec1d9eed100..fafb6ebbf4d 100644 --- a/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -304,7 +304,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock index fe42fc26023..7865e819dd4 100644 --- a/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.6_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -296,7 +296,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_redis_3.gemfile.lock b/gemfiles/ruby_2.6_redis_3.gemfile.lock index 2d0705a28de..b96f998b2f0 100644 --- a/gemfiles/ruby_2.6_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.6_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_redis_4.gemfile.lock b/gemfiles/ruby_2.6_redis_4.gemfile.lock index 2fb827a882e..7ac018c1db5 100644 --- a/gemfiles/ruby_2.6_redis_4.gemfile.lock +++ b/gemfiles/ruby_2.6_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_redis_5.gemfile.lock b/gemfiles/ruby_2.6_redis_5.gemfile.lock index d6fcb5e3879..99a983c01c8 100644 --- a/gemfiles/ruby_2.6_redis_5.gemfile.lock +++ b/gemfiles/ruby_2.6_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_relational_db.gemfile.lock b/gemfiles/ruby_2.6_relational_db.gemfile.lock index 2e00e2f0845..bd7ea5bfc73 100644 --- a/gemfiles/ruby_2.6_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.6_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -187,7 +187,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock index e7c605336a6..fd334ef54c5 100644 --- a/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.6_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -179,7 +179,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock index 83980e537d9..8e3f14b4216 100644 --- a/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.6_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -179,7 +179,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.6_sinatra.gemfile.lock b/gemfiles/ruby_2.6_sinatra.gemfile.lock index 7bbce68a290..c480bd293dc 100644 --- a/gemfiles/ruby_2.6_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.6_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -173,7 +173,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, < 3.19.2, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_activesupport.gemfile.lock b/gemfiles/ruby_2.7_activesupport.gemfile.lock index bbdf9373719..98f43867daf 100644 --- a/gemfiles/ruby_2.7_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.7_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -269,7 +269,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_aws.gemfile.lock b/gemfiles/ruby_2.7_aws.gemfile.lock index 4a9d4620130..ffe4994b6d9 100644 --- a/gemfiles/ruby_2.7_aws.gemfile.lock +++ b/gemfiles/ruby_2.7_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1584,7 +1584,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_contrib.gemfile.lock b/gemfiles/ruby_2.7_contrib.gemfile.lock index 0320ae29e79..cace16c00f3 100644 --- a/gemfiles/ruby_2.7_contrib.gemfile.lock +++ b/gemfiles/ruby_2.7_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -224,7 +224,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_contrib_old.gemfile.lock b/gemfiles/ruby_2.7_contrib_old.gemfile.lock index e54c1a9d303..a0d5906166b 100644 --- a/gemfiles/ruby_2.7_contrib_old.gemfile.lock +++ b/gemfiles/ruby_2.7_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -211,7 +211,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) faraday (= 0.17) diff --git a/gemfiles/ruby_2.7_core_old.gemfile.lock b/gemfiles/ruby_2.7_core_old.gemfile.lock index e91480f372a..4ee6e365352 100644 --- a/gemfiles/ruby_2.7_core_old.gemfile.lock +++ b/gemfiles/ruby_2.7_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock b/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock index b30f2a00f97..fea49e438f0 100644 --- a/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock +++ b/gemfiles/ruby_2.7_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -193,7 +193,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock b/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock index 1e13b18e04f..039bfafb48a 100644 --- a/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock +++ b/gemfiles/ruby_2.7_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -174,7 +174,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_2.7_graphql_1.12.gemfile.lock b/gemfiles/ruby_2.7_graphql_1.12.gemfile.lock index 3659b96a093..8d3579890d1 100644 --- a/gemfiles/ruby_2.7_graphql_1.12.gemfile.lock +++ b/gemfiles/ruby_2.7_graphql_1.12.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -160,7 +160,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_graphql_1.13.gemfile.lock b/gemfiles/ruby_2.7_graphql_1.13.gemfile.lock index 1a74f487775..70a99a57b57 100644 --- a/gemfiles/ruby_2.7_graphql_1.13.gemfile.lock +++ b/gemfiles/ruby_2.7_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -160,7 +160,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_graphql_2.0.gemfile.lock b/gemfiles/ruby_2.7_graphql_2.0.gemfile.lock index 30e88630328..f6930b91b4b 100644 --- a/gemfiles/ruby_2.7_graphql_2.0.gemfile.lock +++ b/gemfiles/ruby_2.7_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -160,7 +160,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_graphql_2.1.gemfile.lock b/gemfiles/ruby_2.7_graphql_2.1.gemfile.lock index 20df8b4794d..742b60b7aee 100644 --- a/gemfiles/ruby_2.7_graphql_2.1.gemfile.lock +++ b/gemfiles/ruby_2.7_graphql_2.1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_graphql_2.2.gemfile.lock b/gemfiles/ruby_2.7_graphql_2.2.gemfile.lock index 37580ab71fa..546a63c0b17 100644 --- a/gemfiles/ruby_2.7_graphql_2.2.gemfile.lock +++ b/gemfiles/ruby_2.7_graphql_2.2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_hanami_1.gemfile.lock b/gemfiles/ruby_2.7_hanami_1.gemfile.lock index b75ae0dca64..bbe87890b2d 100644 --- a/gemfiles/ruby_2.7_hanami_1.gemfile.lock +++ b/gemfiles/ruby_2.7_hanami_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -257,7 +257,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_http.gemfile.lock b/gemfiles/ruby_2.7_http.gemfile.lock index 55e296f219b..5e19bfda732 100644 --- a/gemfiles/ruby_2.7_http.gemfile.lock +++ b/gemfiles/ruby_2.7_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -198,7 +198,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon excon diff --git a/gemfiles/ruby_2.7_multi_rack_app.gemfile.lock b/gemfiles/ruby_2.7_multi_rack_app.gemfile.lock index d49efd88c40..37c6f298a11 100644 --- a/gemfiles/ruby_2.7_multi_rack_app.gemfile.lock +++ b/gemfiles/ruby_2.7_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -318,7 +318,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_opensearch_2.gemfile.lock b/gemfiles/ruby_2.7_opensearch_2.gemfile.lock index 8869f80efee..26ab254b561 100644 --- a/gemfiles/ruby_2.7_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_2.7_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -174,7 +174,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_opensearch_3.gemfile.lock b/gemfiles/ruby_2.7_opensearch_3.gemfile.lock index d738fe5d00f..8cc5ed4fc2a 100644 --- a/gemfiles/ruby_2.7_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_2.7_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -169,7 +169,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_opentelemetry.gemfile.lock b/gemfiles/ruby_2.7_opentelemetry.gemfile.lock index 85196efd8d1..bc27bc97fc4 100755 --- a/gemfiles/ruby_2.7_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_2.7_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -169,7 +169,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_opentracing.gemfile.lock b/gemfiles/ruby_2.7_opentracing.gemfile.lock index d961c207bd2..d5696c2f211 100644 --- a/gemfiles/ruby_2.7_opentracing.gemfile.lock +++ b/gemfiles/ruby_2.7_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -160,7 +160,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rack_1.gemfile.lock b/gemfiles/ruby_2.7_rack_1.gemfile.lock index c6d74d34dd4..33504a8f9f3 100644 --- a/gemfiles/ruby_2.7_rack_1.gemfile.lock +++ b/gemfiles/ruby_2.7_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rack_2.gemfile.lock b/gemfiles/ruby_2.7_rack_2.gemfile.lock index 684be8306f8..dad9c04e171 100644 --- a/gemfiles/ruby_2.7_rack_2.gemfile.lock +++ b/gemfiles/ruby_2.7_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rack_3.gemfile.lock b/gemfiles/ruby_2.7_rack_3.gemfile.lock index 7ddfe2451c6..778e7f680f3 100644 --- a/gemfiles/ruby_2.7_rack_3.gemfile.lock +++ b/gemfiles/ruby_2.7_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock b/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock index d61f2ff2442..d9cc231eaeb 100644 --- a/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -281,7 +281,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock index dce641b7eed..59b664101d7 100644 --- a/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -281,7 +281,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock index c84a9468585..3d9ba23e618 100644 --- a/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -282,7 +282,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock index 72e9de586b9..9dabe1766ad 100644 --- a/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -298,7 +298,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock index 5639f2c472b..3e811e4df37 100644 --- a/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -288,7 +288,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock index aa2aa3c02b0..786b5275ec7 100644 --- a/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.7_rails5_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -280,7 +280,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock b/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock index 4f4b34bdce8..7ba0ce8ad57 100644 --- a/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -300,7 +300,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock b/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock index 12a8a2fa576..73559e012bb 100644 --- a/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -300,7 +300,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock index 1ee0351c0d1..f39e9a130b3 100644 --- a/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -301,7 +301,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock index b9ca2a344c4..d47b6ea14b8 100644 --- a/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -308,7 +308,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock index 1d6af287b03..8cd3a8c06f4 100644 --- a/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.7_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -299,7 +299,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock b/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock index f72a71c5618..4ded827428a 100644 --- a/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -297,7 +297,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock index abcc0bfc2e0..589092682ac 100644 --- a/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -297,7 +297,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock index 7aa1f60b8e9..caeb277b22d 100644 --- a/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -298,7 +298,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock index 9e3730b9687..adb8cfa8143 100644 --- a/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_postgres_redis_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -314,7 +314,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock index 8577e899dfe..b416abef125 100644 --- a/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -304,7 +304,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock b/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock index a66bee23f93..c238ed8b8ed 100644 --- a/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_2.7_rails6_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -296,7 +296,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_redis_3.gemfile.lock b/gemfiles/ruby_2.7_redis_3.gemfile.lock index 3db0d44b5ec..5bfbcf188ad 100644 --- a/gemfiles/ruby_2.7_redis_3.gemfile.lock +++ b/gemfiles/ruby_2.7_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_redis_4.gemfile.lock b/gemfiles/ruby_2.7_redis_4.gemfile.lock index bcb67df4d3e..9ee9e11bdc2 100644 --- a/gemfiles/ruby_2.7_redis_4.gemfile.lock +++ b/gemfiles/ruby_2.7_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_redis_5.gemfile.lock b/gemfiles/ruby_2.7_redis_5.gemfile.lock index 65fafbd97c4..c01547b9571 100644 --- a/gemfiles/ruby_2.7_redis_5.gemfile.lock +++ b/gemfiles/ruby_2.7_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_relational_db.gemfile.lock b/gemfiles/ruby_2.7_relational_db.gemfile.lock index e01be6967ec..668f3b8679f 100644 --- a/gemfiles/ruby_2.7_relational_db.gemfile.lock +++ b/gemfiles/ruby_2.7_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -186,7 +186,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock b/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock index 5455b100f99..f98f6958e3c 100644 --- a/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_2.7_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -179,7 +179,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock b/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock index 87e7f9b1c04..1d57a9d1bd8 100644 --- a/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_2.7_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -179,7 +179,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_2.7_sinatra.gemfile.lock b/gemfiles/ruby_2.7_sinatra.gemfile.lock index 27c3d49e1ef..2cf141380ac 100644 --- a/gemfiles/ruby_2.7_sinatra.gemfile.lock +++ b/gemfiles/ruby_2.7_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -173,7 +173,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_activesupport.gemfile.lock b/gemfiles/ruby_3.0_activesupport.gemfile.lock index e1abfc8955c..5fc58ab3989 100644 --- a/gemfiles/ruby_3.0_activesupport.gemfile.lock +++ b/gemfiles/ruby_3.0_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -270,7 +270,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_aws.gemfile.lock b/gemfiles/ruby_3.0_aws.gemfile.lock index 41b63a57c2f..84c1c57da9b 100644 --- a/gemfiles/ruby_3.0_aws.gemfile.lock +++ b/gemfiles/ruby_3.0_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1585,7 +1585,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_contrib.gemfile.lock b/gemfiles/ruby_3.0_contrib.gemfile.lock index a3b50376d35..871a80c88e9 100644 --- a/gemfiles/ruby_3.0_contrib.gemfile.lock +++ b/gemfiles/ruby_3.0_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -227,7 +227,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_contrib_old.gemfile.lock b/gemfiles/ruby_3.0_contrib_old.gemfile.lock index 00086f801ef..666d2df7011 100644 --- a/gemfiles/ruby_3.0_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.0_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -211,7 +211,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_core_old.gemfile.lock b/gemfiles/ruby_3.0_core_old.gemfile.lock index 5e9dcd16542..9f55f7473c6 100644 --- a/gemfiles/ruby_3.0_core_old.gemfile.lock +++ b/gemfiles/ruby_3.0_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock index 335c7d95bda..045ef4ccece 100644 --- a/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock +++ b/gemfiles/ruby_3.0_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -194,7 +194,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock index 8c6879c6473..27bc60787e1 100644 --- a/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock +++ b/gemfiles/ruby_3.0_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -175,7 +175,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.0_graphql_1.12.gemfile.lock b/gemfiles/ruby_3.0_graphql_1.12.gemfile.lock index 4372de58a77..ab006803031 100644 --- a/gemfiles/ruby_3.0_graphql_1.12.gemfile.lock +++ b/gemfiles/ruby_3.0_graphql_1.12.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.0_graphql_1.13.gemfile.lock index af9baa03d54..664ea8bb9ad 100644 --- a/gemfiles/ruby_3.0_graphql_1.13.gemfile.lock +++ b/gemfiles/ruby_3.0_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.0_graphql_2.0.gemfile.lock index 9ab190bebbb..f3cf89e84f9 100644 --- a/gemfiles/ruby_3.0_graphql_2.0.gemfile.lock +++ b/gemfiles/ruby_3.0_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.0_graphql_2.1.gemfile.lock index 51d2730c4ef..ebbc67f63ca 100644 --- a/gemfiles/ruby_3.0_graphql_2.1.gemfile.lock +++ b/gemfiles/ruby_3.0_graphql_2.1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.0_graphql_2.2.gemfile.lock index 8d561f2e28a..d39df476310 100644 --- a/gemfiles/ruby_3.0_graphql_2.2.gemfile.lock +++ b/gemfiles/ruby_3.0_graphql_2.2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_http.gemfile.lock b/gemfiles/ruby_3.0_http.gemfile.lock index 52b292d073a..3cbed69c429 100644 --- a/gemfiles/ruby_3.0_http.gemfile.lock +++ b/gemfiles/ruby_3.0_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -199,7 +199,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon excon diff --git a/gemfiles/ruby_3.0_multi_rack_app.gemfile.lock b/gemfiles/ruby_3.0_multi_rack_app.gemfile.lock index ea4b78749bf..7305d0548b0 100644 --- a/gemfiles/ruby_3.0_multi_rack_app.gemfile.lock +++ b/gemfiles/ruby_3.0_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -338,7 +338,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_opensearch_2.gemfile.lock b/gemfiles/ruby_3.0_opensearch_2.gemfile.lock index 36cd4725d66..dddac56e02c 100644 --- a/gemfiles/ruby_3.0_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_3.0_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -175,7 +175,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_opensearch_3.gemfile.lock b/gemfiles/ruby_3.0_opensearch_3.gemfile.lock index b50055a5ae9..ad27d7edadd 100644 --- a/gemfiles/ruby_3.0_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_3.0_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -170,7 +170,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_opentelemetry.gemfile.lock b/gemfiles/ruby_3.0_opentelemetry.gemfile.lock index ddfad801fbc..177ada1cfd1 100755 --- a/gemfiles/ruby_3.0_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_3.0_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -169,7 +169,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_opentracing.gemfile.lock b/gemfiles/ruby_3.0_opentracing.gemfile.lock index be2a74a7b15..d25a60eaa38 100644 --- a/gemfiles/ruby_3.0_opentracing.gemfile.lock +++ b/gemfiles/ruby_3.0_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_rack_1.gemfile.lock b/gemfiles/ruby_3.0_rack_1.gemfile.lock index 9819223dfad..52d4870fc48 100644 --- a/gemfiles/ruby_3.0_rack_1.gemfile.lock +++ b/gemfiles/ruby_3.0_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -163,7 +163,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_rack_2.gemfile.lock b/gemfiles/ruby_3.0_rack_2.gemfile.lock index 8d29cd95585..3b17a147e34 100644 --- a/gemfiles/ruby_3.0_rack_2.gemfile.lock +++ b/gemfiles/ruby_3.0_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -163,7 +163,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_rack_3.gemfile.lock b/gemfiles/ruby_3.0_rack_3.gemfile.lock index d64ff37257f..9cd215ca5e9 100644 --- a/gemfiles/ruby_3.0_rack_3.gemfile.lock +++ b/gemfiles/ruby_3.0_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -163,7 +163,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock index d6f8e414cc4..c0e938b1d2b 100644 --- a/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -300,7 +300,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock index 67520e9ca0e..7770e0d02a9 100644 --- a/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -300,7 +300,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock index 56d13bfab33..4223c4d8458 100644 --- a/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -301,7 +301,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock index 77bbb7a11f2..19e87858db3 100644 --- a/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -314,7 +314,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock index 5c2da09b7d0..eb4453d7450 100644 --- a/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -299,7 +299,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.0_rails61_trilogy.gemfile.lock index b38f4eb00bc..f1a6b5112c6 100644 --- a/gemfiles/ruby_3.0_rails61_trilogy.gemfile.lock +++ b/gemfiles/ruby_3.0_rails61_trilogy.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -308,7 +308,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_redis_3.gemfile.lock b/gemfiles/ruby_3.0_redis_3.gemfile.lock index d63514b89f8..ad9c7b5ee30 100644 --- a/gemfiles/ruby_3.0_redis_3.gemfile.lock +++ b/gemfiles/ruby_3.0_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_redis_4.gemfile.lock b/gemfiles/ruby_3.0_redis_4.gemfile.lock index c2bbdf41d4d..83058cf847b 100644 --- a/gemfiles/ruby_3.0_redis_4.gemfile.lock +++ b/gemfiles/ruby_3.0_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_redis_5.gemfile.lock b/gemfiles/ruby_3.0_redis_5.gemfile.lock index 28345e5cecb..b8b3852a644 100644 --- a/gemfiles/ruby_3.0_redis_5.gemfile.lock +++ b/gemfiles/ruby_3.0_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_relational_db.gemfile.lock b/gemfiles/ruby_3.0_relational_db.gemfile.lock index 88a665f2315..e58155f644b 100644 --- a/gemfiles/ruby_3.0_relational_db.gemfile.lock +++ b/gemfiles/ruby_3.0_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -186,7 +186,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock index ad5b77f0994..6698fc26fe5 100644 --- a/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.0_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -179,7 +179,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock index 50dd74579ba..83a79a4473f 100644 --- a/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.0_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -183,7 +183,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.0_sinatra.gemfile.lock b/gemfiles/ruby_3.0_sinatra.gemfile.lock index b9802d90d1c..7cecc49b4bc 100644 --- a/gemfiles/ruby_3.0_sinatra.gemfile.lock +++ b/gemfiles/ruby_3.0_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -173,7 +173,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_activesupport.gemfile.lock b/gemfiles/ruby_3.1_activesupport.gemfile.lock index e1abfc8955c..5fc58ab3989 100644 --- a/gemfiles/ruby_3.1_activesupport.gemfile.lock +++ b/gemfiles/ruby_3.1_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -270,7 +270,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_aws.gemfile.lock b/gemfiles/ruby_3.1_aws.gemfile.lock index 41b63a57c2f..84c1c57da9b 100644 --- a/gemfiles/ruby_3.1_aws.gemfile.lock +++ b/gemfiles/ruby_3.1_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1585,7 +1585,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_contrib.gemfile.lock b/gemfiles/ruby_3.1_contrib.gemfile.lock index a3b50376d35..871a80c88e9 100644 --- a/gemfiles/ruby_3.1_contrib.gemfile.lock +++ b/gemfiles/ruby_3.1_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -227,7 +227,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_contrib_old.gemfile.lock b/gemfiles/ruby_3.1_contrib_old.gemfile.lock index 00086f801ef..666d2df7011 100644 --- a/gemfiles/ruby_3.1_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.1_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -211,7 +211,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_core_old.gemfile.lock b/gemfiles/ruby_3.1_core_old.gemfile.lock index 5e9dcd16542..9f55f7473c6 100644 --- a/gemfiles/ruby_3.1_core_old.gemfile.lock +++ b/gemfiles/ruby_3.1_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock index 335c7d95bda..045ef4ccece 100644 --- a/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock +++ b/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -194,7 +194,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock index 8c6879c6473..27bc60787e1 100644 --- a/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock +++ b/gemfiles/ruby_3.1_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -175,7 +175,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.1_graphql_1.12.gemfile.lock b/gemfiles/ruby_3.1_graphql_1.12.gemfile.lock index 4372de58a77..ab006803031 100644 --- a/gemfiles/ruby_3.1_graphql_1.12.gemfile.lock +++ b/gemfiles/ruby_3.1_graphql_1.12.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.1_graphql_1.13.gemfile.lock index af9baa03d54..664ea8bb9ad 100644 --- a/gemfiles/ruby_3.1_graphql_1.13.gemfile.lock +++ b/gemfiles/ruby_3.1_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.1_graphql_2.0.gemfile.lock index 9ab190bebbb..f3cf89e84f9 100644 --- a/gemfiles/ruby_3.1_graphql_2.0.gemfile.lock +++ b/gemfiles/ruby_3.1_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.1_graphql_2.1.gemfile.lock index 51d2730c4ef..ebbc67f63ca 100644 --- a/gemfiles/ruby_3.1_graphql_2.1.gemfile.lock +++ b/gemfiles/ruby_3.1_graphql_2.1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.1_graphql_2.2.gemfile.lock index 8d561f2e28a..d39df476310 100644 --- a/gemfiles/ruby_3.1_graphql_2.2.gemfile.lock +++ b/gemfiles/ruby_3.1_graphql_2.2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_http.gemfile.lock b/gemfiles/ruby_3.1_http.gemfile.lock index 52b292d073a..3cbed69c429 100644 --- a/gemfiles/ruby_3.1_http.gemfile.lock +++ b/gemfiles/ruby_3.1_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -199,7 +199,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon excon diff --git a/gemfiles/ruby_3.1_multi_rack_app.gemfile.lock b/gemfiles/ruby_3.1_multi_rack_app.gemfile.lock index afbf9049db8..bda2b187253 100644 --- a/gemfiles/ruby_3.1_multi_rack_app.gemfile.lock +++ b/gemfiles/ruby_3.1_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -338,7 +338,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_opensearch_2.gemfile.lock b/gemfiles/ruby_3.1_opensearch_2.gemfile.lock index 36cd4725d66..dddac56e02c 100644 --- a/gemfiles/ruby_3.1_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_3.1_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -175,7 +175,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_opensearch_3.gemfile.lock b/gemfiles/ruby_3.1_opensearch_3.gemfile.lock index b50055a5ae9..ad27d7edadd 100644 --- a/gemfiles/ruby_3.1_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_3.1_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -170,7 +170,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_opentelemetry.gemfile.lock b/gemfiles/ruby_3.1_opentelemetry.gemfile.lock index 328e70f530f..aba90397837 100644 --- a/gemfiles/ruby_3.1_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_3.1_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -174,7 +174,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_opentracing.gemfile.lock b/gemfiles/ruby_3.1_opentracing.gemfile.lock index be2a74a7b15..d25a60eaa38 100644 --- a/gemfiles/ruby_3.1_opentracing.gemfile.lock +++ b/gemfiles/ruby_3.1_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -161,7 +161,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_rack_1.gemfile.lock b/gemfiles/ruby_3.1_rack_1.gemfile.lock index 9819223dfad..52d4870fc48 100644 --- a/gemfiles/ruby_3.1_rack_1.gemfile.lock +++ b/gemfiles/ruby_3.1_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -163,7 +163,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_rack_2.gemfile.lock b/gemfiles/ruby_3.1_rack_2.gemfile.lock index 8d29cd95585..3b17a147e34 100644 --- a/gemfiles/ruby_3.1_rack_2.gemfile.lock +++ b/gemfiles/ruby_3.1_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -163,7 +163,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_rack_3.gemfile.lock b/gemfiles/ruby_3.1_rack_3.gemfile.lock index d64ff37257f..9cd215ca5e9 100644 --- a/gemfiles/ruby_3.1_rack_3.gemfile.lock +++ b/gemfiles/ruby_3.1_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -163,7 +163,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock index d6f8e414cc4..c0e938b1d2b 100644 --- a/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -300,7 +300,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock index 67520e9ca0e..7770e0d02a9 100644 --- a/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -300,7 +300,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock index 56d13bfab33..4223c4d8458 100644 --- a/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -301,7 +301,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock index 77bbb7a11f2..19e87858db3 100644 --- a/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -314,7 +314,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock index 5c2da09b7d0..eb4453d7450 100644 --- a/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -299,7 +299,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.1_rails61_trilogy.gemfile.lock index b38f4eb00bc..f1a6b5112c6 100644 --- a/gemfiles/ruby_3.1_rails61_trilogy.gemfile.lock +++ b/gemfiles/ruby_3.1_rails61_trilogy.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -308,7 +308,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_redis_3.gemfile.lock b/gemfiles/ruby_3.1_redis_3.gemfile.lock index d63514b89f8..ad9c7b5ee30 100644 --- a/gemfiles/ruby_3.1_redis_3.gemfile.lock +++ b/gemfiles/ruby_3.1_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_redis_4.gemfile.lock b/gemfiles/ruby_3.1_redis_4.gemfile.lock index c2bbdf41d4d..83058cf847b 100644 --- a/gemfiles/ruby_3.1_redis_4.gemfile.lock +++ b/gemfiles/ruby_3.1_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_redis_5.gemfile.lock b/gemfiles/ruby_3.1_redis_5.gemfile.lock index 28345e5cecb..b8b3852a644 100644 --- a/gemfiles/ruby_3.1_redis_5.gemfile.lock +++ b/gemfiles/ruby_3.1_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -162,7 +162,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_relational_db.gemfile.lock b/gemfiles/ruby_3.1_relational_db.gemfile.lock index 88a665f2315..e58155f644b 100644 --- a/gemfiles/ruby_3.1_relational_db.gemfile.lock +++ b/gemfiles/ruby_3.1_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -186,7 +186,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock index ad5b77f0994..6698fc26fe5 100644 --- a/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.1_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -179,7 +179,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock index 50dd74579ba..83a79a4473f 100644 --- a/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.1_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -183,7 +183,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.1_sinatra.gemfile.lock b/gemfiles/ruby_3.1_sinatra.gemfile.lock index b9802d90d1c..7cecc49b4bc 100644 --- a/gemfiles/ruby_3.1_sinatra.gemfile.lock +++ b/gemfiles/ruby_3.1_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -173,7 +173,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_activesupport.gemfile.lock b/gemfiles/ruby_3.2_activesupport.gemfile.lock index f73538246f9..a75d609d2e3 100644 --- a/gemfiles/ruby_3.2_activesupport.gemfile.lock +++ b/gemfiles/ruby_3.2_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -266,7 +266,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_aws.gemfile.lock b/gemfiles/ruby_3.2_aws.gemfile.lock index a9825594f95..9f0618dad54 100644 --- a/gemfiles/ruby_3.2_aws.gemfile.lock +++ b/gemfiles/ruby_3.2_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1581,7 +1581,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_contrib.gemfile.lock b/gemfiles/ruby_3.2_contrib.gemfile.lock index 218251d70e8..9f0d57015a0 100644 --- a/gemfiles/ruby_3.2_contrib.gemfile.lock +++ b/gemfiles/ruby_3.2_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -223,7 +223,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_contrib_old.gemfile.lock b/gemfiles/ruby_3.2_contrib_old.gemfile.lock index 36c457d3bd2..5b425a8462c 100644 --- a/gemfiles/ruby_3.2_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.2_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -207,7 +207,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_core_old.gemfile.lock b/gemfiles/ruby_3.2_core_old.gemfile.lock index 007ff1791db..9c93c856fe4 100644 --- a/gemfiles/ruby_3.2_core_old.gemfile.lock +++ b/gemfiles/ruby_3.2_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -153,7 +153,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock index 7d58d9a44dd..f86e1393a90 100644 --- a/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock +++ b/gemfiles/ruby_3.2_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -190,7 +190,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock index 48c94c266ea..a1756f4256d 100644 --- a/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock +++ b/gemfiles/ruby_3.2_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -171,7 +171,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.2_graphql_1.12.gemfile.lock b/gemfiles/ruby_3.2_graphql_1.12.gemfile.lock index 813080361d4..0547f8e1135 100644 --- a/gemfiles/ruby_3.2_graphql_1.12.gemfile.lock +++ b/gemfiles/ruby_3.2_graphql_1.12.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.2_graphql_1.13.gemfile.lock index 75b3a6087b4..09dff57a9cb 100644 --- a/gemfiles/ruby_3.2_graphql_1.13.gemfile.lock +++ b/gemfiles/ruby_3.2_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.2_graphql_2.0.gemfile.lock index 894d9e05418..e1fba49f9f7 100644 --- a/gemfiles/ruby_3.2_graphql_2.0.gemfile.lock +++ b/gemfiles/ruby_3.2_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.2_graphql_2.1.gemfile.lock index c962d1276f8..c2917bdd5a0 100644 --- a/gemfiles/ruby_3.2_graphql_2.1.gemfile.lock +++ b/gemfiles/ruby_3.2_graphql_2.1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.2_graphql_2.2.gemfile.lock index 2357703f7f7..2a3c643828c 100644 --- a/gemfiles/ruby_3.2_graphql_2.2.gemfile.lock +++ b/gemfiles/ruby_3.2_graphql_2.2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_http.gemfile.lock b/gemfiles/ruby_3.2_http.gemfile.lock index e78f04add2d..86bc6a20b61 100644 --- a/gemfiles/ruby_3.2_http.gemfile.lock +++ b/gemfiles/ruby_3.2_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -195,7 +195,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon excon diff --git a/gemfiles/ruby_3.2_multi_rack_app.gemfile.lock b/gemfiles/ruby_3.2_multi_rack_app.gemfile.lock index 4509651fe09..a33822ef79a 100644 --- a/gemfiles/ruby_3.2_multi_rack_app.gemfile.lock +++ b/gemfiles/ruby_3.2_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -334,7 +334,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_opensearch_2.gemfile.lock b/gemfiles/ruby_3.2_opensearch_2.gemfile.lock index 48a51190ba5..5a574fd51e6 100644 --- a/gemfiles/ruby_3.2_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_3.2_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -171,7 +171,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_opensearch_3.gemfile.lock b/gemfiles/ruby_3.2_opensearch_3.gemfile.lock index 2ccd742d884..9e66b726f3c 100644 --- a/gemfiles/ruby_3.2_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_3.2_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -166,7 +166,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_opentelemetry.gemfile.lock b/gemfiles/ruby_3.2_opentelemetry.gemfile.lock index d6f8b5e5086..c5e5ad3fb0a 100644 --- a/gemfiles/ruby_3.2_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_3.2_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -165,7 +165,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_opentracing.gemfile.lock b/gemfiles/ruby_3.2_opentracing.gemfile.lock index bdbe421c031..f8ea11f4b39 100644 --- a/gemfiles/ruby_3.2_opentracing.gemfile.lock +++ b/gemfiles/ruby_3.2_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_rack_1.gemfile.lock b/gemfiles/ruby_3.2_rack_1.gemfile.lock index eac0c50117f..3e22c6f8baf 100644 --- a/gemfiles/ruby_3.2_rack_1.gemfile.lock +++ b/gemfiles/ruby_3.2_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -159,7 +159,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_rack_2.gemfile.lock b/gemfiles/ruby_3.2_rack_2.gemfile.lock index 6f0254886e8..6c474fb21c6 100644 --- a/gemfiles/ruby_3.2_rack_2.gemfile.lock +++ b/gemfiles/ruby_3.2_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -159,7 +159,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_rack_3.gemfile.lock b/gemfiles/ruby_3.2_rack_3.gemfile.lock index 7b9a7075f62..a7c6ffb5d81 100644 --- a/gemfiles/ruby_3.2_rack_3.gemfile.lock +++ b/gemfiles/ruby_3.2_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -159,7 +159,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock index a74ae3ff324..cec7d7ca1d5 100644 --- a/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -296,7 +296,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock index 3317cff6972..f0570ce04f8 100644 --- a/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -296,7 +296,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock index 5f2de00cc1a..8cd6b1ff8a3 100644 --- a/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -297,7 +297,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock index e58ad15f17c..c68df5b11f4 100644 --- a/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -310,7 +310,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock index 66aeff5595f..ac133c1c05a 100644 --- a/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -295,7 +295,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.2_rails61_trilogy.gemfile.lock index 5e8cde713f8..94552e09fc1 100644 --- a/gemfiles/ruby_3.2_rails61_trilogy.gemfile.lock +++ b/gemfiles/ruby_3.2_rails61_trilogy.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -304,7 +304,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_redis_3.gemfile.lock b/gemfiles/ruby_3.2_redis_3.gemfile.lock index fc26463d5dd..746d9f353c8 100644 --- a/gemfiles/ruby_3.2_redis_3.gemfile.lock +++ b/gemfiles/ruby_3.2_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -154,7 +154,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_redis_4.gemfile.lock b/gemfiles/ruby_3.2_redis_4.gemfile.lock index daf8735ce05..d80b384d3c7 100644 --- a/gemfiles/ruby_3.2_redis_4.gemfile.lock +++ b/gemfiles/ruby_3.2_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -154,7 +154,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_redis_5.gemfile.lock b/gemfiles/ruby_3.2_redis_5.gemfile.lock index f1544bc1e62..fd5d36560e8 100644 --- a/gemfiles/ruby_3.2_redis_5.gemfile.lock +++ b/gemfiles/ruby_3.2_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_relational_db.gemfile.lock b/gemfiles/ruby_3.2_relational_db.gemfile.lock index f26ee79c68b..a1c85f3d6d6 100644 --- a/gemfiles/ruby_3.2_relational_db.gemfile.lock +++ b/gemfiles/ruby_3.2_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -182,7 +182,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock index fe7c57332dd..14fc187b52d 100644 --- a/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.2_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -175,7 +175,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock index 8c6e16ec079..229ae2d19cb 100644 --- a/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.2_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -179,7 +179,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.2_sinatra.gemfile.lock b/gemfiles/ruby_3.2_sinatra.gemfile.lock index 2122725732f..f26f268e354 100644 --- a/gemfiles/ruby_3.2_sinatra.gemfile.lock +++ b/gemfiles/ruby_3.2_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -169,7 +169,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_activesupport.gemfile.lock b/gemfiles/ruby_3.3_activesupport.gemfile.lock index 90470d2e027..bdcd39eaab3 100644 --- a/gemfiles/ruby_3.3_activesupport.gemfile.lock +++ b/gemfiles/ruby_3.3_activesupport.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -264,7 +264,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_aws.gemfile.lock b/gemfiles/ruby_3.3_aws.gemfile.lock index 76b3fbedad7..a3c26d0c231 100644 --- a/gemfiles/ruby_3.3_aws.gemfile.lock +++ b/gemfiles/ruby_3.3_aws.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -1580,7 +1580,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_contrib.gemfile.lock b/gemfiles/ruby_3.3_contrib.gemfile.lock index b56e12e2c7b..bfe4cad9935 100644 --- a/gemfiles/ruby_3.3_contrib.gemfile.lock +++ b/gemfiles/ruby_3.3_contrib.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -219,7 +219,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (>= 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_contrib_old.gemfile.lock b/gemfiles/ruby_3.3_contrib_old.gemfile.lock index eb4ebdbbd19..1b77d16b819 100644 --- a/gemfiles/ruby_3.3_contrib_old.gemfile.lock +++ b/gemfiles/ruby_3.3_contrib_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -206,7 +206,7 @@ DEPENDENCIES climate_control (~> 0.2.0) concurrent-ruby dalli (< 3.0.0) - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_core_old.gemfile.lock b/gemfiles/ruby_3.3_core_old.gemfile.lock index 86fbe1d2edb..81bcadf9bd7 100644 --- a/gemfiles/ruby_3.3_core_old.gemfile.lock +++ b/gemfiles/ruby_3.3_core_old.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -151,7 +151,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (~> 4) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock index 03c4adc22a0..f56eb03f8d5 100644 --- a/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock +++ b/gemfiles/ruby_3.3_elasticsearch_7.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -189,7 +189,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 7) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock b/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock index 64929dfeac2..6c2c51880bb 100644 --- a/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock +++ b/gemfiles/ruby_3.3_elasticsearch_8.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -170,7 +170,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) elasticsearch (~> 8) extlz4 (~> 0.3, >= 0.3.3) diff --git a/gemfiles/ruby_3.3_graphql_1.12.gemfile.lock b/gemfiles/ruby_3.3_graphql_1.12.gemfile.lock index be6b67121d4..4e0a0bc93e2 100644 --- a/gemfiles/ruby_3.3_graphql_1.12.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_1.12.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -156,7 +156,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock b/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock index 90242e237dd..b20f818fc7d 100644 --- a/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_1.13.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -156,7 +156,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock index 406bbe9ea59..f1c214d12ae 100644 --- a/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_2.0.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -156,7 +156,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock index 12352009194..bca39d41cd3 100644 --- a/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_2.1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock b/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock index 0b27d1f067d..32370a0729c 100644 --- a/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock +++ b/gemfiles/ruby_3.3_graphql_2.2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -157,7 +157,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_http.gemfile.lock b/gemfiles/ruby_3.3_http.gemfile.lock index cbb177bc4ba..26a4a65cd68 100644 --- a/gemfiles/ruby_3.3_http.gemfile.lock +++ b/gemfiles/ruby_3.3_http.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -194,7 +194,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) ethon excon diff --git a/gemfiles/ruby_3.3_multi_rack_app.gemfile.lock b/gemfiles/ruby_3.3_multi_rack_app.gemfile.lock index b4e40d7786d..69291d668ef 100644 --- a/gemfiles/ruby_3.3_multi_rack_app.gemfile.lock +++ b/gemfiles/ruby_3.3_multi_rack_app.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -333,7 +333,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_opensearch_2.gemfile.lock b/gemfiles/ruby_3.3_opensearch_2.gemfile.lock index 9835e69dd6a..772201e8bc0 100644 --- a/gemfiles/ruby_3.3_opensearch_2.gemfile.lock +++ b/gemfiles/ruby_3.3_opensearch_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -170,7 +170,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_opensearch_3.gemfile.lock b/gemfiles/ruby_3.3_opensearch_3.gemfile.lock index d12b4a7d8b8..dce8f43cf22 100644 --- a/gemfiles/ruby_3.3_opensearch_3.gemfile.lock +++ b/gemfiles/ruby_3.3_opensearch_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -165,7 +165,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_opentelemetry.gemfile.lock b/gemfiles/ruby_3.3_opentelemetry.gemfile.lock index acca3acc3c1..770b6ffd602 100644 --- a/gemfiles/ruby_3.3_opentelemetry.gemfile.lock +++ b/gemfiles/ruby_3.3_opentelemetry.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -163,7 +163,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_opentracing.gemfile.lock b/gemfiles/ruby_3.3_opentracing.gemfile.lock index 8e2ba014930..c4e13a72bcb 100644 --- a/gemfiles/ruby_3.3_opentracing.gemfile.lock +++ b/gemfiles/ruby_3.3_opentracing.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -156,7 +156,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_rack_1.gemfile.lock b/gemfiles/ruby_3.3_rack_1.gemfile.lock index 2430bbb60ce..21a9a39640a 100644 --- a/gemfiles/ruby_3.3_rack_1.gemfile.lock +++ b/gemfiles/ruby_3.3_rack_1.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_rack_2.gemfile.lock b/gemfiles/ruby_3.3_rack_2.gemfile.lock index a784fd3cbba..df1b6e03919 100644 --- a/gemfiles/ruby_3.3_rack_2.gemfile.lock +++ b/gemfiles/ruby_3.3_rack_2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_rack_3.gemfile.lock b/gemfiles/ruby_3.3_rack_3.gemfile.lock index 0188acbc971..ec45e77d86b 100644 --- a/gemfiles/ruby_3.3_rack_3.gemfile.lock +++ b/gemfiles/ruby_3.3_rack_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -158,7 +158,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock b/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock index 87af7524474..b17c2819fb9 100644 --- a/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_mysql2.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -294,7 +294,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock index 1c05965c80f..428e6ee8816 100644 --- a/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_postgres.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -294,7 +294,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock index e0b460d63d1..4efcc6ae6df 100644 --- a/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_postgres_redis.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -295,7 +295,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock index 40b1495c8c8..949798d9c53 100644 --- a/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_postgres_sidekiq.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -308,7 +308,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock index 12fefb082bf..23e1f94e4fe 100644 --- a/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_semantic_logger.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -293,7 +293,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock b/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock index 4ab17039cd9..b456fdd0011 100644 --- a/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock +++ b/gemfiles/ruby_3.3_rails61_trilogy.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -303,7 +303,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_redis_3.gemfile.lock b/gemfiles/ruby_3.3_redis_3.gemfile.lock index 48f6fa93fc8..128e380d063 100644 --- a/gemfiles/ruby_3.3_redis_3.gemfile.lock +++ b/gemfiles/ruby_3.3_redis_3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -152,7 +152,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_redis_4.gemfile.lock b/gemfiles/ruby_3.3_redis_4.gemfile.lock index 013fd88a76d..783372dda81 100644 --- a/gemfiles/ruby_3.3_redis_4.gemfile.lock +++ b/gemfiles/ruby_3.3_redis_4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -152,7 +152,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_redis_5.gemfile.lock b/gemfiles/ruby_3.3_redis_5.gemfile.lock index c825da49dce..f991aa22aa1 100644 --- a/gemfiles/ruby_3.3_redis_5.gemfile.lock +++ b/gemfiles/ruby_3.3_redis_5.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -156,7 +156,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_relational_db.gemfile.lock b/gemfiles/ruby_3.3_relational_db.gemfile.lock index 7f9f48c78eb..097140fd4f5 100644 --- a/gemfiles/ruby_3.3_relational_db.gemfile.lock +++ b/gemfiles/ruby_3.3_relational_db.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -183,7 +183,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! delayed_job delayed_job_active_record dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) diff --git a/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock b/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock index ffd94af392a..c0cbfe2f23c 100644 --- a/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock +++ b/gemfiles/ruby_3.3_resque2_redis3.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -173,7 +173,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock b/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock index 87de3f7cee6..63c35250963 100644 --- a/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock +++ b/gemfiles/ruby_3.3_resque2_redis4.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -177,7 +177,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/gemfiles/ruby_3.3_sinatra.gemfile.lock b/gemfiles/ruby_3.3_sinatra.gemfile.lock index 5ac4a4edcfa..08b47898230 100644 --- a/gemfiles/ruby_3.3_sinatra.gemfile.lock +++ b/gemfiles/ruby_3.3_sinatra.gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: .. specs: - ddtrace (2.0.0.dev) + datadog (2.0.0.dev) base64 debase-ruby_core_source (= 3.3.1) libdatadog (~> 6.0.0.2.0) @@ -167,7 +167,7 @@ DEPENDENCIES builder climate_control (~> 0.2.0) concurrent-ruby - ddtrace! + datadog! dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0) extlz4 (~> 0.3, >= 0.3.3) google-protobuf (~> 3.0, != 3.7.1, != 3.7.0) diff --git a/integration/README.md b/integration/README.md index ff8a337ad49..1fa83813908 100644 --- a/integration/README.md +++ b/integration/README.md @@ -1,6 +1,6 @@ # Datadog APM Ruby integration test suite -Integration tests for `ddtrace` that use a variety of real applications. +Integration tests for `datadog` that use a variety of real applications. ## Quickstart diff --git a/integration/apps/hanami/Dockerfile b/integration/apps/hanami/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/hanami/Dockerfile +++ b/integration/apps/hanami/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/hanami/Dockerfile-ci b/integration/apps/hanami/Dockerfile-ci index d3bb292a07c..fafa30889be 100644 --- a/integration/apps/hanami/Dockerfile-ci +++ b/integration/apps/hanami/Dockerfile-ci @@ -6,7 +6,7 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN /vendor/dd-demo/build_datadog_profiling_native_extension.rb diff --git a/integration/apps/hanami/Gemfile b/integration/apps/hanami/Gemfile index e57ce49b845..edb636efc8f 100644 --- a/integration/apps/hanami/Gemfile +++ b/integration/apps/hanami/Gemfile @@ -13,7 +13,7 @@ gem 'unicorn' gem 'webrick' gem 'pry-byebug' -gem 'ddtrace', Datadog::DemoEnv.gem_spec('ddtrace')[0].merge(require: 'ddtrace/auto_instrument') +gem 'datadog', Datadog::DemoEnv.gem_spec('datadog')[0].merge(require: 'datadog/auto_instrument') gem 'google-protobuf', '~> 3.0' group :development do diff --git a/integration/apps/hanami/README.md b/integration/apps/hanami/README.md index 30ebdc0a75b..bfaf77fcebd 100644 --- a/integration/apps/hanami/README.md +++ b/integration/apps/hanami/README.md @@ -58,9 +58,9 @@ Then rebuild the application environment with: Finally start the application. -#### Running the local version of `ddtrace` +#### Running the local version of `datadog` -Useful for debugging `ddtrace` internals or testing changes. +Useful for debugging `datadog` internals or testing changes. Update the `app` --> `environment` section in `docker-compose.yml`: @@ -69,11 +69,11 @@ version: '3.4' services: app: environment: - # Add the following env var (path to `ddtrace` gem dir in the Docker container) - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb + # Add the following env var (path to `datadog` gem dir in the Docker container) + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb ``` -#### Running a specific version of `ddtrace` +#### Running a specific version of `datadog` Update the `app` --> `environment` section in `docker-compose.yml`: @@ -84,10 +84,10 @@ services: environment: # Comment out any GEM_LOCAL env var. # Otherwise local source code will override your reference. - # - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb + # - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb # Set these to the appropriate Git source and commit SHA: - - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a ``` Then delete the old containers with `docker-compose down` and start the application again. diff --git a/integration/apps/hanami/apps/acme/application.rb b/integration/apps/hanami/apps/acme/application.rb index 40ea6594836..891ef1c78b0 100644 --- a/integration/apps/hanami/apps/acme/application.rb +++ b/integration/apps/hanami/apps/acme/application.rb @@ -1,6 +1,6 @@ require 'hanami/helpers' require 'hanami/assets' -require 'ddtrace' +require 'datadog' require_relative './controllers/fibonacci' module Acme diff --git a/integration/apps/hanami/config/initializers/datadog.rb b/integration/apps/hanami/config/initializers/datadog.rb index 3db6c061fec..0f281349cef 100644 --- a/integration/apps/hanami/config/initializers/datadog.rb +++ b/integration/apps/hanami/config/initializers/datadog.rb @@ -1,4 +1,4 @@ -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.env = 'integration' diff --git a/integration/apps/hanami/docker-compose.ci.yml b/integration/apps/hanami/docker-compose.ci.yml index 04ba7feb3e2..172b3e81ec2 100644 --- a/integration/apps/hanami/docker-compose.ci.yml +++ b/integration/apps/hanami/docker-compose.ci.yml @@ -27,7 +27,7 @@ services: # to an app and verified the responsee and run a couple of self-owned test cases. # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/hanami/docker-compose.yml b/integration/apps/hanami/docker-compose.yml index 215f9e13a4e..bfc10f8708a 100644 --- a/integration/apps/hanami/docker-compose.yml +++ b/integration/apps/hanami/docker-compose.yml @@ -18,11 +18,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=puma - DD_DEMO_ENV_FEATURES=tracing,profiling - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a # Enable building the profiling native extension - DD_DEMO_ENV_BUILD_PROFILING_EXTENSION=true # - DD_TRACE_DEBUG=true diff --git a/integration/apps/opentelemetry/Dockerfile b/integration/apps/opentelemetry/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/opentelemetry/Dockerfile +++ b/integration/apps/opentelemetry/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/opentelemetry/Dockerfile-ci b/integration/apps/opentelemetry/Dockerfile-ci index d5aa17c356a..3eec0df6d13 100644 --- a/integration/apps/opentelemetry/Dockerfile-ci +++ b/integration/apps/opentelemetry/Dockerfile-ci @@ -6,6 +6,6 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -# Setup specific version of ddtrace, if specified. -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +# Setup specific version of datadog, if specified. +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN bundle install diff --git a/integration/apps/opentelemetry/Gemfile b/integration/apps/opentelemetry/Gemfile index 6f3b4545fbf..1dc9402988f 100644 --- a/integration/apps/opentelemetry/Gemfile +++ b/integration/apps/opentelemetry/Gemfile @@ -7,8 +7,8 @@ gem 'google-protobuf' gem 'opentelemetry-sdk' -# Choose correct specs for 'ddtrace' demo environment -gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace') +# Choose correct specs for 'datadog' demo environment +gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog') gem 'byebug' gem 'rspec' diff --git a/integration/apps/opentelemetry/app/datadog.rb b/integration/apps/opentelemetry/app/datadog.rb index 65f0d0740c8..57cbd33b2c0 100644 --- a/integration/apps/opentelemetry/app/datadog.rb +++ b/integration/apps/opentelemetry/app/datadog.rb @@ -1,5 +1,5 @@ require 'datadog/demo_env' -require 'ddtrace' +require 'datadog' require 'opentelemetry/sdk' require 'datadog/opentelemetry' diff --git a/integration/apps/opentelemetry/docker-compose.ci.yml b/integration/apps/opentelemetry/docker-compose.ci.yml index 6c7678286f9..027aa2d947e 100644 --- a/integration/apps/opentelemetry/docker-compose.ci.yml +++ b/integration/apps/opentelemetry/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '3.4' services: app: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. build: context: ../../.. dockerfile: integration/apps/opentelemetry/Dockerfile-ci @@ -28,7 +28,7 @@ services: # ddagent: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/opentelemetry/docker-compose.yml b/integration/apps/opentelemetry/docker-compose.yml index c021f573bf8..34290b1b21a 100644 --- a/integration/apps/opentelemetry/docker-compose.yml +++ b/integration/apps/opentelemetry/docker-compose.yml @@ -18,11 +18,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=main - DD_DEMO_ENV_FEATURES=tracing - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a stdin_open: true tty: true volumes: diff --git a/integration/apps/rack/Dockerfile b/integration/apps/rack/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/rack/Dockerfile +++ b/integration/apps/rack/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/rack/Dockerfile-ci b/integration/apps/rack/Dockerfile-ci index d3bb292a07c..fafa30889be 100644 --- a/integration/apps/rack/Dockerfile-ci +++ b/integration/apps/rack/Dockerfile-ci @@ -6,7 +6,7 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN /vendor/dd-demo/build_datadog_profiling_native_extension.rb diff --git a/integration/apps/rack/Gemfile b/integration/apps/rack/Gemfile index c1a031be60d..3d69edf7514 100644 --- a/integration/apps/rack/Gemfile +++ b/integration/apps/rack/Gemfile @@ -23,25 +23,8 @@ gem 'resque' gem 'rake' gem 'dogstatsd-ruby' -# Choose correct specs for 'ddtrace' demo environment -gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace') - -# Needed for ddtrace profiling -google_protobuf_versions = [ - '~> 3.0', - '!= 3.7.0.rc.2', - '!= 3.7.0.rc.3', - '!= 3.7.0', - '!= 3.7.1', - '!= 3.8.0.rc.1', - '!= 3.24.0.rc.1', -] -if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4') - gem 'google-protobuf', *google_protobuf_versions -else - # Bundler resolves incorrect version (too new, incompatible with Ruby <= 2.3) - gem 'google-protobuf', *google_protobuf_versions, '< 3.19.2' -end +# Choose correct specs for 'datadog' demo environment +gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog') # Development gem 'pry-byebug' if RUBY_VERSION >= '2.3.0' && RUBY_ENGINE != 'truffleruby' && RUBY_VERSION < '3.2.0' diff --git a/integration/apps/rack/app/datadog.rb b/integration/apps/rack/app/datadog.rb index 48261ea6007..9c52f104a35 100644 --- a/integration/apps/rack/app/datadog.rb +++ b/integration/apps/rack/app/datadog.rb @@ -1,5 +1,5 @@ require 'datadog/demo_env' -require 'ddtrace' +require 'datadog' require 'datadog/appsec' Datadog.configure do |c| diff --git a/integration/apps/rack/docker-compose.ci.yml b/integration/apps/rack/docker-compose.ci.yml index c28ef3c2540..2931e767323 100644 --- a/integration/apps/rack/docker-compose.ci.yml +++ b/integration/apps/rack/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '3.4' services: app: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. build: context: ../../.. dockerfile: integration/apps/rack/Dockerfile-ci @@ -78,7 +78,7 @@ services: # to an app and verified the responsee and run a couple of self-owned test cases. # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/rack/docker-compose.yml b/integration/apps/rack/docker-compose.yml index d1493afa915..57d483e69aa 100644 --- a/integration/apps/rack/docker-compose.yml +++ b/integration/apps/rack/docker-compose.yml @@ -20,11 +20,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=puma - DD_DEMO_ENV_FEATURES=tracing,profiling - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a # Enable building the profiling native extension - DD_DEMO_ENV_BUILD_PROFILING_EXTENSION=true expose: diff --git a/integration/apps/rails-five/Dockerfile b/integration/apps/rails-five/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/rails-five/Dockerfile +++ b/integration/apps/rails-five/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/rails-five/Dockerfile-ci b/integration/apps/rails-five/Dockerfile-ci index d3bb292a07c..fafa30889be 100644 --- a/integration/apps/rails-five/Dockerfile-ci +++ b/integration/apps/rails-five/Dockerfile-ci @@ -6,7 +6,7 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN /vendor/dd-demo/build_datadog_profiling_native_extension.rb diff --git a/integration/apps/rails-five/Gemfile b/integration/apps/rails-five/Gemfile index 127e3684d49..765d3bea197 100644 --- a/integration/apps/rails-five/Gemfile +++ b/integration/apps/rails-five/Gemfile @@ -4,18 +4,6 @@ source "https://rubygems.org" # gem 'rails', '5.2.2' -google_protobuf_versions = [ - '~> 3.0', - '!= 3.7.0.rc.2', - '!= 3.7.0.rc.3', - '!= 3.7.0', - '!= 3.7.1', - '!= 3.8.0.rc.1', - '!= 3.20.0.rc.1', - '!= 3.20.0.rc.2', - '!= 3.24.0.rc.1', -] - rails_version = ['~> 5.2', '>= 5.2.6'] gem 'actioncable', *rails_version @@ -36,20 +24,12 @@ gem 'unicorn' # they are not supported by Ruby < 2.5. gem 'loofah', '2.19.1' -# Choose correct specs for 'ddtrace' demo environment -gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace') +# Choose correct specs for 'datadog' demo environment +gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog') gem 'dogstatsd-ruby' gem 'ffi' -# Needed for ddtrace profiling -if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4') - gem 'google-protobuf', *google_protobuf_versions -else - # Bundler resolves incorrect version (too new, incompatible with Ruby <= 2.3) - gem 'google-protobuf', '< 3.19.2' -end - # Fixes conflict with profiling (patch overwrite in Thread) # Upgrade this to latest when this patch is merged & released. # https://github.com/rollbar/rollbar-gem/pull/1018 diff --git a/integration/apps/rails-five/README.md b/integration/apps/rails-five/README.md index 1a2ee1b19bc..477fdb86e70 100644 --- a/integration/apps/rails-five/README.md +++ b/integration/apps/rails-five/README.md @@ -58,9 +58,9 @@ Then rebuild the application environment with: Finally start the application. -#### Running the local version of `ddtrace` +#### Running the local version of `datadog` -Useful for debugging `ddtrace` internals or testing changes. +Useful for debugging `datadog` internals or testing changes. Update the `app` --> `environment` section in `docker-compose.yml`: @@ -69,11 +69,11 @@ version: '3.4' services: app: environment: - # Add the following env var (path to `ddtrace` gem dir in the Docker container) - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb + # Add the following env var (path to `datadog` gem dir in the Docker container) + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb ``` -#### Running a specific version of `ddtrace` +#### Running a specific version of `datadog` Update the `app` --> `environment` section in `docker-compose.yml`: @@ -84,10 +84,10 @@ services: environment: # Comment out any GEM_LOCAL env var. # Otherwise local source code will override your reference. - # - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb + # - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb # Set these to the appropriate Git source and commit SHA: - - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a ``` Then delete the old containers with `docker-compose down` and start the application again. diff --git a/integration/apps/rails-five/config/initializers/datadog.rb b/integration/apps/rails-five/config/initializers/datadog.rb index cc098913b85..f3060959c06 100644 --- a/integration/apps/rails-five/config/initializers/datadog.rb +++ b/integration/apps/rails-five/config/initializers/datadog.rb @@ -1,5 +1,5 @@ require 'datadog/statsd' -require 'ddtrace' +require 'datadog' require 'datadog/appsec' Datadog.configure do |c| diff --git a/integration/apps/rails-five/docker-compose.ci.yml b/integration/apps/rails-five/docker-compose.ci.yml index 089f7306986..7d10ec5e81a 100644 --- a/integration/apps/rails-five/docker-compose.ci.yml +++ b/integration/apps/rails-five/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '3.4' services: app: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. build: context: ../../.. dockerfile: integration/apps/rails-five/Dockerfile-ci @@ -60,7 +60,7 @@ services: expose: - "6379" # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/rails-five/docker-compose.yml b/integration/apps/rails-five/docker-compose.yml index 0bb612e9b32..1d002e3b50d 100644 --- a/integration/apps/rails-five/docker-compose.yml +++ b/integration/apps/rails-five/docker-compose.yml @@ -27,11 +27,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=puma - DD_DEMO_ENV_FEATURES=tracing,profiling,runtime_metrics - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a # Enable building the profiling native extension - DD_DEMO_ENV_BUILD_PROFILING_EXTENSION=true expose: diff --git a/integration/apps/rails-seven/Dockerfile b/integration/apps/rails-seven/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/rails-seven/Dockerfile +++ b/integration/apps/rails-seven/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/rails-seven/Dockerfile-ci b/integration/apps/rails-seven/Dockerfile-ci index d3bb292a07c..fafa30889be 100644 --- a/integration/apps/rails-seven/Dockerfile-ci +++ b/integration/apps/rails-seven/Dockerfile-ci @@ -6,7 +6,7 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN /vendor/dd-demo/build_datadog_profiling_native_extension.rb diff --git a/integration/apps/rails-seven/Gemfile b/integration/apps/rails-seven/Gemfile index 28de90b2a0c..cc39a6c097d 100644 --- a/integration/apps/rails-seven/Gemfile +++ b/integration/apps/rails-seven/Gemfile @@ -6,21 +6,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.0.5" -# Choose correct specs for 'ddtrace' demo environment -gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace') +# Choose correct specs for 'datadog' demo environment +gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog') gem 'dogstatsd-ruby' -google_protobuf_versions = [ - '~> 3.0', - '!= 3.7.0.rc.2', - '!= 3.7.0.rc.3', - '!= 3.7.0', - '!= 3.7.1', - '!= 3.8.0.rc.1' -] -gem 'google-protobuf', *google_protobuf_versions - # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] gem "sprockets-rails" diff --git a/integration/apps/rails-seven/README.md b/integration/apps/rails-seven/README.md index 476b4da4987..fa59006d526 100644 --- a/integration/apps/rails-seven/README.md +++ b/integration/apps/rails-seven/README.md @@ -58,9 +58,9 @@ Then rebuild the application environment with: Finally start the application. -#### Running the local version of `ddtrace` +#### Running the local version of `datadog` -Useful for debugging `ddtrace` internals or testing changes. +Useful for debugging `datadog` internals or testing changes. Update the `app` --> `environment` section in `docker-compose.yml`: @@ -69,11 +69,11 @@ version: '3.4' services: app: environment: - # Add the following env var (path to `ddtrace` gem dir in the Docker container) - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb + # Add the following env var (path to `datadog` gem dir in the Docker container) + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb ``` -#### Running a specific version of `ddtrace` +#### Running a specific version of `datadog` Update the `app` --> `environment` section in `docker-compose.yml`: @@ -84,10 +84,10 @@ services: environment: # Comment out any GEM_LOCAL env var. # Otherwise local source code will override your reference. - # - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb + # - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb # Set these to the appropriate Git source and commit SHA: - - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a ``` Then delete the old containers with `docker-compose down` and start the application again. diff --git a/integration/apps/rails-seven/config/initializers/datadog.rb b/integration/apps/rails-seven/config/initializers/datadog.rb index 6ae2019eb52..89e276870ea 100644 --- a/integration/apps/rails-seven/config/initializers/datadog.rb +++ b/integration/apps/rails-seven/config/initializers/datadog.rb @@ -1,5 +1,5 @@ require 'datadog/statsd' -require 'ddtrace' +require 'datadog' require 'datadog/appsec' Datadog.configure do |c| diff --git a/integration/apps/rails-seven/docker-compose.ci.yml b/integration/apps/rails-seven/docker-compose.ci.yml index 98ab9accb35..c9ff53ab967 100644 --- a/integration/apps/rails-seven/docker-compose.ci.yml +++ b/integration/apps/rails-seven/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '3.4' services: app: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. build: context: ../../.. dockerfile: integration/apps/rails-seven/Dockerfile-ci @@ -60,7 +60,7 @@ services: expose: - "6379" # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/rails-seven/docker-compose.yml b/integration/apps/rails-seven/docker-compose.yml index de316c997e5..32ee7673d7d 100644 --- a/integration/apps/rails-seven/docker-compose.yml +++ b/integration/apps/rails-seven/docker-compose.yml @@ -37,11 +37,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=puma - DD_DEMO_ENV_FEATURES=tracing,profiling,runtime_metrics - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a # Enable building the profiling native extension - DD_DEMO_ENV_BUILD_PROFILING_EXTENSION=true expose: diff --git a/integration/apps/rails-six/Dockerfile b/integration/apps/rails-six/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/rails-six/Dockerfile +++ b/integration/apps/rails-six/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/rails-six/Dockerfile-ci b/integration/apps/rails-six/Dockerfile-ci index d3bb292a07c..fafa30889be 100644 --- a/integration/apps/rails-six/Dockerfile-ci +++ b/integration/apps/rails-six/Dockerfile-ci @@ -6,7 +6,7 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN /vendor/dd-demo/build_datadog_profiling_native_extension.rb diff --git a/integration/apps/rails-six/Gemfile b/integration/apps/rails-six/Gemfile index bcaa7a8f782..70a3073a631 100644 --- a/integration/apps/rails-six/Gemfile +++ b/integration/apps/rails-six/Gemfile @@ -2,16 +2,6 @@ require 'datadog/demo_env' source "https://rubygems.org" -google_protobuf_versions = [ - '~> 3.0', - '!= 3.7.0.rc.2', - '!= 3.7.0.rc.3', - '!= 3.7.0', - '!= 3.7.1', - '!= 3.8.0.rc.1', - '!= 3.24.0.rc.1', -] - rails_version = ['~> 6.1'] gem 'actioncable', *rails_version @@ -27,12 +17,11 @@ gem 'mysql2' gem 'puma' gem 'unicorn' -# Choose correct specs for 'ddtrace' demo environment -gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace') +# Choose correct specs for 'datadog' demo environment +gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog') gem 'dogstatsd-ruby' gem 'ffi' -gem 'google-protobuf', *google_protobuf_versions # Gems which give aide to higher performance gem 'hiredis', platform: :ruby diff --git a/integration/apps/rails-six/README.md b/integration/apps/rails-six/README.md index f3e81a34fbd..54b18c84956 100644 --- a/integration/apps/rails-six/README.md +++ b/integration/apps/rails-six/README.md @@ -58,9 +58,9 @@ Then rebuild the application environment with: Finally start the application. -#### Running the local version of `ddtrace` +#### Running the local version of `datadog` -Useful for debugging `ddtrace` internals or testing changes. +Useful for debugging `datadog` internals or testing changes. Update the `app` --> `environment` section in `docker-compose.yml`: @@ -69,11 +69,11 @@ version: '3.4' services: app: environment: - # Add the following env var (path to `ddtrace` gem dir in the Docker container) - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb + # Add the following env var (path to `datadog` gem dir in the Docker container) + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb ``` -#### Running a specific version of `ddtrace` +#### Running a specific version of `datadog` Update the `app` --> `environment` section in `docker-compose.yml`: @@ -84,10 +84,10 @@ services: environment: # Comment out any GEM_LOCAL env var. # Otherwise local source code will override your reference. - # - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb + # - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb # Set these to the appropriate Git source and commit SHA: - - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a ``` Then delete the old containers with `docker-compose down` and start the application again. diff --git a/integration/apps/rails-six/config/initializers/datadog.rb b/integration/apps/rails-six/config/initializers/datadog.rb index c710e351142..42f9582a4e7 100644 --- a/integration/apps/rails-six/config/initializers/datadog.rb +++ b/integration/apps/rails-six/config/initializers/datadog.rb @@ -1,5 +1,5 @@ require 'datadog/statsd' -require 'ddtrace' +require 'datadog' require 'datadog/appsec' Datadog.configure do |c| diff --git a/integration/apps/rails-six/docker-compose.ci.yml b/integration/apps/rails-six/docker-compose.ci.yml index c083094b0b2..db9896348c7 100644 --- a/integration/apps/rails-six/docker-compose.ci.yml +++ b/integration/apps/rails-six/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '3.4' services: app: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. build: context: ../../.. dockerfile: integration/apps/rails-six/Dockerfile-ci @@ -60,7 +60,7 @@ services: expose: - "6379" # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/rails-six/docker-compose.yml b/integration/apps/rails-six/docker-compose.yml index 16595c33a72..bf3ef14ab29 100644 --- a/integration/apps/rails-six/docker-compose.yml +++ b/integration/apps/rails-six/docker-compose.yml @@ -27,11 +27,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=puma - DD_DEMO_ENV_FEATURES=tracing,profiling,runtime_metrics - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a # Enable building the profiling native extension - DD_DEMO_ENV_BUILD_PROFILING_EXTENSION=true expose: diff --git a/integration/apps/rspec/Dockerfile b/integration/apps/rspec/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/rspec/Dockerfile +++ b/integration/apps/rspec/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/rspec/Dockerfile-ci b/integration/apps/rspec/Dockerfile-ci index d5aa17c356a..3eec0df6d13 100644 --- a/integration/apps/rspec/Dockerfile-ci +++ b/integration/apps/rspec/Dockerfile-ci @@ -6,6 +6,6 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -# Setup specific version of ddtrace, if specified. -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +# Setup specific version of datadog, if specified. +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN bundle install diff --git a/integration/apps/rspec/Gemfile b/integration/apps/rspec/Gemfile index 68e3570d2dd..be4d827bd9b 100644 --- a/integration/apps/rspec/Gemfile +++ b/integration/apps/rspec/Gemfile @@ -5,8 +5,8 @@ source "https://rubygems.org" gem 'ffi' gem 'google-protobuf' -# Choose correct specs for 'ddtrace' demo environment -gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace') +# Choose correct specs for 'datadog' demo environment +gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog') gem 'byebug' diff --git a/integration/apps/rspec/docker-compose.ci.yml b/integration/apps/rspec/docker-compose.ci.yml index 793a007ccb7..8e208e99b3c 100644 --- a/integration/apps/rspec/docker-compose.ci.yml +++ b/integration/apps/rspec/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '3.4' services: app: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. build: context: ../../.. dockerfile: integration/apps/rspec/Dockerfile-ci @@ -26,7 +26,7 @@ services: # to an app and verified the responsee and run a couple of self-owned test cases. # # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/rspec/docker-compose.yml b/integration/apps/rspec/docker-compose.yml index 34d7d081555..c96b44835e3 100644 --- a/integration/apps/rspec/docker-compose.yml +++ b/integration/apps/rspec/docker-compose.yml @@ -18,11 +18,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=rspec - DD_DEMO_ENV_FEATURES=ci - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a stdin_open: true tty: true volumes: diff --git a/integration/apps/ruby/Dockerfile b/integration/apps/ruby/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/ruby/Dockerfile +++ b/integration/apps/ruby/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/ruby/Dockerfile-ci b/integration/apps/ruby/Dockerfile-ci index d5aa17c356a..3eec0df6d13 100644 --- a/integration/apps/ruby/Dockerfile-ci +++ b/integration/apps/ruby/Dockerfile-ci @@ -6,6 +6,6 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -# Setup specific version of ddtrace, if specified. -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +# Setup specific version of datadog, if specified. +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN bundle install diff --git a/integration/apps/ruby/Gemfile b/integration/apps/ruby/Gemfile index 227116c04e7..d31be48f587 100644 --- a/integration/apps/ruby/Gemfile +++ b/integration/apps/ruby/Gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" gem 'ffi' gem 'google-protobuf' -# Choose correct specs for 'ddtrace' demo environment -gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace') +# Choose correct specs for 'datadog' demo environment +gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog') gem 'byebug' diff --git a/integration/apps/ruby/app/datadog.rb b/integration/apps/ruby/app/datadog.rb index 370414b42fd..334fe51f0ab 100644 --- a/integration/apps/ruby/app/datadog.rb +++ b/integration/apps/ruby/app/datadog.rb @@ -1,5 +1,5 @@ require 'datadog/demo_env' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.diagnostics.debug = true if Datadog::DemoEnv.feature?('debug') diff --git a/integration/apps/ruby/docker-compose.ci.yml b/integration/apps/ruby/docker-compose.ci.yml index a85c3f2b401..9ee636d3eb7 100644 --- a/integration/apps/ruby/docker-compose.ci.yml +++ b/integration/apps/ruby/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '3.4' services: app: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. build: context: ../../.. dockerfile: integration/apps/ruby/Dockerfile-ci @@ -28,7 +28,7 @@ services: # ddagent: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/ruby/docker-compose.yml b/integration/apps/ruby/docker-compose.yml index 8e5e42aa2d3..d68b25aae2c 100644 --- a/integration/apps/ruby/docker-compose.yml +++ b/integration/apps/ruby/docker-compose.yml @@ -18,11 +18,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=fibonacci - DD_DEMO_ENV_FEATURES=tracing - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a stdin_open: true tty: true volumes: diff --git a/integration/apps/sinatra2-classic/Dockerfile b/integration/apps/sinatra2-classic/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/sinatra2-classic/Dockerfile +++ b/integration/apps/sinatra2-classic/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/sinatra2-classic/Dockerfile-ci b/integration/apps/sinatra2-classic/Dockerfile-ci index d3bb292a07c..fafa30889be 100644 --- a/integration/apps/sinatra2-classic/Dockerfile-ci +++ b/integration/apps/sinatra2-classic/Dockerfile-ci @@ -6,7 +6,7 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN /vendor/dd-demo/build_datadog_profiling_native_extension.rb diff --git a/integration/apps/sinatra2-classic/Gemfile b/integration/apps/sinatra2-classic/Gemfile index 656831aaedf..cbbc60735b5 100644 --- a/integration/apps/sinatra2-classic/Gemfile +++ b/integration/apps/sinatra2-classic/Gemfile @@ -7,25 +7,8 @@ gem 'unicorn' gem 'sinatra', '>= 2.2.4', '< 3' gem 'dogstatsd-ruby' -# Choose correct specs for 'ddtrace' demo environment -gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace') - -# Needed for ddtrace profiling -google_protobuf_versions = [ - '~> 3.0', - '!= 3.7.0.rc.2', - '!= 3.7.0.rc.3', - '!= 3.7.0', - '!= 3.7.1', - '!= 3.8.0.rc.1', - '!= 3.24.0.rc.1', -] -if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4') - gem 'google-protobuf', *google_protobuf_versions -else - # Bundler resolves incorrect version (too new, incompatible with Ruby <= 2.3) - gem 'google-protobuf', *google_protobuf_versions, '< 3.19.2' -end +# Choose correct specs for 'datadog' demo environment +gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog') # Development gem 'pry-byebug' diff --git a/integration/apps/sinatra2-classic/app/acme.rb b/integration/apps/sinatra2-classic/app/acme.rb index 09af208670a..5152f12e3e5 100644 --- a/integration/apps/sinatra2-classic/app/acme.rb +++ b/integration/apps/sinatra2-classic/app/acme.rb @@ -1,5 +1,5 @@ require 'sinatra' -require 'ddtrace' +require 'datadog' Datadog.configure do |c| c.service = 'acme-sinatra2-classic' diff --git a/integration/apps/sinatra2-classic/docker-compose.ci.yml b/integration/apps/sinatra2-classic/docker-compose.ci.yml index 17fb9705f47..294010a5e4a 100644 --- a/integration/apps/sinatra2-classic/docker-compose.ci.yml +++ b/integration/apps/sinatra2-classic/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '3.4' services: app: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. build: context: ../../.. dockerfile: integration/apps/sinatra2-classic/Dockerfile-ci @@ -29,7 +29,7 @@ services: # to an app and verified the responsee and run a couple of self-owned test cases. # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/sinatra2-classic/docker-compose.yml b/integration/apps/sinatra2-classic/docker-compose.yml index 9a11682f683..dc645b9aa44 100644 --- a/integration/apps/sinatra2-classic/docker-compose.yml +++ b/integration/apps/sinatra2-classic/docker-compose.yml @@ -18,11 +18,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=puma - DD_DEMO_ENV_FEATURES=tracing,profiling - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a # Enable building the profiling native extension - DD_DEMO_ENV_BUILD_PROFILING_EXTENSION=true # - DD_TRACE_DEBUG=true diff --git a/integration/apps/sinatra2-modular/Dockerfile b/integration/apps/sinatra2-modular/Dockerfile index 201df0e5c3f..a70d1d57744 100644 --- a/integration/apps/sinatra2-modular/Dockerfile +++ b/integration/apps/sinatra2-modular/Dockerfile @@ -6,12 +6,12 @@ FROM ${BASE_IMAGE} RUN mkdir /app WORKDIR /app -# Setup specific version of ddtrace, if specified. -ARG ddtrace_git -ENV DD_DEMO_ENV_GEM_GIT_DDTRACE ${ddtrace_git} +# Setup specific version of datadog, if specified. +ARG gem_git_datadog +ENV DD_DEMO_ENV_GEM_GIT_DATADOG ${gem_git_datadog} -ARG ddtrace_ref -ENV DD_DEMO_ENV_GEM_REF_DDTRACE ${ddtrace_ref} +ARG gem_ref_datadog +ENV DD_DEMO_ENV_GEM_REF_DATADOG ${gem_ref_datadog} # Install dependencies COPY Gemfile /app/Gemfile diff --git a/integration/apps/sinatra2-modular/Dockerfile-ci b/integration/apps/sinatra2-modular/Dockerfile-ci index d3bb292a07c..fafa30889be 100644 --- a/integration/apps/sinatra2-modular/Dockerfile-ci +++ b/integration/apps/sinatra2-modular/Dockerfile-ci @@ -6,7 +6,7 @@ FROM ${BASE_IMAGE} COPY . /vendor/dd-trace-rb # Install dependencies -ENV DD_DEMO_ENV_GEM_LOCAL_DDTRACE /vendor/dd-trace-rb +ENV DD_DEMO_ENV_GEM_LOCAL_DATADOG /vendor/dd-trace-rb RUN /vendor/dd-demo/build_datadog_profiling_native_extension.rb diff --git a/integration/apps/sinatra2-modular/Gemfile b/integration/apps/sinatra2-modular/Gemfile index 20022fa5406..6f9490206ab 100644 --- a/integration/apps/sinatra2-modular/Gemfile +++ b/integration/apps/sinatra2-modular/Gemfile @@ -8,25 +8,8 @@ gem 'sinatra', '>= 2.2.4', '< 3' gem 'sinatra-router', '>= 0.3.0' gem 'dogstatsd-ruby' -# Choose correct specs for 'ddtrace' demo environment -gem 'ddtrace', *Datadog::DemoEnv.gem_spec('ddtrace') - -# Needed for ddtrace profiling -google_protobuf_versions = [ - '~> 3.0', - '!= 3.7.0.rc.2', - '!= 3.7.0.rc.3', - '!= 3.7.0', - '!= 3.7.1', - '!= 3.8.0.rc.1', - '!= 3.24.0.rc.1', -] -if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4') - gem 'google-protobuf', *google_protobuf_versions -else - # Bundler resolves incorrect version (too new, incompatible with Ruby <= 2.3) - gem 'google-protobuf', *google_protobuf_versions, '< 3.19.2' -end +# Choose correct specs for 'datadog' demo environment +gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog') # Development gem 'pry-byebug' diff --git a/integration/apps/sinatra2-modular/app/acme.rb b/integration/apps/sinatra2-modular/app/acme.rb index c1317556d28..71a56a01d86 100644 --- a/integration/apps/sinatra2-modular/app/acme.rb +++ b/integration/apps/sinatra2-modular/app/acme.rb @@ -1,8 +1,8 @@ require 'sinatra/base' require 'sinatra/router' -require 'ddtrace' +require 'datadog' -# require 'ddtrace/auto_instrument' +# require 'datadog/auto_instrument' Datadog.configure do |c| c.service = 'acme-sinatra2-modular' diff --git a/integration/apps/sinatra2-modular/app/basic.rb b/integration/apps/sinatra2-modular/app/basic.rb index 115ce2b2fd0..5347811112f 100644 --- a/integration/apps/sinatra2-modular/app/basic.rb +++ b/integration/apps/sinatra2-modular/app/basic.rb @@ -1,5 +1,5 @@ require 'sinatra/base' -require 'ddtrace' +require 'datadog' require_relative 'parent' # Inherit from another app to verify middleware/extension inheritance diff --git a/integration/apps/sinatra2-modular/app/health.rb b/integration/apps/sinatra2-modular/app/health.rb index 7a899fc3dfc..05646bf0a6b 100644 --- a/integration/apps/sinatra2-modular/app/health.rb +++ b/integration/apps/sinatra2-modular/app/health.rb @@ -1,5 +1,5 @@ require 'sinatra/base' -require 'ddtrace' +require 'datadog' class Health < Sinatra::Base # register Datadog::Tracing::Contrib::Sinatra::Tracer diff --git a/integration/apps/sinatra2-modular/app/parent.rb b/integration/apps/sinatra2-modular/app/parent.rb index a1047a39d8e..eed24841907 100644 --- a/integration/apps/sinatra2-modular/app/parent.rb +++ b/integration/apps/sinatra2-modular/app/parent.rb @@ -1,5 +1,5 @@ require 'sinatra/base' -require 'ddtrace' +require 'datadog' class Parent < Sinatra::Base end diff --git a/integration/apps/sinatra2-modular/config.ru b/integration/apps/sinatra2-modular/config.ru index f64a4d13059..88094e24bb2 100644 --- a/integration/apps/sinatra2-modular/config.ru +++ b/integration/apps/sinatra2-modular/config.ru @@ -1,4 +1,4 @@ -require 'ddtrace' +require 'datadog' require_relative 'app/acme' run Acme diff --git a/integration/apps/sinatra2-modular/docker-compose.ci.yml b/integration/apps/sinatra2-modular/docker-compose.ci.yml index 4adb5d7ef60..d6daba6e3f1 100644 --- a/integration/apps/sinatra2-modular/docker-compose.ci.yml +++ b/integration/apps/sinatra2-modular/docker-compose.ci.yml @@ -2,7 +2,7 @@ version: '3.4' services: app: # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. build: context: ../../.. dockerfile: integration/apps/sinatra2-modular/Dockerfile-ci @@ -29,7 +29,7 @@ services: # to an app and verified the responsee and run a couple of self-owned test cases. # Build at dd-trace-rb level to copy in current code - # and use it as the `ddtrace` gem. + # and use it as the `datadog` gem. integration-tester: build: context: ../../.. diff --git a/integration/apps/sinatra2-modular/docker-compose.yml b/integration/apps/sinatra2-modular/docker-compose.yml index 67d1985021a..c6a6067d1be 100644 --- a/integration/apps/sinatra2-modular/docker-compose.yml +++ b/integration/apps/sinatra2-modular/docker-compose.yml @@ -18,11 +18,11 @@ services: # Use these to choose what is run - DD_DEMO_ENV_PROCESS=puma - DD_DEMO_ENV_FEATURES=tracing,profiling - # Use this for a local version of ddtrace - - DD_DEMO_ENV_GEM_LOCAL_DDTRACE=/vendor/dd-trace-rb - # Use these for a specific revision of ddtrace - # - DD_DEMO_ENV_GEM_GIT_DDTRACE=https://github.com/DataDog/dd-trace-rb.git - # - DD_DEMO_ENV_GEM_REF_DDTRACE=f233336994315bfa04dac581387a8152bab8b85a + # Use this for a local version of datadog + - DD_DEMO_ENV_GEM_LOCAL_DATADOG=/vendor/dd-trace-rb + # Use these for a specific revision of datadog + # - DD_DEMO_ENV_GEM_GIT_DATADOG=https://github.com/DataDog/dd-trace-rb.git + # - DD_DEMO_ENV_GEM_REF_DATADOG=f233336994315bfa04dac581387a8152bab8b85a # Enable building the profiling native extension - DD_DEMO_ENV_BUILD_PROFILING_EXTENSION=true # - DD_TRACE_DEBUG=true diff --git a/integration/images/include/build_datadog_profiling_native_extension.rb b/integration/images/include/build_datadog_profiling_native_extension.rb index 8f6ba7493ce..6639c882796 100755 --- a/integration/images/include/build_datadog_profiling_native_extension.rb +++ b/integration/images/include/build_datadog_profiling_native_extension.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -if local_gem_path = ENV['DD_DEMO_ENV_GEM_LOCAL_DDTRACE'] +if local_gem_path = ENV['DD_DEMO_ENV_GEM_LOCAL_DATADOG'] if RUBY_VERSION.start_with?('2.1.', '2.2.') puts "\n== Skipping build of profiler native extension on Ruby 2.1/2.2 ==" else @@ -10,5 +10,5 @@ raise 'Failure to compile profiler native extension' unless success end else - puts "\n== Skipping build of profiler native extension, no DD_DEMO_ENV_GEM_LOCAL_DDTRACE set ==" + puts "\n== Skipping build of profiler native extension, no DD_DEMO_ENV_GEM_LOCAL_DATADOG set ==" end diff --git a/integration/images/include/datadog/demo_env.rb b/integration/images/include/datadog/demo_env.rb index fbe54c191f5..516f2a0d479 100644 --- a/integration/images/include/datadog/demo_env.rb +++ b/integration/images/include/datadog/demo_env.rb @@ -59,13 +59,13 @@ def print_env(header = 'Datadog test environment') puts "Features: #{features}" puts "Rails env: #{ENV['RAILS_ENV']}" if ENV['RAILS_ENV'] puts "PID: #{Process.pid}" - if (ddtrace = Gem.loaded_specs['ddtrace']) + if (datadog = Gem.loaded_specs['datadog']) puts "Runtime ID: #{Datadog::Core::Environment::Identity.id}" if defined?(Datadog::Core::Environment::Identity) - puts "ddtrace version: #{ddtrace.version}" - puts "ddtrace path: #{ddtrace.full_gem_path}" - if (git_spec = git_gem('ddtrace')) - puts "ddtrace git: #{git_spec[:git]}" - puts "ddtrace ref: #{git_spec[:ref]}" + puts "datadog version: #{datadog.version}" + puts "datadog path: #{datadog.full_gem_path}" + if (git_spec = git_gem('datadog')) + puts "datadog git: #{git_spec[:git]}" + puts "datadog ref: #{git_spec[:ref]}" end end puts "\n" diff --git a/lib-injection/Dockerfile b/lib-injection/Dockerfile index 65e97a6c867..62a2421ef3e 100644 --- a/lib-injection/Dockerfile +++ b/lib-injection/Dockerfile @@ -5,11 +5,11 @@ FROM alpine:3.18.3 # Set high UID to prevent possible conflict with existing users: http://www.linfo.org/uid.html ARG UID=10000 -ARG DDTRACE_RUBY_VERSION -ENV DDTRACE_RUBY_VERSION=$DDTRACE_RUBY_VERSION +ARG DATADOG_RUBY_GEM_VERSION +ENV DATADOG_RUBY_GEM_VERSION=$DATADOG_RUBY_GEM_VERSION -ARG DDTRACE_RUBY_SHA -ENV DDTRACE_RUBY_SHA=$DDTRACE_RUBY_SHA +ARG DATADOG_RUBY_GEM_SHA +ENV DATADOG_RUBY_GEM_SHA=$DATADOG_RUBY_GEM_SHA RUN addgroup -g 10000 -S datadog && \ adduser -u ${UID} -S datadog -G datadog @@ -18,7 +18,7 @@ USER ${UID} WORKDIR /datadog-init ADD auto_inject.rb /datadog-init/auto_inject.rb -RUN sed -i "s~~${DDTRACE_RUBY_SHA}~g" /datadog-init/auto_inject.rb -RUN sed -i "s~~${DDTRACE_RUBY_VERSION}~g" /datadog-init/auto_inject.rb +RUN sed -i "s~~${DATADOG_RUBY_GEM_SHA}~g" /datadog-init/auto_inject.rb +RUN sed -i "s~~${DATADOG_RUBY_GEM_VERSION}~g" /datadog-init/auto_inject.rb ADD copy-lib.sh /datadog-init/copy-lib.sh diff --git a/lib-injection/README.md b/lib-injection/README.md index 2187192b598..15da0b805e4 100644 --- a/lib-injection/README.md +++ b/lib-injection/README.md @@ -1,6 +1,6 @@ ### Injection -Injection is Datadog's strategy to [instrument application without touching application code](https://docs.datadoghq.com/tracing/trace_collection/library_injection_local/?tab=kubernetes). Currently, This strategy is implemented by adding `ddtrace` to your application's `Gemfile` to [instrument your application](https://docs.datadoghq.com/tracing/trace_collection/dd_libraries/ruby/#rails-or-hanami-applications)). +Injection is Datadog's strategy to [instrument application without touching application code](https://docs.datadoghq.com/tracing/trace_collection/library_injection_local/?tab=kubernetes). Currently, This strategy is implemented by adding `datadog` to your application's `Gemfile` to [instrument your application](https://docs.datadoghq.com/tracing/trace_collection/dd_libraries/ruby/#rails-or-hanami-applications)). * Supports `Ruby on Rails` and `Hanami` application * Requires [bundler](https://bundler.io/) version 2.3 or above @@ -35,7 +35,7 @@ bundle install --deployment ### Packaging -There's an internal gitlab build pipeline ships pre-installed `ddtrace` deb and rpm packages. +There's an internal gitlab build pipeline ships pre-installed `datadog` deb and rpm packages. Currently, we support @@ -45,7 +45,7 @@ Currently, we support | Arch | `amd64`, `arm64` | | glibc | 2.28+ | -In order to ship `ddtrace` and its dependencies as a pre-install package, we need a few tweaks in our build pipeline. +In order to ship `datadog` and its dependencies as a pre-install package, we need a few tweaks in our build pipeline. * Use multiple custom built Ruby images to build native extensions. Those images are based on Debian `buster` to support older distribution and Ruby is compiled as a static library with `--disable-shared` option which disables the creation of shared libraries (also known as dynamic libraries or DLLs). * Install `ffi` gem with its built-in `libffi` native extension instead of using system's `libffi`. diff --git a/lib-injection/auto_inject.rb b/lib-injection/auto_inject.rb index 0290dc9761e..5ebd3287c8b 100644 --- a/lib-injection/auto_inject.rb +++ b/lib-injection/auto_inject.rb @@ -10,9 +10,9 @@ def debug_log(msg) $stdout.puts msg if ENV['DD_TRACE_DEBUG'] == 'true' end - _, status = Open3.capture2e({ 'DD_TRACE_SKIP_LIB_INJECTION' => 'true' }, 'bundle show ddtrace') + _, status = Open3.capture2e({ 'DD_TRACE_SKIP_LIB_INJECTION' => 'true' }, 'bundle show datadog') if status.success? - debug_log '[ddtrace] ddtrace already installed... skipping injection' + debug_log '[datadog] datadog already installed... skipping injection' return end @@ -21,36 +21,36 @@ def debug_log(msg) require 'shellwords' if Bundler.frozen_bundle? - warn '[ddtrace] Injection failed: Unable to inject into a frozen Gemfile '\ + warn '[datadog] Injection failed: Unable to inject into a frozen Gemfile '\ '(Bundler is configured with `deployment` or `frozen`)' return end unless Bundler::CLI.commands['add'] && Bundler::CLI.commands['add'].options.key?('require') - warn "[ddtrace] Injection failed: Bundler version #{Bundler::VERSION} is not supported. "\ + warn "[datadog] Injection failed: Bundler version #{Bundler::VERSION} is not supported. "\ 'Upgrade to Bundler >= 2.3 to enable injection.' return end # `version` and `sha` should be replaced by docker build arguments - version = '' - sha = '' + version = '' + sha = '' - bundle_add_ddtrace_cmd = + bundle_add_datadog_cmd = if !version.empty? # For public release - "bundle add ddtrace --require ddtrace/auto_instrument --version #{version.gsub(/^v/, '').shellescape}" + "bundle add datadog --require datadog/auto_instrument --version #{version.gsub(/^v/, '').shellescape}" elsif !sha.empty? # For internal testing - "bundle add ddtrace --require ddtrace/auto_instrument --github datadog/dd-trace-rb --ref #{sha.shellescape}" + "bundle add datadog --require datadog/auto_instrument --github datadog/dd-trace-rb --ref #{sha.shellescape}" end - unless bundle_add_ddtrace_cmd - warn "[ddtrace] Injection failed: Missing version specification. #{support_message}" + unless bundle_add_datadog_cmd + warn "[datadog] Injection failed: Missing version specification. #{support_message}" return end - debug_log "[ddtrace] Injection with `#{bundle_add_ddtrace_cmd}`" + debug_log "[datadog] Injection with `#{bundle_add_datadog_cmd}`" gemfile = Bundler::SharedHelpers.default_gemfile lockfile = Bundler::SharedHelpers.default_lockfile @@ -67,17 +67,17 @@ def debug_log(msg) output, status = Open3.capture2e( { 'DD_TRACE_SKIP_LIB_INJECTION' => 'true', 'BUNDLE_GEMFILE' => datadog_gemfile.to_s }, - bundle_add_ddtrace_cmd + bundle_add_datadog_cmd ) if status.success? - $stdout.puts '[ddtrace] Successfully injected ddtrace into the application.' + $stdout.puts '[datadog] Successfully injected datadog into the application.' FileUtils.cp datadog_gemfile, gemfile FileUtils.cp datadog_lockfile, lockfile else - warn "[ddtrace] Injection failed: Unable to add ddtrace. Error output:\n#{output.split("\n").map do |l| - "[ddtrace] #{l}" + warn "[datadog] Injection failed: Unable to add datadog. Error output:\n#{output.split("\n").map do |l| + "[datadog] #{l}" end.join("\n")}\n#{support_message}" end ensure @@ -86,5 +86,5 @@ def debug_log(msg) FileUtils.rm datadog_lockfile end rescue Exception => e - warn "[ddtrace] Injection failed: #{e.class.name} #{e.message}\nBacktrace: #{e.backtrace.join("\n")}\n#{support_message}" + warn "[datadog] Injection failed: #{e.class.name} #{e.message}\nBacktrace: #{e.backtrace.join("\n")}\n#{support_message}" end diff --git a/lib-injection/host_inject.rb b/lib-injection/host_inject.rb index 9b199762f9b..4f6f0b1299b 100644 --- a/lib-injection/host_inject.rb +++ b/lib-injection/host_inject.rb @@ -31,24 +31,24 @@ def debug_log(msg) support_message = 'For help solving this issue, please contact Datadog support at https://docs.datadoghq.com/help/.' unless Bundler::SharedHelpers.in_bundle? - debug_log '[ddtrace] Not in bundle... skipping injection' + debug_log '[datadog] Not in bundle... skipping injection' return end - _, status = Open3.capture2e({ 'DD_TRACE_SKIP_LIB_INJECTION' => 'true' }, 'bundle show ddtrace') + _, status = Open3.capture2e({ 'DD_TRACE_SKIP_LIB_INJECTION' => 'true' }, 'bundle show datadog') if status.success? - debug_log '[ddtrace] ddtrace already installed... skipping injection' + debug_log '[datadog] datadog already installed... skipping injection' return end if Bundler.frozen_bundle? - warn '[ddtrace] Injection failed: Unable to inject into a frozen Gemfile '\ + warn '[datadog] Injection failed: Unable to inject into a frozen Gemfile '\ '(Bundler is configured with `deployment` or `frozen`)' return end unless Bundler::CLI.commands['add'] && Bundler::CLI.commands['add'].options.key?('require') - warn "[ddtrace] Injection failed: Bundler version #{Bundler::VERSION} is not supported. "\ + warn "[datadog] Injection failed: Bundler version #{Bundler::VERSION} is not supported. "\ 'Upgrade to Bundler >= 2.3 to enable injection.' return end @@ -66,19 +66,19 @@ def debug_log(msg) 'debase-ruby_core_source', 'libdatadog', 'libddwaf', - 'ddtrace' + 'datadog' ].each do |gem| _, status = Open3.capture2e({ 'DD_TRACE_SKIP_LIB_INJECTION' => 'true' }, "bundle show #{gem}") if status.success? - debug_log "[ddtrace] #{gem} already installed... skipping..." + debug_log "[datadog] #{gem} already installed... skipping..." next else bundle_add_cmd = "bundle add #{gem} --skip-install --version #{gem_version_mapping[gem]} " - bundle_add_cmd << '--require ddtrace/auto_instrument' if gem == 'ddtrace' + bundle_add_cmd << '--require datadog/auto_instrument' if gem == 'datadog' - debug_log "[ddtrace] Injection with `#{bundle_add_cmd}`" + debug_log "[datadog] Injection with `#{bundle_add_cmd}`" gemfile = Bundler::SharedHelpers.default_gemfile lockfile = Bundler::SharedHelpers.default_lockfile @@ -97,13 +97,13 @@ def debug_log(msg) ) if status.success? - $stdout.puts "[ddtrace] Successfully injected #{gem} into the application." + $stdout.puts "[datadog] Successfully injected #{gem} into the application." ::FileUtils.cp datadog_gemfile, gemfile ::FileUtils.cp datadog_lockfile, lockfile else - warn "[ddtrace] Injection failed: Unable to add ddtrace. Error output:\n#{output.split("\n").map do |l| - "[ddtrace] #{l}" + warn "[datadog] Injection failed: Unable to add datadog. Error output:\n#{output.split("\n").map do |l| + "[datadog] #{l}" end.join("\n")}\n#{support_message}" end ensure @@ -114,5 +114,5 @@ def debug_log(msg) end end rescue Exception => e - warn "[ddtrace] Injection failed: #{e.class.name} #{e.message}\nBacktrace: #{e.backtrace.join("\n")}\n#{support_message}" + warn "[datadog] Injection failed: #{e.class.name} #{e.message}\nBacktrace: #{e.backtrace.join("\n")}\n#{support_message}" end diff --git a/lib/ddtrace.rb b/lib/datadog.rb similarity index 100% rename from lib/ddtrace.rb rename to lib/datadog.rb diff --git a/lib/datadog/appsec/autoload.rb b/lib/datadog/appsec/autoload.rb index 8141c94c6c3..886c35b5f05 100644 --- a/lib/datadog/appsec/autoload.rb +++ b/lib/datadog/appsec/autoload.rb @@ -6,7 +6,7 @@ Datadog::AppSec::Contrib::AutoInstrument.patch_all rescue StandardError => e Kernel.warn( - '[ddtrace] AppSec failed to instrument. No security check will be performed. error: ' \ + '[datadog] AppSec failed to instrument. No security check will be performed. error: ' \ " #{e.class.name} #{e.message}" ) end diff --git a/lib/ddtrace/auto_instrument.rb b/lib/datadog/auto_instrument.rb similarity index 92% rename from lib/ddtrace/auto_instrument.rb rename to lib/datadog/auto_instrument.rb index bc51ff217ae..d32a06cc2ae 100644 --- a/lib/ddtrace/auto_instrument.rb +++ b/lib/datadog/auto_instrument.rb @@ -3,7 +3,7 @@ # Entrypoint file for auto instrumentation. # # This file's path is part of the @public_api. -require_relative '../ddtrace' +require_relative '../datadog' require_relative '../datadog/tracing/contrib/auto_instrument' Datadog::Profiling.start_if_enabled diff --git a/lib/ddtrace/auto_instrument_base.rb b/lib/datadog/auto_instrument_base.rb similarity index 100% rename from lib/ddtrace/auto_instrument_base.rb rename to lib/datadog/auto_instrument_base.rb diff --git a/lib/datadog/core/buffer/cruby.rb b/lib/datadog/core/buffer/cruby.rb index eab492873a8..a46b7178544 100644 --- a/lib/datadog/core/buffer/cruby.rb +++ b/lib/datadog/core/buffer/cruby.rb @@ -20,7 +20,7 @@ module Buffer # This implementation allocates less memory and is faster # than {Datadog::Core::Buffer::ThreadSafe}. # - # @see spec/ddtrace/benchmark/buffer_benchmark_spec.rb Buffer benchmarks + # @see spec/datadog/benchmark/buffer_benchmark_spec.rb Buffer benchmarks # @see https://github.com/ruby-concurrency/concurrent-ruby/blob/c1114a0c6891d9634f019f1f9fe58dcae8658964/lib/concurrent-ruby/concurrent/array.rb#L23-L27 class CRuby < Random # A very large number to allow us to effectively diff --git a/lib/datadog/core/configuration.rb b/lib/datadog/core/configuration.rb index 727d92658b1..61717afb15a 100644 --- a/lib/datadog/core/configuration.rb +++ b/lib/datadog/core/configuration.rb @@ -233,7 +233,7 @@ def safely_synchronize yield write_components rescue ThreadError => e logger_without_components.error( - 'Detected deadlock during ddtrace initialization. ' \ + 'Detected deadlock during datadog initialization. ' \ 'Please report this at https://github.com/DataDog/dd-trace-rb/blob/master/CONTRIBUTING.md#found-a-bug' \ "\n\tSource:\n\t#{Array(e.backtrace).join("\n\t")}" ) diff --git a/lib/datadog/core/configuration/agent_settings_resolver.rb b/lib/datadog/core/configuration/agent_settings_resolver.rb index 654b7cd6866..057f5285d14 100644 --- a/lib/datadog/core/configuration/agent_settings_resolver.rb +++ b/lib/datadog/core/configuration/agent_settings_resolver.rb @@ -238,7 +238,7 @@ def should_use_uds? def can_use_uds? !configured_uds_path.nil? || # If no agent settings have been provided, we try to connect using a local unix socket. - # We only do so if the socket is present when `ddtrace` runs. + # We only do so if the socket is present when `datadog` runs. !uds_fallback.nil? end diff --git a/lib/datadog/core/configuration/settings.rb b/lib/datadog/core/configuration/settings.rb index 66224d02274..1ca83579aae 100644 --- a/lib/datadog/core/configuration/settings.rb +++ b/lib/datadog/core/configuration/settings.rb @@ -137,7 +137,7 @@ def initialize(*_) settings :startup_logs do # Enable startup logs collection. # - # If `nil`, defaults to logging startup logs when `ddtrace` detects that the application + # If `nil`, defaults to logging startup logs when `datadog` detects that the application # is *not* running in a development environment. # # @default `DD_TRACE_STARTUP_LOGS` environment variable, otherwise `nil` diff --git a/lib/datadog/core/diagnostics/environment_logger.rb b/lib/datadog/core/diagnostics/environment_logger.rb index dffa0047e38..005d52f6ce2 100644 --- a/lib/datadog/core/diagnostics/environment_logger.rb +++ b/lib/datadog/core/diagnostics/environment_logger.rb @@ -91,9 +91,9 @@ def os_name RbConfig::CONFIG['host'] end - # @return [String] ddtrace version + # @return [String] datadog version def version - DDTrace::VERSION::STRING + Datadog::VERSION::STRING end # @return [String] "ruby" diff --git a/lib/datadog/core/environment/ext.rb b/lib/datadog/core/environment/ext.rb index 9b92d53a9c4..d3c3a5d2992 100644 --- a/lib/datadog/core/environment/ext.rb +++ b/lib/datadog/core/environment/ext.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative '../../../ddtrace/version' +require_relative '../../../datadog/version' module Datadog module Core @@ -38,8 +38,7 @@ module Ext TAG_SERVICE = 'service' TAG_VERSION = 'version' - # TODO: Migrate to Datadog::Tracing - TRACER_VERSION = DDTrace::VERSION::STRING + GEM_DATADOG_VERSION = Datadog::VERSION::STRING end end end diff --git a/lib/datadog/core/environment/identity.rb b/lib/datadog/core/environment/identity.rb index bd0e2c92afb..90f25237994 100644 --- a/lib/datadog/core/environment/identity.rb +++ b/lib/datadog/core/environment/identity.rb @@ -49,14 +49,14 @@ def lang_version Core::Environment::Ext::LANG_VERSION end - # Returns tracer version, rubygems-style - def tracer_version - Core::Environment::Ext::TRACER_VERSION + # Returns datadog gem version, rubygems-style + def gem_datadog_version + Core::Environment::Ext::GEM_DATADOG_VERSION end # Returns tracer version, comforming to https://semver.org/spec/v2.0.0.html - def tracer_version_semver2 - major, minor, patch, rest = tracer_version.split('.', 4) + def gem_datadog_version_semver2 + major, minor, patch, rest = gem_datadog_version.split('.', 4) semver = "#{major}.#{minor}.#{patch}" diff --git a/lib/datadog/core/logger.rb b/lib/datadog/core/logger.rb index 197d3115735..f14adedd6bf 100644 --- a/lib/datadog/core/logger.rb +++ b/lib/datadog/core/logger.rb @@ -5,12 +5,11 @@ module Datadog module Core # A custom logger with minor enhancements: - # - progname defaults to ddtrace to clearly identify Datadog dd-trace-rb related messages + # - progname defaults to datadog to clearly identify Datadog dd-trace-rb related messages # - adds last caller stack-trace info to know where the message comes from # @public_api class Logger < ::Logger - # TODO: Consider renaming this to 'datadog' - PREFIX = 'ddtrace' + PREFIX = 'datadog' def initialize(*args, &block) super diff --git a/lib/datadog/core/metrics/options.rb b/lib/datadog/core/metrics/options.rb index 10ea69b701b..426944ec1d2 100644 --- a/lib/datadog/core/metrics/options.rb +++ b/lib/datadog/core/metrics/options.rb @@ -14,7 +14,9 @@ module Options "#{Ext::TAG_LANG}:#{Environment::Identity.lang}", "#{Ext::TAG_LANG_INTERPRETER}:#{Environment::Identity.lang_interpreter}", "#{Ext::TAG_LANG_VERSION}:#{Environment::Identity.lang_version}", - "#{Ext::TAG_TRACER_VERSION}:#{Environment::Identity.tracer_version}" + # TODO: Technically not accurate, if tracing version diverges from datadog gem version + # If we extract tracing to its own gem, this needs to be updated. + "#{Ext::TAG_TRACER_VERSION}:#{Environment::Identity.gem_datadog_version}" ].freeze }.freeze diff --git a/lib/datadog/core/remote/client.rb b/lib/datadog/core/remote/client.rb index 8c5c2767245..badb5b2f9d0 100644 --- a/lib/datadog/core/remote/client.rb +++ b/lib/datadog/core/remote/client.rb @@ -123,7 +123,9 @@ def payload # rubocop:disable Metrics/MethodLength "platform:#{native_platform}", # native platform # "asm.config.rules:#{}", # TODO: defined|undefined # "asm.config.enabled:#{}", # TODO: true|false|undefined - "ruby.tracer.version:#{Core::Environment::Identity.tracer_version}", + # TODO: Inaccurate if tracing is extracted and version diverges from the datadog gem. + # Update this if this ever occurs. + "ruby.tracer.version:#{Core::Environment::Identity.gem_datadog_version}", "ruby.runtime.platform:#{RUBY_PLATFORM}", "ruby.runtime.version:#{RUBY_VERSION}", "ruby.runtime.engine.name:#{RUBY_ENGINE}", @@ -138,7 +140,7 @@ def payload # rubocop:disable Metrics/MethodLength client_tracer = { runtime_id: Core::Environment::Identity.id, language: Core::Environment::Identity.lang, - tracer_version: tracer_version_semver2, + tracer_version: tracer_version, service: service_name, env: Datadog.configuration.env, tags: client_tracer_tags, @@ -174,8 +176,8 @@ def service_name Datadog.configuration.remote.service || Datadog.configuration.service end - def tracer_version_semver2 - @tracer_version_semver2 ||= Core::Environment::Identity.tracer_version_semver2 + def tracer_version + @tracer_version ||= Core::Environment::Identity.gem_datadog_version_semver2 end def ruby_engine_version diff --git a/lib/datadog/core/remote/transport/http.rb b/lib/datadog/core/remote/transport/http.rb index d902c96127f..ed87c0dc5cb 100644 --- a/lib/datadog/core/remote/transport/http.rb +++ b/lib/datadog/core/remote/transport/http.rb @@ -115,7 +115,7 @@ def default_headers Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER => Datadog::Core::Environment::Ext::LANG_INTERPRETER, Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION => - Datadog::Core::Environment::Ext::TRACER_VERSION + Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION }.tap do |headers| # Add container ID, if present. container_id = Datadog::Core::Environment::Container.container_id diff --git a/lib/datadog/core/remote/transport/http/api.rb b/lib/datadog/core/remote/transport/http/api.rb index 7b3348cb361..6edcb356f69 100644 --- a/lib/datadog/core/remote/transport/http/api.rb +++ b/lib/datadog/core/remote/transport/http/api.rb @@ -13,7 +13,7 @@ # Separate classes are needed because of `include Trace::API::Instance`. # # Below should be: -# require_relative '../../../../ddtrace/transport/http/api/spec' +# require_relative '../../../../datadog/core/transport/http/api/spec' require_relative 'api/spec' # TODO: only needed for Negotiation::API::Endpoint diff --git a/lib/datadog/core/remote/transport/http/builder.rb b/lib/datadog/core/remote/transport/http/builder.rb index caa69890a9a..393e8f6a1d6 100644 --- a/lib/datadog/core/remote/transport/http/builder.rb +++ b/lib/datadog/core/remote/transport/http/builder.rb @@ -14,7 +14,7 @@ # Separate classes are needed because of `include Trace::API::Instance`. # # Below should be: -# require_relative '../../../../ddtrace/transport/http/api/instance' +# require_relative '../../../../datadog/core/transport/http/api/instance' require_relative 'api/instance' # TODO: Decouple transport/http/client @@ -23,13 +23,13 @@ # stats updates, which may or may not be desirable in general. # # Below should be: -# require_relative '../../../../ddtrace/transport/http/client' +# require_relative '../../../../datadog/core/transport/http/client' require_relative 'client' # TODO: Decouple transport/http/builder # # This class is duplicated even though it is tantalisingly close to the -# one in ddtrace/transport mostly because it refers to a different +# one in datadog/core/transport mostly because it refers to a different # `API::Instance` in `#api_instance_class` but also because it operates on a # different `HTTP::Client`, as well as de-hardcoding the transport class # `Transport::Traces::Transport` in `#to_transport` diff --git a/lib/datadog/core/remote/transport/http/negotiation.rb b/lib/datadog/core/remote/transport/http/negotiation.rb index 002517ef5ed..5cc00c8a8f0 100644 --- a/lib/datadog/core/remote/transport/http/negotiation.rb +++ b/lib/datadog/core/remote/transport/http/negotiation.rb @@ -17,10 +17,10 @@ # Separate classes are needed because of `include Trace::API::Instance`. # # Below should be: -# require_relative '../../../../ddtrace/transport/http/api/instance' +# require_relative '../../../../datadog/core/transport/http/api/instance' require_relative 'api/instance' # Below should be: -# require_relative '../../../../ddtrace/transport/http/api/spec' +# require_relative '../../../../datadog/core/transport/http/api/spec' require_relative 'api/spec' module Datadog diff --git a/lib/datadog/core/telemetry/collector.rb b/lib/datadog/core/telemetry/collector.rb index 39e6cd9474f..50ce5860e2b 100644 --- a/lib/datadog/core/telemetry/collector.rb +++ b/lib/datadog/core/telemetry/collector.rb @@ -182,7 +182,7 @@ def service_version end def library_version - Core::Environment::Identity.tracer_version + Core::Environment::Identity.gem_datadog_version end def products diff --git a/lib/datadog/kit/enable_core_dumps.rb b/lib/datadog/kit/enable_core_dumps.rb index fc189d24ec0..6582708434a 100644 --- a/lib/datadog/kit/enable_core_dumps.rb +++ b/lib/datadog/kit/enable_core_dumps.rb @@ -19,10 +19,10 @@ def self.call enabled_status = "Maximum size: #{maximum_size} Output pattern: '#{core_pattern}'" if maximum_size <= 0 - Kernel.warn("[ddtrace] Could not enable core dumps on crash, maximum size is #{maximum_size} (disabled).") + Kernel.warn("[datadog] Could not enable core dumps on crash, maximum size is #{maximum_size} (disabled).") return elsif maximum_size == current_size - Kernel.warn("[ddtrace] Core dumps already enabled, nothing to do. #{enabled_status}") + Kernel.warn("[datadog] Core dumps already enabled, nothing to do. #{enabled_status}") return end @@ -30,16 +30,16 @@ def self.call Process.setrlimit(:CORE, maximum_size) rescue => e Kernel.warn( - "[ddtrace] Failed to enable core dumps. Cause: #{e.class.name} #{e.message} " \ + "[datadog] Failed to enable core dumps. Cause: #{e.class.name} #{e.message} " \ "Location: #{Array(e.backtrace).first}" ) return end if current_size == 0 - Kernel.warn("[ddtrace] Enabled core dumps. #{enabled_status}") + Kernel.warn("[datadog] Enabled core dumps. #{enabled_status}") else - Kernel.warn("[ddtrace] Raised core dump limit. Old size: #{current_size} #{enabled_status}") + Kernel.warn("[datadog] Raised core dump limit. Old size: #{current_size} #{enabled_status}") end end end diff --git a/lib/datadog/opentelemetry/sdk/propagator.rb b/lib/datadog/opentelemetry/sdk/propagator.rb index f109d157e32..35e9ea99b57 100644 --- a/lib/datadog/opentelemetry/sdk/propagator.rb +++ b/lib/datadog/opentelemetry/sdk/propagator.rb @@ -16,7 +16,7 @@ def inject( ) unless setter == ::OpenTelemetry::Context::Propagation.text_map_setter Datadog.logger.error( - 'Custom setter is not supported. Please inform the `ddtrace` team at ' \ + 'Custom setter is not supported. Please inform the `datadog` team at ' \ ' https://github.com/DataDog/dd-trace-rb of your use case so we can best support you. Using the default ' \ 'OpenTelemetry::Context::Propagation.text_map_setter as a fallback setter.' ) @@ -32,7 +32,7 @@ def extract( if getter != ::OpenTelemetry::Context::Propagation.text_map_getter && getter != ::OpenTelemetry::Common::Propagation.rack_env_getter Datadog.logger.error( - "Custom getter #{getter} is not supported. Please inform the `ddtrace` team at " \ + "Custom getter #{getter} is not supported. Please inform the `datadog` team at " \ ' https://github.com/DataDog/dd-trace-rb of your use case so we can best support you. Using the default ' \ 'OpenTelemetry::Context::Propagation.text_map_getter as a fallback getter.' ) diff --git a/lib/datadog/profiling.rb b/lib/datadog/profiling.rb index d11ec80d0e8..b48bd6b59de 100644 --- a/lib/datadog/profiling.rb +++ b/lib/datadog/profiling.rb @@ -74,7 +74,7 @@ def self.allocation_count # rubocop:disable Lint/NestedMethodDefinition (On purp private_class_method def self.native_library_compilation_skipped? skipped_reason = try_reading_skipped_reason_file - "Your ddtrace installation is missing support for the Continuous Profiler because #{skipped_reason}" if skipped_reason + "Your datadog installation is missing support for the Continuous Profiler because #{skipped_reason}" if skipped_reason end private_class_method def self.try_reading_skipped_reason_file(file_api = File) diff --git a/lib/datadog/profiling/collectors/info.rb b/lib/datadog/profiling/collectors/info.rb index 49cbf776ff4..69a44187213 100644 --- a/lib/datadog/profiling/collectors/info.rb +++ b/lib/datadog/profiling/collectors/info.rb @@ -63,7 +63,9 @@ def collect_profiler_info(settings) unless @profiler_info lib_datadog_gem = ::Gem.loaded_specs['libdatadog'] @profiler_info = { - version: Datadog::Core::Environment::Identity.tracer_version, + # TODO: If profiling is extracted and its version diverges from the datadog gem, this is inaccurate. + # Update if this ever occurs. + version: Datadog::Core::Environment::Identity.gem_datadog_version, libdatadog: "#{lib_datadog_gem.version}-#{lib_datadog_gem.platform}", settings: collect_settings_recursively(settings.profiling), }.freeze diff --git a/lib/datadog/profiling/component.rb b/lib/datadog/profiling/component.rb index e6140aceefd..10af0b0d249 100644 --- a/lib/datadog/profiling/component.rb +++ b/lib/datadog/profiling/component.rb @@ -24,7 +24,7 @@ def self.build_profiler_component(settings:, agent_settings:, optional_tracer:) # # ...thus in #1998 we removed such a require. # - # On the other hand, if datadog/core is loaded by a different product and no general `require 'ddtrace'` is + # On the other hand, if datadog/core is loaded by a different product and no general `require 'datadog'` is # done, then profiling may not be loaded, and thus to avoid this issue we do a require here (which is a # no-op if profiling is already loaded). require_relative '../profiling' diff --git a/lib/datadog/profiling/ext/forking.rb b/lib/datadog/profiling/ext/forking.rb index a08941126ce..423df49f57a 100644 --- a/lib/datadog/profiling/ext/forking.rb +++ b/lib/datadog/profiling/ext/forking.rb @@ -39,7 +39,7 @@ def fork child_block = if block_given? proc do # Trigger :child callback - ddtrace_at_fork_blocks[:child].each(&:call) if ddtrace_at_fork_blocks.key?(:child) + datadog_at_fork_blocks[:child].each(&:call) if datadog_at_fork_blocks.key?(:child) # Invoke original block yield @@ -53,7 +53,7 @@ def fork # Trigger correct callbacks depending on whether we're in the parent or child. # If we're in the fork, result = nil: trigger child callbacks. # If we're in the parent, result = fork PID: trigger parent callbacks. - ddtrace_at_fork_blocks[:child].each(&:call) if result.nil? && ddtrace_at_fork_blocks.key?(:child) + datadog_at_fork_blocks[:child].each(&:call) if result.nil? && datadog_at_fork_blocks.key?(:child) # Return PID from #fork result @@ -62,17 +62,17 @@ def fork def at_fork(stage, &block) raise ArgumentError, 'Bad \'stage\' for ::at_fork' unless stage == :child - ddtrace_at_fork_blocks[stage] = [] unless ddtrace_at_fork_blocks.key?(stage) - ddtrace_at_fork_blocks[stage] << block + datadog_at_fork_blocks[stage] = [] unless datadog_at_fork_blocks.key?(stage) + datadog_at_fork_blocks[stage] << block end module_function - def ddtrace_at_fork_blocks + def datadog_at_fork_blocks # Blocks should be shared across all users of this module, # e.g. Process#fork, Kernel#fork, etc. should all invoke the same callbacks. # rubocop:disable Style/ClassVars - @@ddtrace_at_fork_blocks ||= {} + @@datadog_at_fork_blocks ||= {} # rubocop:enable Style/ClassVars end end @@ -83,11 +83,11 @@ def ddtrace_at_fork_blocks # This monkey patch makes the `Kernel#at_fork` mechanism defined above also work in this situation. module ProcessDaemonPatch def daemon(*args) - ddtrace_at_fork_blocks = Datadog::Profiling::Ext::Forking::Kernel.ddtrace_at_fork_blocks + datadog_at_fork_blocks = Datadog::Profiling::Ext::Forking::Kernel.datadog_at_fork_blocks result = super - ddtrace_at_fork_blocks[:child].each(&:call) if ddtrace_at_fork_blocks.key?(:child) + datadog_at_fork_blocks[:child].each(&:call) if datadog_at_fork_blocks.key?(:child) result end diff --git a/lib/datadog/profiling/load_native_extension.rb b/lib/datadog/profiling/load_native_extension.rb index ce1e0f730ef..cfda56ff192 100644 --- a/lib/datadog/profiling/load_native_extension.rb +++ b/lib/datadog/profiling/load_native_extension.rb @@ -15,7 +15,7 @@ require "datadog_profiling_loader.#{RUBY_VERSION}_#{RUBY_PLATFORM}" rescue LoadError => e raise LoadError, - 'Failed to load the profiling loader extension. To fix this, please remove and then reinstall ddtrace ' \ + 'Failed to load the profiling loader extension. To fix this, please remove and then reinstall datadog ' \ "(Details: #{e.message})" end diff --git a/lib/datadog/profiling/preload.rb b/lib/datadog/profiling/preload.rb index b65a1024313..192b6e39416 100644 --- a/lib/datadog/profiling/preload.rb +++ b/lib/datadog/profiling/preload.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require_relative '../../ddtrace' +require_relative '../../datadog' Datadog::Profiling.start_if_enabled diff --git a/lib/datadog/profiling/tag_builder.rb b/lib/datadog/profiling/tag_builder.rb index 2325a7b93f2..3f8cd07bfdb 100644 --- a/lib/datadog/profiling/tag_builder.rb +++ b/lib/datadog/profiling/tag_builder.rb @@ -19,7 +19,9 @@ def self.call( host: Core::Environment::Socket.hostname, language: Core::Environment::Identity.lang, pid: Process.pid.to_s, - profiler_version: Core::Environment::Identity.tracer_version, + # TODO: If profiling is extracted and its version diverges from the datadog gem, this is inaccurate. + # Update if this ever occurs. + profiler_version: Core::Environment::Identity.gem_datadog_version, runtime_engine: Core::Environment::Identity.lang_engine, runtime_id: Core::Environment::Identity.id, runtime_platform: Core::Environment::Identity.lang_platform, diff --git a/lib/datadog/tracing.rb b/lib/datadog/tracing.rb index 2c9c29db0d3..4acb15e2ffe 100644 --- a/lib/datadog/tracing.rb +++ b/lib/datadog/tracing.rb @@ -95,7 +95,7 @@ def reject! # @public_api def correlation # We access this in this way as: - # * If the components have not been initialized, it doesn't make sense to initialize ddtrace just to say + # * If the components have not been initialized, it doesn't make sense to initialize datadog just to say # 'nil' here # * It prevents recursive initialization attempts, see https://github.com/DataDog/dd-trace-rb/issues/3385 components = Datadog.send(:components, allow_initialization: false) diff --git a/lib/datadog/tracing/contrib/excon/middleware.rb b/lib/datadog/tracing/contrib/excon/middleware.rb index 680628e70a0..e25ee1941cd 100644 --- a/lib/datadog/tracing/contrib/excon/middleware.rb +++ b/lib/datadog/tracing/contrib/excon/middleware.rb @@ -13,7 +13,7 @@ module Datadog module Tracing module Contrib module Excon - # Middleware implements an excon-middleware for ddtrace instrumentation + # Middleware implements an excon-middleware for datadog instrumentation class Middleware < ::Excon::Middleware::Base include Contrib::HttpAnnotationHelper diff --git a/lib/datadog/tracing/contrib/extensions.rb b/lib/datadog/tracing/contrib/extensions.rb index 26f22d6e944..fde0a34c0f0 100644 --- a/lib/datadog/tracing/contrib/extensions.rb +++ b/lib/datadog/tracing/contrib/extensions.rb @@ -57,10 +57,10 @@ def registry # Configuration methods for Datadog module. module Configuration # TODO: Is is not possible to separate this configuration method - # TODO: from core ddtrace parts ()e.g. the registry). + # TODO: from core datadog parts ()e.g. the registry). # TODO: Today this method sits here in the `Datadog::Tracing::Contrib::Extensions` namespace # TODO: but cannot empirically constraints to the contrib domain only. - # TODO: We should promote most of this logic to core parts of ddtrace. + # TODO: We should promote most of this logic to core parts of datadog. def configure(&block) # Reconfigure core settings super(&block) diff --git a/lib/datadog/tracing/contrib/faraday/connection.rb b/lib/datadog/tracing/contrib/faraday/connection.rb index 12c4ca2117c..3d74241915f 100644 --- a/lib/datadog/tracing/contrib/faraday/connection.rb +++ b/lib/datadog/tracing/contrib/faraday/connection.rb @@ -12,7 +12,7 @@ module Faraday module Connection def initialize(*args, &block) super.tap do - use(:ddtrace) unless builder.handlers.any? { |h| h.klass == Middleware } + use(:datadog_tracing) unless builder.handlers.any? { |h| h.klass == Middleware } end end end diff --git a/lib/datadog/tracing/contrib/faraday/middleware.rb b/lib/datadog/tracing/contrib/faraday/middleware.rb index cfe87748b03..1134fb9379a 100644 --- a/lib/datadog/tracing/contrib/faraday/middleware.rb +++ b/lib/datadog/tracing/contrib/faraday/middleware.rb @@ -12,7 +12,7 @@ module Datadog module Tracing module Contrib module Faraday - # Middleware implements a faraday-middleware for ddtrace instrumentation + # Middleware implements a faraday-middleware for datadog instrumentation class Middleware < ::Faraday::Middleware include Contrib::HttpAnnotationHelper diff --git a/lib/datadog/tracing/contrib/faraday/patcher.rb b/lib/datadog/tracing/contrib/faraday/patcher.rb index f69c501640f..f593686f674 100644 --- a/lib/datadog/tracing/contrib/faraday/patcher.rb +++ b/lib/datadog/tracing/contrib/faraday/patcher.rb @@ -27,13 +27,13 @@ def patch end def register_middleware! - ::Faraday::Middleware.register_middleware(ddtrace: Middleware) + ::Faraday::Middleware.register_middleware(datadog_tracing: Middleware) end def add_default_middleware! if target_version >= Gem::Version.new('1.0.0') # Patch the default connection (e.g. +Faraday.get+) - ::Faraday.default_connection.use(:ddtrace) + ::Faraday.default_connection.use(:datadog_tracing) # Patch new connection instances (e.g. +Faraday.new+) ::Faraday::Connection.prepend(Connection) diff --git a/lib/datadog/tracing/contrib/faraday/rack_builder.rb b/lib/datadog/tracing/contrib/faraday/rack_builder.rb index 22a0b8686fd..3481f648d20 100644 --- a/lib/datadog/tracing/contrib/faraday/rack_builder.rb +++ b/lib/datadog/tracing/contrib/faraday/rack_builder.rb @@ -11,7 +11,7 @@ module Faraday # https://github.com/lostisland/faraday/commit/77d7546d6d626b91086f427c56bc2cdd951353b3 module RackBuilder def adapter(*args) - use(:ddtrace) unless @handlers.any? { |h| h.klass == Middleware } + use(:datadog_tracing) unless @handlers.any? { |h| h.klass == Middleware } super end diff --git a/lib/datadog/tracing/contrib/http/integration.rb b/lib/datadog/tracing/contrib/http/integration.rb index bd4ace22660..f2cacaf94b3 100644 --- a/lib/datadog/tracing/contrib/http/integration.rb +++ b/lib/datadog/tracing/contrib/http/integration.rb @@ -5,7 +5,7 @@ require_relative 'configuration/settings' require_relative 'patcher' require_relative '../integration' -require_relative '../../../../ddtrace/version' +require_relative '../../../../datadog/version' module Datadog module Tracing @@ -18,7 +18,7 @@ module HTTP class Integration include Contrib::Integration - MINIMUM_VERSION = DDTrace::VERSION::MINIMUM_RUBY_VERSION + MINIMUM_VERSION = Datadog::VERSION::MINIMUM_RUBY_VERSION # @public_api Changing the integration name or integration options can cause breaking changes register_as :http, auto_patch: true diff --git a/lib/datadog/tracing/contrib/integration.rb b/lib/datadog/tracing/contrib/integration.rb index 03f15c00945..f23570cd750 100644 --- a/lib/datadog/tracing/contrib/integration.rb +++ b/lib/datadog/tracing/contrib/integration.rb @@ -12,7 +12,7 @@ module Contrib # An example for a simple instrumentation of a fictional `BillingApi::Client`: # # ``` - # require 'ddtrace' + # require 'datadog' # # module BillingApi # class Integration diff --git a/lib/datadog/tracing/contrib/resque/resque_job.rb b/lib/datadog/tracing/contrib/resque/resque_job.rb index 874f1a0eecf..21029091590 100644 --- a/lib/datadog/tracing/contrib/resque/resque_job.rb +++ b/lib/datadog/tracing/contrib/resque/resque_job.rb @@ -31,7 +31,7 @@ module ResqueJob # # We could also just use `around_perform` but this might override the user's # own method. - def around_perform0_ddtrace(*args) + def around_perform0_datadog(*args) return yield unless datadog_configuration && Tracing.enabled? Tracing.trace(Ext::SPAN_JOB, **span_options) do |span| diff --git a/lib/datadog/tracing/distributed/datadog.rb b/lib/datadog/tracing/distributed/datadog.rb index 5f16113d2a7..5932f9bfc1f 100644 --- a/lib/datadog/tracing/distributed/datadog.rb +++ b/lib/datadog/tracing/distributed/datadog.rb @@ -123,7 +123,7 @@ def extract_trace_id!(trace_id, tags) # # DEV: This method accesses global state (the active trace) to record its error state as a trace tag. # DEV: This means errors cannot be reported if there's not active span. - # DEV: Ideally, we'd have a dedicated error reporting stream for all of ddtrace. + # DEV: Ideally, we'd have a dedicated error reporting stream for all of datadog. def inject_tags!(tags, data) return set_tags_propagation_error(reason: 'disabled') if tags_disabled? @@ -147,7 +147,7 @@ def inject_tags!(tags, data) # # DEV: This method accesses global state (the active trace) to record its error state as a trace tag. # DEV: This means errors cannot be reported if there's not active span. - # DEV: Ideally, we'd have a dedicated error reporting stream for all of ddtrace. + # DEV: Ideally, we'd have a dedicated error reporting stream for all of datadog. def extract_tags(fetcher) tags = fetcher[@tags_key] diff --git a/lib/datadog/tracing/transport/http.rb b/lib/datadog/tracing/transport/http.rb index de6d001aa6c..25a7e77c426 100644 --- a/lib/datadog/tracing/transport/http.rb +++ b/lib/datadog/tracing/transport/http.rb @@ -10,7 +10,7 @@ require_relative '../../core/transport/http/adapters/unix_socket' require_relative 'http/api' require_relative 'http/builder' -require_relative '../../../ddtrace/version' +require_relative '../../../datadog/version' module Datadog module Tracing @@ -69,7 +69,7 @@ def default_headers Datadog::Core::Environment::Ext::LANG_INTERPRETER, Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER_VENDOR => Core::Environment::Ext::LANG_ENGINE, Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION => - Datadog::Core::Environment::Ext::TRACER_VERSION + Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION }.tap do |headers| # Add container ID, if present. container_id = Datadog::Core::Environment::Container.container_id diff --git a/lib/ddtrace/version.rb b/lib/datadog/version.rb similarity index 98% rename from lib/ddtrace/version.rb rename to lib/datadog/version.rb index 01f0b708c0f..f1b9e01dca6 100644 --- a/lib/ddtrace/version.rb +++ b/lib/datadog/version.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -module DDTrace +module Datadog module VERSION MAJOR = 2 MINOR = 0 diff --git a/sig/datadog.rbs b/sig/datadog.rbs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/sig/ddtrace/auto_instrument.rbs b/sig/datadog/auto_instrument.rbs similarity index 100% rename from sig/ddtrace/auto_instrument.rbs rename to sig/datadog/auto_instrument.rbs diff --git a/sig/ddtrace/auto_instrument_base.rbs b/sig/datadog/auto_instrument_base.rbs similarity index 100% rename from sig/ddtrace/auto_instrument_base.rbs rename to sig/datadog/auto_instrument_base.rbs diff --git a/sig/datadog/core/environment/ext.rbs b/sig/datadog/core/environment/ext.rbs index dbc3431279f..328bdfc4e9e 100644 --- a/sig/datadog/core/environment/ext.rbs +++ b/sig/datadog/core/environment/ext.rbs @@ -14,7 +14,7 @@ module Datadog RUBY_ENGINE: untyped - TRACER_VERSION: untyped + GEM_DATADOG_VERSION: untyped ENGINE_VERSION: untyped end diff --git a/sig/datadog/core/environment/identity.rbs b/sig/datadog/core/environment/identity.rbs index 957e072f92e..5644841f0a3 100644 --- a/sig/datadog/core/environment/identity.rbs +++ b/sig/datadog/core/environment/identity.rbs @@ -16,9 +16,9 @@ module Datadog def self?.lang_version: () -> ::String - def self?.tracer_version: () -> ::String + def self?.gem_datadog_version: () -> ::String - def self?.tracer_version_semver2: () -> ::String + def self?.gem_datadog_version_semver2: () -> ::String end end end diff --git a/sig/datadog/core/remote/client.rbs b/sig/datadog/core/remote/client.rbs index d6d03a5e93c..816633daf34 100644 --- a/sig/datadog/core/remote/client.rbs +++ b/sig/datadog/core/remote/client.rbs @@ -27,12 +27,12 @@ module Datadog @gem_specs: ::Hash[::String, ::Gem::Specification | untyped] @native_platform: ::String @ruby_engine_version: ::String - @tracer_version_semver2: ::String + @tracer_version: ::String def payload: () -> ::Hash[Symbol, untyped] def service_name: () -> ::String def gem_spec: (::String) -> (::Gem::Specification | untyped) - def tracer_version_semver2: () -> ::String + def tracer_version: () -> ::String def native_platform: () -> ::String def ruby_engine_version: () -> ::String diff --git a/sig/datadog/profiling/ext/forking.rbs b/sig/datadog/profiling/ext/forking.rbs index a905a807839..fb6bdad55ce 100644 --- a/sig/datadog/profiling/ext/forking.rbs +++ b/sig/datadog/profiling/ext/forking.rbs @@ -10,7 +10,7 @@ module Datadog def at_fork: (untyped stage) ?{ () -> untyped } -> untyped - def self?.ddtrace_at_fork_blocks: () -> untyped + def self?.datadog_at_fork_blocks: () -> untyped end module ProcessDaemonPatch def daemon: (*untyped args) -> untyped diff --git a/sig/datadog/tracing/contrib/resque/resque_job.rbs b/sig/datadog/tracing/contrib/resque/resque_job.rbs index f8098ddbe2f..59eea098b27 100644 --- a/sig/datadog/tracing/contrib/resque/resque_job.rbs +++ b/sig/datadog/tracing/contrib/resque/resque_job.rbs @@ -6,7 +6,7 @@ module Datadog def perform: () -> untyped end module ResqueJob - def around_perform0_ddtrace: (*untyped args) { () -> untyped } -> untyped + def around_perform0_datadog: (*untyped args) { () -> untyped } -> untyped def after_perform_shutdown_tracer: (*untyped _) -> untyped diff --git a/sig/datadog/version.rbs b/sig/datadog/version.rbs new file mode 100644 index 00000000000..430a1e00940 --- /dev/null +++ b/sig/datadog/version.rbs @@ -0,0 +1,18 @@ +module Datadog + module VERSION + MAJOR: 2 + + MINOR: 0 + + PATCH: 0 + + PRE: "dev" + + BUILD: nil + + STRING: untyped + + MINIMUM_RUBY_VERSION: "2.5.0" + MAXIMUM_RUBY_VERSION: "3.4" + end +end diff --git a/sig/ddtrace.rbs b/sig/ddtrace.rbs deleted file mode 100644 index cf6e2c56bc2..00000000000 --- a/sig/ddtrace.rbs +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally empty: nothing to type diff --git a/sig/ddtrace/version.rbs b/sig/ddtrace/version.rbs deleted file mode 100644 index b0b1c257426..00000000000 --- a/sig/ddtrace/version.rbs +++ /dev/null @@ -1,18 +0,0 @@ -module DDTrace - module VERSION - MAJOR: 1 - - MINOR: 11 - - PATCH: 1 - - PRE: nil - - BUILD: nil - - STRING: untyped - - MINIMUM_RUBY_VERSION: "2.1.0" - MAXIMUM_RUBY_VERSION: "3.3" - end -end diff --git a/spec/datadog/appsec/spec_helper.rb b/spec/datadog/appsec/spec_helper.rb index bf1c8f54690..7fcd6b6bc0b 100644 --- a/spec/datadog/appsec/spec_helper.rb +++ b/spec/datadog/appsec/spec_helper.rb @@ -1,3 +1,3 @@ -require 'ddtrace' +require 'datadog' require 'datadog/appsec' require 'spec_helper' diff --git a/spec/ddtrace/auto_instrument_spec.rb b/spec/datadog/auto_instrument_spec.rb similarity index 87% rename from spec/ddtrace/auto_instrument_spec.rb rename to spec/datadog/auto_instrument_spec.rb index 64676f432f4..28e7a7d898c 100644 --- a/spec/ddtrace/auto_instrument_spec.rb +++ b/spec/datadog/auto_instrument_spec.rb @@ -3,7 +3,7 @@ require 'sinatra/base' -# Loading 'ddtrace/auto_instrument' has side effects and can't +# Loading 'datadog/auto_instrument' has side effects and can't # easily be undone. This test should run on its own process. RSpec.describe 'Auto Instrumentation of non Rails' do include Rack::Test::Methods @@ -14,7 +14,7 @@ raise 'auto_instrument_spec.rb should be run on a separate RSpec process, do not run it together with other specs' end end - require 'ddtrace/auto_instrument' + require 'datadog/auto_instrument' end after { Datadog.registry[:sinatra].reset_configuration! } @@ -47,7 +47,7 @@ end RSpec.describe 'LOADED variable' do - subject(:auto_instrument) { load 'ddtrace/auto_instrument.rb' } + subject(:auto_instrument) { load 'datadog/auto_instrument.rb' } it do auto_instrument expect(Datadog::AutoInstrument::LOADED).to eq(true) @@ -55,7 +55,7 @@ end RSpec.describe 'Profiler startup' do - subject(:auto_instrument) { load 'ddtrace/auto_instrument.rb' } + subject(:auto_instrument) { load 'datadog/auto_instrument.rb' } it 'starts the profiler' do expect(Datadog::Profiling).to receive(:start_if_enabled) diff --git a/spec/ddtrace/benchmark/gem_loading_spec.rb b/spec/datadog/benchmark/gem_loading_spec.rb similarity index 86% rename from spec/ddtrace/benchmark/gem_loading_spec.rb rename to spec/datadog/benchmark/gem_loading_spec.rb index 01ee038e346..513680e62b4 100644 --- a/spec/ddtrace/benchmark/gem_loading_spec.rb +++ b/spec/datadog/benchmark/gem_loading_spec.rb @@ -12,12 +12,12 @@ def run_ruby let(:program) do <<-RUBY - require 'ddtrace' + require 'datadog' RUBY end let(:load_path) do - # Ensure we load the working directory version of 'ddtrace' + # Ensure we load the working directory version of 'datadog' <<-RUBY lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) @@ -39,20 +39,20 @@ def run_ruby <<-'RUBY' require 'benchmark' bm = Benchmark.measure do - require 'ddtrace' + require 'datadog' end puts bm.real RUBY end - it { puts "ddtrace gem load time: #{report_average}s" } + it { puts "datadog gem load time: #{report_average}s" } end context 'memory' do let(:program) do <<-'RUBY' puts `ps -o rss= -p #{Process.pid}`.to_i - require 'ddtrace' + require 'datadog' puts `ps -o rss= -p #{Process.pid}`.to_i RUBY end @@ -64,7 +64,7 @@ def run_ruby after.to_i - before.to_i end - it { puts "ddtrace gem memory footprint: #{report_average} KiB" } + it { puts "datadog gem memory footprint: #{report_average} KiB" } end context 'detailed report' do @@ -76,12 +76,12 @@ def run_ruby # Exclude Ruby internals and gems from the report. # The memory consumed by them will still be captured - # through 'require' statements and method calls present in ddtrace, + # through 'require' statements and method calls present in datadog, # but their internals won't pollute the report output. ignore_files = %r{(.*/gems/[^/]*/lib/|/lib/ruby/\d)} report = MemoryProfiler.report(ignore_files: ignore_files) do - require 'ddtrace' + require 'datadog' end report.pretty_print diff --git a/spec/ddtrace/benchmark/pg_contrib_spec.rb b/spec/datadog/benchmark/pg_contrib_spec.rb similarity index 99% rename from spec/ddtrace/benchmark/pg_contrib_spec.rb rename to spec/datadog/benchmark/pg_contrib_spec.rb index 9e6f10d31fa..2a7ad766c96 100644 --- a/spec/ddtrace/benchmark/pg_contrib_spec.rb +++ b/spec/datadog/benchmark/pg_contrib_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' require 'benchmark' -require 'ddtrace' +require 'datadog' require 'pg' RSpec.describe 'Pg Tracing Integration', :order => :defined do diff --git a/spec/ddtrace/benchmark/sql_comment_propagation_spec.rb b/spec/datadog/benchmark/sql_comment_propagation_spec.rb similarity index 99% rename from spec/ddtrace/benchmark/sql_comment_propagation_spec.rb rename to spec/datadog/benchmark/sql_comment_propagation_spec.rb index f55069f7dac..8f89269f61c 100644 --- a/spec/ddtrace/benchmark/sql_comment_propagation_spec.rb +++ b/spec/datadog/benchmark/sql_comment_propagation_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' require 'benchmark/ips' -require 'ddtrace' +require 'datadog' require 'mysql2' RSpec.describe 'SQL comment propagation', :order => :defined do diff --git a/spec/ddtrace/benchmark/telemetry_spec.rb b/spec/datadog/benchmark/telemetry_spec.rb similarity index 98% rename from spec/ddtrace/benchmark/telemetry_spec.rb rename to spec/datadog/benchmark/telemetry_spec.rb index 3880755f566..c54253789d2 100644 --- a/spec/ddtrace/benchmark/telemetry_spec.rb +++ b/spec/datadog/benchmark/telemetry_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' require 'benchmark' -require 'ddtrace' +require 'datadog' RSpec.describe 'Telemetry Benchmark' do let(:enabled) { 'true' } diff --git a/spec/datadog/core/configuration/agent_settings_resolver_spec.rb b/spec/datadog/core/configuration/agent_settings_resolver_spec.rb index de0b2e24a30..33d40c71368 100644 --- a/spec/datadog/core/configuration/agent_settings_resolver_spec.rb +++ b/spec/datadog/core/configuration/agent_settings_resolver_spec.rb @@ -13,7 +13,7 @@ } end let(:environment) { {} } - let(:ddtrace_settings) { Datadog::Core::Configuration::Settings.new } + let(:datadog_settings) { Datadog::Core::Configuration::Settings.new } let(:logger) { instance_double(Datadog::Core::Logger) } let(:settings) do @@ -39,7 +39,7 @@ allow(File).to receive(:exist?).with('/var/run/datadog/apm.socket').and_return(false) end - subject(:resolver) { described_class.call(ddtrace_settings, logger: logger) } + subject(:resolver) { described_class.call(datadog_settings, logger: logger) } context 'by default' do it 'contacts the agent using the http adapter, using hostname 127.0.0.1 and port 8126' do @@ -80,7 +80,7 @@ context 'when a custom hostname is specified via code using "agent.host ="' do before do - ddtrace_settings.agent.host = 'custom-hostname' + datadog_settings.agent.host = 'custom-hostname' end it 'contacts the agent using the http adapter, using the custom hostname' do @@ -113,8 +113,8 @@ before do allow(logger).to receive(:warn) - (ddtrace_settings.agent.host = with_agent_host) if with_agent_host - (ddtrace_settings.agent.port = with_agent_port) if with_agent_port + (datadog_settings.agent.host = with_agent_host) if with_agent_host + (datadog_settings.agent.port = with_agent_port) if with_agent_port end context 'when agent.host, DD_TRACE_AGENT_URL, DD_AGENT_HOST are provided' do @@ -351,7 +351,7 @@ context 'when a custom port is specified via code using "agent.port = "' do before do - ddtrace_settings.agent.port = 1234 + datadog_settings.agent.port = 1234 end it 'contacts the agent using the http adapter, using the custom port' do @@ -360,7 +360,7 @@ it_behaves_like "parsing of port when it's not an integer" do before do - ddtrace_settings.agent.port = port_value_to_parse + datadog_settings.agent.port = port_value_to_parse end end end @@ -388,7 +388,7 @@ before do allow(logger).to receive(:warn) - (ddtrace_settings.agent.port = with_agent_port) if with_agent_port + (datadog_settings.agent.port = with_agent_port) if with_agent_port end context 'when all of agent.port, DD_TRACE_AGENT_URL, DD_TRACE_AGENT_PORT are provided' do @@ -515,7 +515,7 @@ context 'when a custom timeout is specified via code using "agent.timeout_seconds = "' do before do - ddtrace_settings.agent.timeout_seconds = 111 + datadog_settings.agent.timeout_seconds = 111 end it 'contacts the agent using the http adapter, using the custom timeout' do @@ -524,7 +524,7 @@ it_behaves_like "parsing of timeout when it's not an integer" do before do - ddtrace_settings.agent.timeout_seconds = timeout_value_to_parse + datadog_settings.agent.timeout_seconds = timeout_value_to_parse end end end @@ -542,7 +542,7 @@ before do allow(logger).to receive(:warn) - (ddtrace_settings.agent.timeout_seconds = with_agent_timeout) if with_agent_timeout + (datadog_settings.agent.timeout_seconds = with_agent_timeout) if with_agent_timeout end context 'when all of agent.timeout_seconds, DD_TRACE_AGENT_TIMEOUT_SECONDS are provided' do @@ -579,7 +579,7 @@ describe 'ssl' do context 'When agent.use_ssl is set' do before do - ddtrace_settings.agent.use_ssl = agent_use_ssl + datadog_settings.agent.use_ssl = agent_use_ssl end context 'when agent.use_ssl is true' do @@ -629,7 +629,7 @@ before do allow(logger).to receive(:warn) - (ddtrace_settings.agent.use_ssl = with_agent_use_ssl) if with_agent_use_ssl + (datadog_settings.agent.use_ssl = with_agent_use_ssl) if with_agent_use_ssl end context 'when agent.use_ssl, DD_TRACE_AGENT_URL are provided' do @@ -729,7 +729,7 @@ context 'when a custom path is specified via code using "agent.uds_path ="' do before do - ddtrace_settings.agent.uds_path = '/var/code/custom.socket' + datadog_settings.agent.uds_path = '/var/code/custom.socket' end it 'contacts the agent using the unix adapter, using the custom path' do @@ -758,7 +758,7 @@ before do allow(logger).to receive(:warn) - (ddtrace_settings.agent.uds_path = with_agent_uds_path) if with_agent_uds_path + (datadog_settings.agent.uds_path = with_agent_uds_path) if with_agent_uds_path end context 'when agent.uds_path, DD_TRACE_AGENT_URL are provided' do @@ -798,7 +798,7 @@ let(:message) { 'this is a test warning' } subject(:log_warning) do - described_class.new(ddtrace_settings, logger: logger).send(:log_warning, message) + described_class.new(datadog_settings, logger: logger).send(:log_warning, message) end it 'logs a warning used the configured logger' do diff --git a/spec/datadog/core/configuration/base_spec.rb b/spec/datadog/core/configuration/base_spec.rb index 75c1c8d04e7..a4280977ffa 100644 --- a/spec/datadog/core/configuration/base_spec.rb +++ b/spec/datadog/core/configuration/base_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Core::Configuration::Base do describe 'implemented' do diff --git a/spec/datadog/core/configuration/option_definition_spec.rb b/spec/datadog/core/configuration/option_definition_spec.rb index 543af116816..56e60c33cf7 100644 --- a/spec/datadog/core/configuration/option_definition_spec.rb +++ b/spec/datadog/core/configuration/option_definition_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Core::Configuration::OptionDefinition do subject(:definition) { described_class.new(name, meta, &block) } diff --git a/spec/datadog/core/configuration/option_spec.rb b/spec/datadog/core/configuration/option_spec.rb index 87908465e1e..d84aa576ba9 100644 --- a/spec/datadog/core/configuration/option_spec.rb +++ b/spec/datadog/core/configuration/option_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Core::Configuration::Option do subject(:option) { described_class.new(definition, context) } diff --git a/spec/datadog/core/configuration/options_spec.rb b/spec/datadog/core/configuration/options_spec.rb index 5b657ecf1a0..5b73400d0d0 100644 --- a/spec/datadog/core/configuration/options_spec.rb +++ b/spec/datadog/core/configuration/options_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Core::Configuration::Options do describe 'implemented' do diff --git a/spec/datadog/core/diagnostics/environment_logger_spec.rb b/spec/datadog/core/diagnostics/environment_logger_spec.rb index 73eb0a6f407..53ab8833771 100644 --- a/spec/datadog/core/diagnostics/environment_logger_spec.rb +++ b/spec/datadog/core/diagnostics/environment_logger_spec.rb @@ -25,7 +25,7 @@ { 'date' => '2020-01-01T00:00:00Z', 'os_name' => (include('x86_64').or include('i686').or include('aarch64').or include('arm')), - 'version' => DDTrace::VERSION::STRING, + 'version' => Datadog::VERSION::STRING, 'lang' => 'ruby', 'lang_version' => match(/[23]\./), 'env' => nil, @@ -135,7 +135,7 @@ is_expected.to match( date: '2020-01-01T00:00:00Z', os_name: (include('x86_64').or include('i686').or include('aarch64').or include('arm')), - version: DDTrace::VERSION::STRING, + version: Datadog::VERSION::STRING, lang: 'ruby', lang_version: match(/[23]\./), env: nil, diff --git a/spec/datadog/core/environment/execution_spec.rb b/spec/datadog/core/environment/execution_spec.rb index 9ce602ce019..da338feee82 100644 --- a/spec/datadog/core/environment/execution_spec.rb +++ b/spec/datadog/core/environment/execution_spec.rb @@ -43,7 +43,7 @@ let!(:repl_script) do lib = File.expand_path('lib') <<-RUBY - # Load the working directory version of `ddtrace` + # Load the working directory version of `datadog` $LOAD_PATH.unshift("#{lib}") unless $LOAD_PATH.include?("#{lib}") require 'datadog/core/environment/execution' diff --git a/spec/datadog/core/environment/identity_spec.rb b/spec/datadog/core/environment/identity_spec.rb index 007081d7902..349481977fd 100644 --- a/spec/datadog/core/environment/identity_spec.rb +++ b/spec/datadog/core/environment/identity_spec.rb @@ -64,18 +64,18 @@ it { is_expected.to eq(Datadog::Core::Environment::Ext::LANG_VERSION) } end - describe '::tracer_version' do - subject(:tracer_version) { described_class.tracer_version } + describe '::gem_datadog_version' do + subject(:gem_datadog_version) { described_class.gem_datadog_version } - it { is_expected.to eq(Datadog::Core::Environment::Ext::TRACER_VERSION) } + it { is_expected.to eq(Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION) } end - describe '::tracer_version_semver2' do - subject(:tracer_version) { described_class.tracer_version_semver2 } + describe '::gem_datadog_version_semver2' do + subject(:gem_datadog_version) { described_class.gem_datadog_version_semver2 } context 'when not prerelease' do before do - expect(described_class).to receive(:tracer_version).and_return('10.20.30'.freeze) + expect(described_class).to receive(:gem_datadog_version).and_return('10.20.30'.freeze) end it { is_expected.to eq('10.20.30') } @@ -83,7 +83,7 @@ context 'when prerelease' do before do - expect(described_class).to receive(:tracer_version).and_return('10.20.30.beta40'.freeze) + expect(described_class).to receive(:gem_datadog_version).and_return('10.20.30.beta40'.freeze) end it { is_expected.to eq('10.20.30-beta40') } @@ -91,7 +91,8 @@ context 'when development' do before do - expect(described_class).to receive(:tracer_version).and_return('10.20.30.b3fe268.gha12345.ga1b2c3d4'.freeze) + expect(described_class).to receive(:gem_datadog_version) + .and_return('10.20.30.b3fe268.gha12345.ga1b2c3d4'.freeze) end it { is_expected.to eq('10.20.30+b3fe268.gha12345.ga1b2c3d4') } @@ -99,7 +100,8 @@ context 'when prerelease and development' do before do - expect(described_class).to receive(:tracer_version).and_return('10.20.30.beta40.b3fe268.gha12345.ga1b2c3d4'.freeze) + expect(described_class).to receive(:gem_datadog_version) + .and_return('10.20.30.beta40.b3fe268.gha12345.ga1b2c3d4'.freeze) end it { is_expected.to eq('10.20.30-beta40+b3fe268.gha12345.ga1b2c3d4') } diff --git a/spec/datadog/core/logger_spec.rb b/spec/datadog/core/logger_spec.rb index 74cf7830e70..412a899f25f 100644 --- a/spec/datadog/core/logger_spec.rb +++ b/spec/datadog/core/logger_spec.rb @@ -33,22 +33,22 @@ def log_messages! it { is_expected.to have(5).items } it 'produces log messages with expected format' do - expect(lines[0]).to match(/I,.*INFO -- ddtrace: \[ddtrace\] Info message/) + expect(lines[0]).to match(/I,.*INFO -- datadog: \[datadog\] Info message/) expect(lines[1]).to match( - /W,.*WARN -- ddtrace: \[ddtrace\] Warning message/ + /W,.*WARN -- datadog: \[datadog\] Warning message/ ) expect(lines[2]).to match( - /E,.*ERROR -- ddtrace: \[ddtrace\] \(.*logger_spec.rb.*\) Error message #1/ + /E,.*ERROR -- datadog: \[datadog\] \(.*logger_spec.rb.*\) Error message #1/ ) expect(lines[3]).to match( - /E,.*ERROR -- my-progname: \[ddtrace\] \(.*logger_spec.rb.*\) Error message #2/ + /E,.*ERROR -- my-progname: \[datadog\] \(.*logger_spec.rb.*\) Error message #2/ ) expect(lines[4]).to match( - /E,.*ERROR -- ddtrace: \[ddtrace\] \(.*logger_spec.rb.*\) Error message #3/ + /E,.*ERROR -- datadog: \[datadog\] \(.*logger_spec.rb.*\) Error message #3/ ) end end @@ -60,27 +60,27 @@ def log_messages! it 'produces log messages with expected format' do expect(lines[0]).to match( - /D,.*DEBUG -- ddtrace: \[ddtrace\] \(.*logger_spec.rb.*\) Debug message/ + /D,.*DEBUG -- datadog: \[datadog\] \(.*logger_spec.rb.*\) Debug message/ ) expect(lines[1]).to match( - /I,.*INFO -- ddtrace: \[ddtrace\] \(.*logger_spec.rb.*\) Info message/ + /I,.*INFO -- datadog: \[datadog\] \(.*logger_spec.rb.*\) Info message/ ) expect(lines[2]).to match( - /W,.*WARN -- ddtrace: \[ddtrace\] \(.*logger_spec.rb.*\) Warning message/ + /W,.*WARN -- datadog: \[datadog\] \(.*logger_spec.rb.*\) Warning message/ ) expect(lines[3]).to match( - /E,.*ERROR -- ddtrace: \[ddtrace\] \(.*logger_spec.rb.*\) Error message #1/ + /E,.*ERROR -- datadog: \[datadog\] \(.*logger_spec.rb.*\) Error message #1/ ) expect(lines[4]).to match( - /E,.*ERROR -- my-progname: \[ddtrace\] \(.*logger_spec.rb.*\) Error message #2/ + /E,.*ERROR -- my-progname: \[datadog\] \(.*logger_spec.rb.*\) Error message #2/ ) expect(lines[5]).to match( - /E,.*ERROR -- ddtrace: \[ddtrace\] \(.*logger_spec.rb.*\) Error message #3/ + /E,.*ERROR -- datadog: \[datadog\] \(.*logger_spec.rb.*\) Error message #3/ ) end end diff --git a/spec/datadog/core/metrics/options_spec.rb b/spec/datadog/core/metrics/options_spec.rb index f4dedf22ca1..8cbef35693d 100644 --- a/spec/datadog/core/metrics/options_spec.rb +++ b/spec/datadog/core/metrics/options_spec.rb @@ -29,7 +29,7 @@ "#{Datadog::Core::Metrics::Ext::TAG_LANG}:#{Datadog::Core::Environment::Identity.lang}", "#{Datadog::Core::Metrics::Ext::TAG_LANG_INTERPRETER}:#{Datadog::Core::Environment::Identity.lang_interpreter}", "#{Datadog::Core::Metrics::Ext::TAG_LANG_VERSION}:#{Datadog::Core::Environment::Identity.lang_version}", - "#{Datadog::Core::Metrics::Ext::TAG_TRACER_VERSION}:#{Datadog::Core::Environment::Identity.tracer_version}" + "#{Datadog::Core::Metrics::Ext::TAG_TRACER_VERSION}:#{Datadog::Core::Environment::Identity.gem_datadog_version}" ) end diff --git a/spec/datadog/core/remote/client_spec.rb b/spec/datadog/core/remote/client_spec.rb index 042536973f4..7051621eb0f 100644 --- a/spec/datadog/core/remote/client_spec.rb +++ b/spec/datadog/core/remote/client_spec.rb @@ -529,7 +529,7 @@ context 'client_tracer' do context 'tags' do - let(:tracer_version) { '1.1.1' } + let(:gem_datadog_version) { '1.1.1' } let(:ruby_platform) { 'ruby-platform' } let(:ruby_version) { '2.2.2' } let(:ruby_engine) { 'ruby_engine_name' } @@ -546,7 +546,7 @@ stub_const('RUBY_ENGINE_VERSION', ruby_engine_version) allow(Gem::Platform).to receive(:local).and_return(gem_platform_local) - allow(Datadog::Core::Environment::Identity).to receive(:tracer_version).and_return(tracer_version) + allow(Datadog::Core::Environment::Identity).to receive(:gem_datadog_version).and_return(gem_datadog_version) allow(client).to receive(:ruby_engine_version).and_return(ruby_engine_version) allow(client).to receive(:native_platform).and_return(native_platform) allow(client).to receive(:gem_spec).with('libddwaf').and_return(libddwaf_gem_spec) @@ -558,7 +558,7 @@ expected_client_tracer_tags = [ "platform:#{native_platform}", - "ruby.tracer.version:#{tracer_version}", + "ruby.tracer.version:#{gem_datadog_version}", "ruby.runtime.platform:#{ruby_platform}", "ruby.runtime.version:#{ruby_version}", "ruby.runtime.engine.name:#{ruby_engine}", @@ -581,7 +581,7 @@ expected_client_tracer = { :runtime_id => Datadog::Core::Environment::Identity.id, :language => Datadog::Core::Environment::Identity.lang, - :tracer_version => Datadog::Core::Environment::Identity.tracer_version_semver2, + :tracer_version => Datadog::Core::Environment::Identity.gem_datadog_version_semver2, :service => Datadog.configuration.remote.service, :env => Datadog.configuration.env, } @@ -597,7 +597,7 @@ expected_client_tracer = { :runtime_id => Datadog::Core::Environment::Identity.id, :language => Datadog::Core::Environment::Identity.lang, - :tracer_version => Datadog::Core::Environment::Identity.tracer_version_semver2, + :tracer_version => Datadog::Core::Environment::Identity.gem_datadog_version_semver2, :service => Datadog.configuration.service, :env => Datadog.configuration.env, :app_version => Datadog.configuration.version, @@ -614,7 +614,7 @@ expected_client_tracer = { :runtime_id => Datadog::Core::Environment::Identity.id, :language => Datadog::Core::Environment::Identity.lang, - :tracer_version => Datadog::Core::Environment::Identity.tracer_version_semver2, + :tracer_version => Datadog::Core::Environment::Identity.gem_datadog_version_semver2, :service => Datadog.configuration.service, :env => Datadog.configuration.env, } diff --git a/spec/datadog/core/remote/transport/http_spec.rb b/spec/datadog/core/remote/transport/http_spec.rb index 04d4c014a1c..ef6c30dfbe2 100644 --- a/spec/datadog/core/remote/transport/http_spec.rb +++ b/spec/datadog/core/remote/transport/http_spec.rb @@ -128,7 +128,7 @@ client_tracer: { runtime_id: Datadog::Core::Environment::Identity.id, language: Datadog::Core::Environment::Identity.lang, - tracer_version: Datadog::Core::Environment::Identity.tracer_version, + tracer_version: Datadog::Core::Environment::Identity.gem_datadog_version, service: Datadog.configuration.service, env: Datadog.configuration.env, tags: [], diff --git a/spec/datadog/core/remote/transport/integration_spec.rb b/spec/datadog/core/remote/transport/integration_spec.rb index b7e47306611..d8f61f3de99 100644 --- a/spec/datadog/core/remote/transport/integration_spec.rb +++ b/spec/datadog/core/remote/transport/integration_spec.rb @@ -84,7 +84,7 @@ client_tracer: { runtime_id: Datadog::Core::Environment::Identity.id, language: Datadog::Core::Environment::Identity.lang, - tracer_version: Datadog::Core::Environment::Identity.tracer_version, + tracer_version: Datadog::Core::Environment::Identity.gem_datadog_version, service: Datadog.configuration.service, env: Datadog.configuration.env, tags: [], diff --git a/spec/datadog/core/runtime/metrics_spec.rb b/spec/datadog/core/runtime/metrics_spec.rb index 62acb6dd4e5..fbb7f55d184 100644 --- a/spec/datadog/core/runtime/metrics_spec.rb +++ b/spec/datadog/core/runtime/metrics_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -require 'ddtrace' +require 'datadog' require 'datadog/core/metrics/client' require 'datadog/core/runtime/metrics' diff --git a/spec/datadog/core/telemetry/collector_spec.rb b/spec/datadog/core/telemetry/collector_spec.rb index 7faccef5810..bd9a3768dde 100644 --- a/spec/datadog/core/telemetry/collector_spec.rb +++ b/spec/datadog/core/telemetry/collector_spec.rb @@ -12,8 +12,8 @@ require 'datadog/core/transport/ext' require 'datadog/profiling/profiler' -require 'ddtrace' -require 'ddtrace/version' +require 'datadog' +require 'datadog/version' RSpec.describe Datadog::Core::Telemetry::Collector do let(:dummy_class) { Class.new { extend(Datadog::Core::Telemetry::Collector) } } @@ -95,7 +95,7 @@ before do Datadog.configuration.profiling.enabled = false Datadog.configuration.appsec.enabled = false - stub_const('Datadog::Core::Environment::Ext::TRACER_VERSION', '4.2') + stub_const('Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION', '4.2') end after do @@ -272,7 +272,7 @@ context 'when profiling is enabled' do before do - stub_const('Datadog::Core::Environment::Ext::TRACER_VERSION', '4.2') + stub_const('Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION', '4.2') Datadog.configure do |c| c.profiling.enabled = true end @@ -286,7 +286,7 @@ before do require 'datadog/appsec' - stub_const('Datadog::Core::Environment::Ext::TRACER_VERSION', '4.2') + stub_const('Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION', '4.2') Datadog.configure do |c| c.appsec.enabled = true end diff --git a/spec/datadog/core/telemetry/v1/application_spec.rb b/spec/datadog/core/telemetry/v1/application_spec.rb index f15fb2c8dbd..57bb642ba4a 100644 --- a/spec/datadog/core/telemetry/v1/application_spec.rb +++ b/spec/datadog/core/telemetry/v1/application_spec.rb @@ -16,7 +16,7 @@ runtime_version: runtime_version, service_name: service_name, service_version: service_version, - tracer_version: tracer_version + tracer_version: gem_datadog_version ) end @@ -34,7 +34,7 @@ let(:runtime_version) { '3.2.1' } let(:service_name) { 'myapp' } let(:service_version) { '1.2.3' } - let(:tracer_version) { '1.0' } + let(:gem_datadog_version) { '1.0' } it do is_expected.to have_attributes( @@ -47,7 +47,7 @@ runtime_version: runtime_version, service_name: service_name, service_version: service_version, - tracer_version: tracer_version + tracer_version: gem_datadog_version ) end @@ -65,7 +65,7 @@ end context ':tracer_version' do - it_behaves_like 'a required string parameter', 'tracer_version' + it_behaves_like 'a required string parameter', 'gem_datadog_version' end context ':env' do @@ -123,7 +123,7 @@ let(:runtime_version) { '3.2.1' } let(:service_name) { 'myapp' } let(:service_version) { '1.2.3' } - let(:tracer_version) { '1.0' } + let(:gem_datadog_version) { '1.0' } it do is_expected.to eq( @@ -136,7 +136,7 @@ runtime_version: runtime_version, service_name: service_name, service_version: service_version, - tracer_version: tracer_version + tracer_version: gem_datadog_version ) end end diff --git a/spec/datadog/core/workers/runtime_metrics_spec.rb b/spec/datadog/core/workers/runtime_metrics_spec.rb index c09117f2479..7addaf20c81 100644 --- a/spec/datadog/core/workers/runtime_metrics_spec.rb +++ b/spec/datadog/core/workers/runtime_metrics_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -require 'ddtrace' +require 'datadog' require 'datadog/core/workers/runtime_metrics' RSpec.describe Datadog::Core::Workers::RuntimeMetrics do diff --git a/spec/datadog/profiling/collectors/code_provenance_spec.rb b/spec/datadog/profiling/collectors/code_provenance_spec.rb index 51ae2a2a8d1..85544df3a9d 100644 --- a/spec/datadog/profiling/collectors/code_provenance_spec.rb +++ b/spec/datadog/profiling/collectors/code_provenance_spec.rb @@ -19,8 +19,8 @@ ), have_attributes( kind: 'library', - name: 'ddtrace', - version: DDTrace::VERSION::STRING, + name: 'datadog', + version: Datadog::VERSION::STRING, path: start_with('/'), ), have_attributes( @@ -32,13 +32,13 @@ ) end - it 'records the correct path for ddtrace' do + it 'records the correct path for datadog' do refresh current_file_directory = __dir__ - dd_trace_root_directory = code_provenance.generate.find { |lib| lib.name == 'ddtrace' }.path + datadog_gem_root_directory = code_provenance.generate.find { |lib| lib.name == 'datadog' }.path - expect(current_file_directory).to start_with(dd_trace_root_directory) + expect(current_file_directory).to start_with(datadog_gem_root_directory) end it 'skips libraries not present in the loaded files' do @@ -75,7 +75,7 @@ context "when a gem's path is inside another gem's path" do # I'm not entirely sure if this can happen in end-user apps, but can happen in CI if bundler is configured to - # install dependencies into a subfolder of ddtrace. In particular GitHub Actions does this. + # install dependencies into a subfolder of datadog. In particular GitHub Actions does this. it 'matches the loaded file to the longest matching path' do code_provenance.refresh( @@ -83,7 +83,7 @@ loaded_specs: [ instance_double( Gem::Specification, - name: 'ddtrace', + name: 'datadog', version: '1.2.3', gem_dir: '/dd-trace-rb' ), @@ -170,9 +170,9 @@ 'paths' => include(start_with('/')), ), hash_including( - 'name' => 'ddtrace', + 'name' => 'datadog', 'kind' => 'library', - 'version' => DDTrace::VERSION::STRING, + 'version' => Datadog::VERSION::STRING, 'paths' => include(start_with('/')), ), hash_including( diff --git a/spec/datadog/profiling/collectors/info_spec.rb b/spec/datadog/profiling/collectors/info_spec.rb index 418864c6a01..43edaf67c98 100644 --- a/spec/datadog/profiling/collectors/info_spec.rb +++ b/spec/datadog/profiling/collectors/info_spec.rb @@ -22,7 +22,7 @@ service: settings.service, ), profiler: hash_including( - version: Datadog::Core::Environment::Identity.tracer_version, + version: Datadog::Core::Environment::Identity.gem_datadog_version, ), } ) diff --git a/spec/datadog/profiling/collectors/thread_context_spec.rb b/spec/datadog/profiling/collectors/thread_context_spec.rb index 03c89848621..561cd4fec5e 100644 --- a/spec/datadog/profiling/collectors/thread_context_spec.rb +++ b/spec/datadog/profiling/collectors/thread_context_spec.rb @@ -536,7 +536,7 @@ def self.otel_sdk_available? require 'datadog/opentelemetry' OpenTelemetry::SDK.configure - OpenTelemetry.tracer_provider.tracer('ddtrace-profiling-test') + OpenTelemetry.tracer_provider.tracer('datadog-profiling-test') end let(:t1) do @@ -593,8 +593,8 @@ def self.otel_sdk_available? end end - context 'mixing of otel sdk and ddtrace' do - context 'when top-level span is started from ddtrace' do + context 'mixing of otel sdk and datadog' do + context 'when top-level span is started from datadog' do let(:t1) do Thread.new(ready_queue, otel_tracer) do |ready_queue, otel_tracer| Datadog::Tracing.trace('profiler.test', type: :web) do |_span, trace| diff --git a/spec/datadog/profiling/ext/forking_spec.rb b/spec/datadog/profiling/ext/forking_spec.rb index cb504d078b5..85d024d85e3 100644 --- a/spec/datadog/profiling/ext/forking_spec.rb +++ b/spec/datadog/profiling/ext/forking_spec.rb @@ -116,7 +116,7 @@ def fork(&block) end after do - described_class.ddtrace_at_fork_blocks.clear + described_class.datadog_at_fork_blocks.clear end end @@ -247,7 +247,7 @@ def fork(&block) end after do - Datadog::Profiling::Ext::Forking::Kernel.ddtrace_at_fork_blocks.clear + Datadog::Profiling::Ext::Forking::Kernel.datadog_at_fork_blocks.clear end it 'calls the child at_fork callbacks after calling Process.daemon' do diff --git a/spec/datadog/profiling/http_transport_spec.rb b/spec/datadog/profiling/http_transport_spec.rb index 9f4bf421be5..472e100874f 100644 --- a/spec/datadog/profiling/http_transport_spec.rb +++ b/spec/datadog/profiling/http_transport_spec.rb @@ -337,7 +337,7 @@ expect(request.header).to include( 'content-type' => [%r{^multipart/form-data; boundary=(.+)}], 'dd-evp-origin' => ['dd-trace-rb'], - 'dd-evp-origin-version' => [DDTrace::VERSION::STRING], + 'dd-evp-origin-version' => [Datadog::VERSION::STRING], ) # check body diff --git a/spec/datadog/profiling/native_extension_helpers_spec.rb b/spec/datadog/profiling/native_extension_helpers_spec.rb index 5b49b859d30..186ca7bb64a 100644 --- a/spec/datadog/profiling/native_extension_helpers_spec.rb +++ b/spec/datadog/profiling/native_extension_helpers_spec.rb @@ -22,7 +22,7 @@ ('dylib' if PlatformHelpers.mac?) || raise('Missing SOEXT for current platform') - gem_lib_folder = "#{Gem.loaded_specs['ddtrace'].gem_dir}/lib" + gem_lib_folder = "#{Gem.loaded_specs['datadog'].gem_dir}/lib" full_libdatadog_path = "#{gem_lib_folder}/#{relative_path}/libdatadog_profiling.#{libdatadog_extension}" expect(relative_path).to start_with('../') @@ -43,7 +43,7 @@ # This test is expected to break when the libdatadog version on the .gemspec is updated but we forget to update # the version on the `native_extension_helpers.rb` file. Kindly keep them in sync! :) expect(described_class::LIBDATADOG_VERSION).to eq( - Gem.loaded_specs['ddtrace'].dependencies.find { |dependency| dependency.name == 'libdatadog' }.requirement.to_s + Gem.loaded_specs['datadog'].dependencies.find { |dependency| dependency.name == 'libdatadog' }.requirement.to_s ) end end diff --git a/spec/ddtrace/release_gem_spec.rb b/spec/datadog/release_gem_spec.rb similarity index 92% rename from spec/ddtrace/release_gem_spec.rb rename to spec/datadog/release_gem_spec.rb index 6ce79c42bb3..d879a2431ea 100644 --- a/spec/ddtrace/release_gem_spec.rb +++ b/spec/datadog/release_gem_spec.rb @@ -1,7 +1,7 @@ RSpec.describe 'gem release process' do - context 'ddtrace.gemspec' do + context 'datadog.gemspec' do context 'files' do - subject(:files) { Gem::Specification.load('ddtrace.gemspec').files } + subject(:files) { Gem::Specification.load('datadog.gemspec').files } # It's easy to forget to ship new files, especially when a new paradigm is # introduced (e.g. introducing native files requires the inclusion `ext/`) @@ -31,7 +31,7 @@ |Gemfile-.* |Rakefile |Steepfile - |ddtrace\.gemspec + |datadog\.gemspec |docker-compose\.yml |shell\.nix ) diff --git a/spec/datadog/tracing/benchmark/support/benchmark_helper.rb b/spec/datadog/tracing/benchmark/support/benchmark_helper.rb index c607e893063..0fd8f3fe980 100644 --- a/spec/datadog/tracing/benchmark/support/benchmark_helper.rb +++ b/spec/datadog/tracing/benchmark/support/benchmark_helper.rb @@ -1,7 +1,7 @@ require 'spec_helper' require 'datadog/statsd' -require 'ddtrace' +require 'datadog' require 'benchmark/ips' unless PlatformHelpers.jruby? diff --git a/spec/datadog/tracing/contrib/action_cable/instrumentation_spec.rb b/spec/datadog/tracing/contrib/action_cable/instrumentation_spec.rb index 2f060be89bf..fb81d1b1c86 100644 --- a/spec/datadog/tracing/contrib/action_cable/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/action_cable/instrumentation_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'spec/datadog/tracing/contrib/rails/support/deprecation' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/rails/rails_helper' diff --git a/spec/datadog/tracing/contrib/action_mailer/patcher_spec.rb b/spec/datadog/tracing/contrib/action_mailer/patcher_spec.rb index c00d2ad8d01..23708ef1eb9 100644 --- a/spec/datadog/tracing/contrib/action_mailer/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/action_mailer/patcher_spec.rb @@ -4,7 +4,7 @@ require 'active_support' require 'spec/datadog/tracing/contrib/action_mailer/helpers' require 'datadog/tracing/contrib/action_mailer/integration' -require 'ddtrace' +require 'datadog' begin require 'action_mailer' diff --git a/spec/datadog/tracing/contrib/action_pack/action_controller/instrumentation_spec.rb b/spec/datadog/tracing/contrib/action_pack/action_controller/instrumentation_spec.rb index 1c53aafb4b2..aea74072301 100644 --- a/spec/datadog/tracing/contrib/action_pack/action_controller/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/action_pack/action_controller/instrumentation_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'action_controller' -require 'ddtrace' +require 'datadog' # TODO: We plan on rewriting much of this instrumentation to bring it up to # present day patterns/conventions. For now, just test a few known cases. diff --git a/spec/datadog/tracing/contrib/action_pack/action_controller/metal_spec.rb b/spec/datadog/tracing/contrib/action_pack/action_controller/metal_spec.rb index a65eb7848aa..9a24f0be10a 100644 --- a/spec/datadog/tracing/contrib/action_pack/action_controller/metal_spec.rb +++ b/spec/datadog/tracing/contrib/action_pack/action_controller/metal_spec.rb @@ -2,7 +2,7 @@ require 'action_controller' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/action_pack/action_controller/instrumentation' RSpec.describe 'Datadog::Tracing::Contrib::ActionPack::ActionController::Metal' do diff --git a/spec/datadog/tracing/contrib/active_model_serializers/patcher_spec.rb b/spec/datadog/tracing/contrib/active_model_serializers/patcher_spec.rb index 4393a4ba4da..61e53c98151 100644 --- a/spec/datadog/tracing/contrib/active_model_serializers/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/active_model_serializers/patcher_spec.rb @@ -8,7 +8,7 @@ require 'datadog/tracing' require 'datadog/tracing/metadata/ext' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/active_model_serializers/patcher' RSpec.describe 'ActiveModelSerializers patcher' do diff --git a/spec/datadog/tracing/contrib/active_record/instantiation_spec.rb b/spec/datadog/tracing/contrib/active_record/instantiation_spec.rb index 2593529b6cf..9767c7c8b0d 100644 --- a/spec/datadog/tracing/contrib/active_record/instantiation_spec.rb +++ b/spec/datadog/tracing/contrib/active_record/instantiation_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'datadog/tracing/contrib/analytics_examples' require 'datadog/tracing/contrib/span_attribute_schema_examples' -require 'ddtrace' +require 'datadog' require 'spec/datadog/tracing/contrib/rails/support/deprecation' diff --git a/spec/datadog/tracing/contrib/active_record/multi_db_spec.rb b/spec/datadog/tracing/contrib/active_record/multi_db_spec.rb index dca6f8bbd67..27ef87c9cd2 100644 --- a/spec/datadog/tracing/contrib/active_record/multi_db_spec.rb +++ b/spec/datadog/tracing/contrib/active_record/multi_db_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/integration_examples' require 'spec/datadog/tracing/contrib/rails/support/deprecation' diff --git a/spec/datadog/tracing/contrib/active_record/performance_spec.rb b/spec/datadog/tracing/contrib/active_record/performance_spec.rb index a2cacbbd89c..efdffe43937 100644 --- a/spec/datadog/tracing/contrib/active_record/performance_spec.rb +++ b/spec/datadog/tracing/contrib/active_record/performance_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'active_record' diff --git a/spec/datadog/tracing/contrib/active_record/tracer_spec.rb b/spec/datadog/tracing/contrib/active_record/tracer_spec.rb index a742157e904..ae3a43e4fb7 100644 --- a/spec/datadog/tracing/contrib/active_record/tracer_spec.rb +++ b/spec/datadog/tracing/contrib/active_record/tracer_spec.rb @@ -2,7 +2,7 @@ require 'datadog/tracing/contrib/analytics_examples' require 'datadog/tracing/contrib/integration_examples' require 'datadog/tracing/contrib/span_attribute_schema_examples' -require 'ddtrace' +require 'datadog' require 'spec/datadog/tracing/contrib/rails/support/deprecation' diff --git a/spec/datadog/tracing/contrib/active_support/notifications/event_spec.rb b/spec/datadog/tracing/contrib/active_support/notifications/event_spec.rb index fb772cfb80d..c9688166f2f 100644 --- a/spec/datadog/tracing/contrib/active_support/notifications/event_spec.rb +++ b/spec/datadog/tracing/contrib/active_support/notifications/event_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'active_support/notifications' require 'datadog/tracing/contrib/active_support/notifications/event' diff --git a/spec/datadog/tracing/contrib/active_support/notifications/subscriber_spec.rb b/spec/datadog/tracing/contrib/active_support/notifications/subscriber_spec.rb index 18dbb58ad71..df65f5c7260 100644 --- a/spec/datadog/tracing/contrib/active_support/notifications/subscriber_spec.rb +++ b/spec/datadog/tracing/contrib/active_support/notifications/subscriber_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/active_support/notifications/subscriber' diff --git a/spec/datadog/tracing/contrib/active_support/notifications/subscription_spec.rb b/spec/datadog/tracing/contrib/active_support/notifications/subscription_spec.rb index b81cd94afd1..90376bb68bf 100644 --- a/spec/datadog/tracing/contrib/active_support/notifications/subscription_spec.rb +++ b/spec/datadog/tracing/contrib/active_support/notifications/subscription_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'active_support/notifications' require 'datadog/tracing/contrib/active_support/notifications/subscription' diff --git a/spec/datadog/tracing/contrib/aws/instrumentation_spec.rb b/spec/datadog/tracing/contrib/aws/instrumentation_spec.rb index 8d3008daccf..88e6c7cbee0 100644 --- a/spec/datadog/tracing/contrib/aws/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/aws/instrumentation_spec.rb @@ -9,7 +9,7 @@ require 'datadog/tracing' require 'datadog/tracing/metadata/ext' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/aws/patcher' RSpec.describe 'AWS instrumentation' do diff --git a/spec/datadog/tracing/contrib/concurrent_ruby/integration_test_spec.rb b/spec/datadog/tracing/contrib/concurrent_ruby/integration_test_spec.rb index e7f4cc40b63..c537a8efc76 100644 --- a/spec/datadog/tracing/contrib/concurrent_ruby/integration_test_spec.rb +++ b/spec/datadog/tracing/contrib/concurrent_ruby/integration_test_spec.rb @@ -1,7 +1,7 @@ require 'concurrent-ruby' # concurrent-ruby is not modular require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'spec/support/thread_helpers' RSpec.describe 'ConcurrentRuby integration tests' do @@ -44,7 +44,7 @@ # global threads that are never closed. # # This allows us to separate internal concurrent-ruby threads - # from ddtrace threads for leak detection. We need to create the maximum + # from datadog threads for leak detection. We need to create the maximum # number of threads that will be created concurrently in a test, which in # this case is 2. ThreadHelpers.with_leaky_thread_creation(:concurrent_ruby) do @@ -157,7 +157,7 @@ # global threads that are never closed. # # This allows us to separate internal concurrent-ruby threads - # from ddtrace threads for leak detection. + # from datadog threads for leak detection. ThreadHelpers.with_leaky_thread_creation(:concurrent_ruby) do Concurrent::Future.execute {}.value end @@ -218,7 +218,7 @@ # global threads that are never closed. # # This allows us to separate internal concurrent-ruby threads - # from ddtrace threads for leak detection. We need to create the maximum + # from datadog threads for leak detection. We need to create the maximum # number of threads that will be created concurrently in a test, which in # this case is 2. ThreadHelpers.with_leaky_thread_creation(:concurrent_ruby) do diff --git a/spec/datadog/tracing/contrib/configurable_spec.rb b/spec/datadog/tracing/contrib/configurable_spec.rb index e212bb4102e..f9f548ae4c5 100644 --- a/spec/datadog/tracing/contrib/configurable_spec.rb +++ b/spec/datadog/tracing/contrib/configurable_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::Configurable do describe 'implemented' do diff --git a/spec/datadog/tracing/contrib/configuration/resolvers/pattern_resolver_spec.rb b/spec/datadog/tracing/contrib/configuration/resolvers/pattern_resolver_spec.rb index 3049d32677a..88933ec57d2 100644 --- a/spec/datadog/tracing/contrib/configuration/resolvers/pattern_resolver_spec.rb +++ b/spec/datadog/tracing/contrib/configuration/resolvers/pattern_resolver_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::Configuration::Resolvers::PatternResolver do subject(:resolver) { described_class.new } diff --git a/spec/datadog/tracing/contrib/configuration/settings_spec.rb b/spec/datadog/tracing/contrib/configuration/settings_spec.rb index 73880f7aea1..ce93ca5f59a 100644 --- a/spec/datadog/tracing/contrib/configuration/settings_spec.rb +++ b/spec/datadog/tracing/contrib/configuration/settings_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::Configuration::Settings do subject(:settings) { described_class.new } diff --git a/spec/datadog/tracing/contrib/dalli/instrumentation_spec.rb b/spec/datadog/tracing/contrib/dalli/instrumentation_spec.rb index cb318ff6212..f1d6f720cd0 100644 --- a/spec/datadog/tracing/contrib/dalli/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/dalli/instrumentation_spec.rb @@ -6,7 +6,7 @@ require 'datadog/tracing/contrib/peer_service_configuration_examples' require 'dalli' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/dalli/patcher' RSpec.describe 'Dalli instrumentation' do diff --git a/spec/datadog/tracing/contrib/dalli/patcher_spec.rb b/spec/datadog/tracing/contrib/dalli/patcher_spec.rb index 02282b0f22e..9fa6f382f03 100644 --- a/spec/datadog/tracing/contrib/dalli/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/dalli/patcher_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'dalli' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/dalli/patcher' RSpec.describe 'Dalli instrumentation' do diff --git a/spec/datadog/tracing/contrib/dalli/quantize_spec.rb b/spec/datadog/tracing/contrib/dalli/quantize_spec.rb index 361df9fee62..19f0f52122d 100644 --- a/spec/datadog/tracing/contrib/dalli/quantize_spec.rb +++ b/spec/datadog/tracing/contrib/dalli/quantize_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'dalli' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/dalli/quantize' RSpec.describe Datadog::Tracing::Contrib::Dalli::Quantize do diff --git a/spec/datadog/tracing/contrib/delayed_job/patcher_spec.rb b/spec/datadog/tracing/contrib/delayed_job/patcher_spec.rb index 03df44c9ef3..6f4d509cbe8 100644 --- a/spec/datadog/tracing/contrib/delayed_job/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/delayed_job/patcher_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require_relative 'delayed_job_active_record' RSpec.describe Datadog::Tracing::Contrib::DelayedJob::Patcher, :delayed_job_active_record do diff --git a/spec/datadog/tracing/contrib/delayed_job/plugin_spec.rb b/spec/datadog/tracing/contrib/delayed_job/plugin_spec.rb index 68e74afa285..7266ff9d0e5 100644 --- a/spec/datadog/tracing/contrib/delayed_job/plugin_spec.rb +++ b/spec/datadog/tracing/contrib/delayed_job/plugin_spec.rb @@ -4,7 +4,7 @@ require 'active_record' require 'delayed_job' require 'delayed_job_active_record' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/delayed_job/plugin' require_relative 'delayed_job_active_record' diff --git a/spec/datadog/tracing/contrib/elasticsearch/patcher_spec.rb b/spec/datadog/tracing/contrib/elasticsearch/patcher_spec.rb index 259fc58e5af..aee55a6bb68 100644 --- a/spec/datadog/tracing/contrib/elasticsearch/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/elasticsearch/patcher_spec.rb @@ -5,7 +5,7 @@ require 'datadog/tracing/contrib/span_attribute_schema_examples' require 'datadog/tracing/contrib/peer_service_configuration_examples' -require 'ddtrace' +require 'datadog' require 'elasticsearch' diff --git a/spec/datadog/tracing/contrib/elasticsearch/quantize_spec.rb b/spec/datadog/tracing/contrib/elasticsearch/quantize_spec.rb index ac94abb40d6..12db32eb4e1 100644 --- a/spec/datadog/tracing/contrib/elasticsearch/quantize_spec.rb +++ b/spec/datadog/tracing/contrib/elasticsearch/quantize_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'elasticsearch' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/elasticsearch/quantize' RSpec.describe Datadog::Tracing::Contrib::Elasticsearch::Quantize do diff --git a/spec/datadog/tracing/contrib/elasticsearch/transport_spec.rb b/spec/datadog/tracing/contrib/elasticsearch/transport_spec.rb index 6e0561e9e43..ab9f800f84c 100644 --- a/spec/datadog/tracing/contrib/elasticsearch/transport_spec.rb +++ b/spec/datadog/tracing/contrib/elasticsearch/transport_spec.rb @@ -8,7 +8,7 @@ require 'elasticsearch' require 'faraday' -require 'ddtrace' +require 'datadog' RSpec.describe 'Elasticsearch::Transport::Client tracing' do before do diff --git a/spec/datadog/tracing/contrib/ethon/patcher_spec.rb b/spec/datadog/tracing/contrib/ethon/patcher_spec.rb index 884e4ba2389..4a79d0c77df 100644 --- a/spec/datadog/tracing/contrib/ethon/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/ethon/patcher_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'ethon' RSpec.describe Datadog::Tracing::Contrib::Ethon::Patcher do diff --git a/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb b/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb index 9c2fca9491d..411abc43d8e 100644 --- a/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb @@ -7,7 +7,7 @@ require 'datadog/tracing/contrib/support/http' require 'excon' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/excon/middleware' RSpec.describe Datadog::Tracing::Contrib::Excon::Middleware do diff --git a/spec/datadog/tracing/contrib/faraday/middleware_spec.rb b/spec/datadog/tracing/contrib/faraday/middleware_spec.rb index 86ad6a3ae62..808d4e8cd82 100644 --- a/spec/datadog/tracing/contrib/faraday/middleware_spec.rb +++ b/spec/datadog/tracing/contrib/faraday/middleware_spec.rb @@ -14,7 +14,7 @@ RSpec.describe 'Faraday middleware' do let(:client) do ::Faraday.new('http://example.com') do |builder| - builder.use(:ddtrace, middleware_options) if use_middleware + builder.use(:datadog_tracing, middleware_options) if use_middleware builder.adapter(:test) do |stub| stub.get('/success') { |_| [200, response_headers, 'OK'] } stub.post('/failure') { |_| [500, {}, 'Boom!'] } diff --git a/spec/datadog/tracing/contrib/faraday/patcher_spec.rb b/spec/datadog/tracing/contrib/faraday/patcher_spec.rb index a9523970dcf..4de3bdbba5b 100644 --- a/spec/datadog/tracing/contrib/faraday/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/faraday/patcher_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'faraday' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/faraday/patcher' RSpec.describe 'Faraday instrumentation' do diff --git a/spec/datadog/tracing/contrib/grape/tracer_spec.rb b/spec/datadog/tracing/contrib/grape/tracer_spec.rb index 53402b1c7aa..0ebfd7000f2 100644 --- a/spec/datadog/tracing/contrib/grape/tracer_spec.rb +++ b/spec/datadog/tracing/contrib/grape/tracer_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'datadog/tracing/contrib/analytics_examples' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/grape/patcher' require 'datadog/tracing/contrib/rack/middlewares' require 'rack/test' diff --git a/spec/datadog/tracing/contrib/graphql/patcher_spec.rb b/spec/datadog/tracing/contrib/graphql/patcher_spec.rb index 8f008492b14..f02618d0984 100644 --- a/spec/datadog/tracing/contrib/graphql/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/graphql/patcher_spec.rb @@ -3,7 +3,7 @@ require 'datadog/tracing/contrib/graphql/tracing_patcher' require 'datadog/tracing/contrib/graphql/trace_patcher' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::GraphQL::Patcher do around do |example| diff --git a/spec/datadog/tracing/contrib/graphql/trace_patcher_spec.rb b/spec/datadog/tracing/contrib/graphql/trace_patcher_spec.rb index aea073160d0..6e225cf8aaf 100644 --- a/spec/datadog/tracing/contrib/graphql/trace_patcher_spec.rb +++ b/spec/datadog/tracing/contrib/graphql/trace_patcher_spec.rb @@ -2,7 +2,7 @@ require 'datadog/tracing/contrib/graphql/test_schema_examples' require 'datadog/tracing/contrib/graphql/trace_patcher' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::GraphQL::TracePatcher, skip: Gem::Version.new(::GraphQL::VERSION) < Gem::Version.new('2.0.19') do diff --git a/spec/datadog/tracing/contrib/graphql/tracing_patcher_spec.rb b/spec/datadog/tracing/contrib/graphql/tracing_patcher_spec.rb index 15129d8f510..0943e474b5f 100644 --- a/spec/datadog/tracing/contrib/graphql/tracing_patcher_spec.rb +++ b/spec/datadog/tracing/contrib/graphql/tracing_patcher_spec.rb @@ -2,7 +2,7 @@ require 'datadog/tracing/contrib/graphql/test_schema_examples' require 'datadog/tracing/contrib/graphql/tracing_patcher' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::GraphQL::TracingPatcher do describe '#patch!' do diff --git a/spec/datadog/tracing/contrib/grpc/datadog_interceptor/client_spec.rb b/spec/datadog/tracing/contrib/grpc/datadog_interceptor/client_spec.rb index 53fffd2784f..de8b3926be3 100644 --- a/spec/datadog/tracing/contrib/grpc/datadog_interceptor/client_spec.rb +++ b/spec/datadog/tracing/contrib/grpc/datadog_interceptor/client_spec.rb @@ -8,7 +8,7 @@ require_relative 'shared_examples' require 'grpc' -require 'ddtrace' +require 'datadog' RSpec.describe 'tracing on the client connection' do subject(:client) { Datadog::Tracing::Contrib::GRPC::DatadogInterceptor::Client.new } diff --git a/spec/datadog/tracing/contrib/grpc/datadog_interceptor/server_spec.rb b/spec/datadog/tracing/contrib/grpc/datadog_interceptor/server_spec.rb index ab946d38558..0f3a34502b8 100644 --- a/spec/datadog/tracing/contrib/grpc/datadog_interceptor/server_spec.rb +++ b/spec/datadog/tracing/contrib/grpc/datadog_interceptor/server_spec.rb @@ -7,7 +7,7 @@ require_relative 'shared_examples' require 'grpc' -require 'ddtrace' +require 'datadog' RSpec.describe 'tracing on the server connection' do subject(:server) { Datadog::Tracing::Contrib::GRPC::DatadogInterceptor::Server.new } diff --git a/spec/datadog/tracing/contrib/grpc/integration_test_spec.rb b/spec/datadog/tracing/contrib/grpc/integration_test_spec.rb index d902f8f778b..94de206256e 100644 --- a/spec/datadog/tracing/contrib/grpc/integration_test_spec.rb +++ b/spec/datadog/tracing/contrib/grpc/integration_test_spec.rb @@ -3,7 +3,7 @@ require_relative 'support/grpc_helper' require 'grpc' -require 'ddtrace' +require 'datadog' RSpec.describe 'gRPC integration test' do include GRPCHelper diff --git a/spec/datadog/tracing/contrib/grpc/interception_context_spec.rb b/spec/datadog/tracing/contrib/grpc/interception_context_spec.rb index 12a0f0eb8a4..87916000cf3 100644 --- a/spec/datadog/tracing/contrib/grpc/interception_context_spec.rb +++ b/spec/datadog/tracing/contrib/grpc/interception_context_spec.rb @@ -6,7 +6,7 @@ require 'datadog/tracing/contrib/peer_service_configuration_examples' require 'grpc' -require 'ddtrace' +require 'datadog' RSpec.describe GRPC::InterceptionContext do subject(:interception_context) { described_class.new } diff --git a/spec/datadog/tracing/contrib/grpc/patcher_spec.rb b/spec/datadog/tracing/contrib/grpc/patcher_spec.rb index b035e1ad623..e6f6a6fb3f0 100644 --- a/spec/datadog/tracing/contrib/grpc/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/grpc/patcher_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'grpc' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/grpc/patcher' RSpec.describe 'GRPC instrumentation' do diff --git a/spec/datadog/tracing/contrib/hanami/integration_test_spec.rb b/spec/datadog/tracing/contrib/hanami/integration_test_spec.rb index eace7e3c5d8..da79902e3e8 100644 --- a/spec/datadog/tracing/contrib/hanami/integration_test_spec.rb +++ b/spec/datadog/tracing/contrib/hanami/integration_test_spec.rb @@ -2,7 +2,7 @@ require_relative './support/custom_matchers' require 'rack' require 'rack/test' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/support/spec_helper' require 'datadog/tracing/contrib/rack/ext' require 'datadog/tracing/contrib/hanami/ext' diff --git a/spec/datadog/tracing/contrib/hanami/support/hanami_helpers.rb b/spec/datadog/tracing/contrib/hanami/support/hanami_helpers.rb index a06ffc26457..1edf69562f4 100644 --- a/spec/datadog/tracing/contrib/hanami/support/hanami_helpers.rb +++ b/spec/datadog/tracing/contrib/hanami/support/hanami_helpers.rb @@ -1,4 +1,4 @@ -require 'ddtrace' +require 'datadog' require 'rack' require 'hanami' @@ -29,7 +29,7 @@ class App < ::Hanami::Application let(:app) do if ENV['TEST_AUTO_INSTRUMENT'] == 'true' - require 'ddtrace/auto_instrument' + require 'datadog/auto_instrument' else require 'datadog/tracing/contrib/hanami/plugin' end diff --git a/spec/datadog/tracing/contrib/http/circuit_breaker_spec.rb b/spec/datadog/tracing/contrib/http/circuit_breaker_spec.rb index ee0593fd030..4d656c7ed87 100644 --- a/spec/datadog/tracing/contrib/http/circuit_breaker_spec.rb +++ b/spec/datadog/tracing/contrib/http/circuit_breaker_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/http/circuit_breaker' require 'datadog/core/transport/ext' @@ -63,7 +63,7 @@ context "when the #{Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION} header" do context 'is present' do let(:request) { ::Net::HTTP::Post.new('/some/path', headers) } - let(:headers) { { Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION => DDTrace::VERSION::STRING } } + let(:headers) { { Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION => Datadog::VERSION::STRING } } it { is_expected.to be true } end diff --git a/spec/datadog/tracing/contrib/http/miniapp_spec.rb b/spec/datadog/tracing/contrib/http/miniapp_spec.rb index 0a8d87816a0..b8a9a04d216 100644 --- a/spec/datadog/tracing/contrib/http/miniapp_spec.rb +++ b/spec/datadog/tracing/contrib/http/miniapp_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/integration_examples' require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'net/http' require 'time' diff --git a/spec/datadog/tracing/contrib/http/patcher_spec.rb b/spec/datadog/tracing/contrib/http/patcher_spec.rb index 62fd36534ae..0f4220dfbea 100644 --- a/spec/datadog/tracing/contrib/http/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/http/patcher_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/integration_examples' require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'net/http' RSpec.describe 'net/http patcher' do diff --git a/spec/datadog/tracing/contrib/http/request_spec.rb b/spec/datadog/tracing/contrib/http/request_spec.rb index 3cdba7f4c14..451bfe52a63 100644 --- a/spec/datadog/tracing/contrib/http/request_spec.rb +++ b/spec/datadog/tracing/contrib/http/request_spec.rb @@ -7,7 +7,7 @@ require 'datadog/tracing/contrib/peer_service_configuration_examples' require 'datadog/tracing/contrib/support/http' -require 'ddtrace' +require 'datadog' require 'net/http' require 'time' require 'json' diff --git a/spec/datadog/tracing/contrib/http_route_spec.rb b/spec/datadog/tracing/contrib/http_route_spec.rb index 924db954d96..fed2230c9ac 100644 --- a/spec/datadog/tracing/contrib/http_route_spec.rb +++ b/spec/datadog/tracing/contrib/http_route_spec.rb @@ -6,7 +6,7 @@ require 'rails' require 'action_controller' -require 'ddtrace' +require 'datadog' RSpec.describe 'Multi-app testing for http.route' do include Rack::Test::Methods diff --git a/spec/datadog/tracing/contrib/integration_spec.rb b/spec/datadog/tracing/contrib/integration_spec.rb index dd5a00bf5a8..4ad43fe6851 100644 --- a/spec/datadog/tracing/contrib/integration_spec.rb +++ b/spec/datadog/tracing/contrib/integration_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::Integration do describe 'implemented' do diff --git a/spec/datadog/tracing/contrib/kafka/patcher_spec.rb b/spec/datadog/tracing/contrib/kafka/patcher_spec.rb index c7b75656ef7..24546032930 100644 --- a/spec/datadog/tracing/contrib/kafka/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/kafka/patcher_spec.rb @@ -3,7 +3,7 @@ require 'ruby-kafka' require 'active_support' -require 'ddtrace' +require 'datadog' RSpec.describe 'Kafka patcher' do let(:configuration_options) { {} } diff --git a/spec/datadog/tracing/contrib/lograge/patcher_spec.rb b/spec/datadog/tracing/contrib/lograge/patcher_spec.rb index 71d02f554d5..23536af465b 100644 --- a/spec/datadog/tracing/contrib/lograge/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/lograge/patcher_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'lograge' require 'datadog/tracing/contrib/lograge/patcher' diff --git a/spec/datadog/tracing/contrib/mongodb/client_spec.rb b/spec/datadog/tracing/contrib/mongodb/client_spec.rb index 6e76a7fcc44..90a359c0da0 100644 --- a/spec/datadog/tracing/contrib/mongodb/client_spec.rb +++ b/spec/datadog/tracing/contrib/mongodb/client_spec.rb @@ -5,7 +5,7 @@ require 'datadog/tracing/contrib/span_attribute_schema_examples' require 'datadog/tracing/contrib/peer_service_configuration_examples' -require 'ddtrace' +require 'datadog' require 'mongo' RSpec.describe 'Mongo::Client instrumentation' do diff --git a/spec/datadog/tracing/contrib/mongodb/regression_issue_1235_spec.rb b/spec/datadog/tracing/contrib/mongodb/regression_issue_1235_spec.rb index afeaef56f98..8bd9e1a0c7b 100644 --- a/spec/datadog/tracing/contrib/mongodb/regression_issue_1235_spec.rb +++ b/spec/datadog/tracing/contrib/mongodb/regression_issue_1235_spec.rb @@ -1,4 +1,4 @@ -require 'ddtrace' +require 'datadog' require 'mongo' RSpec.describe 'Mongo crash regression #1235' do diff --git a/spec/datadog/tracing/contrib/mysql2/patcher_spec.rb b/spec/datadog/tracing/contrib/mysql2/patcher_spec.rb index 34341a1222a..f7380c8ff43 100644 --- a/spec/datadog/tracing/contrib/mysql2/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/mysql2/patcher_spec.rb @@ -7,7 +7,7 @@ require 'datadog/tracing/contrib/span_attribute_schema_examples' require 'datadog/tracing/contrib/peer_service_configuration_examples' -require 'ddtrace' +require 'datadog' require 'mysql2' RSpec.describe 'Mysql2::Client patcher' do diff --git a/spec/datadog/tracing/contrib/opensearch/patcher_spec.rb b/spec/datadog/tracing/contrib/opensearch/patcher_spec.rb index 523f8e29587..852987ac63a 100644 --- a/spec/datadog/tracing/contrib/opensearch/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/opensearch/patcher_spec.rb @@ -4,7 +4,7 @@ require 'datadog/tracing/contrib/environment_service_name_examples' require 'datadog/tracing/contrib/peer_service_configuration_examples' -require 'ddtrace' +require 'datadog' require 'opensearch' diff --git a/spec/datadog/tracing/contrib/opensearch/quantize_spec.rb b/spec/datadog/tracing/contrib/opensearch/quantize_spec.rb index 66fc03ceea9..bc9aece98fa 100644 --- a/spec/datadog/tracing/contrib/opensearch/quantize_spec.rb +++ b/spec/datadog/tracing/contrib/opensearch/quantize_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'opensearch' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/opensearch/quantize' RSpec.describe Datadog::Tracing::Contrib::OpenSearch::Quantize do diff --git a/spec/datadog/tracing/contrib/patchable_spec.rb b/spec/datadog/tracing/contrib/patchable_spec.rb index 2a728bc083a..9cfe9b4a85b 100644 --- a/spec/datadog/tracing/contrib/patchable_spec.rb +++ b/spec/datadog/tracing/contrib/patchable_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::Patchable do include_context 'tracer logging' diff --git a/spec/datadog/tracing/contrib/pg/patcher_spec.rb b/spec/datadog/tracing/contrib/pg/patcher_spec.rb index 727bcfec089..43cbfdd438b 100644 --- a/spec/datadog/tracing/contrib/pg/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/pg/patcher_spec.rb @@ -8,7 +8,7 @@ require 'datadog/tracing/contrib/propagation/sql_comment/mode' -require 'ddtrace' +require 'datadog' require 'pg' RSpec.describe 'PG::Connection patcher' do diff --git a/spec/datadog/tracing/contrib/presto/client_spec.rb b/spec/datadog/tracing/contrib/presto/client_spec.rb index 4ded05910ee..d66ab2d9876 100644 --- a/spec/datadog/tracing/contrib/presto/client_spec.rb +++ b/spec/datadog/tracing/contrib/presto/client_spec.rb @@ -5,7 +5,7 @@ require 'datadog/tracing/contrib/span_attribute_schema_examples' require 'datadog/tracing/contrib/peer_service_configuration_examples' -require 'ddtrace' +require 'datadog' require 'presto-client' RSpec.describe 'Presto::Client instrumentation' do diff --git a/spec/datadog/tracing/contrib/que/patcher_spec.rb b/spec/datadog/tracing/contrib/que/patcher_spec.rb index e79bd5ea48f..276ae5c255a 100644 --- a/spec/datadog/tracing/contrib/que/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/que/patcher_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'que' RSpec.describe Datadog::Tracing::Contrib::Que::Patcher do diff --git a/spec/datadog/tracing/contrib/que/tracer_spec.rb b/spec/datadog/tracing/contrib/que/tracer_spec.rb index 90b90de2178..8e21f6b2cba 100644 --- a/spec/datadog/tracing/contrib/que/tracer_spec.rb +++ b/spec/datadog/tracing/contrib/que/tracer_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'datadog/tracing/contrib/analytics_examples' -require 'ddtrace' +require 'datadog' require 'que' RSpec.describe Datadog::Tracing::Contrib::Que::Tracer do diff --git a/spec/datadog/tracing/contrib/racecar/patcher_spec.rb b/spec/datadog/tracing/contrib/racecar/patcher_spec.rb index 80b921eccb2..ede59466435 100644 --- a/spec/datadog/tracing/contrib/racecar/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/racecar/patcher_spec.rb @@ -11,7 +11,7 @@ require 'racecar/cli' require 'active_support' -require 'ddtrace' +require 'datadog' RSpec.describe 'Racecar patcher' do let(:configuration_options) { {} } @@ -94,7 +94,7 @@ end describe 'for single message processing' do - let(:topic) { 'dd_trace_test_dummy' } + let(:topic) { 'datadog_tracing_test_dummy' } let(:consumer) { 'DummyConsumer' } let(:partition) { 1 } let(:offset) { 2 } @@ -177,7 +177,7 @@ end describe 'for batch message processing' do - let(:topic) { 'dd_trace_test_dummy_batch' } + let(:topic) { 'datadog_tracing_test_dummy_batch' } let(:consumer) { 'DummyBatchConsumer' } let(:partition) { 1 } let(:offset) { 2 } diff --git a/spec/datadog/tracing/contrib/rack/configuration_spec.rb b/spec/datadog/tracing/contrib/rack/configuration_spec.rb index e7131344efd..e2d37818529 100644 --- a/spec/datadog/tracing/contrib/rack/configuration_spec.rb +++ b/spec/datadog/tracing/contrib/rack/configuration_spec.rb @@ -3,7 +3,7 @@ require 'rack/test' require 'rack' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/rack/middlewares' RSpec.describe 'Rack integration configuration' do diff --git a/spec/datadog/tracing/contrib/rack/disabled_spec.rb b/spec/datadog/tracing/contrib/rack/disabled_spec.rb index fd0459ff9cf..879101da275 100644 --- a/spec/datadog/tracing/contrib/rack/disabled_spec.rb +++ b/spec/datadog/tracing/contrib/rack/disabled_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'rack/test' require 'rack' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/rack/middlewares' RSpec.describe 'Rack integration tests' do diff --git a/spec/datadog/tracing/contrib/rack/distributed_spec.rb b/spec/datadog/tracing/contrib/rack/distributed_spec.rb index 076507801ef..9fdafb4ef71 100644 --- a/spec/datadog/tracing/contrib/rack/distributed_spec.rb +++ b/spec/datadog/tracing/contrib/rack/distributed_spec.rb @@ -4,7 +4,7 @@ require 'rack' require 'datadog/tracing/sampling/ext' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/rack/middlewares' RSpec.describe 'Rack integration distributed tracing' do diff --git a/spec/datadog/tracing/contrib/rack/integration_test_spec.rb b/spec/datadog/tracing/contrib/rack/integration_test_spec.rb index 4c2acb8ebcc..8028528d636 100644 --- a/spec/datadog/tracing/contrib/rack/integration_test_spec.rb +++ b/spec/datadog/tracing/contrib/rack/integration_test_spec.rb @@ -2,7 +2,7 @@ require 'rack/test' require 'securerandom' require 'rack' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/rack/middlewares' require_relative '../support/http' diff --git a/spec/datadog/tracing/contrib/rack/middlewares_spec.rb b/spec/datadog/tracing/contrib/rack/middlewares_spec.rb index 7d6aef3c0d8..48a4d92ed85 100644 --- a/spec/datadog/tracing/contrib/rack/middlewares_spec.rb +++ b/spec/datadog/tracing/contrib/rack/middlewares_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'rack' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/rack/middlewares' RSpec.describe Datadog::Tracing::Contrib::Rack::TraceMiddleware do diff --git a/spec/datadog/tracing/contrib/rack/queue_time_spec.rb b/spec/datadog/tracing/contrib/rack/queue_time_spec.rb index fce9933cd23..d0f7b722819 100644 --- a/spec/datadog/tracing/contrib/rack/queue_time_spec.rb +++ b/spec/datadog/tracing/contrib/rack/queue_time_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'rack' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/rack/request_queue' RSpec.describe Datadog::Tracing::Contrib::Rack::QueueTime do diff --git a/spec/datadog/tracing/contrib/rack/resource_name_spec.rb b/spec/datadog/tracing/contrib/rack/resource_name_spec.rb index ff9a67905d5..660a23b57c9 100644 --- a/spec/datadog/tracing/contrib/rack/resource_name_spec.rb +++ b/spec/datadog/tracing/contrib/rack/resource_name_spec.rb @@ -2,7 +2,7 @@ require 'rack/test' require 'rack' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/rack/middlewares' RSpec.describe 'Rack integration with other middleware' do diff --git a/spec/datadog/tracing/contrib/rails/rails_helper.rb b/spec/datadog/tracing/contrib/rails/rails_helper.rb index fc91449d724..1fe3866197e 100644 --- a/spec/datadog/tracing/contrib/rails/rails_helper.rb +++ b/spec/datadog/tracing/contrib/rails/rails_helper.rb @@ -170,7 +170,7 @@ # # - We would happily substitute this for a gem like `rspec-rails` if it were possible. However, # `rspec-rails` is for testing a Rails application. It doesn't create mock Rails apps for testing -# against, like we need to in `ddtrace`. +# against, like we need to in `datadog`. # - The most challenging part of implementation is that Rails wasn't designed to be re-initialized # like this. There are a number of places, particularly with Rails::Configuration and Railties that # use global, constant-level variables to hold application configuration. This configuration can and diff --git a/spec/datadog/tracing/contrib/rails/support/rails4.rb b/spec/datadog/tracing/contrib/rails/support/rails4.rb index ecd00d98d02..85ebf284ed6 100644 --- a/spec/datadog/tracing/contrib/rails/support/rails4.rb +++ b/spec/datadog/tracing/contrib/rails/support/rails4.rb @@ -19,7 +19,7 @@ def config.database_configuration klass.send(:define_method, :initialize) do |*args| super(*args) redis_cache = [:redis_store, { url: ENV['REDIS_URL'] }] - file_cache = [:file_store, '/tmp/ddtrace-rb/cache/'] + file_cache = [:file_store, '/tmp/datadog-rb/cache/'] config.secret_key_base = 'f624861242e4ccf20eacb6bb48a886da' config.cache_store = ENV['REDIS_URL'] ? redis_cache : file_cache @@ -48,7 +48,7 @@ def config.database_configuration # we want to disable explicit instrumentation # when testing auto patching if ENV['TEST_AUTO_INSTRUMENT'] == 'true' - require 'ddtrace/auto_instrument' + require 'datadog/auto_instrument' else # Enables the auto-instrumentation for the testing application Datadog.configure do |c| diff --git a/spec/datadog/tracing/contrib/rails/support/rails5.rb b/spec/datadog/tracing/contrib/rails/support/rails5.rb index 22088937b15..1c675ec11ce 100644 --- a/spec/datadog/tracing/contrib/rails/support/rails5.rb +++ b/spec/datadog/tracing/contrib/rails/support/rails5.rb @@ -23,7 +23,7 @@ def config.database_configuration else [:redis_cache_store, { url: ENV['REDIS_URL'] }] end - file_cache = [:file_store, '/tmp/ddtrace-rb/cache/'] + file_cache = [:file_store, '/tmp/datadog-rb/cache/'] config.secret_key_base = 'f624861242e4ccf20eacb6bb48a886da' config.cache_store = ENV['REDIS_URL'] ? redis_cache : file_cache @@ -51,7 +51,7 @@ def config.database_configuration # we want to disable explicit instrumentation # when testing auto patching if ENV['TEST_AUTO_INSTRUMENT'] == 'true' - require 'ddtrace/auto_instrument' + require 'datadog/auto_instrument' else # Enables the auto-instrumentation for the testing application Datadog.configure do |c| diff --git a/spec/datadog/tracing/contrib/rails/support/rails6.rb b/spec/datadog/tracing/contrib/rails/support/rails6.rb index 8894e9ff572..37ccb8d4c8c 100644 --- a/spec/datadog/tracing/contrib/rails/support/rails6.rb +++ b/spec/datadog/tracing/contrib/rails/support/rails6.rb @@ -23,7 +23,7 @@ def config.database_configuration else [:redis_cache_store, { url: ENV['REDIS_URL'] }] end - file_cache = [:file_store, '/tmp/ddtrace-rb/cache/'] + file_cache = [:file_store, '/tmp/datadog-rb/cache/'] config.load_defaults '6.0' config.secret_key_base = 'f624861242e4ccf20eacb6bb48a886da' @@ -54,7 +54,7 @@ def config.database_configuration # we want to disable explicit instrumentation # when testing auto patching if ENV['TEST_AUTO_INSTRUMENT'] == 'true' - require 'ddtrace/auto_instrument' + require 'datadog/auto_instrument' else # Enables the auto-instrumentation for the testing application Datadog.configure do |c| diff --git a/spec/datadog/tracing/contrib/rake/instrumentation_spec.rb b/spec/datadog/tracing/contrib/rake/instrumentation_spec.rb index 0d17d786216..8c4d5153a0a 100644 --- a/spec/datadog/tracing/contrib/rake/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/rake/instrumentation_spec.rb @@ -4,7 +4,7 @@ require 'securerandom' require 'rake' require 'rake/tasklib' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/rake/patcher' RSpec.describe Datadog::Tracing::Contrib::Rake::Instrumentation do diff --git a/spec/datadog/tracing/contrib/redis/configuration/resolver_spec.rb b/spec/datadog/tracing/contrib/redis/configuration/resolver_spec.rb index 08ac17dd38a..6a7596c0099 100644 --- a/spec/datadog/tracing/contrib/redis/configuration/resolver_spec.rb +++ b/spec/datadog/tracing/contrib/redis/configuration/resolver_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'redis' -require 'ddtrace' +require 'datadog' RSpec.describe 'Redis configuration resolver' do let(:resolver) { Datadog::Tracing::Contrib::Redis::Configuration::Resolver.new } diff --git a/spec/datadog/tracing/contrib/redis/instrumentation_spec.rb b/spec/datadog/tracing/contrib/redis/instrumentation_spec.rb index d29dec585d7..847b50c1527 100644 --- a/spec/datadog/tracing/contrib/redis/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/redis/instrumentation_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'redis' -require 'ddtrace' +require 'datadog' RSpec.describe 'Redis instrumentation test' do let(:test_host) { ENV.fetch('TEST_REDIS_HOST', '127.0.0.1') } diff --git a/spec/datadog/tracing/contrib/redis/integration_test_spec.rb b/spec/datadog/tracing/contrib/redis/integration_test_spec.rb index 08f77c06e0d..2542ce7bdcd 100644 --- a/spec/datadog/tracing/contrib/redis/integration_test_spec.rb +++ b/spec/datadog/tracing/contrib/redis/integration_test_spec.rb @@ -2,7 +2,7 @@ require 'time' require 'redis' -require 'ddtrace' +require 'datadog' RSpec.describe 'Redis integration test' do before do diff --git a/spec/datadog/tracing/contrib/redis/miniapp_spec.rb b/spec/datadog/tracing/contrib/redis/miniapp_spec.rb index 4400328875a..528b3251060 100644 --- a/spec/datadog/tracing/contrib/redis/miniapp_spec.rb +++ b/spec/datadog/tracing/contrib/redis/miniapp_spec.rb @@ -3,7 +3,7 @@ require 'time' require 'redis' -require 'ddtrace' +require 'datadog' RSpec.describe 'Redis mini app test' do before { skip unless ENV['TEST_DATADOG_INTEGRATION'] } diff --git a/spec/datadog/tracing/contrib/redis/redis_patcher_lifecycle_spec.rb b/spec/datadog/tracing/contrib/redis/redis_patcher_lifecycle_spec.rb index eb333beb127..813272d4227 100644 --- a/spec/datadog/tracing/contrib/redis/redis_patcher_lifecycle_spec.rb +++ b/spec/datadog/tracing/contrib/redis/redis_patcher_lifecycle_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'redis' -require 'ddtrace' +require 'datadog' # This must be a standalone task due to the life cycle of patcher RSpec.describe 'Patcher lifecycle - instrumenting a redis instance initialized before patching instrumentation' do diff --git a/spec/datadog/tracing/contrib/redis/redis_spec.rb b/spec/datadog/tracing/contrib/redis/redis_spec.rb index acb80acf35d..68d9b6593cb 100644 --- a/spec/datadog/tracing/contrib/redis/redis_spec.rb +++ b/spec/datadog/tracing/contrib/redis/redis_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'redis' -require 'ddtrace' +require 'datadog' require_relative './shared_examples' require 'datadog/tracing/contrib/environment_service_name_examples' diff --git a/spec/datadog/tracing/contrib/registerable_spec.rb b/spec/datadog/tracing/contrib/registerable_spec.rb index 1e83e2276ea..a3d5ef7a1ae 100644 --- a/spec/datadog/tracing/contrib/registerable_spec.rb +++ b/spec/datadog/tracing/contrib/registerable_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::Registerable do describe 'implemented' do diff --git a/spec/datadog/tracing/contrib/registry_spec.rb b/spec/datadog/tracing/contrib/registry_spec.rb index d8839a636e6..f0439e606ac 100644 --- a/spec/datadog/tracing/contrib/registry_spec.rb +++ b/spec/datadog/tracing/contrib/registry_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' RSpec.describe Datadog::Tracing::Contrib::Registry do describe 'instance' do diff --git a/spec/datadog/tracing/contrib/rest_client/patcher_spec.rb b/spec/datadog/tracing/contrib/rest_client/patcher_spec.rb index a4be79f67e4..df64f7272bb 100644 --- a/spec/datadog/tracing/contrib/rest_client/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/rest_client/patcher_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'restclient/request' RSpec.describe Datadog::Tracing::Contrib::RestClient::Patcher do diff --git a/spec/datadog/tracing/contrib/roda/instrumentation_spec.rb b/spec/datadog/tracing/contrib/roda/instrumentation_spec.rb index 2ba42fcacbf..84b1f81c9df 100644 --- a/spec/datadog/tracing/contrib/roda/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/roda/instrumentation_spec.rb @@ -2,7 +2,7 @@ require_relative './shared_examples' require 'roda' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/roda/instrumentation' require 'datadog/tracing/contrib/roda/ext' require 'datadog/tracing/contrib/support/spec_helper' diff --git a/spec/datadog/tracing/contrib/roda/patcher_spec.rb b/spec/datadog/tracing/contrib/roda/patcher_spec.rb index 527a3567fa7..7855577ca2c 100644 --- a/spec/datadog/tracing/contrib/roda/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/roda/patcher_spec.rb @@ -1,6 +1,6 @@ # typed: ignore -require 'ddtrace' +require 'datadog' require 'datadog/tracing/metadata/ext' require 'datadog/tracing/contrib/analytics_examples' require 'rack/test' diff --git a/spec/datadog/tracing/contrib/roda/shared_examples.rb b/spec/datadog/tracing/contrib/roda/shared_examples.rb index 0d6be4444d7..4c85a224f7c 100644 --- a/spec/datadog/tracing/contrib/roda/shared_examples.rb +++ b/spec/datadog/tracing/contrib/roda/shared_examples.rb @@ -1,7 +1,7 @@ # typed: ignore require 'roda' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/roda/instrumentation' require 'datadog/tracing/contrib/roda/ext' require 'datadog/tracing/contrib/analytics_examples' diff --git a/spec/datadog/tracing/contrib/semantic_logger/patcher_spec.rb b/spec/datadog/tracing/contrib/semantic_logger/patcher_spec.rb index 6054b50aa6a..16d938216d8 100644 --- a/spec/datadog/tracing/contrib/semantic_logger/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/semantic_logger/patcher_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'semantic_logger' require 'datadog/tracing/contrib/semantic_logger/patcher' diff --git a/spec/datadog/tracing/contrib/sequel/configuration_spec.rb b/spec/datadog/tracing/contrib/sequel/configuration_spec.rb index dc0b15fb8ae..f73e0b865b2 100644 --- a/spec/datadog/tracing/contrib/sequel/configuration_spec.rb +++ b/spec/datadog/tracing/contrib/sequel/configuration_spec.rb @@ -3,7 +3,7 @@ require 'time' require 'sequel' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/sequel/patcher' RSpec.describe 'Sequel configuration' do diff --git a/spec/datadog/tracing/contrib/sequel/instrumentation_spec.rb b/spec/datadog/tracing/contrib/sequel/instrumentation_spec.rb index 5f662377c0a..e3ab8fae81b 100644 --- a/spec/datadog/tracing/contrib/sequel/instrumentation_spec.rb +++ b/spec/datadog/tracing/contrib/sequel/instrumentation_spec.rb @@ -5,7 +5,7 @@ require 'time' require 'sequel' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/sequel/integration' RSpec.describe 'Sequel instrumentation' do diff --git a/spec/datadog/tracing/contrib/shoryuken/patcher_spec.rb b/spec/datadog/tracing/contrib/shoryuken/patcher_spec.rb index 2c874624a6f..4d45e267f61 100644 --- a/spec/datadog/tracing/contrib/shoryuken/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/shoryuken/patcher_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'shoryuken' RSpec.describe Datadog::Tracing::Contrib::Shoryuken::Patcher do diff --git a/spec/datadog/tracing/contrib/shoryuken/tracer_spec.rb b/spec/datadog/tracing/contrib/shoryuken/tracer_spec.rb index 16320e5dbd5..4dee0b2a3f8 100644 --- a/spec/datadog/tracing/contrib/shoryuken/tracer_spec.rb +++ b/spec/datadog/tracing/contrib/shoryuken/tracer_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'datadog/tracing/contrib/analytics_examples' -require 'ddtrace' +require 'datadog' require 'shoryuken' RSpec.describe Datadog::Tracing::Contrib::Shoryuken::Tracer do diff --git a/spec/datadog/tracing/contrib/sinatra/multi_app_spec.rb b/spec/datadog/tracing/contrib/sinatra/multi_app_spec.rb index 4b4b922cfaf..0007524bfcd 100644 --- a/spec/datadog/tracing/contrib/sinatra/multi_app_spec.rb +++ b/spec/datadog/tracing/contrib/sinatra/multi_app_spec.rb @@ -3,7 +3,7 @@ require 'sinatra/base' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/contrib/sinatra/tracer' RSpec.describe 'Sinatra instrumentation for multi-apps' do diff --git a/spec/datadog/tracing/contrib/sneakers/patcher_spec.rb b/spec/datadog/tracing/contrib/sneakers/patcher_spec.rb index c97dcf327db..b077e92e8c7 100644 --- a/spec/datadog/tracing/contrib/sneakers/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/sneakers/patcher_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'sneakers' RSpec.describe Datadog::Tracing::Contrib::Sneakers::Patcher do diff --git a/spec/datadog/tracing/contrib/sneakers/tracer_spec.rb b/spec/datadog/tracing/contrib/sneakers/tracer_spec.rb index bfeb7704a98..8798eb6a36b 100644 --- a/spec/datadog/tracing/contrib/sneakers/tracer_spec.rb +++ b/spec/datadog/tracing/contrib/sneakers/tracer_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'datadog/tracing/contrib/analytics_examples' -require 'ddtrace' +require 'datadog' require 'sneakers' class MiddlewareWorker diff --git a/spec/datadog/tracing/contrib/stripe/patcher_spec.rb b/spec/datadog/tracing/contrib/stripe/patcher_spec.rb index 94c976a701b..35aae76a486 100644 --- a/spec/datadog/tracing/contrib/stripe/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/stripe/patcher_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'stripe' require 'datadog/tracing/contrib/stripe/patcher' diff --git a/spec/datadog/tracing/contrib/stripe/request_spec.rb b/spec/datadog/tracing/contrib/stripe/request_spec.rb index 63395752aac..5159d07bde3 100644 --- a/spec/datadog/tracing/contrib/stripe/request_spec.rb +++ b/spec/datadog/tracing/contrib/stripe/request_spec.rb @@ -1,5 +1,5 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' require 'stripe' RSpec.describe Datadog::Tracing::Contrib::Stripe::Request do diff --git a/spec/datadog/tracing/contrib/sucker_punch/patcher_spec.rb b/spec/datadog/tracing/contrib/sucker_punch/patcher_spec.rb index a2643e12cc5..62bbc90c00c 100644 --- a/spec/datadog/tracing/contrib/sucker_punch/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/sucker_punch/patcher_spec.rb @@ -1,7 +1,7 @@ require 'datadog/tracing/contrib/support/spec_helper' require 'datadog/tracing/contrib/analytics_examples' require 'sucker_punch' -require 'ddtrace' +require 'datadog' RSpec.describe 'sucker_punch instrumentation' do before do diff --git a/spec/datadog/tracing/contrib/suite/integration_spec.rb b/spec/datadog/tracing/contrib/suite/integration_spec.rb index 4b88a7f2af6..5132840e157 100644 --- a/spec/datadog/tracing/contrib/suite/integration_spec.rb +++ b/spec/datadog/tracing/contrib/suite/integration_spec.rb @@ -1,6 +1,6 @@ require 'datadog/tracing/contrib/support/spec_helper' -require 'ddtrace' +require 'datadog' # For testing dynamic configuration require 'semantic_logger' diff --git a/spec/datadog/tracing/contrib/trilogy/patcher_spec.rb b/spec/datadog/tracing/contrib/trilogy/patcher_spec.rb index 07994ef603f..c7641f4b070 100644 --- a/spec/datadog/tracing/contrib/trilogy/patcher_spec.rb +++ b/spec/datadog/tracing/contrib/trilogy/patcher_spec.rb @@ -7,7 +7,7 @@ require 'datadog/tracing/contrib/span_attribute_schema_examples' require 'datadog/tracing/contrib/peer_service_configuration_examples' -require 'ddtrace' +require 'datadog' require 'trilogy' RSpec.describe 'Trlogy::Client patcher' do diff --git a/spec/datadog/tracing/contrib_spec.rb b/spec/datadog/tracing/contrib_spec.rb index f6a99638b42..ec3f8f37ca3 100644 --- a/spec/datadog/tracing/contrib_spec.rb +++ b/spec/datadog/tracing/contrib_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' RSpec.describe Datadog::Tracing::Contrib do - root = Gem::Specification.find_by_name('ddtrace').gem_dir + root = Gem::Specification.find_by_name('datadog').gem_dir # Our module names are camelized directory name with some exceptions mapping = { diff --git a/spec/datadog/tracing/diagnostics/health_spec.rb b/spec/datadog/tracing/diagnostics/health_spec.rb index 3d4fd133bf8..cf7949145c7 100644 --- a/spec/datadog/tracing/diagnostics/health_spec.rb +++ b/spec/datadog/tracing/diagnostics/health_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -require 'ddtrace' +require 'datadog' require 'datadog/core/diagnostics/health' require 'datadog/tracing/diagnostics/health' diff --git a/spec/datadog/tracing/integration_spec.rb b/spec/datadog/tracing/integration_spec.rb index 44e35aba5bd..4aa9cd4fe66 100644 --- a/spec/datadog/tracing/integration_spec.rb +++ b/spec/datadog/tracing/integration_spec.rb @@ -143,7 +143,7 @@ def agent_receives_span_step3(previous_success) context 'using unix transport' do before do - skip('ddtrace only supports unix socket connectivity on Linux') unless PlatformHelpers.linux? + skip('datadog only supports unix socket connectivity on Linux') unless PlatformHelpers.linux? # DEV: To connect to a unix socket in another docker container (the agent container in our case) # we need to share a volume with that container. Our current CircleCI setup uses `docker` executors diff --git a/spec/datadog/tracing/transport/http/adapters/net_integration_spec.rb b/spec/datadog/tracing/transport/http/adapters/net_integration_spec.rb index efa3faa68e1..2c70b30cac8 100644 --- a/spec/datadog/tracing/transport/http/adapters/net_integration_spec.rb +++ b/spec/datadog/tracing/transport/http/adapters/net_integration_spec.rb @@ -84,7 +84,7 @@ 'datadog-meta-lang' => [Datadog::Core::Environment::Ext::LANG], 'datadog-meta-lang-version' => [Datadog::Core::Environment::Ext::LANG_VERSION], 'datadog-meta-lang-interpreter' => [Datadog::Core::Environment::Ext::LANG_INTERPRETER], - 'datadog-meta-tracer-version' => [Datadog::Core::Environment::Ext::TRACER_VERSION], + 'datadog-meta-tracer-version' => [Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION], 'content-type' => ['application/msgpack'], 'x-datadog-trace-count' => [traces.length.to_s] ) diff --git a/spec/datadog/tracing/transport/http/adapters/unix_socket_integration_spec.rb b/spec/datadog/tracing/transport/http/adapters/unix_socket_integration_spec.rb index b6d434a889e..4e3230cc31a 100644 --- a/spec/datadog/tracing/transport/http/adapters/unix_socket_integration_spec.rb +++ b/spec/datadog/tracing/transport/http/adapters/unix_socket_integration_spec.rb @@ -11,7 +11,7 @@ subject(:adapter) { Datadog::Core::Transport::HTTP::Adapters::UnixSocket.new(**options) } - let(:uds_path) { '/tmp/ddtrace_unix_test.sock' } + let(:uds_path) { '/tmp/datadog_unix_test.sock' } let(:options) { { uds_path: uds_path, timeout: timeout } } let(:timeout) { 2 } @@ -95,7 +95,7 @@ def cleanup_socket 'datadog-meta-lang' => [Datadog::Core::Environment::Ext::LANG], 'datadog-meta-lang-version' => [Datadog::Core::Environment::Ext::LANG_VERSION], 'datadog-meta-lang-interpreter' => [Datadog::Core::Environment::Ext::LANG_INTERPRETER], - 'datadog-meta-tracer-version' => [Datadog::Core::Environment::Ext::TRACER_VERSION], + 'datadog-meta-tracer-version' => [Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION], 'content-type' => ['application/msgpack'], 'x-datadog-trace-count' => [traces.length.to_s] ) diff --git a/spec/datadog/tracing/transport/http/benchmark_spec.rb b/spec/datadog/tracing/transport/http/benchmark_spec.rb index 26590023d2e..ef1258ef7f3 100644 --- a/spec/datadog/tracing/transport/http/benchmark_spec.rb +++ b/spec/datadog/tracing/transport/http/benchmark_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' require 'benchmark' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/transport/http' RSpec.describe 'Transport::HTTP benchmarks' do diff --git a/spec/datadog/tracing/transport/http/client_spec.rb b/spec/datadog/tracing/transport/http/client_spec.rb index 69decdcad23..d45a6e3231a 100644 --- a/spec/datadog/tracing/transport/http/client_spec.rb +++ b/spec/datadog/tracing/transport/http/client_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/transport/http/client' RSpec.describe Datadog::Tracing::Transport::HTTP::Client do diff --git a/spec/datadog/tracing/transport/http_spec.rb b/spec/datadog/tracing/transport/http_spec.rb index feae6028d76..830f9d372f1 100644 --- a/spec/datadog/tracing/transport/http_spec.rb +++ b/spec/datadog/tracing/transport/http_spec.rb @@ -160,7 +160,8 @@ Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER => Datadog::Core::Environment::Ext::LANG_INTERPRETER, 'Datadog-Meta-Lang-Interpreter-Vendor' => RUBY_ENGINE, - Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION => Datadog::Core::Environment::Ext::TRACER_VERSION + Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION => + Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION ) end diff --git a/spec/datadog/tracing/transport/statistics_spec.rb b/spec/datadog/tracing/transport/statistics_spec.rb index e20ade7fdc4..adfae88bc82 100644 --- a/spec/datadog/tracing/transport/statistics_spec.rb +++ b/spec/datadog/tracing/transport/statistics_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/transport/statistics' RSpec.describe Datadog::Tracing::Transport::Statistics do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index bc994bcfb91..8add7625230 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -162,14 +162,14 @@ end unless background_threads.empty? - # TODO: Temporarily disabled for `spec/ddtrace/workers` + # TODO: Temporarily disabled for `spec/datadog/tracing/workers` # was meaningful changes are required to address clean # teardown in those tests. # They currently flood the output, making our test # suite output unreadable. if example.file_path.start_with?( './spec/datadog/core/workers/', - './spec/ddtrace/workers/' + './spec/datadog/tracing/workers/' ) puts # Add newline so we get better output when the progress formatter is being used RSpec.warning("FIXME: #{example.file_path}:#{example.metadata[:line_number]} is leaking threads") diff --git a/spec/support/health_metric_helpers.rb b/spec/support/health_metric_helpers.rb index 39059bf9a88..1ef507195ae 100644 --- a/spec/support/health_metric_helpers.rb +++ b/spec/support/health_metric_helpers.rb @@ -1,5 +1,5 @@ require 'support/metric_helpers' -require 'ddtrace' +require 'datadog' require 'datadog/tracing/diagnostics/ext' module HealthMetricHelpers diff --git a/spec/support/synchronization_helpers.rb b/spec/support/synchronization_helpers.rb index ef0390a9eed..0a1d52f7cad 100644 --- a/spec/support/synchronization_helpers.rb +++ b/spec/support/synchronization_helpers.rb @@ -6,8 +6,8 @@ def expect_in_fork(fork_expectations: nil, timeout_seconds: 10) expect(status && status.success?).to be(true), "STDOUT:`#{stdout}` STDERR:`#{stderr}" } - fork_stdout = Tempfile.new('ddtrace-rspec-expect-in-fork-stdout') - fork_stderr = Tempfile.new('ddtrace-rspec-expect-in-fork-stderr') + fork_stdout = Tempfile.new('datadog-rspec-expect-in-fork-stdout') + fork_stderr = Tempfile.new('datadog-rspec-expect-in-fork-stderr') begin # Start in fork pid = fork do diff --git a/tasks/release_gem.rake b/tasks/release_gem.rake index ce10ff5ad77..2958a5757c7 100644 --- a/tasks/release_gem.rake +++ b/tasks/release_gem.rake @@ -3,7 +3,7 @@ Rake::Task["build"].enhance(["build:pre_check"]) desc 'Checks executed before gem is built' task :'build:pre_check' do require 'rspec' - ret = RSpec::Core::Runner.run(['spec/ddtrace/release_gem_spec.rb']) + ret = RSpec::Core::Runner.run(['spec/datadog/release_gem_spec.rb']) raise "Release tests failed! See error output above." if ret != 0 end diff --git a/tasks/upstream_test.rake b/tasks/upstream_test.rake index f968bc76afa..84b0998cfc3 100644 --- a/tasks/upstream_test.rake +++ b/tasks/upstream_test.rake @@ -1,8 +1,8 @@ -DDTRACE_PATH = File.expand_path('..', __dir__) -TMP_DIR = File.join(DDTRACE_PATH, 'tmp') +DATADOG_PATH = File.expand_path('..', __dir__) +TMP_DIR = File.join(DATADOG_PATH, 'tmp') BASE_CLONE_DIR = "#{TMP_DIR}/upstream/" -desc "Run instrumented gems' original test suites with ddtrace enabled" +desc "Run instrumented gems' original test suites with datadog enabled" namespace :upstream do # Executes block in the context of a GitHub repository def with_repository(user, repository, commit, setup = nil) @@ -30,10 +30,10 @@ namespace :upstream do end end - # Install this `ddtrace` repository into the cloned project. - def add_ddtrace_to_gemfile(path) + # Install this `datadog` repository into the cloned project. + def add_datadog_to_gemfile(path) File.write(path, <<-GEMFILE, mode: 'a+') - gem 'ddtrace', path: '#{Pathname.new(DDTRACE_PATH).relative_path_from(Dir.pwd).to_s}' + gem 'datadog', path: '#{Pathname.new(DATADOG_PATH).relative_path_from(Dir.pwd).to_s}' GEMFILE end @@ -47,10 +47,10 @@ namespace :upstream do # One-time setup setup = ->() do Dir.chdir('api') do - add_ddtrace_to_gemfile('Gemfile') + add_datadog_to_gemfile('Gemfile') File.write('test/test_helper.rb', <<-RUBY, mode: 'a+') - require 'ddtrace' + require 'datadog' require 'datadog/opentelemetry' RUBY @@ -58,10 +58,10 @@ namespace :upstream do end Dir.chdir('sdk') do - add_ddtrace_to_gemfile('Gemfile') + add_datadog_to_gemfile('Gemfile') File.write('test/test_helper.rb', <<-RUBY, mode: 'a+') - require 'ddtrace' + require 'datadog' require 'datadog/opentelemetry' RUBY @@ -74,10 +74,10 @@ namespace :upstream do skipped_tests.empty? ? '' : "-e='/(#{skipped_tests})/'" end - desc "Run opentelemetry-api tests with ddtrace enabled" + desc "Run opentelemetry-api tests with datadog enabled" task :api do skipped_tests = [ - 'finishes the new span at the end of the block', # Mocked OTel Span errors when ddtrace invokes required methods + 'finishes the new span at the end of the block', # Mocked OTel Span errors when datadog invokes required methods ] with_repository('open-telemetry', 'opentelemetry-ruby', OTEL_GIT_COMMIT, setup) do Dir.chdir('api') do @@ -88,7 +88,7 @@ namespace :upstream do end end - desc "Run opentelemetry-sdk tests with ddtrace enabled" + desc "Run opentelemetry-sdk tests with datadog enabled" task :sdk do skipped_tests = [ 'defaults to trace context and baggage', # The defaults are now Datadog-specific defaults diff --git a/yard/extensions.rb b/yard/extensions.rb index 348b50dba8f..516239d9305 100644 --- a/yard/extensions.rb +++ b/yard/extensions.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -TOP_LEVEL_MODULE_FILE = 'lib/ddtrace.rb' +TOP_LEVEL_MODULE_FILE = 'lib/datadog.rb' # The top-level `Datadog` module gets its docstring overwritten by # on almost every file in the repo, due to comments at the top of the file # (e.g. '# typed: true' or from vendor files 'Copyright (c) 2001-2010 Not Datadog.') # -# This module ensures that only the comment provided by 'lib/ddtrace.rb' +# This module ensures that only the comment provided by 'lib/datadog.rb' # is used as documentation for the top-level `Datadog` module. # # For non-top-level documentation, this can be solved by removing duplicate module/class