[dubbo] branch 3.2 updated: :fire: remove applicationName in jvm metric (#12770)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new 10870708eb :fire: remove applicationName in jvm metric (#12770)
10870708eb is described below

commit 10870708eb99a10fcfb25f71138e8d43cde566c4
Author: songxiaosheng <songxiaosh...@elastic.link>
AuthorDate: Mon Jul 31 10:25:02 2023 +0800

    :fire: remove applicationName in jvm metric (#12770)
    
    * :fire: remove applicationName in jvm metric
    
    * :fire: remove applicationName in jvm metric
    
    * :fire: remove applicationName in jvm metric
---
 .../dubbo/metrics/report/AbstractMetricsReporter.java   | 17 ++++++-----------
 .../prometheus/PrometheusMetricsReporterTest.java       |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git 
a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/report/AbstractMetricsReporter.java
 
b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/report/AbstractMetricsReporter.java
index 3dfed9b466..c6eb309b36 100644
--- 
a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/report/AbstractMetricsReporter.java
+++ 
b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/report/AbstractMetricsReporter.java
@@ -21,7 +21,6 @@ import io.micrometer.core.instrument.FunctionCounter;
 import io.micrometer.core.instrument.binder.MeterBinder;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
-import org.apache.dubbo.common.constants.MetricsConstants;
 import org.apache.dubbo.common.lang.ShutdownHookCallbacks;
 import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
@@ -38,7 +37,6 @@ import org.apache.dubbo.rpc.model.ApplicationModel;
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tag;
-import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
@@ -49,7 +47,6 @@ import 
io.micrometer.core.instrument.composite.CompositeMeterRegistry;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -112,21 +109,19 @@ public abstract class AbstractMetricsReporter implements 
MetricsReporter {
     private void addJvmMetrics() {
         boolean enableJvmMetrics = url.getParameter(ENABLE_JVM_METRICS_KEY, 
false);
         if (enableJvmMetrics) {
-            Tags extraTags = Tags.of(MetricsConstants.TAG_APPLICATION_NAME,
-                
Optional.ofNullable(applicationModel.getApplicationName()).orElse(""));
-            new ClassLoaderMetrics(extraTags).bindTo(compositeRegistry);
-            new JvmMemoryMetrics(extraTags).bindTo(compositeRegistry);
+            new ClassLoaderMetrics().bindTo(compositeRegistry);
+            new JvmMemoryMetrics().bindTo(compositeRegistry);
 
             @SuppressWarnings("java:S2095")
             // Do not change JvmGcMetrics to try-with-resources as the 
JvmGcMetrics will not be available after (auto-)closing.
             // See https://github.com/micrometer-metrics/micrometer/issues/1492
-            JvmGcMetrics jvmGcMetrics = new JvmGcMetrics(extraTags);
+            JvmGcMetrics jvmGcMetrics = new JvmGcMetrics();
             jvmGcMetrics.bindTo(compositeRegistry);
             Runtime.getRuntime().addShutdownHook(new 
Thread(jvmGcMetrics::close));
 
-            bindTo(new ProcessorMetrics(extraTags));
-            new JvmThreadMetrics(extraTags).bindTo(compositeRegistry);
-            bindTo(new UptimeMetrics(extraTags));
+            bindTo(new ProcessorMetrics());
+            new JvmThreadMetrics().bindTo(compositeRegistry);
+            bindTo(new UptimeMetrics());
         }
     }
 
diff --git 
a/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsReporterTest.java
 
b/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsReporterTest.java
index e6aae6745d..6b4122753e 100644
--- 
a/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsReporterTest.java
+++ 
b/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsReporterTest.java
@@ -80,7 +80,7 @@ class PrometheusMetricsReporterTest {
         Double d2 = 
prometheusRegistry.getPrometheusRegistry().getSampleValue("jvm_gc_memory_promoted_bytes_total",
             new String[]{"application_name"}, new String[]{name});
         Assertions.assertNull(d1);
-        Assertions.assertNotNull(d2);
+        Assertions.assertNull(d2);
     }
 
     @Test