Merge pull request #71 from andrewshan/main

feat: 修改客户端ID为host+pid的格式

Author: chuntaojun

polaris-common/polaris-client/src/main/java/com/tencent/polaris/client/api/SDKContext.java

@@ -38,6 +38,7 @@
 import com.tencent.polaris.factory.config.ConfigurationImpl;
 import java.io.Closeable;
 import java.io.IOException;
+import java.lang.management.ManagementFactory;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.Socket;
@@ -48,7 +49,6 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.ServiceLoader;
-import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -103,7 +103,7 @@ public SDKContext(Configuration configuration, Manager plugins, ValueContext val
         this.configuration = configuration;
         this.plugins = plugins;
         this.valueContext = valueContext;
-        this.valueContext.setClientId(UUID.randomUUID().toString());
+        this.valueContext.setClientId(generateClientId(this.valueContext.getHost()));
         List<ServerServiceInfo> services = new ArrayList<>();
         //加载系统服务配置
         SystemConfig system = configuration.getGlobal().getSystem();
@@ -122,6 +122,31 @@ public SDKContext(Configuration configuration, Manager plugins, ValueContext val
         this.serverServices = Collections.unmodifiableCollection(services);
     }
 
+    private static String generateClientId(String host) {
+        return host + "-" + getProcessId("0");
+    }
+
+    private static String getProcessId(String fallback) {
+        // Note: may fail in some JVM implementations
+        // therefore fallback has to be provided
+
+        // something like '<pid>@<hostname>', at least in SUN / Oracle JVMs
+        final String jvmName = ManagementFactory.getRuntimeMXBean().getName();
+        final int index = jvmName.indexOf('@');
+
+        if (index < 1) {
+            // part before '@' empty (index = 0) / '@' not found (index = -1)
+            return fallback;
+        }
+
+        try {
+            return Long.toString(Long.parseLong(jvmName.substring(0, index)));
+        } catch (NumberFormatException e) {
+            // ignore
+        }
+        return fallback;
+    }
+
     public synchronized void init() throws PolarisException {
         if (!initialized.compareAndSet(false, true)) {
             return;

polaris-plugins/polaris-plugins-observability/stat-prometheus/src/main/java/com/tencent/polaris/plugins/stat/prometheus/plugin/PrometheusReporter.java

@@ -51,8 +51,8 @@ public void postContextInit(Extensions extensions) throws PolarisException {
                     .getPluginConfig(getName(), PrometheusPushHandlerConfig.class);
             ServiceDiscoveryProvider provider = new ServiceDiscoveryProvider(extensions, config);
             String instanceId = extensions.getValueContext().getClientId();
-            statInfoHandler = new PrometheusPushHandler(extensions.getValueContext().getHost(),
-                    config, provider, PUSH_DEFAULT_JOB_NAME, instanceId);
+            String host = extensions.getValueContext().getHost();
+            statInfoHandler = new PrometheusPushHandler(host, config, provider, PUSH_DEFAULT_JOB_NAME, instanceId);
         }
     }
 
@@ -85,4 +85,5 @@ public void destroy() {
             statInfoHandler = null;
         }
     }
+
 }