This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 45e945e GEODE-6295: Extract default from CompositeMeterRegistryFactory
45e945e is described below
commit 45e945ee813c2f4b077d274c6e2bb3ffadec6c70
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Wed Mar 13 16:20:45 2019 -0700
GEODE-6295: Extract default from CompositeMeterRegistryFactory
Extract default from CompositeMeterRegistryFactory to concrete class
CompositeMeterRegistryFactory.
---
.../geode/internal/cache/InternalCacheBuilder.java | 3 ++-
...yFactory.java => CacheMeterRegistryFactory.java} | 14 ++++++--------
.../metrics/CompositeMeterRegistryFactory.java | 21 +--------------------
...Test.java => CacheMeterRegistryFactoryTest.java} | 16 ++++++++--------
4 files changed, 17 insertions(+), 37 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheBuilder.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheBuilder.java
index 8c8702e..a567597 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheBuilder.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheBuilder.java
@@ -43,6 +43,7 @@ import
org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.SecurityConfig;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.metrics.CacheLifecycleMetricsSession;
+import org.apache.geode.internal.metrics.CacheMeterRegistryFactory;
import org.apache.geode.internal.metrics.CompositeMeterRegistryFactory;
import org.apache.geode.pdx.PdxSerializer;
import org.apache.geode.pdx.internal.TypeRegistry;
@@ -111,7 +112,7 @@ public class InternalCacheBuilder {
private InternalCacheBuilder(Properties configProperties, CacheConfig
cacheConfig) {
this(configProperties,
cacheConfig,
- new CompositeMeterRegistryFactory() {},
+ new CacheMeterRegistryFactory(),
CacheLifecycleMetricsSession.builder()::build,
InternalDistributedSystem::getConnectedInstance,
InternalDistributedSystem::connectInternal,
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactory.java
b/geode-core/src/main/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactory.java
similarity index 81%
copy from
geode-core/src/main/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactory.java
copy to
geode-core/src/main/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactory.java
index a0e378d..e4336f9 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactory.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactory.java
@@ -19,19 +19,17 @@ import
io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import org.apache.geode.annotations.VisibleForTesting;
-/**
- * Creates {@code CompositeMeterRegistry} and configures commonTags.
- */
-public interface CompositeMeterRegistryFactory {
+public class CacheMeterRegistryFactory implements
CompositeMeterRegistryFactory {
@VisibleForTesting
- String CLUSTER_ID_TAG = "ClusterId";
+ static final String CLUSTER_ID_TAG = "cluster.id";
@VisibleForTesting
- String MEMBER_NAME_TAG = "MemberName";
+ static final String MEMBER_NAME_TAG = "member.name";
@VisibleForTesting
- String HOST_NAME_TAG = "HostName";
+ static final String HOST_NAME_TAG = "host.name";
- default CompositeMeterRegistry create(int systemId, String memberName,
String hostName) {
+ @Override
+ public CompositeMeterRegistry create(int systemId, String memberName, String
hostName) {
CompositeMeterRegistry registry = new CompositeMeterRegistry();
MeterRegistry.Config registryConfig = registry.config();
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactory.java
b/geode-core/src/main/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactory.java
index a0e378d..0664dea 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactory.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactory.java
@@ -14,31 +14,12 @@
*/
package org.apache.geode.internal.metrics;
-import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import org.apache.geode.annotations.VisibleForTesting;
-
/**
* Creates {@code CompositeMeterRegistry} and configures commonTags.
*/
public interface CompositeMeterRegistryFactory {
- @VisibleForTesting
- String CLUSTER_ID_TAG = "ClusterId";
- @VisibleForTesting
- String MEMBER_NAME_TAG = "MemberName";
- @VisibleForTesting
- String HOST_NAME_TAG = "HostName";
-
- default CompositeMeterRegistry create(int systemId, String memberName,
String hostName) {
- CompositeMeterRegistry registry = new CompositeMeterRegistry();
-
- MeterRegistry.Config registryConfig = registry.config();
- registryConfig.commonTags(CLUSTER_ID_TAG, String.valueOf(systemId));
- registryConfig.commonTags(MEMBER_NAME_TAG, memberName == null ? "" :
memberName);
- registryConfig.commonTags(HOST_NAME_TAG, hostName == null ? "" : hostName);
-
- return registry;
- }
+ CompositeMeterRegistry create(int systemId, String memberName, String
hostName);
}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactoryTest.java
b/geode-core/src/test/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactoryTest.java
similarity index 78%
rename from
geode-core/src/test/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactoryTest.java
rename to
geode-core/src/test/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactoryTest.java
index 0a31db9..a7d76cb 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/metrics/CompositeMeterRegistryFactoryTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/metrics/CacheMeterRegistryFactoryTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.internal.metrics;
-import static
org.apache.geode.internal.metrics.CompositeMeterRegistryFactory.CLUSTER_ID_TAG;
-import static
org.apache.geode.internal.metrics.CompositeMeterRegistryFactory.HOST_NAME_TAG;
-import static
org.apache.geode.internal.metrics.CompositeMeterRegistryFactory.MEMBER_NAME_TAG;
+import static
org.apache.geode.internal.metrics.CacheMeterRegistryFactory.CLUSTER_ID_TAG;
+import static
org.apache.geode.internal.metrics.CacheMeterRegistryFactory.HOST_NAME_TAG;
+import static
org.apache.geode.internal.metrics.CacheMeterRegistryFactory.MEMBER_NAME_TAG;
import static org.assertj.core.api.Assertions.assertThat;
import io.micrometer.core.instrument.Meter;
@@ -24,7 +24,7 @@ import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import org.junit.Test;
-public class CompositeMeterRegistryFactoryTest {
+public class CacheMeterRegistryFactoryTest {
private static final int CLUSTER_ID = 42;
private static final String MEMBER_NAME = "member-name";
@@ -32,7 +32,7 @@ public class CompositeMeterRegistryFactoryTest {
@Test
public void createsCompositeMeterRegistry() {
- CompositeMeterRegistryFactory factory = new
CompositeMeterRegistryFactory() {};
+ CacheMeterRegistryFactory factory = new CacheMeterRegistryFactory();
assertThat(factory.create(CLUSTER_ID, MEMBER_NAME, HOST_NAME))
.isInstanceOf(CompositeMeterRegistry.class);
@@ -40,7 +40,7 @@ public class CompositeMeterRegistryFactoryTest {
@Test
public void addsMemberNameCommonTag() {
- CompositeMeterRegistryFactory factory = new
CompositeMeterRegistryFactory() {};
+ CacheMeterRegistryFactory factory = new CacheMeterRegistryFactory();
String theMemberName = "the-member-name";
CompositeMeterRegistry registry = factory.create(CLUSTER_ID,
theMemberName, HOST_NAME);
@@ -53,7 +53,7 @@ public class CompositeMeterRegistryFactoryTest {
@Test
public void addsClusterIdCommonTag() {
- CompositeMeterRegistryFactory factory = new
CompositeMeterRegistryFactory() {};
+ CacheMeterRegistryFactory factory = new CacheMeterRegistryFactory();
int theSystemId = 21;
CompositeMeterRegistry registry = factory.create(theSystemId, MEMBER_NAME,
HOST_NAME);
@@ -66,7 +66,7 @@ public class CompositeMeterRegistryFactoryTest {
@Test
public void addsHostNameCommonTag() {
- CompositeMeterRegistryFactory factory = new
CompositeMeterRegistryFactory() {};
+ CacheMeterRegistryFactory factory = new CacheMeterRegistryFactory();
String theHostName = "the-host-name";
CompositeMeterRegistry registry = factory.create(CLUSTER_ID, MEMBER_NAME,
theHostName);
