diff --git a/.github/workflows/conventional-commits.yaml b/.github/workflows/conventional-commits.yaml index cc3a3ef71..1a4cf46ab 100644 --- 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 index d90a946b2..54531df41 100644 --- 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/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/querying.rb b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/querying.rb index d359c31ff..41280b1f1 100644 --- a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/patches/querying.rb +++ b/instrumentation/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 index 1c6672829..290ad59bc 100644 --- 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.