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

Jump to bottom

chore(deps-dev): update rubocop to ~> 1.58.0 in multiple gems #756

Merged
merged 4 commits into from
Dec 7, 2023
Merged

chore(deps-dev): update rubocop to ~> 1.58.0 in multiple gems #756

merged 4 commits into from
Dec 7, 2023

Conversation

robbkidd
Copy link
Member

@robbkidd robbkidd commented Dec 7, 2023 •
edited
Loading

Update gemspecs

When dependabot is piecemealing a monorepo of gems (#748, #749, #750. #751, #752. #753, #754), go Old School:

git ls-files \*.gemspec \
  | xargs \
    sed -i '' \
        -E "s/'rubocop', '~> [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'/'rubocop', '~> 1.54.1'/"

Rubocop Appeasements

Lint/RedundantSafeNavigation

Redundant safe navigation with default literal detected.
  prefix = endpoint.routes.first.options[:prefix]&.to_s || ''
                                                 ^^^^^^^^^^^^

OK. We can stop at safely navigating the string coercion without supplying a default because paths.reject{} below filters nils.

Style/RedundantReturn

Redundant return detected.
  return "HTTP #{request_method} #{request_path} miniswan"
  ^^^^^^

Sure.

Style/RedundantParentheses

Don't use parentheses around a logical expression.
      (!gem_version.nil? && gem_version >= MINIMUM_VERSION)
      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

OK.

@robbkidd
chore(deps-dev): update rubocop to ~> 1.58.0 in multiple gems
419c49a
@robbkidd
appease Rubocop: Lint/RedundantSafeNavigation
3960ea2 
  Redundant safe navigation with default literal detected.
    prefix = endpoint.routes.first.options[:prefix]&.to_s || ''
                                                   ^^^^^^^^^^^^

OK. We can stop at safely navigating the string coersion without
supplying a default because paths.reject{} below filters nils.
@robbkidd
appease Rubocop: Style/RedundantReturn
f21e13d 
  Redundant return detected.
    return "HTTP #{request_method} #{request_path} miniswan"
    ^^^^^^

Sure.
@robbkidd
appease Rubocop: Style/RedundantParentheses
457d97b 
  Don't use parentheses around a logical expression.
        (!gem_version.nil? && gem_version >= MINIMUM_VERSION)
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

OK.
@robbkidd robbkidd requested a review from a team December 7, 2023 22:45
@robbkidd robbkidd added the dependencies Pull requests that update a dependency file label Dec 7, 2023
@robbkidd robbkidd self-assigned this Dec 7, 2023
@robbkidd robbkidd added the ruby Pull requests that update Ruby code label Dec 7, 2023
kaylareopelle
kaylareopelle approved these changes Dec 7, 2023
View reviewed changes
Copy link
Contributor

@kaylareopelle kaylareopelle left a comment

Choose a reason for hiding this comment

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

Thank you!

@arielvalentin arielvalentin merged commit 9dbea18 into open-telemetry:main Dec 7, 2023
47 checks passed
robbkidd
robbkidd commented Dec 7, 2023
View reviewed changes
Copy link
Member Author

@robbkidd robbkidd left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Leaving the notes about code changes inline for easier review.

Update: ... and then it merged before I added these notes!

It happened so fast!

instrumentation/grape/lib/opentelemetry/instrumentation/grape/event_handler.rb
version = endpoint.routes.first.options[:version] || ''
prefix = endpoint.routes.first.options[:prefix]&.to_s || ''
version = endpoint.routes.first.options[:version]&.to_s
prefix = endpoint.routes.first.options[:prefix]&.to_s
Copy link
Member Author

Choose a reason for hiding this comment

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

We can stop at safely navigating the string coercion without supplying a default because parts.reject{} below filters nils.

instrumentation/ruby_kafka/lib/opentelemetry/instrumentation/ruby_kafka/instrumentation.rb
@@ -22,7 +22,7 @@ class Instrumentation < OpenTelemetry::Instrumentation::Base
end

compatible do
(!gem_version.nil? && gem_version >= MINIMUM_VERSION)
!gem_version.nil? && gem_version >= MINIMUM_VERSION
Copy link
Member Author

Choose a reason for hiding this comment

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

appease Rubocop: Style/RedundantParentheses

Don't use parentheses around a logical expression.
     (!gem_version.nil? && gem_version >= MINIMUM_VERSION)
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

OK.

instrumentation/http/test/instrumentation/http/patches/client_test.rb
@@ -128,7 +128,7 @@
let(:span_name_formatter) do
# demonstrate simple addition of path and string to span name:
lambda { |request_method, request_path|
return "HTTP #{request_method} #{request_path} miniswan"
"HTTP #{request_method} #{request_path} miniswan"
Copy link
Member Author

Choose a reason for hiding this comment

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

appease Rubocop: Style/RedundantReturn

Redundant return detected.
  return "HTTP #{request_method} #{request_path} miniswan"
  ^^^^^^

Sure.

@robbkidd robbkidd deleted the update-rubocop-in-bulk branch December 7, 2023 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaylareopelle kaylareopelle kaylareopelle approved these changes

@simi simi simi approved these changes

@arielvalentin arielvalentin arielvalentin approved these changes

@fbogsany fbogsany Awaiting requested review from fbogsany fbogsany is a code owner

@mwear mwear Awaiting requested review from mwear mwear is a code owner

@robertlaurin robertlaurin Awaiting requested review from robertlaurin robertlaurin is a code owner

@dazuma dazuma Awaiting requested review from dazuma dazuma is a code owner

@ericmustin ericmustin Awaiting requested review from ericmustin ericmustin is a code owner

@ahayworth ahayworth Awaiting requested review from ahayworth ahayworth is a code owner

@plantfansam plantfansam Awaiting requested review from plantfansam plantfansam is a code owner

Assignees

@robbkidd robbkidd

Labels
dependencies Pull requests that update a dependency file ruby Pull requests that update Ruby code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@robbkidd @arielvalentin @simi @kaylareopelle