Merge pull request #19298 from meiao/develop

chore(java-agent): release 8.16.0

Author: cbehera-newrelic

src/content/docs/apm/agents/java-agent/api-guides/guide-using-java-agent-api.mdx

@@ -703,6 +703,38 @@ The following APIs provide additional functionality, such as setting app server
         Also refer to the information in this document about using `Insights` to [obtain references to New Relic API classes](#).
       </td>
     </tr>
+
+    <tr>
+      <td>
+        Provide general cloud provider account information to the agent
+      </td>
+
+      <td>
+        ```java
+        NewRelic.getAgent().getCloud().setAccountInfo(CloudAccountInfo.AWS_ACCOUNT_ID, "...");
+        ```
+
+        With this method, you can provide the type of account information and its value. The agent uses this information to populate the attribute `cloud.resource_id` in the select cloud services spans.
+
+        AWS DynamoDB and Kinesis are services that require this value to populate the `cloud.resource_id` attribute. Similarly, AWS Lambda requires this value when the account ID is not part of the function name.
+
+        Calling this method overrides the respective cloud configuration. The call shown above overrides `cloud.aws.account_id`.
+      </td>
+    </tr>
+
+    <tr>
+      <td>
+        Provide SDK client specific cloud provider account information to the agent
+      </td>
+
+      <td>
+        ```java
+        NewRelic.getAgent().getCloud().setAccountInfo(sdkClient, CloudAccountInfo.AWS_ACCOUNT_ID, "...");
+        ```
+
+        This call provides the same information as the preceding method, but it is specific to the SDK client provided. When the specified SDK client is used, this data will be used instead of the general one.
+      </td>
+    </tr>
   </tbody>
 </table>
 

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

@@ -2137,6 +2137,59 @@ common: &default_settings​
   </Collapser>
 </CollapserGroup>
 
+## Cloud configuration
+
+Set cloud related options, in the `cloud` section of the agent YAML. You can override these settings with a `newrelic.config.cloud` prefixed [system property](/docs/apm/agents/java-agent/configuration/java-agent-configuration-config-file/#System_Properties) or a `NEW_RELIC_CLOUD_` prefixed [environment variable](/docs/apm/agents/java-agent/configuration/java-agent-configuration-config-file/#Environment_Variables).
+
+An example configuration:
+
+```yml
+cloud:
+  aws:
+    account_id: 123456789012
+```
+
+  <CollapserGroup>
+  <Collapser
+    id="aws-account_id"
+    title="aws.account_id"
+  >
+    <table>
+      <tbody>
+      <tr>
+        <th>
+          Type
+        </th>
+
+        <td>
+          String
+        </td>
+      </tr>
+
+      <tr>
+        <th>
+          Default
+        </th>
+
+        <td>
+          (none)
+        </td>
+      </tr>
+      </tbody>
+    </table>
+
+    This setting is read by some cloud service instrumentation so the `cloud.resource_id` attribute can be set in the respective spans.
+
+    AWS DynamoDB and Kinesis are services that require this value to be able to populate the `cloud.resource_id` attribute. Likewise, AWS Lambda requires that this value when the account ID is not part of the function name.
+
+    The following call will override this setting:
+    ```java
+    NewRelic.getAgent().getCloud().setAccountInfo(CloudAccountInfo.AWS_ACCOUNT_ID, "...");
+    ```
+  </Collapser>
+</CollapserGroup>
+
+
 ## Cloud platform utilization [#utilization]
 
 Set the cloud platform utilization settings in the `utilization` section and can be overridden with the `newrelic.config.utilization` prefixed system property.
@@ -3611,7 +3664,7 @@ Set the jar collection configuration in the `jar_collector` section. These confi
 
 The Java agent uses Java Flight Recorder (JFR) to collect high fidelity JVM data for [Real-time profiling](/docs/agents/java-agent/features/real-time-profiling-java-using-jfr-metrics/).
 
-Configure real-time profiling in the `jfr` section in the agent YAML with [system properties](#System_Properties) prefixed by `newrelic.config.jfr.` or with [environment variables](#Environment_Variables) prefixed with `NEW_RELIC_JFR_`.
+Configure real-time profiling in the `jfr` section in the agent YAML. These configuration options can be overridden with [system properties](#System_Properties) prefixed by `newrelic.config.jfr.` or with [environment variables](#Environment_Variables) prefixed with `NEW_RELIC_JFR_`.
 
 <CollapserGroup>
   <Collapser
@@ -3759,11 +3812,118 @@ The Java agent uses JMX to collect JVM data. Additionally the agent can expose l
   </Collapser>
 </CollapserGroup>
 
+## JVM properties obfuscation
+
+The Java agent sends JVM properties to New Relic for display in the UI. Starting with Java agent version `8.16.0` the values of most properties will be obfuscated. For example: `-Dprop=12345` will now be sent as `-Dprop=obfuscated`.
+
+Set obfuscation related options, in the `obfuscate_jvm_props` section of the agent YAML. You can override these settings with a `newrelic.config.obfuscate_jvm_props` prefixed [system property](/docs/apm/agents/java-agent/configuration/java-agent-configuration-config-file/#System_Properties) or a `NEW_RELIC_OBFUSCATE_JVM_PROPS_` prefixed [environment variable](/docs/apm/agents/java-agent/configuration/java-agent-configuration-config-file/#Environment_Variables).
+
+By default, values of properties starting with `-X` won't be obfuscated.
+
+<CollapserGroup>
+  <Collapser
+    id="obfuscate-jvm-properties-enabled"
+    title="enabled">
+
+    <table>
+      <tbody>
+        <tr>
+          <th>
+            Type
+          </th>
+
+          <td>
+            Boolean
+          </td>
+        </tr>
+
+        <tr>
+          <th>
+            Default
+          </th>
+
+          <td>
+            `true`
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    Used to enabled/disable obfuscation of JVM properties.
+  </Collapser>
+
+  <Collapser
+    id="obfuscate-jvm-properties-allow"
+    title="allow">
+    <table>
+      <tbody>
+        <tr>
+          <th>
+            Type
+          </th>
+
+          <td>
+            List of strings
+          </td>
+        </tr>
+
+        <tr>
+          <th>
+            Default
+          </th>
+
+          <td>
+            (none)
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+   If obfuscation is enabled, when the property key matches a value in this list, then the value won't be obfuscated.
+
+   The items in this list can have wildcards, `*` as the last character. Conflicts with the block list are resolved following [attribute rules](/docs/apm/agents/java-agent/attributes/java-agent-attributes/#attruls), where `allow` works as `include`.
+  </Collapser>
+
+  <Collapser
+    id="obfuscate-jvm-properties-block"
+    title="block">
+    <table>
+      <tbody>
+        <tr>
+          <th>
+            Type
+          </th>
+
+          <td>
+            List of strings
+          </td>
+        </tr>
+
+        <tr>
+          <th>
+            Default
+          </th>
+
+          <td>
+            (none)
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    If obfuscation is enabled, when the property key matches a value in this list, then the value will be obfuscated.
+
+    The items in this list can have wildcards, `*` as the last character. Conflicts with the allow list are resolved following [attribute rules](/docs/apm/agents/java-agent/attributes/java-agent-attributes/#attruls), where `block` works as `exclude`.
+
+  </Collapser>
+</CollapserGroup>
+
+
 ## Kafka message queues [#kafka-message-queues]
 
 Detailed information on Kafka instrumentation configuration and can be found on the [Instrument Kafka message queues](/docs/apm/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues/) page.
 
-* \[Kafka event collection(/docs/apm/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues/#collect-kafka-events)
+* [Kafka event collection](/docs/apm/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues/#collect-kafka-events)
 * [Kafka node metrics](/docs/apm/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues/#kafka-node-metrics)
 * [Kafka config events](/docs/apm/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues/#kafka-config)
 * [Kafka streams transactions](/docs/apm/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues/#collect-kafka-streams-transactions)

src/content/docs/apm/agents/java-agent/getting-started/compatibility-requirements-java-agent.mdx

@@ -236,13 +236,13 @@ The agent automatically instruments these frameworks and libraries:
     * Apache Httpclient from 3.1 to 5.x
     * java.net.HttpURLConnection
     * JMS from 1.1 to latest
-    * Kafka Client Node Metrics](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 3.7.0 to latest (for metrics)
+    * [Kafka Client Node Metrics](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 1.0.0 to latest (for metrics)
     * [Kafka Client Metrics](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 0.10.0.0 to latest (for metrics)
-    * [Kafka Client Spans](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 0.11.0.0 to 3.6.x (for distributed tracing)
-    * [Kafka Connect](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 1.0.0 to 3.6.x (for metrics)
-    * [Kafka Connect](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 2.0.0 to 3.6.x (for distributed tracing and transaction data)
-    * [Kafka Streams](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 1.0.0 to 3.6.x (for metrics)
-    * [Kafka Streams](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 2.0.0 to 3.6.x (for distributed tracing and transaction data)
+    * [Kafka Client Spans](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 0.11.0.0 to latest (for distributed tracing)
+    * [Kafka Connect](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 1.0.0 to latest (for metrics)
+    * [Kafka Connect](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 2.0.0 to latest (for distributed tracing and transaction data)
+    * [Kafka Streams](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 1.0.0 to latest (for metrics)
+    * [Kafka Streams](/docs/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues) 2.0.0 to latest (for distributed tracing and transaction data)
     * OkHttp 3.6.0 to latest
     * Ning AsyncHttpClient 1.x
     * Play WS

src/content/docs/release-notes/agent-release-notes/java-release-notes/java-agent-8150.mdx

@@ -19,25 +19,25 @@ security: []
 
 ## New features and improvements
 
-- Addition of AWS Lambda SDK instrumentation by @meiao in [1998](https://github.com/newrelic/newrelic-java-agent/pull/1998)
-- Reporting of Flyway migration events by @jtduffy in [2021](https://github.com/newrelic/newrelic-java-agent/pull/2021)
-- Add support for using an environment variable for config file location by @jtduffy in [2022](https://github.com/newrelic/newrelic-java-agent/pull/2022)
-- Support AWS Kinesis V1 and V2 SDKs by @obenkenobi in [2031](https://github.com/newrelic/newrelic-java-agent/pull/2031)
-- Addition of kafka-clients-node-metrics-3.7.0 Instrumentation module by @deleonenriqueta in [2039](https://github.com/newrelic/newrelic-java-agent/pull/2039)
-- Add instrumentation for glassfish-jul-extension logging library by @jasonjkeller in [2049](https://github.com/newrelic/newrelic-java-agent/pull/2049)
-- Java 23 support by @jasonjkeller in [2055](https://github.com/newrelic/newrelic-java-agent/pull/2055)
-- Support reporting of ECS Fargate Docker ids by @jtduffy in [2050](https://github.com/newrelic/newrelic-java-agent/pull/2050)
-- Actuator endpoint transaction naming for Spring Boot 3 by @jtduffy in [2077](https://github.com/newrelic/newrelic-java-agent/pull/2077)
+- Addition of AWS Lambda SDK instrumentation [1998](https://github.com/newrelic/newrelic-java-agent/pull/1998)
+- Reporting of Flyway migration events [2021](https://github.com/newrelic/newrelic-java-agent/pull/2021)
+- Add support for using an environment variable for config file location [2022](https://github.com/newrelic/newrelic-java-agent/pull/2022)
+- Support AWS Kinesis V1 and V2 SDKs [2031](https://github.com/newrelic/newrelic-java-agent/pull/2031)
+- Addition of kafka-clients-node-metrics-3.7.0 Instrumentation module [2039](https://github.com/newrelic/newrelic-java-agent/pull/2039)
+- Add instrumentation for glassfish-jul-extension logging library [2049](https://github.com/newrelic/newrelic-java-agent/pull/2049)
+- Java 23 support [2055](https://github.com/newrelic/newrelic-java-agent/pull/2055)
+- Support reporting of ECS Fargate Docker ids [2050](https://github.com/newrelic/newrelic-java-agent/pull/2050)
+- Actuator endpoint transaction naming for Spring Boot 3 [2077](https://github.com/newrelic/newrelic-java-agent/pull/2077)
 
 ## Fixes
 
-- Slick 3.5.0 instrumentation bug fix by @kanderson250 in [2025](https://github.com/newrelic/newrelic-java-agent/pull/2025)
-- Protect against Http2Headers methods throwing exceptions in Netty instrumentation by @jasonjkeller in [2042](https://github.com/newrelic/newrelic-java-agent/pull/2042)
-- Fix an issue where the Kinesis instrumentation is generating ERROR logs due to a NullPointerException by @obenkenobi in [2052](https://github.com/newrelic/newrelic-java-agent/pull/2052)
+- Slick 3.5.0 instrumentation bug fix [2025](https://github.com/newrelic/newrelic-java-agent/pull/2025)
+- Protect against Http2Headers methods throwing exceptions in Netty instrumentation [2042](https://github.com/newrelic/newrelic-java-agent/pull/2042)
+- Fix an issue where the Kinesis instrumentation is generating ERROR logs due to a NullPointerException [2052](https://github.com/newrelic/newrelic-java-agent/pull/2052)
 
 ## IAST
 
-- CSEC version bump to 1.5 by @jtduffy in [2076](https://github.com/newrelic/newrelic-java-agent/pull/2076)
+- CSEC version bump to 1.5 [2076](https://github.com/newrelic/newrelic-java-agent/pull/2076)
 - Changelog: https://github.com/newrelic/csec-java-agent/releases/tag/1.5.0
 
 **Full Changelog**: https://github.com/newrelic/newrelic-java-agent/compare/v8.14.0...v8.15.0