Merge pull request #3490 from DataDog/delner/rename_to_datadog

Rename library to datadog

.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" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
-                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-
-                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}
           - *check_exact_bundle_cache_hit
           - *step_bundle_install
           - when:
@@ -278,7 +278,7 @@ orbs:
               paths:
                 - /app
           - save_cache:
-              key: bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
+              key: bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
               paths:
                 - /usr/local/bundle
       build_and_test_integration:
@@ -329,7 +329,7 @@ orbs:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
           - restore_cache:
               keys:
-                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
           - run:
               name: Set coverage report directory
               command: |
@@ -372,7 +372,7 @@ orbs:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
           - restore_cache:
               keys:
-                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
           - *step_rubocop
       coverage:
         <<: *test_job_default
@@ -382,7 +382,7 @@ orbs:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
           - restore_cache:
               keys:
-                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
           - attach_workspace:
               at: /tmp/workspace
           - run:
@@ -404,7 +404,7 @@ orbs:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
           - restore_cache:
               keys:
-                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
           - attach_workspace:
               at: /tmp/workspace
           - run:

.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?**
-<!-- Optionally, tell us why and how you're using ddtrace, and what your overall experience with it is! -->
+**How does `datadog` help you?**
+<!-- Optionally, tell us why and how you're using datadog, and what your overall experience with it is! -->
 
 **Environment**
 
-* **ddtrace version:**
+* **datadog version:**
 * **Configuration block (`Datadog.configure ...`):**
 * **Ruby version:**
 * **Operating system:**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -19,5 +19,5 @@ assignees: ''
 **Additional context**
 <!-- Add any other context or screenshots about the feature request here. -->
 
-**How does `ddtrace` help you?**
-<!-- Optionally, tell us why and how you're using ddtrace, and what your overall experience with it is! -->
+**How does `datadog` help you?**
+<!-- Optionally, tell us why and how you're using datadog, and what your overall experience with it is! -->

.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}' ]

.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: |

.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~<DD_TRACE_SHA_TO_BE_REPLACED>~${{github.sha}}~g" lib-injection/auto_inject.rb
-          sed -i "s~<DD_TRACE_VERSION_TO_BE_REPLACED>~~g" lib-injection/auto_inject.rb
+          sed -i "s~<DATADOG_GEM_SHA_TO_BE_REPLACED>~${{github.sha}}~g" lib-injection/auto_inject.rb
+          sed -i "s~<DATADOG_GEM_VERSION_TO_BE_REPLACED>~~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}}

.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
 

.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:

.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

.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 }}

.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 }}

.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/**

.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

.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

.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."

.gitlab/install_ddtrace_deps.rb → .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} "

.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'

.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
 

.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:

.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

.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