Merge branch 'main' into dependabot/bundler/helpers/sql-obfuscation/r…

…ubocop-performance-tw-1.21.0
open-telemetry · Apr 2, 2024 · 7d08844 · 7d08844
2 parents 0091f74 + addc2f3
commit 7d08844
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/conventional-commits.yaml b/.github/workflows/conventional-commits.yaml
@@ -22,7 +22,7 @@ jobs:
     name: Conventional Commits Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: dev-build-deploy/commit-me@v1.3.1
+      - uses: dev-build-deploy/commit-me@v1.4.0
         env:
           FORCE_COLOR: 3
         with:

diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
@@ -13,6 +13,7 @@ permissions:
 
 jobs:
   prepare:
+    if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     name: Process Release
     runs-on: ubuntu-latest
     steps:

diff --git a/...ntation/active_record/lib/opentelemetry/instrumentation/active_record/patches/querying.rb b/...ntation/active_record/lib/opentelemetry/instrumentation/active_record/patches/querying.rb
@@ -18,7 +18,7 @@ class << base
 
           # Contains ActiveRecord::Querying to be patched
           module ClassMethods
-            def find_by_sql(sql, binds = [], preparable: nil, &block)
+            def find_by_sql(...)
               tracer.in_span("#{self}.find_by_sql") do
                 super
               end

diff --git a/instrumentation/rack/README.md b/instrumentation/rack/README.md
@@ -45,7 +45,7 @@ end
 
 ## Rack Middleware vs Rack Events
 
-Since `v0.24.0`, this instrumentation uses `Rake::Events` as opposed to `Middleware` to support Requests that use Buffered Response Bodies.
+Since `v0.24.0`, this instrumentation uses `Rack::Events` as opposed to `Middleware` to support Requests that use Buffered Response Bodies.
 
 If your application does not support `Rack::Events`, you may disable it by setting `use_rack_events: false`, e.g.