Merge branch 'main' into que

open-telemetry · Jan 24, 2025 · c08fdd1 · c08fdd1
2 parents abbad6d + f12b0d7
commit c08fdd1
Show file tree

Hide file tree

Showing 252 changed files with 1,071 additions and 879 deletions.
diff --git a/.github/actions/test_gem/action.yml b/.github/actions/test_gem/action.yml
@@ -66,7 +66,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.207.0
+      uses: ruby/setup-ruby@v1.213.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -77,7 +77,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.207.0
+      uses: ruby/setup-ruby@v1.213.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         bundler:  "latest"

diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml
@@ -44,12 +44,6 @@ jobs:
         with:
           gem: "opentelemetry-helpers-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem: "opentelemetry-helpers-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -89,12 +83,6 @@ jobs:
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem: "opentelemetry-propagator-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -134,15 +122,9 @@ jobs:
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem: "opentelemetry-${{ matrix.gem }}"
           yard: true
           rubocop: true
           build: true
-          ruby: "3.0"
       - name: "Test JRuby"
         if: "${{ matrix.os == 'ubuntu-latest' }}"
         uses: ./.github/actions/test_gem
@@ -177,12 +159,6 @@ jobs:
         with:
           gem:  "opentelemetry-processor-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-processor-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true

diff --git a/.github/workflows/ci-instrumentation-with-services.yml b/.github/workflows/ci-instrumentation-with-services.yml
@@ -44,11 +44,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -95,11 +90,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -137,11 +127,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -195,11 +180,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -244,11 +224,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -290,11 +265,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true

diff --git a/.github/workflows/ci-instrumentation.yml b/.github/workflows/ci-instrumentation.yml
@@ -39,6 +39,7 @@ jobs:
           - faraday
           - grape
           - graphql
+          - grpc
           - gruf
           - http
           - http_client
@@ -73,12 +74,6 @@ jobs:
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
           ruby: "3.1"
-      - name: "Test Ruby 3.0"
-        if: "${{ matrix.os == 'ubuntu-latest' }}"
-        uses: ./.github/actions/test_gem
-        with:
-          gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "3.0"
           yard: true
           rubocop: true
           build: true
@@ -102,6 +97,7 @@ jobs:
           [[ "${{ matrix.gem }}" == "lmdb"                     ]] && echo "skip=true" >> $GITHUB_OUTPUT
           [[ "${{ matrix.gem }}" == "rack"                     ]] && echo "skip=true" >> $GITHUB_OUTPUT
           [[ "${{ matrix.gem }}" == "rails"                    ]] && echo "skip=true" >> $GITHUB_OUTPUT
+          [[ "${{ matrix.gem }}" == "grpc"                     ]] && echo "skip=true" >> $GITHUB_OUTPUT
           [[ "${{ matrix.gem }}" == "gruf"                     ]] && echo "skip=true" >> $GITHUB_OUTPUT
           # This is essentially a bash script getting evaluated, so we need to return true or the whole job fails.
           true

diff --git a/.github/workflows/installation-tests.yml b/.github/workflows/installation-tests.yml
@@ -15,17 +15,17 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
+          - 3.4
           - 3.3
           - 3.2
           - 3.1
-          - 3.0
     name: ${{ matrix.ruby-version }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         # ATTENTION: Dependabot does not know how to update shared actions file.
         # If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
-      - uses: ruby/setup-ruby@v1.207.0
+      - uses: ruby/setup-ruby@v1.213.0
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml
@@ -8,11 +8,11 @@ jobs:
   release-process-request:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.207.0
+        uses: ruby/setup-ruby@v1.213.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml
@@ -9,11 +9,11 @@ jobs:
   release-update-open-requests:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.207.0
+        uses: ruby/setup-ruby@v1.213.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml
@@ -18,11 +18,11 @@ jobs:
   release-perform:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.207.0
+        uses: ruby/setup-ruby@v1.213.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
@@ -50,9 +50,9 @@ jobs:
           chmod 0600 $HOME/.gem/credentials
           printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
 
-      - uses: ruby/setup-ruby@v1.207.0
+      - uses: ruby/setup-ruby@v1.213.0
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.1"
           bundler: latest
           bundler-cache: false
           working-directory: ${{ matrix.path }}

diff --git a/.github/workflows/release-request-weekly.yml b/.github/workflows/release-request-weekly.yml
@@ -8,11 +8,11 @@ jobs:
   release-request:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.207.0
+        uses: ruby/setup-ruby@v1.213.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml
@@ -12,11 +12,11 @@ jobs:
   release-request:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.207.0
+        uses: ruby/setup-ruby@v1.213.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml
@@ -15,11 +15,11 @@ jobs:
   release-retry:
     if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     env:
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.207.0
+        uses: ruby/setup-ruby@v1.213.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.instrumentation_generator/instrumentation_generator.rb b/.instrumentation_generator/instrumentation_generator.rb
@@ -61,7 +61,7 @@ def add_to_instrumentation_all
     insert_into_file("#{instrumentation_all_path}/Gemfile", gemfile_text, after: "gemspec\n")
 
     gemspec_text = "\n  spec.add_dependency '#{instrumentation_gem_name}', '~> 0.0.0'"
-    insert_into_file("#{instrumentation_all_path}/opentelemetry-instrumentation-all.gemspec", gemspec_text, after: "spec.required_ruby_version = '>= 3.0'\n")
+    insert_into_file("#{instrumentation_all_path}/opentelemetry-instrumentation-all.gemspec", gemspec_text, after: "spec.required_ruby_version = '>= 3.1'\n")
 
     all_rb_text = "\nrequire '#{instrumentation_gem_name}'"
     insert_into_file("#{instrumentation_all_path}/lib/opentelemetry/instrumentation/all.rb", all_rb_text, after: "# SPDX-License-Identifier: Apache-2.0\n")

diff --git a/.instrumentation_generator/templates/Appraisals b/.instrumentation_generator/templates/Appraisals
@@ -13,4 +13,3 @@
 # appraise 'rack-2.0' do
 #   gem 'rack', '2.0.8'
 # end
-
diff --git a/.instrumentation_generator/templates/gemspec.tt b/.instrumentation_generator/templates/gemspec.tt
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
                Dir.glob('*.md') +
                ['LICENSE', '.yardopts']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'opentelemetry-api', '~> <%= opentelemetry_version %>'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> <%= instrumentation_base_version %>'
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.69.1'
+  spec.add_development_dependency 'rubocop', '~> 1.70.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.19.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'webmock', '~> 3.24.0'

diff --git a/.instrumentation_generator/templates/lib/entrypoint.rb b/.instrumentation_generator/templates/lib/entrypoint.rb
@@ -4,4 +4,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require_relative './opentelemetry/instrumentation'
+require_relative 'opentelemetry/instrumentation'
diff --git a/.instrumentation_generator/templates/lib/instrumentation.rb.tt b/.instrumentation_generator/templates/lib/instrumentation.rb.tt
@@ -16,4 +16,4 @@ module OpenTelemetry
   end
 end
 
-require_relative './instrumentation/<%= instrumentation_name %>'
+require_relative 'instrumentation/<%= instrumentation_name %>'
diff --git a/.instrumentation_generator/templates/lib/instrumentation/instrumentation_name.rb.tt b/.instrumentation_generator/templates/lib/instrumentation/instrumentation_name.rb.tt
@@ -15,5 +15,5 @@ module OpenTelemetry
   end
 end
 
-require_relative './<%= instrumentation_name %>/instrumentation'
-require_relative './<%= instrumentation_name %>/version'
+require_relative '<%= instrumentation_name %>/instrumentation'
+require_relative '<%= instrumentation_name %>/version'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,3 @@
		# appraise 'rack-2.0' do
		# gem 'rack', '2.0.8'
		# end
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ module OpenTelemetry @@
       end
     end
-    require_relative './instrumentation/<%= instrumentation_name %>'
+    require_relative 'instrumentation/<%= instrumentation_name %>'