From 6130bd7b42a595bf0b1c1d298944aa58dfc01cd6 Mon Sep 17 00:00:00 2001 From: JackShi148 Date: Tue, 9 Dec 2025 18:11:09 +0800 Subject: [PATCH 1/2] change domain to keep the same as 1x --- .../java/com/alipay/oceanbase/hbase/util/OHMetrics.java | 2 +- .../com/alipay/oceanbase/hbase/util/OHMetricsTracker.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alipay/oceanbase/hbase/util/OHMetrics.java b/src/main/java/com/alipay/oceanbase/hbase/util/OHMetrics.java index 6cc41fa7..a2bfb42e 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/util/OHMetrics.java +++ b/src/main/java/com/alipay/oceanbase/hbase/util/OHMetrics.java @@ -32,7 +32,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); diff --git a/src/main/java/com/alipay/oceanbase/hbase/util/OHMetricsTracker.java b/src/main/java/com/alipay/oceanbase/hbase/util/OHMetricsTracker.java index dda0929f..485544f2 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/util/OHMetricsTracker.java +++ b/src/main/java/com/alipay/oceanbase/hbase/util/OHMetricsTracker.java @@ -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() { From 610c03e01f8860b47f507ebc43515d8d42f5f0b1 Mon Sep 17 00:00:00 2001 From: JackShi148 Date: Tue, 9 Dec 2025 19:56:34 +0800 Subject: [PATCH 2/2] fix jmx test bug --- .../java/com/alipay/oceanbase/hbase/OHTable.java | 2 ++ .../com/alipay/oceanbase/hbase/OHTableClient.java | 2 +- .../hbase/{util => metrics}/MetricsExporter.java | 2 +- .../hbase/{util => metrics}/MetricsImporter.java | 2 +- .../oceanbase/hbase/{util => metrics}/OHMetrics.java | 3 ++- .../hbase/{util => metrics}/OHMetricsTracker.java | 2 +- .../oceanbase/hbase/result/ClientStreamScanner.java | 4 ++-- .../com/alipay/oceanbase/hbase/JMXMetricsTest.java | 4 ++-- .../com/alipay/oceanbase/hbase/OHMetricsTest.java | 4 ++-- .../oceanbase/hbase/util/JMXMetricsTestHelper.java | 12 ++++++------ 10 files changed, 20 insertions(+), 17 deletions(-) rename src/main/java/com/alipay/oceanbase/hbase/{util => metrics}/MetricsExporter.java (99%) rename src/main/java/com/alipay/oceanbase/hbase/{util => metrics}/MetricsImporter.java (94%) rename src/main/java/com/alipay/oceanbase/hbase/{util => metrics}/OHMetrics.java (97%) rename src/main/java/com/alipay/oceanbase/hbase/{util => metrics}/OHMetricsTracker.java (98%) diff --git a/src/main/java/com/alipay/oceanbase/hbase/OHTable.java b/src/main/java/com/alipay/oceanbase/hbase/OHTable.java index 181e456f..0b9ada6e 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/OHTable.java +++ b/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; diff --git a/src/main/java/com/alipay/oceanbase/hbase/OHTableClient.java b/src/main/java/com/alipay/oceanbase/hbase/OHTableClient.java index 7a113b82..660c491e 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/OHTableClient.java +++ b/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; diff --git a/src/main/java/com/alipay/oceanbase/hbase/util/MetricsExporter.java b/src/main/java/com/alipay/oceanbase/hbase/metrics/MetricsExporter.java similarity index 99% rename from src/main/java/com/alipay/oceanbase/hbase/util/MetricsExporter.java rename to src/main/java/com/alipay/oceanbase/hbase/metrics/MetricsExporter.java index c32b15d2..4898c029 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/util/MetricsExporter.java +++ b/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; diff --git a/src/main/java/com/alipay/oceanbase/hbase/util/MetricsImporter.java b/src/main/java/com/alipay/oceanbase/hbase/metrics/MetricsImporter.java similarity index 94% rename from src/main/java/com/alipay/oceanbase/hbase/util/MetricsImporter.java rename to src/main/java/com/alipay/oceanbase/hbase/metrics/MetricsImporter.java index d442fccf..4230bc0a 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/util/MetricsImporter.java +++ b/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; diff --git a/src/main/java/com/alipay/oceanbase/hbase/util/OHMetrics.java b/src/main/java/com/alipay/oceanbase/hbase/metrics/OHMetrics.java similarity index 97% rename from src/main/java/com/alipay/oceanbase/hbase/util/OHMetrics.java rename to src/main/java/com/alipay/oceanbase/hbase/metrics/OHMetrics.java index a2bfb42e..c3afc7d6 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/util/OHMetrics.java +++ b/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; diff --git a/src/main/java/com/alipay/oceanbase/hbase/util/OHMetricsTracker.java b/src/main/java/com/alipay/oceanbase/hbase/metrics/OHMetricsTracker.java similarity index 98% rename from src/main/java/com/alipay/oceanbase/hbase/util/OHMetricsTracker.java rename to src/main/java/com/alipay/oceanbase/hbase/metrics/OHMetricsTracker.java index 485544f2..daf92818 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/util/OHMetricsTracker.java +++ b/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.*; diff --git a/src/main/java/com/alipay/oceanbase/hbase/result/ClientStreamScanner.java b/src/main/java/com/alipay/oceanbase/hbase/result/ClientStreamScanner.java index 5d588d87..cfc50270 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/result/ClientStreamScanner.java +++ b/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; diff --git a/src/test/java/com/alipay/oceanbase/hbase/JMXMetricsTest.java b/src/test/java/com/alipay/oceanbase/hbase/JMXMetricsTest.java index 76be9286..098c367e 100644 --- a/src/test/java/com/alipay/oceanbase/hbase/JMXMetricsTest.java +++ b/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; diff --git a/src/test/java/com/alipay/oceanbase/hbase/OHMetricsTest.java b/src/test/java/com/alipay/oceanbase/hbase/OHMetricsTest.java index 2046ea72..2d17522d 100644 --- a/src/test/java/com/alipay/oceanbase/hbase/OHMetricsTest.java +++ b/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; diff --git a/src/test/java/com/alipay/oceanbase/hbase/util/JMXMetricsTestHelper.java b/src/test/java/com/alipay/oceanbase/hbase/util/JMXMetricsTestHelper.java index 36ed5702..0244c414 100644 --- a/src/test/java/com/alipay/oceanbase/hbase/util/JMXMetricsTestHelper.java +++ b/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);