Merge branch 'main' into auto-instrumentation

Author: xuan-cao-swi

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,8 +26,8 @@ what happened and what you expected with a link to the relevant portion of the s
 
 Operating system details: Linux, Ubuntu 20.04 LTS
 RUBY_ENGINE: "ruby"
-RUBY_VERSION: "3.1.1"
-RUBY_DESCRIPTION: "ruby 3.1.1p18 (2022-02-18 revision 53f5fc4236) [arm64-darwin21]"
+RUBY_VERSION: "3.4"
+RUBY_DESCRIPTION: "ruby 3.4.1 (2024-12-25 revision 48d4efcb85) arm64-darwin21]"
 
 **Share a simplified reproduction if possible**
 
@@ -76,4 +76,4 @@ end
 OpenTelemetry.tracer_provider.shutdown
 ```
 
-<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
+<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [in our end user docs](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/actions/test_gem/action.yml

@@ -84,7 +84,7 @@ runs:
     # ...but not for appraisals, sadly.
     - name: Install Ruby ${{ inputs.ruby }} with dependencies
       if: "${{ steps.setup.outputs.appraisals == 'false' }}"
-      uses: ruby/setup-ruby@v1.254.0
+      uses: ruby/setup-ruby@v1.258.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -95,7 +95,7 @@ runs:
     # If we're using appraisals, do it all manually.
     - name: Install Ruby ${{ inputs.ruby }} without dependencies
       if: "${{ steps.setup.outputs.appraisals == 'true' }}"
-      uses: ruby/setup-ruby@v1.254.0
+      uses: ruby/setup-ruby@v1.258.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         bundler:  "latest"

.github/dependabot.yml

@@ -5,11 +5,25 @@ updates:
     directory: "/"
     schedule:
       interval: daily
+  # Update all dependencies - processes from root to handle path dependencies correctly
   - package-ecosystem: bundler
     directory: "/"
     schedule:
       interval: weekly
+    ignore:
+      # Ignore internal instrumentation interdependencies managed via local paths in Gemfiles
+      - dependency-name: "opentelemetry-instrumentation-*"
+      - dependency-name: "opentelemetry-helpers-*"
+      - dependency-name: "opentelemetry-processor-*"
+      - dependency-name: "opentelemetry-propagator-*"
+      - dependency-name: "opentelemetry-sampler-*"
+      - dependency-name: "opentelemetry-resource-detector-*"
     groups:
-      all-gems:
+      production-dependencies:
+        dependency-type: "production"
         patterns:
-          - "**/Gemfile"
+          - "*"
+      development-dependencies:
+        dependency-type: "development"
+        patterns:
+          - "*"

.github/workflows/check-spelling.yml

@@ -11,7 +11,7 @@ jobs:
     name: SPELLING check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: streetsidesoftware/cspell-action@v7
         with:
           # Files should be consistent with check:spelling files

.github/workflows/ci-contrib.yml

@@ -27,12 +27,13 @@ jobs:
           - sql
           - mysql
           - sql-obfuscation
+          - sql-processor
         os:
           - ubuntu-latest
     name: "helpers-${{ matrix.gem }} / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
@@ -48,11 +49,6 @@ jobs:
         with:
           gem: "opentelemetry-helpers-${{ matrix.gem }}"
           ruby: "3.2"
-      - name: "Test Ruby 3.1"
-        uses: ./.github/actions/test_gem
-        with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
-          ruby: "3.1"
           yard: true
           rubocop: true
           coverage: true
@@ -62,7 +58,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-helpers-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
 
   propagators:
     strategy:
@@ -78,7 +74,7 @@ jobs:
     name: "propagator-${{ matrix.gem }} / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
@@ -94,11 +90,6 @@ jobs:
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
           ruby: "3.2"
-      - name: "Test Ruby 3.1"
-        uses: ./.github/actions/test_gem
-        with:
-          gem: "opentelemetry-propagator-${{ matrix.gem }}"
-          ruby: "3.1"
           yard: true
           rubocop: true
           build: true
@@ -107,7 +98,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
 
   resource-detectors:
     strategy:
@@ -123,7 +114,7 @@ jobs:
     name: "opentelemetry-${{ matrix.gem }} / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
@@ -139,11 +130,6 @@ jobs:
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
           ruby: "3.2"
-      - name: "Test Ruby 3.1"
-        uses: ./.github/actions/test_gem
-        with:
-          gem: "opentelemetry-${{ matrix.gem }}"
-          ruby: "3.1"
           yard: true
           rubocop: true
           coverage: true
@@ -153,7 +139,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
 
   processors:
     strategy:
@@ -166,7 +152,7 @@ jobs:
     name: "processors-${{ matrix.gem }} / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
@@ -182,11 +168,6 @@ jobs:
         with:
           gem: "opentelemetry-processor-${{ matrix.gem }}"
           ruby: "3.2"
-      - name: "Test Ruby 3.1"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-processor-${{ matrix.gem }}"
-          ruby: "3.1"
           yard: true
           rubocop: true
           coverage: true
@@ -196,7 +177,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-processor-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
+          ruby: "jruby-10.0.2.0"
 
   samplers:
     strategy:
@@ -209,7 +190,7 @@ jobs:
     name: "samplers-${{ matrix.gem }} / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: "Test Ruby 3.4"
         uses: ./.github/actions/test_gem
         with:
@@ -225,11 +206,6 @@ jobs:
         with:
           gem: "opentelemetry-sampler-${{ matrix.gem }}"
           ruby: "3.2"
-      - name: "Test Ruby 3.1"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-sampler-${{ matrix.gem }}"
-          ruby: "3.1"
           yard: true
           rubocop: true
           coverage: true
@@ -239,70 +215,4 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-sampler-${{ matrix.gem }}"
-          ruby: "jruby-9.4.12.0"
-
-  auto-instrumentation:
-    name: "auto-instrumentation / ubuntu-latest"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Test Ruby 3.4"
-        uses: ruby/[email protected]
-        with:
-          ruby-version: "3.4"
-      - name: Test Gem
-        shell: bash
-        run: |
-          bundle install --quiet --jobs=3 --retry=4
-          bundle exec rake test
-          rm -f Gemfile.lock
-        working-directory: './opentelemetry-auto-instrumentation'
-      - name: "Test Ruby 3.3"
-        uses: ruby/[email protected]
-        with:
-          ruby-version: "3.3"
-      - name: Test Gem
-        shell: bash
-        run: |
-          bundle install --quiet --jobs=3 --retry=4
-          bundle exec rake test
-          rm -f Gemfile.lock
-        working-directory: './opentelemetry-auto-instrumentation'
-      - name: "Test Ruby 3.2"
-        uses: ruby/[email protected]
-        with:
-          ruby-version: "3.2"
-      - name: Test Gem
-        shell: bash
-        run: |
-          bundle install --quiet --jobs=3 --retry=4
-          bundle exec rake test
-          rm -f Gemfile.lock
-        working-directory: './opentelemetry-auto-instrumentation'
-
-      - name: YARD
-        shell: bash
-        run: |
-          # 📄 Yard Docs 📄
-          bundle exec rake yard
-        working-directory: './opentelemetry-auto-instrumentation'
-
-      - name: Rubocop
-        shell: bash
-        run: |
-          # 🤖 Rubocop 🤖
-          bundle exec rake rubocop
-        working-directory: './opentelemetry-auto-instrumentation'
-
-      - name: Coverage
-        shell: bash
-        run: |
-          bundle exec ruby -e 'require "simplecov"; SimpleCov.minimum_coverage(85)'
-        working-directory: './opentelemetry-auto-instrumentation'
-
-      - name: Build Gem
-        shell: bash
-        run: |
-          # 📦 Build Gem 📦
-          gem build opentelemetry-auto-instrumentation.gemspec
-        working-directory: './opentelemetry-auto-instrumentation'
+          ruby: "jruby-10.0.2.0"