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

Rebase latest changes from dev into k2 #2395

Merged
merged 158 commits into from
Jan 12, 2024
Merged

Rebase latest changes from dev into k2 #2395

merged 158 commits into from
Jan 12, 2024

Conversation

prateeksen
Copy link
Contributor

Before contributing, please read our contributing guidelines and code of conduct.

Overview

Describe the changes present in the pull request

Submitter Checklist:

  • Include a link to the related GitHub issue, if applicable
  • Include a security review link, if applicable

Testing

The agent includes a suite of unit and functional tests which should be used to
verify your changes don't break existing functionality. These tests will run with
GitHub Actions when a pull request is made. More details on running the tests locally can be found
here for our unit tests,
and here for our functional tests.
For most contributions it is strongly recommended to add additional tests which
exercise your changes.

Reviewer Checklist

  • Perform code review
  • Add performance label
  • Perform appropriate level of performance testing
  • Confirm all checks passed
  • Add version label prior to acceptance

tannalynn and others added 30 commits June 26, 2023 11:38
use the latest stable JRuby for JRuby tests
For the `async_http` multiverse suite:

- ignore JRuby, as it can not work with the required native extensions
- ignore expected errors instead of having them hit STDOUT
for JRuby, allow multiple seen errors
for JRuby permit the odd extra event
relax assertions for JRuby, while still verifying the same object in the
same way as CRuby
standardize on relaxing JRuby assertions for all collector calls
update `first_call_for` usage
Change rubocop to 1.57.2, as 1.54 breaks an installation using bundler 1.17, fix was posted to robucop and a new release was created.
Autocorrections applied by Rubocop v1.57.2 after upgrading from v1.54
Update newrelic_rpm.gemspec
Fixes the consistency for the capitalization of 'Agent' -> 'agent' across the project
Update `CONTIBUTING.md` to remove the reference to the Slack workspace
CONTRIBUTING.md - remove Slack workspace mention
Infinite Tracing depends on the `grpc` gem, which requires Ruby 2.5+.

Frequently, the gRPC Ruby gem maintainers inadvertently break
compatibility with Ruby 2.5 and 2.6 by publishing a new version of
`google-protobuf` (which `grpc` depends on) that itself requires Ruby
2.7+.

We do not wish to pin our `grpc` dependency to an exact version that is
known to be compatible with Ruby 2.5 and Ruby 2.6 so that we leave users
free to use whatever 1.x version of `grpc` that they wish, especially if
they are themselves using `grpc` in their application.

Whether the gRPC maintainers' frequent breaking of Ruby 2.5 and 2.6
compatibility is accidental or deliberate, supporting these Rubies with
our CI system has simply caused too many issues.

We are not actively introducing any new Ruby code to Infinite Tracing
that could break Ruby 2.5 and 2.6 compatibility, so we will switch to
manual testing of these Rubies as appropriate moving forward.
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@github-actions github-actions bot added the community To tag external issues and PRs submitted by the community label Jan 11, 2024
…tion_if_newrelic_traces

Skip Async-http instrumentation installation when Traces::Backend::NewRelic is defined
Copy link
Contributor

SimpleCov Report

Coverage Threshold
Line 93.7% 93%
Branch 71.83% 71%

@prateeksen prateeksen merged commit 7a71f62 into k2 Jan 12, 2024
119 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
community To tag external issues and PRs submitted by the community
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.