Skip to content

Commit

Permalink
Merge branch 'main' into sidekiq-add-compatibility-with-sidekiq-7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
arielvalentin authored Jul 18, 2023
2 parents 4e08370 + 7d788bb commit 8074008
Show file tree
Hide file tree
Showing 186 changed files with 468 additions and 232 deletions.
17 changes: 12 additions & 5 deletions .github/actions/test_gem/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ runs:
id: setup
shell: bash
run: |
# 🛠️ Setup 🛠️
dir=$(find . -iname '${{ inputs.gem }}.gemspec' -exec dirname {} \;)
echo "gem_dir=${dir}" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -73,23 +74,26 @@ runs:
ruby-version: "${{ inputs.ruby }}"
bundler: "latest"
working-directory: "${{ steps.setup.outputs.gem_dir }}"
- name: Install dependencies and appraisals
- name: Install dependencies and generate appraisals
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
shell: bash
run: |
# 💎 Install dependencies and generate appraisals 💎
bundle install --quiet --jobs=3 --retry=4
bundle exec appraisal generate
working-directory: "${{ steps.setup.outputs.gem_dir }}"

- name: Test Gem
shell: bash
run: |
# 🍿 Test Gem 🍿
if [[ -f "Appraisals" ]]; then
for i in `bundle exec appraisal list | sed 's/-/_/g' `; do
echo "Appraisal install and test ${i}"
echo "::group::🔎 Appraising ${i}"
BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle install --quiet --jobs=3 --retry=4 && \
BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle show && \
BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle exec rake test
echo "::endgroup::"
done
else
bundle exec rake test
Expand Down Expand Up @@ -121,19 +125,22 @@ runs:
shell: bash
if: "${{ inputs.yard == 'true' }}"
run: |
cd "${{ steps.setup.outputs.gem_dir }}"
# 📄 Yard Docs 📄
bundle exec rake yard
working-directory: "${{ steps.setup.outputs.gem_dir }}"

- name: Rubocop
shell: bash
if: "${{ inputs.rubocop == 'true' }}"
run: |
cd "${{ steps.setup.outputs.gem_dir }}"
# 🤖 Rubocop 🤖
bundle exec rake rubocop
working-directory: "${{ steps.setup.outputs.gem_dir }}"

- name: Build Gem
shell: bash
if: "${{ inputs.build == 'true' }}"
run: |
cd "${{ steps.setup.outputs.gem_dir }}"
# 📦 Build Gem 📦
gem build ${{ inputs.gem }}.gemspec
working-directory: "${{ steps.setup.outputs.gem_dir }}"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI Intrumentation With Services - Canary
name: CI Instrumentation With Services - Canary

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-instrumentation-with-services.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI Intrumentation With Services
name: CI Instrumentation With Services

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
source 'https://rubygems.org'

gem 'rake', '~> 13.0'
gem 'rubocop', '~> 1.52.0'
gem 'rubocop', '~> 1.54.1'
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ module Instrumentation
end
end

require_relative './instrumentation/action_pack'
require_relative 'instrumentation/action_pack'
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ module ActionPack
end

require 'opentelemetry-instrumentation-rack'
require_relative './action_pack/instrumentation'
require_relative './action_pack/version'
require_relative 'action_pack/instrumentation'
require_relative 'action_pack/version'
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
spec.add_development_dependency 'rails', '>= 6'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'webmock', '~> 3.7.6'
spec.add_development_dependency 'yard', '~> 0.9'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ module Instrumentation
end
end

require_relative './instrumentation/action_view'
require_relative 'instrumentation/action_view'
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ module ActionView
end
end

require_relative './action_view/instrumentation'
require_relative './action_view/version'
require_relative 'action_view/instrumentation'
require_relative 'action_view/version'
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
spec.add_development_dependency 'rails', '>= 6'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'webmock', '~> 3.7.6'
spec.add_development_dependency 'yard', '~> 0.9'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ module Instrumentation
end
end

require_relative './instrumentation/active_job'
require_relative 'instrumentation/active_job'
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ module ActiveJob
end
end

require_relative './active_job/instrumentation'
require_relative './active_job/version'
require_relative 'active_job/instrumentation'
require_relative 'active_job/version'
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
spec.add_development_dependency 'pry'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'webmock', '~> 3.7.6'
spec.add_development_dependency 'yard', '~> 0.9'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ module Instrumentation
end
end

require_relative './instrumentation/active_model_serializers'
require_relative 'instrumentation/active_model_serializers'
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ module ActiveModelSerializers
end
end

require_relative './active_model_serializers/instrumentation'
require_relative './active_model_serializers/version'
require_relative 'active_model_serializers/instrumentation'
require_relative 'active_model_serializers/version'
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
spec.add_development_dependency 'rspec-mocks'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'webmock', '~> 3.7.6'
spec.add_development_dependency 'yard', '~> 0.9'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ module Instrumentation
end
end

require_relative './instrumentation/active_record'
require_relative 'instrumentation/active_record'
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ module ActiveRecord
end
end

require_relative './active_record/instrumentation'
require_relative './active_record/version'
require_relative 'active_record/instrumentation'
require_relative 'active_record/version'
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'webmock', '~> 3.7.6'
spec.add_development_dependency 'yard', '~> 0.9'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ module Instrumentation
end
end

require_relative './instrumentation/active_support'
require_relative 'instrumentation/active_support'
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ module ActiveSupport
end
end

require_relative './active_support/instrumentation'
require_relative './active_support/version'
require_relative 'active_support/instrumentation'
require_relative 'active_support/version'
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'pry-byebug'
spec.add_development_dependency 'rails', '>= 6'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'webmock', '~> 3.7.6'
spec.add_development_dependency 'yard', '~> 0.9'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation/all'
require_relative 'opentelemetry/instrumentation/all'
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ module All
end
end

require_relative './all/version'
require_relative 'all/version'
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'bundler', '~> 2.4'
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'yard', '~> 0.9'
spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ module Instrumentation
end
end

require_relative './instrumentation/aws_sdk'
require_relative 'instrumentation/aws_sdk'
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ module AwsSdk
end
end

require_relative './aws_sdk/instrumentation'
require_relative './aws_sdk/version'
require_relative 'aws_sdk/instrumentation'
require_relative 'aws_sdk/version'
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'pry'
spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby'
spec.add_development_dependency 'rspec-mocks'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'webmock', '~> 3.7.6'
spec.add_development_dependency 'yard', '~> 0.9'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.52.0'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.22.0'
spec.add_development_dependency 'yard', '~> 0.9'
spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
2 changes: 1 addition & 1 deletion instrumentation/bunny/lib/opentelemetry/instrumentation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ module Instrumentation
end
end

require_relative './instrumentation/bunny'
require_relative 'instrumentation/bunny'
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ module Bunny
end
end

require_relative './bunny/instrumentation'
require_relative './bunny/version'
require_relative 'bunny/instrumentation'
require_relative 'bunny/version'
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'yard', '~> 0.9'
spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ module Instrumentation
end
end

require_relative './instrumentation/concurrent_ruby'
require_relative 'instrumentation/concurrent_ruby'
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ module ConcurrentRuby
end
end

require_relative './concurrent_ruby/instrumentation'
require_relative './concurrent_ruby/version'
require_relative 'concurrent_ruby/instrumentation'
require_relative 'concurrent_ruby/version'
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
spec.add_development_dependency 'rubocop', '~> 1.50.2'
spec.add_development_dependency 'rubocop', '~> 1.54.1'
spec.add_development_dependency 'simplecov', '~> 0.17.1'
spec.add_development_dependency 'yard', '~> 0.9'
spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require_relative './opentelemetry/instrumentation'
require_relative 'opentelemetry/instrumentation'
2 changes: 1 addition & 1 deletion instrumentation/dalli/lib/opentelemetry/instrumentation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ module Instrumentation
end
end

require_relative './instrumentation/dalli'
require_relative 'instrumentation/dalli'
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ module Dalli
end
end

require_relative './dalli/instrumentation'
require_relative './dalli/version'
require_relative 'dalli/instrumentation'
require_relative 'dalli/version'
Loading

0 comments on commit 8074008

Please sign in to comment.