[skywalking] branch master updated: Delete unused code (MachineInfo) (#6679)

[ke...@apache.org]

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

kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 2bc3b61  Delete unused code (MachineInfo) (#6679)
2bc3b61 is described below

commit 2bc3b6135546745210a84e31c0a3454ae8749bd9
Author: Kirs <ac...@163.com>
AuthorDate: Sun Apr 4 21:47:57 2021 +0800

    Delete unused code (MachineInfo) (#6679)
---
 .../apache/skywalking/apm/util/MachineInfo.java    | 88 ----------------------
 .../skywalking/apm/util/MachineInfoTest.java       | 41 ----------
 2 files changed, 129 deletions(-)

diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java
deleted file mode 100644
index 808bc42..0000000
--- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.apm.util;
-
-import java.lang.management.ManagementFactory;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-public final class MachineInfo {
-    private static int PROCESS_NO = -1;
-    private static String IP;
-    private static String HOST_NAME;
-
-    static {
-        PROCESS_NO = getProcessNo();
-    }
-
-    public static int getProcessNo() {
-        if (PROCESS_NO == -1) {
-            String name = ManagementFactory.getRuntimeMXBean().getName();
-            try {
-                PROCESS_NO = Integer.parseInt(name.split("@")[0]);
-            } catch (Throwable t) {
-                PROCESS_NO = 0;
-            }
-        }
-        return PROCESS_NO;
-    }
-
-    private static InetAddress getInetAddress() {
-        try {
-            return InetAddress.getLocalHost();
-        } catch (UnknownHostException e) {
-            HOST_NAME = "unknown host!";
-        }
-        return null;
-
-    }
-
-    public static String getHostIp() {
-        if (StringUtil.isEmpty(IP)) {
-            InetAddress netAddress = getInetAddress();
-            if (null == netAddress) {
-                IP = "N/A";
-            } else {
-                IP = netAddress.getHostAddress(); //get the ip address
-            }
-        }
-        return IP;
-    }
-
-    public static String getHostName() {
-        if (StringUtil.isEmpty(HOST_NAME)) {
-            InetAddress netAddress = getInetAddress();
-            if (null == netAddress) {
-                HOST_NAME = "N/A";
-            } else {
-                HOST_NAME = netAddress.getHostName(); //get the host address
-            }
-        }
-        return HOST_NAME;
-    }
-
-    public static String getHostDesc() {
-        return getHostName() + "/" + getHostIp();
-    }
-
-    private MachineInfo() {
-        // Non
-    }
-
-}
diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java
deleted file mode 100644
index 7bf0742..0000000
--- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.apm.util;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class MachineInfoTest {
-
-    @Test
-    public void testMachine() {
-        int processNo = MachineInfo.getProcessNo();
-        Assert.assertTrue(processNo >= 0);
-
-        String hostIp = MachineInfo.getHostIp();
-        Assert.assertTrue(!StringUtil.isEmpty(hostIp));
-
-        String hostName = MachineInfo.getHostName();
-        Assert.assertTrue(!StringUtil.isEmpty(hostName));
-
-        String hostDesc = MachineInfo.getHostDesc();
-        Assert.assertTrue(!StringUtil.isEmpty(hostDesc) && hostDesc.contains("/"));
-    }
-
-}