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.

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

Better: remove restrictions on koala. #1090

Closed
wants to merge 3 commits into from

Conversation

ylecuyer
Copy link

Following arsduo/koala#659 and the recent release of koala arsduo/koala#663, restrictions on koala and faraday can be removed

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jan 18, 2022

CLA Not Signed

@@ -3,7 +3,6 @@
# Copyright The OpenTelemetry Authors
#
# SPDX-License-Identifier: Apache-2.0
appraise 'koala-3' do
gem 'koala', '~> 3.0.0'
Copy link
Author

Choose a reason for hiding this comment

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

The ~> 3 removal can be discussed, the plan is to release koala v4 which will support faraday 2 (but not faraday 1) so if you want to be able to support both farday 1 and 2 it would be better to remove this restriction

Copy link
Contributor

Choose a reason for hiding this comment

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

for some reason the tests are still pulling down v3.0.0

https://github.com/open-telemetry/opentelemetry-ruby/runs/4884674419?check_suite_focus=true

Testing opentelemetry-instrumentation-koala ...
opentelemetry-instrumentation-koala: bundle
Fetching gem metadata from https://rubygems.org/.........
Resolving dependencies...
Using rake 12.3.3
Using bundler 2.3.5
Using public_suffix 4.0.6
Using thor 1.2.1
Using ast 2.4.2
Using byebug 11.1.3
Using coderay 1.1.3
Using rexml 3.2.5
Using docile 1.4.0
Fetching faraday-net_http 2.0.1
Using diff-lcs 1.5.0
Using hashdiff 1.0.1
Using jaro_winkler 1.5.4
Using json 2.6.1
Using method_source 1.0.0
Using minitest 5.15.0
Using opentelemetry-api 1.0.1 from source at `../../api`
Using ruby2_keywords 0.0.5
Using parallel 1.21.0
Using rainbow 3.1.1
Using rspec-support 3.10.3
Using ruby-progressbar 1.11.0
Using unicode-display_width 1.6.1
Using simplecov-html 0.10.2
Using webrick 1.7.0
Using addressable 2.8.0
Using appraisal 2.2.0
Using crack 0.4.5
Using parser 3.1.0.0
Using pry 0.13.1
Using pry-byebug 3.9.0
Using rubocop 0.73.0
Using simplecov 0.17.1
Using webmock 3.7.6
Using yard 0.9.27
Using rspec-mocks 3.10.2
Using opentelemetry-common 0.19.3 from source at `../../common`
Using opentelemetry-instrumentation-base 0.19.0 from source at `../base`
Using opentelemetry-semantic_conventions 1.8.0 from source at `../../semantic_conventions`
Using yard-doctest 0.1.17
Using opentelemetry-instrumentation-koala 0.18.4 from source at `.`
Using opentelemetry-sdk 1.0.2 from source at `../../sdk`
Installing faraday-net_http 2.0.1
Fetching faraday 2.1.0
Installing faraday 2.1.0
Fetching koala 3.0.0
Installing koala 3.0.0
Bundle complete! 19 Gemfile dependencies, 44 gems now installed.
Use `bundle info [gemname]` to see where a bundled gem is installed.
opentelemetry-instrumentation-koala: appraisal
>> bundle check --gemfile='/home/runner/work/opentelemetry-ruby/opentelemetry-ruby/instrumentation/koala/gemfiles/koala.gemfile' || bundle install --gemfile='/home/runner/work/opentelemetry-ruby/opentelemetry-ruby/instrumentation/koala/gemfiles/koala.gemfile' --retry 1
Resolving dependencies...
The Gemfile's dependencies are satisfied
opentelemetry-instrumentation-koala: test
>> BUNDLE_GEMFILE=/home/runner/work/opentelemetry-ruby/opentelemetry-ruby/instrumentation/koala/gemfiles/koala.gemfile bundle exec rake test

File does not exist: net/http/post/multipart

Copy link
Contributor

Choose a reason for hiding this comment

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

I think maybe just excluding that single bad version probably just makes this easier to maintain going forward, something like

appraise 'koala' do
  gem 'koala', '!= 3.0.0'
end

wdyt?

Copy link
Author

Choose a reason for hiding this comment

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

I think the problem comes from the gemspec and development dependencies as koala ~> 3.0.0, I'll add a commit to this PR removing the restriction here. (I even wonder if it is needed to have it has a its own appraisal)

Copy link
Contributor

@ericmustin ericmustin left a comment

Choose a reason for hiding this comment

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

I think we just need the cli signed and then should be good to go, thanks!

edit: tests still having some issues, added a suggestion as a comment to resolve, once that's cleaned up this should be good to go

@ericmustin
Copy link
Contributor

@ylecuyer hey ,sorry been a bit underwater, not sure why the CLA isn't taking, mind pushing an empty commit to kick the CLA check?

@plantfansam
Copy link
Contributor

Hello, and thank you for your contribution!

We recently split Ruby instrumentation out into the opentelemetry-ruby-contrib repo.

This PR is related to instrumentation, so we'll need you to re-open it against opentelemetry-ruby-contrib. Sorry for the inconvenience!

To do that, you can:

  1. Create a fork of opentelemetry-ruby-contrib and copy the git url
  2. In your opentelemetry-ruby repo, run git remote add tmp-contrib <your-fork-git-url>
  3. git push tmp-contrib your-branch-name
  4. Open a new PR in contrib (feel free to just copy/paste your original PR description there)
  5. Close your open PR in this repo with a comment that links to your new PR in contrib
  6. Delete your tmp-contrib remote from opentelemetry-ruby (git remote rm tmp-contrib)
  7. git clone your opentelemetry-ruby-contrib fork, check out your branch, and make all changes in that repo from now on!

Sorry again for the inconvenience, and thank you for contributing!

Copy link
Contributor

👋 This pull request has been marked as stale because it has been open with no activity. You can: comment on the issue or remove the stale label to hold stale off for a while, add the keep label to hold stale off permanently, or do nothing. If you do nothing this pull request will be closed eventually by the stale bot

@github-actions github-actions bot added the stale label Mar 31, 2024
@kaylareopelle
Copy link
Contributor

👋 Hi, @ylecuyer! Thank you for your PR!

As Sam mentioned, Ruby instrumentation now lives in the opentelemetry-ruby-contrib repo. We'd be happy to take another look at your work in that context.

Since this PR is focused on instrumentation, I'm going to close it.

We appreciate your contribution and hope to work with you again soon!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants