Main to dev merge conflicts #2963
Merged
+12
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Release 9.12.0
Release 9.13.0
Release 9.14.0
* Remove opensearch service from depends_on OpenSearch does not have a service, it's commented out. * Update verbiage to match docs website Tweaks for automatic_custom_instrumentation_method_list * add ruby version check * Update 9.14 changelog to match release notes * Stripe: restrict CI tests to Stripe <= v12 For now, limit Stripe testing to < v13 * Sequel: relax Ruby requirement for Timed pool Accommodate Sequel v5.85.0, which has made the timed connection pool the default for Ruby 3.2+ by always permitting the use of a timed connection pool for explain plan generation in a Ruby 3.2+ context (previously only a Ruby 3.4+ context would work). https://sequel.jeremyevans.net/rdoc/files/doc/release_notes/5_85_0_txt.html#label-Other+Improvements * add changelog entry * Remove excess info-level instrumentation logs (#2881) * Remove duplicate info-level instrumentation logs The methods `prepend_instrument` and `chain_instrument` eventually produce info-level log statements. Remove duplicate statements. --------- Co-authored-by: James Bunch <fallwith@gmail.com> * Stripe testing update (#2891) * Update Stripe test Co-authored-by: James Bunch <fallwith@gmail.com> --------- Co-authored-by: James Bunch <fallwith@gmail.com> * increase db.statement threshold to 4096 increase the db.statement max from 2000 to 4096 as per the updated cross agent spec * Test Ruby 3.4.0-preview2 * Update CHANGELOG.md Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com> * add aws_account_id config * tests script: perform cleanup clean up content on each fresh test run instance * Add assertion condition for 3.4 support The JSON string output changed in Ruby 3.4 to remove the hash rocket Pre Ruby 3.4: :app_name=>\"test\" Ruby 3.4+: app_name: \"test\" * Exclude api_key from reported settings * Add TODO to fix the test before 3.4 is released * Improve failure output for assert_log_contains * stringio CI test * Update stringio version * berm/bermq: only clean once given than `berm` and `bermq` both follow the same path, prevent duplicate cleaning operations * use cloud.aws.account_id for config name * add changelog entry * Skip config_file_loading suite on Ruby 3.4 * add allow nil to config * Simplify excluded_settings test * Update CHANGELOG.md Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com> * Update lib/new_relic/agent/configuration/default_source.rb Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com> * Update newrelic-grape check logic * Update View Component metric building (#2907) * Use default `View/component` metric name for unidentified View Components * add exit code to output * move rdkafka to its own group for multiverse * add config to allow test to pass for jruby * Create helper method to return rubygems specs Bundler version 2.5.12 deprecated all_specs and added installed_specs. To support newer Bundler versions, try to use installed_specs first, then fall back to all_specs. All callers expect this to be an array, so return an array if Bundler isn't defined. This consolidates the way the rubygems specs are accessed across the multiple places we use them. * Add changelog entry for all_specs update * Update stub for Rubies below 2.7 * Rubocop * prevent false 'unsatisfied' dependency status address 2 issues causing dependency detection to falsely label an instrumentation's dependencies as "unsatisfied". - handle Padrino with a special case pending resolution of #2912 - don't mark an item as unsatisfied the second (or higher) time it comes around through the `detect!` loop * sinatra dd check - use a string use a string for comparison * Use double splat for Ruby >= 3.0 * Update changelog * update changelog * Update CHANGELOG.md Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com> * DD templating: conditionally invoke requires as per #2844, don't perform `require_relative` on content that won't be used unless all dependency detection checks succeed * DD: require only prepend OR chain DD code when chaining or prepending, only bring in the appropriate chain or prepend code * DD: update the rendering of the 'named' line the template's rendering of a `named` line was previously attempting to wrap symbol values with single quotes when necessary. but given that everything is routed through the `snake_name` method, nothing will ever need the quotes if we simply use the output of that method, held in `@snake_name`. * bugfix: always apply transformations on booleans v9.14.0 introduced improved handling of boolean based configuration parameters and inadvertently broke AWS Lambda layer based functionality due to a bypassing of config transformations for booleans. Boolean based values will now again be routed through their transformations if defined. resolves #2919 * Update CHANGELOG.md Update dev bugfix title for Lambda layer functionality restoration Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com> * Update CHANGELOG.md Reference the Lambda bugfix PR now that it exists Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com> * CHANGELOG: improve Lambda bugfix summary Improve the wording for the Lambda bugfix summary Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com> * add .vscode to gitignore * Add security scan * Add scan-type: fs * chore: Rename build job * Update run conditions * Add bundling step * bundle after checkout * Prerelease 9.15.0-pre (#2927) * bump version --------- Co-authored-by: newrelic-ruby-agent-bot <ruby-agent@newrelic.com> Co-authored-by: Hannah Ramadan <76922290+hannahramadan@users.noreply.github.com> --------- Co-authored-by: Kayla Reopelle <kreopelle@newrelic.com> Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com> Co-authored-by: Tanna McClure <tmcclure@newrelic.com> Co-authored-by: James Bunch <fallwith@gmail.com> Co-authored-by: Hannah Ramadan <76922290+hannahramadan@users.noreply.github.com> Co-authored-by: Patrick Arnett <parnett@g2.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: newrelic-ruby-agent-bot <ruby-agent@newrelic.com>
kaylareopelle
requested review from
hannahramadan and
tannalynn
as code owners
Merged
SimpleCov Report
|
hannahramadan
approved these changes
Nov 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves merge conflicts related to updating setup-ruby, ViewComponent, and newrelic.yml text and spacing updates, and CHANGELOG text.