Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add support gruf 2.19 #872

Merged
merged 3 commits into from
Feb 18, 2024
Merged

feat: Add support gruf 2.19 #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
084b756
feat: Add support gruf 2.19
AS-AlStar Feb 17, 2024
d62bfa3
revert versio, fix appraisals
AS-AlStar Feb 17, 2024
115825e
fix workflows ci
AS-AlStar Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/ci-instrumentation-canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.3"
# BLOCKED BY: https://github.com/bigcommerce/gruf/pull/197
if: "${{ matrix.gem != 'gruf' }}"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci-instrumentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: "Test Ruby 3.3"
# BLOCKED BY: https://github.com/bigcommerce/gruf/pull/197
if: "${{ matrix.gem != 'gruf' }}"
uses: ./.github/actions/test_gem
with:
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
Expand Down
12 changes: 8 additions & 4 deletions instrumentation/gruf/Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@
#
# SPDX-License-Identifier: Apache-2.0

appraise 'gruf-2.15.1' do
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means we lose test coverage for versions prior to 2.19.

Is that ok? Are you looking to drop support for older versions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the support of the last three versions of Gruf, it seems that there is no need to indicate the dependence of the GRPC version

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you!

gem 'gruf', '~> 2.15.1'
appraise 'gruf-2.17' do
gem 'gruf', '~> 2.17.0'
end

appraise 'gruf-2.16.1' do
gem 'gruf', '~> 2.16.1'
appraise 'gruf-2.18' do
gem 'gruf', '~> 2.18.0'
end

appraise 'gruf-2.19' do
gem 'gruf', '~> 2.19.0'
end
2 changes: 1 addition & 1 deletion instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'appraisal', '~> 2.5'
spec.add_development_dependency 'bundler', '>= 1.17'
spec.add_development_dependency 'grpc_mock'
spec.add_development_dependency 'gruf', '>= 2.15.1'
spec.add_development_dependency 'gruf', '>= 2.19.0'
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
spec.add_development_dependency 'opentelemetry-test-helpers'
Expand Down