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

Fix JRuby config manager bug #2848

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Fix JRuby config manager bug #2848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a63dfbd
fix jruby config bug
tannalynn Sep 11, 2024
65dfe18
add changelog entry
tannalynn Sep 11, 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
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

## dev

Version <dev> adds instrumentation for the rdkafka gem.
Version <dev> adds instrumentation for the rdkafka gem and fixes a JRuby bug in the configuration manager.

- **Feature: Add instrumentation for the rdkafka gem**

The agent now has instrumentation for the rdkafka gem and will record message broker segments for produce and consume calls made using this gem. [PR#2824](https://github.com/newrelic/newrelic-ruby-agent/pull/2824)

- **Bugfix: Jruby not saving configuration values correctly in configuration manager**

Previously, a change made to fix a different JRuby bug caused the agent to not save configuration values correctly in the configuration manager when running on JRuby. This has been fixed. [PR#2848](https://github.com/newrelic/newrelic-ruby-agent/pull/2848)


## v9.13.0

Expand Down
2 changes: 1 addition & 1 deletion lib/new_relic/agent/configuration/manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ def reset_cache
# modified. The hash really only needs to be modified for the benefit
# of the security agent, so if JRuby is in play and the security agent
# is not, don't attempt to modify the hash at all and return early.
return @cache if NewRelic::LanguageSupport.jruby? && !Agent.config[:'security.agent.enabled']
return new_cache if NewRelic::LanguageSupport.jruby? && !Agent.config[:'security.agent.enabled']

@lock.synchronize do
preserved = @cache.dup.select { |_k, v| DEPENDENCY_DETECTION_VALUES.include?(v) }
Expand Down
Loading