Adapt 1x JMX domain

src/main/java/com/alipay/oceanbase/hbase/OHTable.java

@@ -21,6 +21,8 @@
 import com.alipay.oceanbase.hbase.exception.OperationTimeoutException;
 import com.alipay.oceanbase.hbase.execute.ServerCallable;
 import com.alipay.oceanbase.hbase.filter.HBaseFilterUtils;
+import com.alipay.oceanbase.hbase.metrics.MetricsImporter;
+import com.alipay.oceanbase.hbase.metrics.OHMetrics;
 import com.alipay.oceanbase.hbase.result.ClientStreamScanner;
 import com.alipay.oceanbase.hbase.util.*;
 import com.alipay.oceanbase.rpc.ObGlobal;

src/main/java/com/alipay/oceanbase/hbase/OHTableClient.java

@@ -18,7 +18,7 @@
 package com.alipay.oceanbase.hbase;
 
 import com.alipay.oceanbase.hbase.core.Lifecycle;
-import com.alipay.oceanbase.hbase.util.OHMetrics;
+import com.alipay.oceanbase.hbase.metrics.OHMetrics;
 import com.google.protobuf.Descriptors;
 import com.google.protobuf.Message;
 import com.google.protobuf.Service;

src/main/java/com/alipay/oceanbase/hbase/util/MetricsExporter.java → src/main/java/com/alipay/oceanbase/hbase/metrics/MetricsExporter.java

@@ -1,4 +1,4 @@
-package com.alipay.oceanbase.hbase.util;
+package com.alipay.oceanbase.hbase.metrics;
 
 import com.codahale.metrics.Snapshot;
 import com.codahale.metrics.Timer;

src/main/java/com/alipay/oceanbase/hbase/util/MetricsImporter.java → src/main/java/com/alipay/oceanbase/hbase/metrics/MetricsImporter.java

@@ -1,4 +1,4 @@
-package com.alipay.oceanbase.hbase.util;
+package com.alipay.oceanbase.hbase.metrics;
 
 public class MetricsImporter {
     private boolean isFailedOp;

src/main/java/com/alipay/oceanbase/hbase/util/OHMetrics.java → src/main/java/com/alipay/oceanbase/hbase/metrics/OHMetrics.java

@@ -1,5 +1,6 @@
-package com.alipay.oceanbase.hbase.util;
+package com.alipay.oceanbase.hbase.metrics;
 
+import com.alipay.oceanbase.hbase.util.TableHBaseLoggerFactory;
 import com.alipay.oceanbase.rpc.location.model.partition.ObPair;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.OHOperationType;
 import com.codahale.metrics.JmxReporter;
@@ -32,7 +33,7 @@ public OHMetrics(String metricsName) {
                                                    opType);
         }
         this.reporter = JmxReporter.forRegistry(this.registry)
-                                   .inDomain("com.oceanbase.hbase.metrics")
+                                   .inDomain("com.alipay.oceanbase.hbase.metrics")
                                    .build();
         this.reporter.start();
         scheduler.scheduleWithFixedDelay(this::updateMetrics, 0, 10, TimeUnit.SECONDS);

src/main/java/com/alipay/oceanbase/hbase/util/OHMetricsTracker.java → src/main/java/com/alipay/oceanbase/hbase/metrics/OHMetricsTracker.java

@@ -1,4 +1,4 @@
-package com.alipay.oceanbase.hbase.util;
+package com.alipay.oceanbase.hbase.metrics;
 
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.OHOperationType;
 import com.codahale.metrics.*;
@@ -18,13 +18,13 @@ public OHMetricsTracker(MetricRegistry registry, String metricsName, OHOperation
         String typeName = opType.name();
         this.opType = opType;
         this.latencyHistogram = registry.timer(
-                name(OHMetrics.class, typeName, "latencyHistogram", metricsName));
+                name(metricsName, typeName, "latencyHistogram"));
         this.failedOpCounter = registry.meter(
-                name(OHMetrics.class, typeName, "failedOpCounter", metricsName));
+                name(metricsName, typeName, "failedOpCounter"));
         this.totalSingleOpCount = registry.counter(
-                name(OHMetrics.class, typeName, "totalSingleOpCount", metricsName));
+                name(metricsName, typeName, "totalSingleOpCount"));
         this.totalRuntime = registry.counter(
-                name(OHMetrics.class, typeName, "totalRuntime", metricsName));
+                name(metricsName, typeName, "totalRuntime"));
     }
 
     public OHOperationType getOpType() {

src/main/java/com/alipay/oceanbase/hbase/result/ClientStreamScanner.java

@@ -17,9 +17,9 @@
 
 package com.alipay.oceanbase.hbase.result;
 
-import com.alipay.oceanbase.hbase.util.MetricsImporter;
+import com.alipay.oceanbase.hbase.metrics.MetricsImporter;
 import com.alipay.oceanbase.hbase.util.OHBaseFuncUtils;
-import com.alipay.oceanbase.hbase.util.OHMetrics;
+import com.alipay.oceanbase.hbase.metrics.OHMetrics;
 import com.alipay.oceanbase.hbase.util.TableHBaseLoggerFactory;
 import com.alipay.oceanbase.rpc.location.model.partition.ObPair;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.ObObj;

src/test/java/com/alipay/oceanbase/hbase/JMXMetricsTest.java

@@ -1,8 +1,8 @@
 package com.alipay.oceanbase.hbase;
 
 import com.alipay.oceanbase.hbase.util.JMXMetricsTestHelper;
-import com.alipay.oceanbase.hbase.util.MetricsExporter;
-import com.alipay.oceanbase.hbase.util.OHMetrics;
+import com.alipay.oceanbase.hbase.metrics.MetricsExporter;
+import com.alipay.oceanbase.hbase.metrics.OHMetrics;
 import com.alipay.oceanbase.hbase.util.ObHTableTestUtil;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.OHOperationType;
 import org.apache.hadoop.conf.Configuration;

src/test/java/com/alipay/oceanbase/hbase/OHMetricsTest.java

@@ -1,7 +1,7 @@
 package com.alipay.oceanbase.hbase;
 
-import com.alipay.oceanbase.hbase.util.MetricsExporter;
-import com.alipay.oceanbase.hbase.util.OHMetrics;
+import com.alipay.oceanbase.hbase.metrics.MetricsExporter;
+import com.alipay.oceanbase.hbase.metrics.OHMetrics;
 import com.alipay.oceanbase.hbase.util.ObHTableTestUtil;
 import com.alipay.oceanbase.rpc.exception.ObTableUnexpectedException;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.OHOperationType;

src/test/java/com/alipay/oceanbase/hbase/util/JMXMetricsTestHelper.java

@@ -1,5 +1,6 @@
 package com.alipay.oceanbase.hbase.util;
 
+import com.alipay.oceanbase.hbase.metrics.OHMetrics;
 import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.OHOperationType;
 import org.junit.Assert;
 
@@ -12,7 +13,7 @@
  */
 public class JMXMetricsTestHelper {
 
-    private static final String JMX_DOMAIN = "com.oceanbase.hbase.metrics";
+    private static final String JMX_DOMAIN = "com.alipay.oceanbase.hbase.metrics";
     private final MBeanServer mBeanServer;
 
     public JMXMetricsTestHelper() {
@@ -31,12 +32,11 @@ public ObjectName getObjectName(OHOperationType opType, String metricsName,
                                     String attributeName) {
         try {
             // the format of JMX name: domain:name=metricName
-            // example: com.alipay.oceanbase.hbase.util.OHMetrics.PUT.latencyHistogram.metricsName
-            String name = String.format("%s.%s.%s.%s",
-                    OHMetrics.class.getName(),
+            // example: test_multi_cf.test.PUT.latencyHistogram
+            String name = String.format("%s.%s.%s",
+                    metricsName,
                     opType.name(),
-                    attributeName,
-                    metricsName);
+                    attributeName);
 
             String objectNameStr = String.format("%s:name=%s",
                 JMX_DOMAIN, name);