Merge pull request #20788 from jasonjkeller/patch-46

Update java-agent-config-file-template.mdx

Author: adutta-newrelic

src/content/docs/apm/agents/java-agent/configuration/java-agent-config-file-template.mdx

@@ -106,6 +106,20 @@ common: &default_settings
   # Default is the logs directory in the newrelic.jar parent directory.
   #log_file_path:
 
+  # AI Monitoring captures insights on the performance, quality, and cost of interactions with LLM models made with instrumented SDKs.
+  ai_monitoring:
+
+    # Provides control over all AI Monitoring functionality. Set as true to enable all AI Monitoring features.
+    # Default is false.
+    enabled: false
+
+    # Provides control over whether attributes for the input and output content should be added to LLM events.
+    record_content:
+
+      # Set as false to disable attributes for the input and output content.
+      # Default is true.
+      enabled: true
+
   # Provides the ability to forward application logs to New Relic, generate log usage metrics,
   # and decorate local application log files with agent metadata for use with third party log forwarders.
   # The application_logging.forwarding and application_logging.local_decorating should not be used together.
@@ -138,7 +152,7 @@ common: &default_settings
 
         # A comma separated list of label keys that should NOT be added to application logs.
         # Example:
-        #   exclude: label_name1, label_name2
+        #   exclude: label_name1,label_name2
         exclude:
 
       # Whether the log events should include context from loggers with support for that.
@@ -200,11 +214,11 @@ common: &default_settings
     # When true, attributes will be sent to New Relic. The default is true.
     enabled: true
 
-    #A comma separated list of attribute keys whose values should
+    #A comma separated list of attribute keys whose values should 
     # be sent to New Relic.
     #include:
 
-    # A comma separated list of attribute keys whose values should
+    # A comma separated list of attribute keys whose values should 
     # not be sent to New Relic.
     #exclude:
 
@@ -258,7 +272,7 @@ common: &default_settings
     # Default is true.
     explain_enabled: true
 
-    # Threshold for query execution time below which query plans will
+    # Threshold for query execution time below which query plans will 
     # not be captured. Relevant only when `explain_enabled` is true.
     # Default is 0.5 seconds.
     explain_threshold: 0.5
@@ -292,7 +306,7 @@ common: &default_settings
     ignore_status_codes: 404
 
   # Transaction events are used for histograms and percentiles. Non-aggregated data is collected
-  # for each web transaction and sent to the server on harvest.
+  # for each web transaction and sent to the server on harvest. 
   transaction_events:
 
     # Set to false to disable transaction events.
@@ -320,14 +334,17 @@ common: &default_settings
     # Default is false.
     exclude_newrelic_header: false
 
-    # These options define how the agent should handle sampling of spans,
-    # depending on sampling decisions that were made for their parent span by an upstream entity.
-    # 'remote_parent_sampled' and 'remote_parent_not_sampled' specify what to do in the case the parent span was sampled or not sampled, respectively.
-    # Possible values are:
-    # 'default': Use New Relic's standard sampling rules.
-    # 'always_on': Always sample spans in this case.
-    # 'always_off': Always skip sampling spans in this case.
-    # Default is 'default'
+    # Agent version 8.20.0+ utilize these settings for controlling how to sample when we have a remote parent
+    # involved. That is, if there is a valid traceparent with a value in the sampled flag on the inbound headers.
+    # If the inbound traceparent is marked as sampled then the remote_parent_sampled setting will be used.
+    # If the inbound traceparent is marked as NOT sampled then the remote_parent_not_sampled setting will be used.
+    # Otherwise New Relic's standard sampling will be used.
+    # Note: Reservoir limits are still in effect on top of these settings, so spans may be dropped even if they
+    # are marked for sampling, if the reservoir reaches its limit (max_samples_stored).
+    # Possible values:
+    #   default: New Relic's standard sampling rules will be used.
+    #   always_on: Always sample spans in this case.
+    #   always_off: Always skip sampling in this case.
     sampler:
       remote_parent_sampled: default
       remote_parent_not_sampled: default
@@ -371,7 +388,7 @@ common: &default_settings
   # New Relic Real User Monitoring (RUM) gives you insight into the performance real users are
   # experiencing with your website. This is accomplished by measuring the time it takes for
   # your users' browsers to download and render your web pages by injecting a small amount
-  # of JavaScript code into the header and footer of each page.
+  # of JavaScript code into the header and footer of each page. 
   browser_monitoring:
 
     # By default the agent automatically inserts API calls in compiled JSPs to
@@ -381,11 +398,38 @@ common: &default_settings
     # Set this attribute to false to turn off this behavior.
     auto_instrument: true
 
+    # For pages that emit the <head> tag via a JSP tag library, enabling this setting
+    # will monitor JspWriter print/println calls for output of the <head> element and
+    # inject the RUM script automatically.
+    tag_lib_instrument: false
+
+    # If tag_lib_instrument is true, this is the regex pattern that will be used to detect HTML start head elements. Modify
+    # the regex if you have more complex start head elements (attributes for example). The defined pattern is case-insensitive.
+    tag_lib_head_pattern: '<head>'
+
+  # By default, the agent sends JVM input arguments to New Relic, where they are visible as Environment data.
+  # Set to false to disable the sending of JVM props.
+  send_jvm_props: true
+
+  # Before sending JVM props to New Relic, the agent will obfuscate all data in a prop after an = sign.
+  # For example, the property -Dmy.prop=my-value will be sent to New Relic as -Dmy.prop=obfuscated.
+  # By default, the standard and extended JVM props (those beginning with -X*) are sent unobfuscated.
+  # Available since agent 8.16.0.
+  obfuscate_jvm_props:
+    #To disable this feature, and send all JVM props unobfuscated, set enabled to false. The default is true.
+    #enabled: true
+
+    # A comma separated list of JVM property names whose values should be sent to New Relic unobfuscated.
+    #allow:
+
+    # A comma separated list of JVM property names whose values should be sent to New Relic obfuscated.
+    #block:
+
   # Class transformer can be used to disable all agent instrumentation or specific instrumentation modules.
   # All instrumentation modules can be found here: https://github.com/newrelic/newrelic-java-agent/tree/main/instrumentation
   class_transformer:
 
-    # This instrumentation reports the name of the user principal returned from
+    # This instrumentation reports the name of the user principal returned from 
     # HttpServletRequest.getUserPrincipal() when servlets and filters are invoked.
     com.newrelic.instrumentation.servlet-user:
       enabled: false
@@ -419,9 +463,8 @@ common: &default_settings
     # present on the actual class, will still get named based on route and HTTP method.
     enhanced_spring_transaction_naming: false
 
-    # Actuator endpoint transaction naming
     # By default, built-in actuator endpoints and custom actuator endpoints (using the @Endpoint annotation
-    # and its subclasses) will all be named as "OperationHandler/handle" in New Relic. Setting this
+    # and it's subclasses) will all be named as "OperationHandler/handle" in New Relic. Setting this
     # to true will result in the transaction name reflecting the actual base actuator endpoint URI.
     # For example, invoking "/actuator/loggers" or "actuator/loggers/com.newrelic" will result in the
     # transaction name "actuator/loggers (GET)". This is to prevent MGI.
@@ -485,7 +528,7 @@ common: &default_settings
       enabled: false
 
     # This configuration allows users to specify a unique test identifier when running IAST Scan with CI/CD
-    iast_test_identifier: 'run-id'
+    # iast_test_identifier: 'run-id'
 
       # Security controllers
     scan_controllers:
@@ -549,6 +592,8 @@ common: &default_settings
         xpath_injection: false
         ssrf: false
         rxss: false
+        unsafe_deserialization: false
+        unsafe_reflection: false
 
   # Slow transaction detection will report an event to New Relic ("SlowTransaction") whenever a Transaction's
   # time exceeds the threshold value (in ms). A transaction will only be reported once and by default, only