Merge branch 'main' into xray-sampler-pr0

kaylareopelle · web-flow · commit 2657c0774f8b · 2025-04-21T10:18:55.000-07:00
diff --git a/.github/actions/test_gem/action.yml b/.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.229.0
+      uses: ruby/setup-ruby@v1.231.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.229.0
+      uses: ruby/setup-ruby@v1.231.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         bundler:  "latest"
diff --git a/.github/workflows/installation-tests.yml b/.github/workflows/installation-tests.yml
@@ -25,7 +25,7 @@ jobs:
       - 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.229.0
+      - uses: ruby/setup-ruby@v1.231.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
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.229.0
+        uses: ruby/setup-ruby@v1.231.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
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.229.0
+        uses: ruby/setup-ruby@v1.231.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo
diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.229.0
+        uses: ruby/setup-ruby@v1.231.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,7 +50,7 @@ jobs:
           chmod 0600 $HOME/.gem/credentials
           printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
 
-      - uses: ruby/setup-ruby@v1.229.0
+      - uses: ruby/setup-ruby@v1.231.0
         with:
           ruby-version: "3.1"
           bundler: latest
diff --git a/.github/workflows/release-request-weekly.yml b/.github/workflows/release-request-weekly.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.229.0
+        uses: ruby/setup-ruby@v1.231.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo
diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.229.0
+        uses: ruby/setup-ruby@v1.231.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo
diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.229.0
+        uses: ruby/setup-ruby@v1.231.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo
diff --git a/helpers/sql/CHANGELOG.md b/helpers/sql/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-helpers-sql
 
+### v0.1.1 / 2025-04-14
+
+* (No significant changes)
+
 ### v0.1.0 / 2025-01-24
 
 Initial release.
diff --git a/helpers/sql/lib/opentelemetry/helpers/sql/version.rb b/helpers/sql/lib/opentelemetry/helpers/sql/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module Sql
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end
diff --git a/instrumentation/all/CHANGELOG.md b/instrumentation/all/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Release History: opentelemetry-instrumentation-all
 
+### v0.75.1 / 2025-04-16
+
+* (No significant changes)
+
+### v0.75.0 / 2025-04-15
+
+* ADDED: Add `opentelemetry-instrumentation-grpc` to `-all`
+* ADDED: Support meta protocol instrumentation for Dalli
+
 ### v0.74.0 / 2025-02-11
 
 * ADDED: Rdkafka support to v0.19 including
diff --git a/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb b/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module All
-      VERSION = '0.74.0'
+      VERSION = '0.75.1'
     end
   end
 end
diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-aws_sdk', '~> 0.8.0'
   spec.add_dependency 'opentelemetry-instrumentation-bunny', '~> 0.22.0'
   spec.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.22.0'
-  spec.add_dependency 'opentelemetry-instrumentation-dalli', '~> 0.26.0'
+  spec.add_dependency 'opentelemetry-instrumentation-dalli', '~> 0.27.0'
   spec.add_dependency 'opentelemetry-instrumentation-delayed_job', '~> 0.23.0'
   spec.add_dependency 'opentelemetry-instrumentation-ethon', '~> 0.22.0'
   spec.add_dependency 'opentelemetry-instrumentation-excon', '~> 0.23.0'
diff --git a/instrumentation/dalli/CHANGELOG.md b/instrumentation/dalli/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-dalli
 
+### v0.27.1 / 2025-04-21
+
+* FIXED: Only prepend Dalli patch if binary protocol defined
+
+### v0.27.0 / 2025-04-15
+
+* ADDED: Support meta protocol instrumentation
+
 ### v0.26.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1
diff --git a/instrumentation/dalli/lib/opentelemetry/instrumentation/dalli/instrumentation.rb b/instrumentation/dalli/lib/opentelemetry/instrumentation/dalli/instrumentation.rb
@@ -33,7 +33,8 @@ def add_patches
           if Gem::Version.new(::Dalli::VERSION) < Gem::Version.new('3.0.0')
             ::Dalli::Server.prepend(Patches::Server)
           else
-            ::Dalli::Protocol::Binary.prepend(Patches::Server)
+            ::Dalli::Protocol::Binary.prepend(Patches::Server) if defined?(::Dalli::Protocol::Binary)
+            ::Dalli::Protocol::Meta.prepend(Patches::Server) if defined?(::Dalli::Protocol::Meta)
           end
         end
       end
diff --git a/instrumentation/dalli/lib/opentelemetry/instrumentation/dalli/patches/server.rb b/instrumentation/dalli/lib/opentelemetry/instrumentation/dalli/patches/server.rb
@@ -8,7 +8,7 @@ module OpenTelemetry
   module Instrumentation
     module Dalli
       module Patches
-        # Module to prepend to Dalli::Server (or Dalli::Protocol::Binary in 3.0+) for instrumentation
+        # Module to prepend to Dalli::Server (or Dalli::Protocol::Binary/Meta in 3.0+) for instrumentation
         module Server
           def request(op, *args) # rubocop:disable Naming/MethodParameterName
             operation = Utils.opname(op, multi?)
diff --git a/instrumentation/dalli/lib/opentelemetry/instrumentation/dalli/version.rb b/instrumentation/dalli/lib/opentelemetry/instrumentation/dalli/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Dalli
-      VERSION = '0.26.0'
+      VERSION = '0.27.1'
     end
   end
 end
diff --git a/instrumentation/dalli/test/opentelemetry/instrumentation/dalli/instrumentation_test.rb b/instrumentation/dalli/test/opentelemetry/instrumentation/dalli/instrumentation_test.rb
diff --git a/instrumentation/grpc/CHANGELOG.md b/instrumentation/grpc/CHANGELOG.md
diff --git a/instrumentation/grpc/lib/opentelemetry/instrumentation/grpc/version.rb b/instrumentation/grpc/lib/opentelemetry/instrumentation/grpc/version.rb
diff --git a/instrumentation/mysql2/CHANGELOG.md b/instrumentation/mysql2/CHANGELOG.md
diff --git a/instrumentation/mysql2/lib/opentelemetry/instrumentation/mysql2/version.rb b/instrumentation/mysql2/lib/opentelemetry/instrumentation/mysql2/version.rb
diff --git a/instrumentation/pg/CHANGELOG.md b/instrumentation/pg/CHANGELOG.md
diff --git a/instrumentation/pg/lib/opentelemetry/instrumentation/pg/version.rb b/instrumentation/pg/lib/opentelemetry/instrumentation/pg/version.rb
diff --git a/instrumentation/trilogy/CHANGELOG.md b/instrumentation/trilogy/CHANGELOG.md
diff --git a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb
