From 23b3c2733d7914b9876a7edc8b393f744e80909e Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Thu, 24 Oct 2024 17:00:13 +0200
Subject: [PATCH 1/3] Fix JMX invalid composite value type log message

---
 .../apm/agent/jmx/JmxMetricTracker.java       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/apm-agent-plugins/apm-jmx-plugin/src/main/java/co/elastic/apm/agent/jmx/JmxMetricTracker.java b/apm-agent-plugins/apm-jmx-plugin/src/main/java/co/elastic/apm/agent/jmx/JmxMetricTracker.java
index 6518f4f03e..08391e0e51 100644
--- a/apm-agent-plugins/apm-jmx-plugin/src/main/java/co/elastic/apm/agent/jmx/JmxMetricTracker.java
+++ b/apm-agent-plugins/apm-jmx-plugin/src/main/java/co/elastic/apm/agent/jmx/JmxMetricTracker.java
@@ -18,16 +18,16 @@
  */
 package co.elastic.apm.agent.jmx;
 
-import co.elastic.apm.agent.tracer.AbstractLifecycleListener;
-import co.elastic.apm.agent.tracer.metrics.DoubleSupplier;
-import co.elastic.apm.agent.tracer.Tracer;
-import co.elastic.apm.agent.tracer.metrics.Labels;
-import co.elastic.apm.agent.tracer.GlobalLocks;
 import co.elastic.apm.agent.sdk.internal.util.ExecutorUtils;
 import co.elastic.apm.agent.sdk.internal.util.PrivilegedActionUtils;
 import co.elastic.apm.agent.sdk.logging.Logger;
 import co.elastic.apm.agent.sdk.logging.LoggerFactory;
+import co.elastic.apm.agent.tracer.AbstractLifecycleListener;
+import co.elastic.apm.agent.tracer.GlobalLocks;
+import co.elastic.apm.agent.tracer.Tracer;
 import co.elastic.apm.agent.tracer.configuration.TimeDuration;
+import co.elastic.apm.agent.tracer.metrics.DoubleSupplier;
+import co.elastic.apm.agent.tracer.metrics.Labels;
 import org.stagemonitor.configuration.ConfigurationOption;
 
 import javax.annotation.Nullable;
@@ -35,6 +35,7 @@
 import javax.management.InstanceNotFoundException;
 import javax.management.JMException;
 import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanException;
 import javax.management.MBeanInfo;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerDelegate;
@@ -45,9 +46,8 @@
 import javax.management.NotificationListener;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
-import javax.management.RuntimeMBeanException;
-import javax.management.MBeanException;
 import javax.management.ReflectionException;
+import javax.management.RuntimeMBeanException;
 import javax.management.openmbean.CompositeData;
 import javax.management.relation.MBeanServerNotificationFilter;
 import java.lang.management.ManagementFactory;
@@ -436,7 +436,8 @@ private void addJmxMetricRegistration(JmxMetric jmxMetric, List<JmxMetricRegistr
         } else if (value instanceof CompositeData) {
             final CompositeData compositeValue = (CompositeData) value;
             for (final String key : compositeValue.getCompositeType().keySet()) {
-                if (compositeValue.get(key) instanceof Number) {
+                Object entryValue = compositeValue.get(key);
+                if (entryValue instanceof Number) {
                     logger.debug("Found composite number attribute {}.{}={}", attribute.getJmxAttributeName(), key, value);
                     registrations.add(
                         new JmxMetricRegistration(
@@ -452,7 +453,7 @@ private void addJmxMetricRegistration(JmxMetric jmxMetric, List<JmxMetricRegistr
                     );
                 } else {
                     if (!isWildcard(attribute)) {
-                        logger.warn("Can't create metric '{}' because composite value '{}' is not a number: '{}'", jmxMetric, key, value);
+                        logger.warn("Can't create metric '{}' because composite value '{}' is not a number: '{}'", jmxMetric, key, entryValue);
                     }
                 }
             }

From 03d63cb3ba374dd860e5bc25ee661121674f3a1e Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Thu, 24 Oct 2024 17:03:49 +0200
Subject: [PATCH 2/3] Changelog

---
 CHANGELOG.asciidoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 2d294d7773..e2f2109b3c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -34,6 +34,10 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 [[release-notes-1.x]]
 === Java Agent version 1.x
 
+[float]
+===== Bug fixes
+* Fix JMX metric warning message about unsupported composite value types - {pull}3849[#3849]
+
 [[release-notes-1.52.0]]
 ==== 1.52.0 - 2024/09/23
 

From 470428e68f120c0923a658e0362bdf5e030bae6e Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Thu, 24 Oct 2024 17:11:14 +0200
Subject: [PATCH 3/3] Fix changelog

---
 CHANGELOG.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e2f2109b3c..c5d4cfe1f0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -31,13 +31,13 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 
 === Unreleased
 
-[[release-notes-1.x]]
-=== Java Agent version 1.x
-
 [float]
 ===== Bug fixes
 * Fix JMX metric warning message about unsupported composite value types - {pull}3849[#3849]
 
+[[release-notes-1.x]]
+=== Java Agent version 1.x
+
 [[release-notes-1.52.0]]
 ==== 1.52.0 - 2024/09/23