Merge pull request #2392 from newrelic/prerelease_updates_9.7.0-pre

Prerelease 9.7.0-pre
newrelic · Jan 8, 2024 · 13243df · 13243df
2 parents 38199be + 4266f65
commit 13243df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/new_relic/version.rb b/lib/new_relic/version.rb
@@ -6,7 +6,7 @@
 module NewRelic
   module VERSION # :nodoc:
     MAJOR = 9
-    MINOR = 6
+    MINOR = 7
     TINY = 0
 
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"

diff --git a/newrelic.yml b/newrelic.yml
@@ -8,7 +8,8 @@
 # For full documentation of agent configuration options, please refer to
 # https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration
 
-common: &default_settings # Required license key associated with your New Relic account.
+common: &default_settings
+  # Required license key associated with your New Relic account.
   license_key: <%= license_key %>
 
   # Your application name. Renaming here affects where data displays in New
@@ -534,6 +535,10 @@ common: &default_settings # Required license key associated with your New Relic
   # prepend, chain, disabled.
   # instrumentation.typhoeus: auto
 
+  # Controls auto-instrumentation of ViewComponent at startup. May be one of: auto,
+  # prepend, chain, disabled.
+  # instrumentation.view_component: auto
+
   # A dictionary of label names and values that will be applied to the data sent
   # from this agent. May also be expressed as a semicolon-delimited ; string of
   # colon-separated : pairs. For example, Server:One;Data Center:Primary.