RATIS-1710. Refactor metrics api and implementation to separated modules.#749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szetszwo merged 1 commit into from
Sep 22, 2022
Merged

RATIS-1710. Refactor metrics api and implementation to separated modules. #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@

<module>ratis-examples</module>
<module>ratis-replicated-map</module>
<module>ratis-metrics</module>
<module>ratis-metrics-api</module>
<module>ratis-metrics-default</module>
<module>ratis-tools</module>
<module>ratis-shell</module>
<module>ratis-assembly</module>
Expand DownExpand Up@@ -271,16 +272,21 @@
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>ratis-metrics</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<artifactId>ratis-metrics-api</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>ratis-metrics</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<artifactId>ratis-tools</artifactId>
Expand Down
6 changes: 5 additions & 1 deletion ratis-assembly/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,11 @@

<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-metrics</artifactId>
<artifactId>ratis-metrics-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-metrics-default</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
Expand Down
3 changes: 2 additions & 1 deletion ratis-assembly/src/main/assembly/bin.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,8 @@
<include>org.apache.ratis:ratis-server-api</include>
<include>org.apache.ratis:ratis-server</include>
<include>org.apache.ratis:ratis-test</include>
<include>org.apache.ratis:ratis-metrics</include>
<include>org.apache.ratis:ratis-metrics-api</include>
<include>org.apache.ratis:ratis-metrics-default</include>
<include>org.apache.ratis:ratis-tools</include>
<include>org.apache.ratis:ratis-resource-bundle</include>
</includes>
Expand Down
3 changes: 2 additions & 1 deletion ratis-assembly/src/main/assembly/src.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,8 @@
<include>org.apache.ratis:ratis-server</include>
<include>org.apache.ratis:ratis-shell</include>
<include>org.apache.ratis:ratis-test</include>
<include>org.apache.ratis:ratis-metrics</include>
<include>org.apache.ratis:ratis-metrics-api</include>
<include>org.apache.ratis:ratis-metrics-default</include>
<include>org.apache.ratis:ratis-tools</include>
<include>org.apache.ratis:ratis-resource-bundle</include>
</includes>
Expand Down
5 changes: 5 additions & 0 deletions ratis-examples/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,11 @@
<type>test-jar</type>
</dependency>

<dependency>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
</dependency>

<dependency>
<artifactId>ratis-grpc</artifactId>
<groupId>org.apache.ratis</groupId>
Expand Down
38 changes: 38 additions & 0 deletions ratis-metrics-api/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed 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. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ratis</artifactId>
<groupId>org.apache.ratis</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>ratis-metrics-api</artifactId>
<name>Apache Ratis Metrics API</name>

<dependencies>
<dependency>
<artifactId>ratis-common</artifactId>
<groupId>org.apache.ratis</groupId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
</project>
0 ...org/apache/ratis/metrics/LongCounter.java → ...org/apache/ratis/metrics/LongCounter.java
View file
Open in desktop
File renamed without changes.
0 ...pache/ratis/metrics/MetricRegistries.java → ...pache/ratis/metrics/MetricRegistries.java
View file
Open in desktop
File renamed without changes.
0 ...ratis/metrics/MetricRegistriesLoader.java → ...ratis/metrics/MetricRegistriesLoader.java
View file
Open in desktop
File renamed without changes.
5 changes: 1 addition & 4 deletions .../ratis/metrics/MetricRegistryFactory.java → .../ratis/metrics/MetricRegistryFactory.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
/**
*
/*
* 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
Expand All@@ -16,8 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/


package org.apache.ratis.metrics;

/**
Expand Down
41 changes: 27 additions & 14 deletions ...che/ratis/metrics/MetricRegistryInfo.java → ...che/ratis/metrics/MetricRegistryInfo.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,25 @@

package org.apache.ratis.metrics;

import org.apache.ratis.thirdparty.com.codahale.metrics.MetricRegistry;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.MemoizedSupplier;

import java.util.Objects;
import java.util.function.Supplier;

/**
*
* This class holds the name and description and JMX related context names for such group of
* metrics.
* This class holds the name, description and JMX related context names for such group of metrics.
* <p>
* This class is immutable.
*/
public class MetricRegistryInfo {

private final String prefix;
private final String metricsDescription;
private final String metricsComponentName;
private final String fullName;
private final String applicationName;

private final Supplier<Integer> hash = MemoizedSupplier.valueOf(this::computeHash);

/**
* @param prefix className or component name this metric registry collects metric for
* @param applicationName application Name needs to be in small case as it is used for hadoop2metrics
Expand All@@ -48,7 +50,6 @@ public MetricRegistryInfo(String prefix, String applicationName, String metricsC
this.applicationName = applicationName;
this.metricsComponentName = metricsComponentName;
this.metricsDescription = metricsDescription;
this.fullName = MetricRegistry.name(applicationName, metricsComponentName, prefix);
}

public String getApplicationName() {
Expand DownExpand Up@@ -79,21 +80,33 @@ public String getPrefix() {

@Override
public boolean equals(Object obj) {
if (obj instanceof MetricRegistryInfo) {
return this.hashCode() == obj.hashCode();
} else {
if (this == obj) {
return true;
} else if (!(obj instanceof MetricRegistryInfo)) {
return false;
}
final MetricRegistryInfo that = (MetricRegistryInfo) obj;
return Objects.equals(prefix, that.prefix)
&& Objects.equals(metricsDescription, that.metricsDescription)
&& Objects.equals(metricsComponentName, that.metricsComponentName)
&& Objects.equals(applicationName, that.applicationName);
}

@Override
public int hashCode() {
return Objects.hash(prefix, metricsDescription, metricsComponentName);
return hash.get();
}

public String getName() {
return fullName;
private Integer computeHash() {
return Objects.hash(prefix, metricsDescription, metricsComponentName);
}


@Override
public String toString() {
return JavaUtils.getClassSimpleName(getClass())
+ ": applicationName=" + getApplicationName()
+ ", metricsComponentName=" + getMetricsComponentName()
+ ", prefix=" + getPrefix()
+ ", metricsDescription=" + getMetricsDescription();
}
}
0 ...he/ratis/metrics/RatisMetricRegistry.java → ...he/ratis/metrics/RatisMetricRegistry.java
View file
Open in desktop
File renamed without changes.
8 changes: 2 additions & 6 deletions ...rg/apache/ratis/metrics/RatisMetrics.java → ...rg/apache/ratis/metrics/RatisMetrics.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,7 @@ protected static <T extends Enum<T>> Map<T, Timekeeper> newTimerMap(
protected static RatisMetricRegistry create(MetricRegistryInfo info) {
Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
return metricRegistry.orElseGet(() -> {
if (LOG.isDebugEnabled()) {
LOG.debug("Creating Metrics Registry : {}", info.getName());
}
LOG.debug("Creating {}", info);
return MetricRegistries.global().create(info);
});
}
Expand All@@ -74,9 +72,7 @@ protected RatisMetrics(RatisMetricRegistry registry) {

public void unregister() {
MetricRegistryInfo info = registry.getMetricRegistryInfo();
if (LOG.isDebugEnabled()) {
LOG.debug("Unregistering Metrics Registry : {}", info.getName());
}
LOG.debug("Unregistering {}", info);
Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
if (metricRegistry.isPresent()) {
MetricRegistries.global().remove(info);
Expand Down
0 .../org/apache/ratis/metrics/Timekeeper.java → .../org/apache/ratis/metrics/Timekeeper.java
View file
Open in desktop
File renamed without changes.
8 changes: 6 additions & 2 deletions ratis-metrics/pom.xml → ratis-metrics-default/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,14 @@
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>ratis-metrics</artifactId>
<name>Apache Ratis Metrics</name>
<artifactId>ratis-metrics-default</artifactId>
<name>Apache Ratis Metrics Default Implementation</name>

<dependencies>
<dependency>
<artifactId>ratis-metrics-api</artifactId>
<groupId>org.apache.ratis</groupId>
</dependency>
<dependency>
<artifactId>ratis-proto</artifactId>
<groupId>org.apache.ratis</groupId>
Expand Down
0 ...s/metrics/impl/DefaultTimekeeperImpl.java → ...s/metrics/impl/DefaultTimekeeperImpl.java
View file
Open in desktop
File renamed without changes.
0 ...apache/ratis/metrics/impl/JvmMetrics.java → ...apache/ratis/metrics/impl/JvmMetrics.java
View file
Open in desktop
File renamed without changes.
0 ...is/metrics/impl/MetricRegistriesImpl.java → ...is/metrics/impl/MetricRegistriesImpl.java
View file
Open in desktop
File renamed without changes.
0 ...trics/impl/MetricRegistryFactoryImpl.java → ...trics/impl/MetricRegistryFactoryImpl.java
View file
Open in desktop
File renamed without changes.
0 .../ratis/metrics/impl/MetricsReporting.java → .../ratis/metrics/impl/MetricsReporting.java
View file
Open in desktop
File renamed without changes.
8 changes: 5 additions & 3 deletions ...metrics/impl/RatisMetricRegistryImpl.java → ...metrics/impl/RatisMetricRegistryImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;

import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
import java.util.function.Supplier;

Expand All@@ -49,13 +50,14 @@ static RatisMetricRegistryImpl cast(RatisMetricRegistry registry) {
private final MetricRegistry metricRegistry = new MetricRegistry();

private final MetricRegistryInfo info;
private final String namePrefix;

private JmxReporter jmxReporter;
private ConsoleReporter consoleReporter;

public RatisMetricRegistryImpl(MetricRegistryInfo info) {
super();
this.info = info;
this.info = Objects.requireNonNull(info, "info == null");
this.namePrefix = MetricRegistry.name(info.getApplicationName(), info.getMetricsComponentName(), info.getPrefix());
}

@Override
Expand DownExpand Up@@ -111,7 +113,7 @@ public Metric get(String shortName) {
}

private String getMetricName(String shortName) {
return MetricRegistry.name(info.getName(), shortName);
return MetricRegistry.name(namePrefix, shortName);
}

private <T extends Metric> T register(String name, T metric) throws IllegalArgumentException {
Expand Down
0 .../metrics/impl/RatisObjectNameFactory.java → .../metrics/impl/RatisObjectNameFactory.java
View file
Open in desktop
File renamed without changes.
0 ...he/ratis/metrics/impl/RefCountingMap.java → ...he/ratis/metrics/impl/RefCountingMap.java
View file
Open in desktop
File renamed without changes.
0 ...org.apache.ratis.metrics.MetricRegistries → ...org.apache.ratis.metrics.MetricRegistries
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/metrics/TestMetricRegistriesLoader.java → ...s/metrics/TestMetricRegistriesLoader.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/**
/*
* 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
Expand Down
0 ...atis/metrics/impl/TestRefCountingMap.java → ...atis/metrics/impl/TestRefCountingMap.java
View file
Open in desktop
File renamed without changes.
45 changes: 0 additions & 45 deletions ratis-metrics/src/test/resources/hadoop-metrics2.properties
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ratis-server/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,15 +82,15 @@
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-metrics</artifactId>
<artifactId>ratis-metrics-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-metrics</artifactId>
<type>test-jar</type>
<artifactId>ratis-metrics-default</artifactId>
<scope>test</scope>
</dependency>


<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions ratis-test/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,12 @@
<type>test-jar</type>
</dependency>

<dependency>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<scope>test</scope>
</dependency>

<dependency>
<artifactId>ratis-netty</artifactId>
<groupId>org.apache.ratis</groupId>
Expand Down
0 ...is/grpc/server/TestGrpcServerMetrics.java → ...is/grpc/server/TestGrpcServerMetrics.java
View file
Open in desktop
File renamed without changes.
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
RATIS-1710. Refactor metrics api and implementation to separated modules.#749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 1 commit into

from

Sep 22, 2022
 Merged


RATIS-1710. Refactor metrics api and implementation to separated modules.
#749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 15 additions & 9 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@

 <module>ratis-examples</module>
 <module>ratis-replicated-map</module>
 <module>ratis-metrics</module>
 <module>ratis-metrics-api</module>
 <module>ratis-metrics-default</module>
 <module>ratis-tools</module>
 <module>ratis-shell</module>
 <module>ratis-assembly</module>
Expand DownExpand Up@@ -271,16 +272,21 @@
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <type>test-jar</type>
 <scope>test</scope>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
 </dependency>
 <dependency>
 <artifactId>ratis-tools</artifactId>
Expand Down

6 changes: 5 additions & 1 deletion
ratis-assembly/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,11 @@

 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics-default</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/bin.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,8 @@
 <include>org.apache.ratis:ratis-server-api</include>
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/src.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,8 @@
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-shell</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

5 changes: 5 additions & 0 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,11 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <artifactId>ratis-grpc</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

38 changes: 38 additions & 0 deletions
ratis-metrics-api/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
 Licensed 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. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <parent>
 <artifactId>ratis</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics-api</artifactId>
 <name>Apache Ratis Metrics API</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-common</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
 </dependency>
 </dependencies>
</project>

0
...org/apache/ratis/metrics/LongCounter.java → ...org/apache/ratis/metrics/LongCounter.java

View file


Open in desktop


File renamed without changes.


0
...pache/ratis/metrics/MetricRegistries.java → ...pache/ratis/metrics/MetricRegistries.java

View file


Open in desktop


File renamed without changes.


0
...ratis/metrics/MetricRegistriesLoader.java → ...ratis/metrics/MetricRegistriesLoader.java

View file


Open in desktop


File renamed without changes.


5 changes: 1 addition & 4 deletions
.../ratis/metrics/MetricRegistryFactory.java → .../ratis/metrics/MetricRegistryFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
/**
 *
/*
 * 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
Expand All@@ -16,8 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */


package org.apache.ratis.metrics;

/**
Expand Down

41 changes: 27 additions & 14 deletions
...che/ratis/metrics/MetricRegistryInfo.java → ...che/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,25 @@

package org.apache.ratis.metrics;

import org.apache.ratis.thirdparty.com.codahale.metrics.MetricRegistry;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.MemoizedSupplier;

import java.util.Objects;
import java.util.function.Supplier;

/**
 *
 * This class holds the name and description and JMX related context names for such group of
 * metrics.
 * This class holds the name, description and JMX related context names for such group of metrics.
 * <p>
 * This class is immutable.
 */
public class MetricRegistryInfo {

 private final String prefix;
 private final String metricsDescription;
 private final String metricsComponentName;
 private final String fullName;
 private final String applicationName;

 private final Supplier<Integer> hash = MemoizedSupplier.valueOf(this::computeHash);

 /**
 * @param prefix className or component name this metric registry collects metric for
 * @param applicationName application Name needs to be in small case as it is used for hadoop2metrics
Expand All@@ -48,7 +50,6 @@ public MetricRegistryInfo(String prefix, String applicationName, String metricsC
 this.applicationName = applicationName;
 this.metricsComponentName = metricsComponentName;
 this.metricsDescription = metricsDescription;
 this.fullName = MetricRegistry.name(applicationName, metricsComponentName, prefix);
 }

 public String getApplicationName() {
Expand DownExpand Up@@ -79,21 +80,33 @@ public String getPrefix() {

 @Override
 public boolean equals(Object obj) {
 if (obj instanceof MetricRegistryInfo) {
 return this.hashCode() == obj.hashCode();
 } else {
 if (this == obj) {
 return true;
 } else if (!(obj instanceof MetricRegistryInfo)) {
 return false;
 }
 final MetricRegistryInfo that = (MetricRegistryInfo) obj;
 return Objects.equals(prefix, that.prefix)
 && Objects.equals(metricsDescription, that.metricsDescription)
 && Objects.equals(metricsComponentName, that.metricsComponentName)
 && Objects.equals(applicationName, that.applicationName);
 }

 @Override
 public int hashCode() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 return hash.get();
 }

public String getName() {
 return fullName;
private Integer computeHash() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 }


 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass())
 + ": applicationName=" + getApplicationName()
 + ", metricsComponentName=" + getMetricsComponentName()
 + ", prefix=" + getPrefix()
 + ", metricsDescription=" + getMetricsDescription();
 }
}

0
...he/ratis/metrics/RatisMetricRegistry.java → ...he/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop


File renamed without changes.


8 changes: 2 additions & 6 deletions
...rg/apache/ratis/metrics/RatisMetrics.java → ...rg/apache/ratis/metrics/RatisMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,7 @@ protected static <T extends Enum<T>> Map<T, Timekeeper> newTimerMap(
 protected static RatisMetricRegistry create(MetricRegistryInfo info) {
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 return metricRegistry.orElseGet(() -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Creating Metrics Registry : {}", info.getName());
 }
 LOG.debug("Creating {}", info);
 return MetricRegistries.global().create(info);
 });
 }
Expand All@@ -74,9 +72,7 @@ protected RatisMetrics(RatisMetricRegistry registry) {

 public void unregister() {
 MetricRegistryInfo info = registry.getMetricRegistryInfo();
 if (LOG.isDebugEnabled()) {
 LOG.debug("Unregistering Metrics Registry : {}", info.getName());
 }
 LOG.debug("Unregistering {}", info);
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 if (metricRegistry.isPresent()) {
 MetricRegistries.global().remove(info);
Expand Down

0
.../org/apache/ratis/metrics/Timekeeper.java → .../org/apache/ratis/metrics/Timekeeper.java

View file


Open in desktop


File renamed without changes.


8 changes: 6 additions & 2 deletions
ratis-metrics/pom.xml → ratis-metrics-default/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,14 @@
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics</artifactId>
 <name>Apache Ratis Metrics</name>
 <artifactId>ratis-metrics-default</artifactId>
 <name>Apache Ratis Metrics Default Implementation</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>
 <dependency>
 <artifactId>ratis-proto</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...s/metrics/impl/DefaultTimekeeperImpl.java → ...s/metrics/impl/DefaultTimekeeperImpl.java

View file


Open in desktop


File renamed without changes.


0
...apache/ratis/metrics/impl/JvmMetrics.java → ...apache/ratis/metrics/impl/JvmMetrics.java

View file


Open in desktop


File renamed without changes.


0
...is/metrics/impl/MetricRegistriesImpl.java → ...is/metrics/impl/MetricRegistriesImpl.java

View file


Open in desktop


File renamed without changes.


0
...trics/impl/MetricRegistryFactoryImpl.java → ...trics/impl/MetricRegistryFactoryImpl.java

View file


Open in desktop


File renamed without changes.


0
.../ratis/metrics/impl/MetricsReporting.java → .../ratis/metrics/impl/MetricsReporting.java

View file


Open in desktop


File renamed without changes.


8 changes: 5 additions & 3 deletions
...metrics/impl/RatisMetricRegistryImpl.java → ...metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;

import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
import java.util.function.Supplier;

Expand All@@ -49,13 +50,14 @@ static RatisMetricRegistryImpl cast(RatisMetricRegistry registry) {
 private final MetricRegistry metricRegistry = new MetricRegistry();

 private final MetricRegistryInfo info;
 private final String namePrefix;

 private JmxReporter jmxReporter;
 private ConsoleReporter consoleReporter;

 public RatisMetricRegistryImpl(MetricRegistryInfo info) {
super();
 this.info = info;
this.info = Objects.requireNonNull(info, "info == null");
 this.namePrefix = MetricRegistry.name(info.getApplicationName(), info.getMetricsComponentName(), info.getPrefix());
 }

 @Override
Expand DownExpand Up@@ -111,7 +113,7 @@ public Metric get(String shortName) {
 }

 private String getMetricName(String shortName) {
 return MetricRegistry.name(info.getName(), shortName);
 return MetricRegistry.name(namePrefix, shortName);
 }

 private <T extends Metric> T register(String name, T metric) throws IllegalArgumentException {
Expand Down

0
.../metrics/impl/RatisObjectNameFactory.java → .../metrics/impl/RatisObjectNameFactory.java

View file


Open in desktop


File renamed without changes.


0
...he/ratis/metrics/impl/RefCountingMap.java → ...he/ratis/metrics/impl/RefCountingMap.java

View file


Open in desktop


File renamed without changes.


0
...org.apache.ratis.metrics.MetricRegistries → ...org.apache.ratis.metrics.MetricRegistries

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...s/metrics/TestMetricRegistriesLoader.java → ...s/metrics/TestMetricRegistriesLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/**
/*
 * 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
Expand Down

0
...atis/metrics/impl/TestRefCountingMap.java → ...atis/metrics/impl/TestRefCountingMap.java

View file


Open in desktop


File renamed without changes.


45 changes: 0 additions & 45 deletions
ratis-metrics/src/test/resources/hadoop-metrics2.properties

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
ratis-server/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,15 +82,15 @@
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <type>test-jar</type>
 <artifactId>ratis-metrics-default</artifactId>
 <scope>test</scope>
 </dependency>


 <dependency>
 <groupId>com.github.spotbugs</groupId>
 <artifactId>spotbugs-annotations</artifactId>
Expand Down

6 changes: 6 additions & 0 deletions
ratis-test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,12 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <scope>test</scope>
 </dependency>

 <dependency>
 <artifactId>ratis-netty</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...is/grpc/server/TestGrpcServerMetrics.java → ...is/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1710. Refactor metrics api and implementation to separated modules.#749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 1 commit into

from

Sep 22, 2022
 Merged


RATIS-1710. Refactor metrics api and implementation to separated modules.
#749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 15 additions & 9 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@

 <module>ratis-examples</module>
 <module>ratis-replicated-map</module>
 <module>ratis-metrics</module>
 <module>ratis-metrics-api</module>
 <module>ratis-metrics-default</module>
 <module>ratis-tools</module>
 <module>ratis-shell</module>
 <module>ratis-assembly</module>
Expand DownExpand Up@@ -271,16 +272,21 @@
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <type>test-jar</type>
 <scope>test</scope>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
 </dependency>
 <dependency>
 <artifactId>ratis-tools</artifactId>
Expand Down

6 changes: 5 additions & 1 deletion
ratis-assembly/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,11 @@

 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics-default</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/bin.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,8 @@
 <include>org.apache.ratis:ratis-server-api</include>
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/src.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,8 @@
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-shell</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

5 changes: 5 additions & 0 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,11 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <artifactId>ratis-grpc</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

38 changes: 38 additions & 0 deletions
ratis-metrics-api/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
 Licensed 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. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <parent>
 <artifactId>ratis</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics-api</artifactId>
 <name>Apache Ratis Metrics API</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-common</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
 </dependency>
 </dependencies>
</project>

0
...org/apache/ratis/metrics/LongCounter.java → ...org/apache/ratis/metrics/LongCounter.java

View file


Open in desktop


File renamed without changes.


0
...pache/ratis/metrics/MetricRegistries.java → ...pache/ratis/metrics/MetricRegistries.java

View file


Open in desktop


File renamed without changes.


0
...ratis/metrics/MetricRegistriesLoader.java → ...ratis/metrics/MetricRegistriesLoader.java

View file


Open in desktop


File renamed without changes.


5 changes: 1 addition & 4 deletions
.../ratis/metrics/MetricRegistryFactory.java → .../ratis/metrics/MetricRegistryFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
/**
 *
/*
 * 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
Expand All@@ -16,8 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */


package org.apache.ratis.metrics;

/**
Expand Down

41 changes: 27 additions & 14 deletions
...che/ratis/metrics/MetricRegistryInfo.java → ...che/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,25 @@

package org.apache.ratis.metrics;

import org.apache.ratis.thirdparty.com.codahale.metrics.MetricRegistry;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.MemoizedSupplier;

import java.util.Objects;
import java.util.function.Supplier;

/**
 *
 * This class holds the name and description and JMX related context names for such group of
 * metrics.
 * This class holds the name, description and JMX related context names for such group of metrics.
 * <p>
 * This class is immutable.
 */
public class MetricRegistryInfo {

 private final String prefix;
 private final String metricsDescription;
 private final String metricsComponentName;
 private final String fullName;
 private final String applicationName;

 private final Supplier<Integer> hash = MemoizedSupplier.valueOf(this::computeHash);

 /**
 * @param prefix className or component name this metric registry collects metric for
 * @param applicationName application Name needs to be in small case as it is used for hadoop2metrics
Expand All@@ -48,7 +50,6 @@ public MetricRegistryInfo(String prefix, String applicationName, String metricsC
 this.applicationName = applicationName;
 this.metricsComponentName = metricsComponentName;
 this.metricsDescription = metricsDescription;
 this.fullName = MetricRegistry.name(applicationName, metricsComponentName, prefix);
 }

 public String getApplicationName() {
Expand DownExpand Up@@ -79,21 +80,33 @@ public String getPrefix() {

 @Override
 public boolean equals(Object obj) {
 if (obj instanceof MetricRegistryInfo) {
 return this.hashCode() == obj.hashCode();
 } else {
 if (this == obj) {
 return true;
 } else if (!(obj instanceof MetricRegistryInfo)) {
 return false;
 }
 final MetricRegistryInfo that = (MetricRegistryInfo) obj;
 return Objects.equals(prefix, that.prefix)
 && Objects.equals(metricsDescription, that.metricsDescription)
 && Objects.equals(metricsComponentName, that.metricsComponentName)
 && Objects.equals(applicationName, that.applicationName);
 }

 @Override
 public int hashCode() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 return hash.get();
 }

public String getName() {
 return fullName;
private Integer computeHash() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 }


 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass())
 + ": applicationName=" + getApplicationName()
 + ", metricsComponentName=" + getMetricsComponentName()
 + ", prefix=" + getPrefix()
 + ", metricsDescription=" + getMetricsDescription();
 }
}

0
...he/ratis/metrics/RatisMetricRegistry.java → ...he/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop


File renamed without changes.


8 changes: 2 additions & 6 deletions
...rg/apache/ratis/metrics/RatisMetrics.java → ...rg/apache/ratis/metrics/RatisMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,7 @@ protected static <T extends Enum<T>> Map<T, Timekeeper> newTimerMap(
 protected static RatisMetricRegistry create(MetricRegistryInfo info) {
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 return metricRegistry.orElseGet(() -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Creating Metrics Registry : {}", info.getName());
 }
 LOG.debug("Creating {}", info);
 return MetricRegistries.global().create(info);
 });
 }
Expand All@@ -74,9 +72,7 @@ protected RatisMetrics(RatisMetricRegistry registry) {

 public void unregister() {
 MetricRegistryInfo info = registry.getMetricRegistryInfo();
 if (LOG.isDebugEnabled()) {
 LOG.debug("Unregistering Metrics Registry : {}", info.getName());
 }
 LOG.debug("Unregistering {}", info);
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 if (metricRegistry.isPresent()) {
 MetricRegistries.global().remove(info);
Expand Down

0
.../org/apache/ratis/metrics/Timekeeper.java → .../org/apache/ratis/metrics/Timekeeper.java

View file


Open in desktop


File renamed without changes.


8 changes: 6 additions & 2 deletions
ratis-metrics/pom.xml → ratis-metrics-default/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,14 @@
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics</artifactId>
 <name>Apache Ratis Metrics</name>
 <artifactId>ratis-metrics-default</artifactId>
 <name>Apache Ratis Metrics Default Implementation</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>
 <dependency>
 <artifactId>ratis-proto</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...s/metrics/impl/DefaultTimekeeperImpl.java → ...s/metrics/impl/DefaultTimekeeperImpl.java

View file


Open in desktop


File renamed without changes.


0
...apache/ratis/metrics/impl/JvmMetrics.java → ...apache/ratis/metrics/impl/JvmMetrics.java

View file


Open in desktop


File renamed without changes.


0
...is/metrics/impl/MetricRegistriesImpl.java → ...is/metrics/impl/MetricRegistriesImpl.java

View file


Open in desktop


File renamed without changes.


0
...trics/impl/MetricRegistryFactoryImpl.java → ...trics/impl/MetricRegistryFactoryImpl.java

View file


Open in desktop


File renamed without changes.


0
.../ratis/metrics/impl/MetricsReporting.java → .../ratis/metrics/impl/MetricsReporting.java

View file


Open in desktop


File renamed without changes.


8 changes: 5 additions & 3 deletions
...metrics/impl/RatisMetricRegistryImpl.java → ...metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;

import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
import java.util.function.Supplier;

Expand All@@ -49,13 +50,14 @@ static RatisMetricRegistryImpl cast(RatisMetricRegistry registry) {
 private final MetricRegistry metricRegistry = new MetricRegistry();

 private final MetricRegistryInfo info;
 private final String namePrefix;

 private JmxReporter jmxReporter;
 private ConsoleReporter consoleReporter;

 public RatisMetricRegistryImpl(MetricRegistryInfo info) {
super();
 this.info = info;
this.info = Objects.requireNonNull(info, "info == null");
 this.namePrefix = MetricRegistry.name(info.getApplicationName(), info.getMetricsComponentName(), info.getPrefix());
 }

 @Override
Expand DownExpand Up@@ -111,7 +113,7 @@ public Metric get(String shortName) {
 }

 private String getMetricName(String shortName) {
 return MetricRegistry.name(info.getName(), shortName);
 return MetricRegistry.name(namePrefix, shortName);
 }

 private <T extends Metric> T register(String name, T metric) throws IllegalArgumentException {
Expand Down

0
.../metrics/impl/RatisObjectNameFactory.java → .../metrics/impl/RatisObjectNameFactory.java

View file


Open in desktop


File renamed without changes.


0
...he/ratis/metrics/impl/RefCountingMap.java → ...he/ratis/metrics/impl/RefCountingMap.java

View file


Open in desktop


File renamed without changes.


0
...org.apache.ratis.metrics.MetricRegistries → ...org.apache.ratis.metrics.MetricRegistries

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...s/metrics/TestMetricRegistriesLoader.java → ...s/metrics/TestMetricRegistriesLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/**
/*
 * 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
Expand Down

0
...atis/metrics/impl/TestRefCountingMap.java → ...atis/metrics/impl/TestRefCountingMap.java

View file


Open in desktop


File renamed without changes.


45 changes: 0 additions & 45 deletions
ratis-metrics/src/test/resources/hadoop-metrics2.properties

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
ratis-server/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,15 +82,15 @@
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <type>test-jar</type>
 <artifactId>ratis-metrics-default</artifactId>
 <scope>test</scope>
 </dependency>


 <dependency>
 <groupId>com.github.spotbugs</groupId>
 <artifactId>spotbugs-annotations</artifactId>
Expand Down

6 changes: 6 additions & 0 deletions
ratis-test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,12 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <scope>test</scope>
 </dependency>

 <dependency>
 <artifactId>ratis-netty</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...is/grpc/server/TestGrpcServerMetrics.java → ...is/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1710. Refactor metrics api and implementation to separated modules.#749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 1 commit into

from

Sep 22, 2022
 Merged


RATIS-1710. Refactor metrics api and implementation to separated modules.
#749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 15 additions & 9 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@

 <module>ratis-examples</module>
 <module>ratis-replicated-map</module>
 <module>ratis-metrics</module>
 <module>ratis-metrics-api</module>
 <module>ratis-metrics-default</module>
 <module>ratis-tools</module>
 <module>ratis-shell</module>
 <module>ratis-assembly</module>
Expand DownExpand Up@@ -271,16 +272,21 @@
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <type>test-jar</type>
 <scope>test</scope>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
 </dependency>
 <dependency>
 <artifactId>ratis-tools</artifactId>
Expand Down

6 changes: 5 additions & 1 deletion
ratis-assembly/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,11 @@

 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics-default</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/bin.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,8 @@
 <include>org.apache.ratis:ratis-server-api</include>
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/src.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,8 @@
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-shell</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

5 changes: 5 additions & 0 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,11 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <artifactId>ratis-grpc</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

38 changes: 38 additions & 0 deletions
ratis-metrics-api/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
 Licensed 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. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <parent>
 <artifactId>ratis</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics-api</artifactId>
 <name>Apache Ratis Metrics API</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-common</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
 </dependency>
 </dependencies>
</project>

0
...org/apache/ratis/metrics/LongCounter.java → ...org/apache/ratis/metrics/LongCounter.java

View file


Open in desktop


File renamed without changes.


0
...pache/ratis/metrics/MetricRegistries.java → ...pache/ratis/metrics/MetricRegistries.java

View file


Open in desktop


File renamed without changes.


0
...ratis/metrics/MetricRegistriesLoader.java → ...ratis/metrics/MetricRegistriesLoader.java

View file


Open in desktop


File renamed without changes.


5 changes: 1 addition & 4 deletions
.../ratis/metrics/MetricRegistryFactory.java → .../ratis/metrics/MetricRegistryFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
/**
 *
/*
 * 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
Expand All@@ -16,8 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */


package org.apache.ratis.metrics;

/**
Expand Down

41 changes: 27 additions & 14 deletions
...che/ratis/metrics/MetricRegistryInfo.java → ...che/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,25 @@

package org.apache.ratis.metrics;

import org.apache.ratis.thirdparty.com.codahale.metrics.MetricRegistry;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.MemoizedSupplier;

import java.util.Objects;
import java.util.function.Supplier;

/**
 *
 * This class holds the name and description and JMX related context names for such group of
 * metrics.
 * This class holds the name, description and JMX related context names for such group of metrics.
 * <p>
 * This class is immutable.
 */
public class MetricRegistryInfo {

 private final String prefix;
 private final String metricsDescription;
 private final String metricsComponentName;
 private final String fullName;
 private final String applicationName;

 private final Supplier<Integer> hash = MemoizedSupplier.valueOf(this::computeHash);

 /**
 * @param prefix className or component name this metric registry collects metric for
 * @param applicationName application Name needs to be in small case as it is used for hadoop2metrics
Expand All@@ -48,7 +50,6 @@ public MetricRegistryInfo(String prefix, String applicationName, String metricsC
 this.applicationName = applicationName;
 this.metricsComponentName = metricsComponentName;
 this.metricsDescription = metricsDescription;
 this.fullName = MetricRegistry.name(applicationName, metricsComponentName, prefix);
 }

 public String getApplicationName() {
Expand DownExpand Up@@ -79,21 +80,33 @@ public String getPrefix() {

 @Override
 public boolean equals(Object obj) {
 if (obj instanceof MetricRegistryInfo) {
 return this.hashCode() == obj.hashCode();
 } else {
 if (this == obj) {
 return true;
 } else if (!(obj instanceof MetricRegistryInfo)) {
 return false;
 }
 final MetricRegistryInfo that = (MetricRegistryInfo) obj;
 return Objects.equals(prefix, that.prefix)
 && Objects.equals(metricsDescription, that.metricsDescription)
 && Objects.equals(metricsComponentName, that.metricsComponentName)
 && Objects.equals(applicationName, that.applicationName);
 }

 @Override
 public int hashCode() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 return hash.get();
 }

public String getName() {
 return fullName;
private Integer computeHash() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 }


 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass())
 + ": applicationName=" + getApplicationName()
 + ", metricsComponentName=" + getMetricsComponentName()
 + ", prefix=" + getPrefix()
 + ", metricsDescription=" + getMetricsDescription();
 }
}

0
...he/ratis/metrics/RatisMetricRegistry.java → ...he/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop


File renamed without changes.


8 changes: 2 additions & 6 deletions
...rg/apache/ratis/metrics/RatisMetrics.java → ...rg/apache/ratis/metrics/RatisMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,7 @@ protected static <T extends Enum<T>> Map<T, Timekeeper> newTimerMap(
 protected static RatisMetricRegistry create(MetricRegistryInfo info) {
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 return metricRegistry.orElseGet(() -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Creating Metrics Registry : {}", info.getName());
 }
 LOG.debug("Creating {}", info);
 return MetricRegistries.global().create(info);
 });
 }
Expand All@@ -74,9 +72,7 @@ protected RatisMetrics(RatisMetricRegistry registry) {

 public void unregister() {
 MetricRegistryInfo info = registry.getMetricRegistryInfo();
 if (LOG.isDebugEnabled()) {
 LOG.debug("Unregistering Metrics Registry : {}", info.getName());
 }
 LOG.debug("Unregistering {}", info);
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 if (metricRegistry.isPresent()) {
 MetricRegistries.global().remove(info);
Expand Down

0
.../org/apache/ratis/metrics/Timekeeper.java → .../org/apache/ratis/metrics/Timekeeper.java

View file


Open in desktop


File renamed without changes.


8 changes: 6 additions & 2 deletions
ratis-metrics/pom.xml → ratis-metrics-default/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,14 @@
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics</artifactId>
 <name>Apache Ratis Metrics</name>
 <artifactId>ratis-metrics-default</artifactId>
 <name>Apache Ratis Metrics Default Implementation</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>
 <dependency>
 <artifactId>ratis-proto</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...s/metrics/impl/DefaultTimekeeperImpl.java → ...s/metrics/impl/DefaultTimekeeperImpl.java

View file


Open in desktop


File renamed without changes.


0
...apache/ratis/metrics/impl/JvmMetrics.java → ...apache/ratis/metrics/impl/JvmMetrics.java

View file


Open in desktop


File renamed without changes.


0
...is/metrics/impl/MetricRegistriesImpl.java → ...is/metrics/impl/MetricRegistriesImpl.java

View file


Open in desktop


File renamed without changes.


0
...trics/impl/MetricRegistryFactoryImpl.java → ...trics/impl/MetricRegistryFactoryImpl.java

View file


Open in desktop


File renamed without changes.


0
.../ratis/metrics/impl/MetricsReporting.java → .../ratis/metrics/impl/MetricsReporting.java

View file


Open in desktop


File renamed without changes.


8 changes: 5 additions & 3 deletions
...metrics/impl/RatisMetricRegistryImpl.java → ...metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;

import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
import java.util.function.Supplier;

Expand All@@ -49,13 +50,14 @@ static RatisMetricRegistryImpl cast(RatisMetricRegistry registry) {
 private final MetricRegistry metricRegistry = new MetricRegistry();

 private final MetricRegistryInfo info;
 private final String namePrefix;

 private JmxReporter jmxReporter;
 private ConsoleReporter consoleReporter;

 public RatisMetricRegistryImpl(MetricRegistryInfo info) {
super();
 this.info = info;
this.info = Objects.requireNonNull(info, "info == null");
 this.namePrefix = MetricRegistry.name(info.getApplicationName(), info.getMetricsComponentName(), info.getPrefix());
 }

 @Override
Expand DownExpand Up@@ -111,7 +113,7 @@ public Metric get(String shortName) {
 }

 private String getMetricName(String shortName) {
 return MetricRegistry.name(info.getName(), shortName);
 return MetricRegistry.name(namePrefix, shortName);
 }

 private <T extends Metric> T register(String name, T metric) throws IllegalArgumentException {
Expand Down

0
.../metrics/impl/RatisObjectNameFactory.java → .../metrics/impl/RatisObjectNameFactory.java

View file


Open in desktop


File renamed without changes.


0
...he/ratis/metrics/impl/RefCountingMap.java → ...he/ratis/metrics/impl/RefCountingMap.java

View file


Open in desktop


File renamed without changes.


0
...org.apache.ratis.metrics.MetricRegistries → ...org.apache.ratis.metrics.MetricRegistries

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...s/metrics/TestMetricRegistriesLoader.java → ...s/metrics/TestMetricRegistriesLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/**
/*
 * 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
Expand Down

0
...atis/metrics/impl/TestRefCountingMap.java → ...atis/metrics/impl/TestRefCountingMap.java

View file


Open in desktop


File renamed without changes.


45 changes: 0 additions & 45 deletions
ratis-metrics/src/test/resources/hadoop-metrics2.properties

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
ratis-server/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,15 +82,15 @@
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <type>test-jar</type>
 <artifactId>ratis-metrics-default</artifactId>
 <scope>test</scope>
 </dependency>


 <dependency>
 <groupId>com.github.spotbugs</groupId>
 <artifactId>spotbugs-annotations</artifactId>
Expand Down

6 changes: 6 additions & 0 deletions
ratis-test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,12 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <scope>test</scope>
 </dependency>

 <dependency>
 <artifactId>ratis-netty</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...is/grpc/server/TestGrpcServerMetrics.java → ...is/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
RATIS-1710. Refactor metrics api and implementation to separated modules.#749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 1 commit into

from

Sep 22, 2022
 Merged


RATIS-1710. Refactor metrics api and implementation to separated modules.
#749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 15 additions & 9 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@

 <module>ratis-examples</module>
 <module>ratis-replicated-map</module>
 <module>ratis-metrics</module>
 <module>ratis-metrics-api</module>
 <module>ratis-metrics-default</module>
 <module>ratis-tools</module>
 <module>ratis-shell</module>
 <module>ratis-assembly</module>
Expand DownExpand Up@@ -271,16 +272,21 @@
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <type>test-jar</type>
 <scope>test</scope>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
 </dependency>
 <dependency>
 <artifactId>ratis-tools</artifactId>
Expand Down

6 changes: 5 additions & 1 deletion
ratis-assembly/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,11 @@

 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics-default</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/bin.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,8 @@
 <include>org.apache.ratis:ratis-server-api</include>
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/src.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,8 @@
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-shell</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

5 changes: 5 additions & 0 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,11 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <artifactId>ratis-grpc</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

38 changes: 38 additions & 0 deletions
ratis-metrics-api/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
 Licensed 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. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <parent>
 <artifactId>ratis</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics-api</artifactId>
 <name>Apache Ratis Metrics API</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-common</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
 </dependency>
 </dependencies>
</project>

0
...org/apache/ratis/metrics/LongCounter.java → ...org/apache/ratis/metrics/LongCounter.java

View file


Open in desktop


File renamed without changes.


0
...pache/ratis/metrics/MetricRegistries.java → ...pache/ratis/metrics/MetricRegistries.java

View file


Open in desktop


File renamed without changes.


0
...ratis/metrics/MetricRegistriesLoader.java → ...ratis/metrics/MetricRegistriesLoader.java

View file


Open in desktop


File renamed without changes.


5 changes: 1 addition & 4 deletions
.../ratis/metrics/MetricRegistryFactory.java → .../ratis/metrics/MetricRegistryFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
/**
 *
/*
 * 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
Expand All@@ -16,8 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */


package org.apache.ratis.metrics;

/**
Expand Down

41 changes: 27 additions & 14 deletions
...che/ratis/metrics/MetricRegistryInfo.java → ...che/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,25 @@

package org.apache.ratis.metrics;

import org.apache.ratis.thirdparty.com.codahale.metrics.MetricRegistry;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.MemoizedSupplier;

import java.util.Objects;
import java.util.function.Supplier;

/**
 *
 * This class holds the name and description and JMX related context names for such group of
 * metrics.
 * This class holds the name, description and JMX related context names for such group of metrics.
 * <p>
 * This class is immutable.
 */
public class MetricRegistryInfo {

 private final String prefix;
 private final String metricsDescription;
 private final String metricsComponentName;
 private final String fullName;
 private final String applicationName;

 private final Supplier<Integer> hash = MemoizedSupplier.valueOf(this::computeHash);

 /**
 * @param prefix className or component name this metric registry collects metric for
 * @param applicationName application Name needs to be in small case as it is used for hadoop2metrics
Expand All@@ -48,7 +50,6 @@ public MetricRegistryInfo(String prefix, String applicationName, String metricsC
 this.applicationName = applicationName;
 this.metricsComponentName = metricsComponentName;
 this.metricsDescription = metricsDescription;
 this.fullName = MetricRegistry.name(applicationName, metricsComponentName, prefix);
 }

 public String getApplicationName() {
Expand DownExpand Up@@ -79,21 +80,33 @@ public String getPrefix() {

 @Override
 public boolean equals(Object obj) {
 if (obj instanceof MetricRegistryInfo) {
 return this.hashCode() == obj.hashCode();
 } else {
 if (this == obj) {
 return true;
 } else if (!(obj instanceof MetricRegistryInfo)) {
 return false;
 }
 final MetricRegistryInfo that = (MetricRegistryInfo) obj;
 return Objects.equals(prefix, that.prefix)
 && Objects.equals(metricsDescription, that.metricsDescription)
 && Objects.equals(metricsComponentName, that.metricsComponentName)
 && Objects.equals(applicationName, that.applicationName);
 }

 @Override
 public int hashCode() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 return hash.get();
 }

public String getName() {
 return fullName;
private Integer computeHash() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 }


 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass())
 + ": applicationName=" + getApplicationName()
 + ", metricsComponentName=" + getMetricsComponentName()
 + ", prefix=" + getPrefix()
 + ", metricsDescription=" + getMetricsDescription();
 }
}

0
...he/ratis/metrics/RatisMetricRegistry.java → ...he/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop


File renamed without changes.


8 changes: 2 additions & 6 deletions
...rg/apache/ratis/metrics/RatisMetrics.java → ...rg/apache/ratis/metrics/RatisMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,7 @@ protected static <T extends Enum<T>> Map<T, Timekeeper> newTimerMap(
 protected static RatisMetricRegistry create(MetricRegistryInfo info) {
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 return metricRegistry.orElseGet(() -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Creating Metrics Registry : {}", info.getName());
 }
 LOG.debug("Creating {}", info);
 return MetricRegistries.global().create(info);
 });
 }
Expand All@@ -74,9 +72,7 @@ protected RatisMetrics(RatisMetricRegistry registry) {

 public void unregister() {
 MetricRegistryInfo info = registry.getMetricRegistryInfo();
 if (LOG.isDebugEnabled()) {
 LOG.debug("Unregistering Metrics Registry : {}", info.getName());
 }
 LOG.debug("Unregistering {}", info);
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 if (metricRegistry.isPresent()) {
 MetricRegistries.global().remove(info);
Expand Down

0
.../org/apache/ratis/metrics/Timekeeper.java → .../org/apache/ratis/metrics/Timekeeper.java

View file


Open in desktop


File renamed without changes.


8 changes: 6 additions & 2 deletions
ratis-metrics/pom.xml → ratis-metrics-default/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,14 @@
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics</artifactId>
 <name>Apache Ratis Metrics</name>
 <artifactId>ratis-metrics-default</artifactId>
 <name>Apache Ratis Metrics Default Implementation</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>
 <dependency>
 <artifactId>ratis-proto</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...s/metrics/impl/DefaultTimekeeperImpl.java → ...s/metrics/impl/DefaultTimekeeperImpl.java

View file


Open in desktop


File renamed without changes.


0
...apache/ratis/metrics/impl/JvmMetrics.java → ...apache/ratis/metrics/impl/JvmMetrics.java

View file


Open in desktop


File renamed without changes.


0
...is/metrics/impl/MetricRegistriesImpl.java → ...is/metrics/impl/MetricRegistriesImpl.java

View file


Open in desktop


File renamed without changes.


0
...trics/impl/MetricRegistryFactoryImpl.java → ...trics/impl/MetricRegistryFactoryImpl.java

View file


Open in desktop


File renamed without changes.


0
.../ratis/metrics/impl/MetricsReporting.java → .../ratis/metrics/impl/MetricsReporting.java

View file


Open in desktop


File renamed without changes.


8 changes: 5 additions & 3 deletions
...metrics/impl/RatisMetricRegistryImpl.java → ...metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;

import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
import java.util.function.Supplier;

Expand All@@ -49,13 +50,14 @@ static RatisMetricRegistryImpl cast(RatisMetricRegistry registry) {
 private final MetricRegistry metricRegistry = new MetricRegistry();

 private final MetricRegistryInfo info;
 private final String namePrefix;

 private JmxReporter jmxReporter;
 private ConsoleReporter consoleReporter;

 public RatisMetricRegistryImpl(MetricRegistryInfo info) {
super();
 this.info = info;
this.info = Objects.requireNonNull(info, "info == null");
 this.namePrefix = MetricRegistry.name(info.getApplicationName(), info.getMetricsComponentName(), info.getPrefix());
 }

 @Override
Expand DownExpand Up@@ -111,7 +113,7 @@ public Metric get(String shortName) {
 }

 private String getMetricName(String shortName) {
 return MetricRegistry.name(info.getName(), shortName);
 return MetricRegistry.name(namePrefix, shortName);
 }

 private <T extends Metric> T register(String name, T metric) throws IllegalArgumentException {
Expand Down

0
.../metrics/impl/RatisObjectNameFactory.java → .../metrics/impl/RatisObjectNameFactory.java

View file


Open in desktop


File renamed without changes.


0
...he/ratis/metrics/impl/RefCountingMap.java → ...he/ratis/metrics/impl/RefCountingMap.java

View file


Open in desktop


File renamed without changes.


0
...org.apache.ratis.metrics.MetricRegistries → ...org.apache.ratis.metrics.MetricRegistries

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...s/metrics/TestMetricRegistriesLoader.java → ...s/metrics/TestMetricRegistriesLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/**
/*
 * 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
Expand Down

0
...atis/metrics/impl/TestRefCountingMap.java → ...atis/metrics/impl/TestRefCountingMap.java

View file


Open in desktop


File renamed without changes.


45 changes: 0 additions & 45 deletions
ratis-metrics/src/test/resources/hadoop-metrics2.properties

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
ratis-server/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,15 +82,15 @@
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <type>test-jar</type>
 <artifactId>ratis-metrics-default</artifactId>
 <scope>test</scope>
 </dependency>


 <dependency>
 <groupId>com.github.spotbugs</groupId>
 <artifactId>spotbugs-annotations</artifactId>
Expand Down

6 changes: 6 additions & 0 deletions
ratis-test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,12 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <scope>test</scope>
 </dependency>

 <dependency>
 <artifactId>ratis-netty</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...is/grpc/server/TestGrpcServerMetrics.java → ...is/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1710. Refactor metrics api and implementation to separated modules.#749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 1 commit into

from

Sep 22, 2022
 Merged


RATIS-1710. Refactor metrics api and implementation to separated modules.
#749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 15 additions & 9 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@

 <module>ratis-examples</module>
 <module>ratis-replicated-map</module>
 <module>ratis-metrics</module>
 <module>ratis-metrics-api</module>
 <module>ratis-metrics-default</module>
 <module>ratis-tools</module>
 <module>ratis-shell</module>
 <module>ratis-assembly</module>
Expand DownExpand Up@@ -271,16 +272,21 @@
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <type>test-jar</type>
 <scope>test</scope>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
 </dependency>
 <dependency>
 <artifactId>ratis-tools</artifactId>
Expand Down

6 changes: 5 additions & 1 deletion
ratis-assembly/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,11 @@

 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics-default</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/bin.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,8 @@
 <include>org.apache.ratis:ratis-server-api</include>
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/src.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,8 @@
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-shell</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

5 changes: 5 additions & 0 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,11 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <artifactId>ratis-grpc</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

38 changes: 38 additions & 0 deletions
ratis-metrics-api/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
 Licensed 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. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <parent>
 <artifactId>ratis</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics-api</artifactId>
 <name>Apache Ratis Metrics API</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-common</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
 </dependency>
 </dependencies>
</project>

0
...org/apache/ratis/metrics/LongCounter.java → ...org/apache/ratis/metrics/LongCounter.java

View file


Open in desktop


File renamed without changes.


0
...pache/ratis/metrics/MetricRegistries.java → ...pache/ratis/metrics/MetricRegistries.java

View file


Open in desktop


File renamed without changes.


0
...ratis/metrics/MetricRegistriesLoader.java → ...ratis/metrics/MetricRegistriesLoader.java

View file


Open in desktop


File renamed without changes.


5 changes: 1 addition & 4 deletions
.../ratis/metrics/MetricRegistryFactory.java → .../ratis/metrics/MetricRegistryFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
/**
 *
/*
 * 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
Expand All@@ -16,8 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */


package org.apache.ratis.metrics;

/**
Expand Down

41 changes: 27 additions & 14 deletions
...che/ratis/metrics/MetricRegistryInfo.java → ...che/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,25 @@

package org.apache.ratis.metrics;

import org.apache.ratis.thirdparty.com.codahale.metrics.MetricRegistry;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.MemoizedSupplier;

import java.util.Objects;
import java.util.function.Supplier;

/**
 *
 * This class holds the name and description and JMX related context names for such group of
 * metrics.
 * This class holds the name, description and JMX related context names for such group of metrics.
 * <p>
 * This class is immutable.
 */
public class MetricRegistryInfo {

 private final String prefix;
 private final String metricsDescription;
 private final String metricsComponentName;
 private final String fullName;
 private final String applicationName;

 private final Supplier<Integer> hash = MemoizedSupplier.valueOf(this::computeHash);

 /**
 * @param prefix className or component name this metric registry collects metric for
 * @param applicationName application Name needs to be in small case as it is used for hadoop2metrics
Expand All@@ -48,7 +50,6 @@ public MetricRegistryInfo(String prefix, String applicationName, String metricsC
 this.applicationName = applicationName;
 this.metricsComponentName = metricsComponentName;
 this.metricsDescription = metricsDescription;
 this.fullName = MetricRegistry.name(applicationName, metricsComponentName, prefix);
 }

 public String getApplicationName() {
Expand DownExpand Up@@ -79,21 +80,33 @@ public String getPrefix() {

 @Override
 public boolean equals(Object obj) {
 if (obj instanceof MetricRegistryInfo) {
 return this.hashCode() == obj.hashCode();
 } else {
 if (this == obj) {
 return true;
 } else if (!(obj instanceof MetricRegistryInfo)) {
 return false;
 }
 final MetricRegistryInfo that = (MetricRegistryInfo) obj;
 return Objects.equals(prefix, that.prefix)
 && Objects.equals(metricsDescription, that.metricsDescription)
 && Objects.equals(metricsComponentName, that.metricsComponentName)
 && Objects.equals(applicationName, that.applicationName);
 }

 @Override
 public int hashCode() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 return hash.get();
 }

public String getName() {
 return fullName;
private Integer computeHash() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 }


 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass())
 + ": applicationName=" + getApplicationName()
 + ", metricsComponentName=" + getMetricsComponentName()
 + ", prefix=" + getPrefix()
 + ", metricsDescription=" + getMetricsDescription();
 }
}

0
...he/ratis/metrics/RatisMetricRegistry.java → ...he/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop


File renamed without changes.


8 changes: 2 additions & 6 deletions
...rg/apache/ratis/metrics/RatisMetrics.java → ...rg/apache/ratis/metrics/RatisMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,7 @@ protected static <T extends Enum<T>> Map<T, Timekeeper> newTimerMap(
 protected static RatisMetricRegistry create(MetricRegistryInfo info) {
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 return metricRegistry.orElseGet(() -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Creating Metrics Registry : {}", info.getName());
 }
 LOG.debug("Creating {}", info);
 return MetricRegistries.global().create(info);
 });
 }
Expand All@@ -74,9 +72,7 @@ protected RatisMetrics(RatisMetricRegistry registry) {

 public void unregister() {
 MetricRegistryInfo info = registry.getMetricRegistryInfo();
 if (LOG.isDebugEnabled()) {
 LOG.debug("Unregistering Metrics Registry : {}", info.getName());
 }
 LOG.debug("Unregistering {}", info);
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 if (metricRegistry.isPresent()) {
 MetricRegistries.global().remove(info);
Expand Down

0
.../org/apache/ratis/metrics/Timekeeper.java → .../org/apache/ratis/metrics/Timekeeper.java

View file


Open in desktop


File renamed without changes.


8 changes: 6 additions & 2 deletions
ratis-metrics/pom.xml → ratis-metrics-default/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,14 @@
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics</artifactId>
 <name>Apache Ratis Metrics</name>
 <artifactId>ratis-metrics-default</artifactId>
 <name>Apache Ratis Metrics Default Implementation</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>
 <dependency>
 <artifactId>ratis-proto</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...s/metrics/impl/DefaultTimekeeperImpl.java → ...s/metrics/impl/DefaultTimekeeperImpl.java

View file


Open in desktop


File renamed without changes.


0
...apache/ratis/metrics/impl/JvmMetrics.java → ...apache/ratis/metrics/impl/JvmMetrics.java

View file


Open in desktop


File renamed without changes.


0
...is/metrics/impl/MetricRegistriesImpl.java → ...is/metrics/impl/MetricRegistriesImpl.java

View file


Open in desktop


File renamed without changes.


0
...trics/impl/MetricRegistryFactoryImpl.java → ...trics/impl/MetricRegistryFactoryImpl.java

View file


Open in desktop


File renamed without changes.


0
.../ratis/metrics/impl/MetricsReporting.java → .../ratis/metrics/impl/MetricsReporting.java

View file


Open in desktop


File renamed without changes.


8 changes: 5 additions & 3 deletions
...metrics/impl/RatisMetricRegistryImpl.java → ...metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;

import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
import java.util.function.Supplier;

Expand All@@ -49,13 +50,14 @@ static RatisMetricRegistryImpl cast(RatisMetricRegistry registry) {
 private final MetricRegistry metricRegistry = new MetricRegistry();

 private final MetricRegistryInfo info;
 private final String namePrefix;

 private JmxReporter jmxReporter;
 private ConsoleReporter consoleReporter;

 public RatisMetricRegistryImpl(MetricRegistryInfo info) {
super();
 this.info = info;
this.info = Objects.requireNonNull(info, "info == null");
 this.namePrefix = MetricRegistry.name(info.getApplicationName(), info.getMetricsComponentName(), info.getPrefix());
 }

 @Override
Expand DownExpand Up@@ -111,7 +113,7 @@ public Metric get(String shortName) {
 }

 private String getMetricName(String shortName) {
 return MetricRegistry.name(info.getName(), shortName);
 return MetricRegistry.name(namePrefix, shortName);
 }

 private <T extends Metric> T register(String name, T metric) throws IllegalArgumentException {
Expand Down

0
.../metrics/impl/RatisObjectNameFactory.java → .../metrics/impl/RatisObjectNameFactory.java

View file


Open in desktop


File renamed without changes.


0
...he/ratis/metrics/impl/RefCountingMap.java → ...he/ratis/metrics/impl/RefCountingMap.java

View file


Open in desktop


File renamed without changes.


0
...org.apache.ratis.metrics.MetricRegistries → ...org.apache.ratis.metrics.MetricRegistries

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...s/metrics/TestMetricRegistriesLoader.java → ...s/metrics/TestMetricRegistriesLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/**
/*
 * 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
Expand Down

0
...atis/metrics/impl/TestRefCountingMap.java → ...atis/metrics/impl/TestRefCountingMap.java

View file


Open in desktop


File renamed without changes.


45 changes: 0 additions & 45 deletions
ratis-metrics/src/test/resources/hadoop-metrics2.properties

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
ratis-server/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,15 +82,15 @@
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <type>test-jar</type>
 <artifactId>ratis-metrics-default</artifactId>
 <scope>test</scope>
 </dependency>


 <dependency>
 <groupId>com.github.spotbugs</groupId>
 <artifactId>spotbugs-annotations</artifactId>
Expand Down

6 changes: 6 additions & 0 deletions
ratis-test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,12 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <scope>test</scope>
 </dependency>

 <dependency>
 <artifactId>ratis-netty</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...is/grpc/server/TestGrpcServerMetrics.java → ...is/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
RATIS-1710. Refactor metrics api and implementation to separated modules.#749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 1 commit into

from

Sep 22, 2022
 Merged


RATIS-1710. Refactor metrics api and implementation to separated modules.
#749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 15 additions & 9 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@

 <module>ratis-examples</module>
 <module>ratis-replicated-map</module>
 <module>ratis-metrics</module>
 <module>ratis-metrics-api</module>
 <module>ratis-metrics-default</module>
 <module>ratis-tools</module>
 <module>ratis-shell</module>
 <module>ratis-assembly</module>
Expand DownExpand Up@@ -271,16 +272,21 @@
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <type>test-jar</type>
 <scope>test</scope>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
 </dependency>
 <dependency>
 <artifactId>ratis-tools</artifactId>
Expand Down

6 changes: 5 additions & 1 deletion
ratis-assembly/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,11 @@

 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics-default</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/bin.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,8 @@
 <include>org.apache.ratis:ratis-server-api</include>
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/src.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,8 @@
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-shell</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

5 changes: 5 additions & 0 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,11 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <artifactId>ratis-grpc</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

38 changes: 38 additions & 0 deletions
ratis-metrics-api/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
 Licensed 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. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <parent>
 <artifactId>ratis</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics-api</artifactId>
 <name>Apache Ratis Metrics API</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-common</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
 </dependency>
 </dependencies>
</project>

0
...org/apache/ratis/metrics/LongCounter.java → ...org/apache/ratis/metrics/LongCounter.java

View file


Open in desktop


File renamed without changes.


0
...pache/ratis/metrics/MetricRegistries.java → ...pache/ratis/metrics/MetricRegistries.java

View file


Open in desktop


File renamed without changes.


0
...ratis/metrics/MetricRegistriesLoader.java → ...ratis/metrics/MetricRegistriesLoader.java

View file


Open in desktop


File renamed without changes.


5 changes: 1 addition & 4 deletions
.../ratis/metrics/MetricRegistryFactory.java → .../ratis/metrics/MetricRegistryFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
/**
 *
/*
 * 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
Expand All@@ -16,8 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */


package org.apache.ratis.metrics;

/**
Expand Down

41 changes: 27 additions & 14 deletions
...che/ratis/metrics/MetricRegistryInfo.java → ...che/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,25 @@

package org.apache.ratis.metrics;

import org.apache.ratis.thirdparty.com.codahale.metrics.MetricRegistry;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.MemoizedSupplier;

import java.util.Objects;
import java.util.function.Supplier;

/**
 *
 * This class holds the name and description and JMX related context names for such group of
 * metrics.
 * This class holds the name, description and JMX related context names for such group of metrics.
 * <p>
 * This class is immutable.
 */
public class MetricRegistryInfo {

 private final String prefix;
 private final String metricsDescription;
 private final String metricsComponentName;
 private final String fullName;
 private final String applicationName;

 private final Supplier<Integer> hash = MemoizedSupplier.valueOf(this::computeHash);

 /**
 * @param prefix className or component name this metric registry collects metric for
 * @param applicationName application Name needs to be in small case as it is used for hadoop2metrics
Expand All@@ -48,7 +50,6 @@ public MetricRegistryInfo(String prefix, String applicationName, String metricsC
 this.applicationName = applicationName;
 this.metricsComponentName = metricsComponentName;
 this.metricsDescription = metricsDescription;
 this.fullName = MetricRegistry.name(applicationName, metricsComponentName, prefix);
 }

 public String getApplicationName() {
Expand DownExpand Up@@ -79,21 +80,33 @@ public String getPrefix() {

 @Override
 public boolean equals(Object obj) {
 if (obj instanceof MetricRegistryInfo) {
 return this.hashCode() == obj.hashCode();
 } else {
 if (this == obj) {
 return true;
 } else if (!(obj instanceof MetricRegistryInfo)) {
 return false;
 }
 final MetricRegistryInfo that = (MetricRegistryInfo) obj;
 return Objects.equals(prefix, that.prefix)
 && Objects.equals(metricsDescription, that.metricsDescription)
 && Objects.equals(metricsComponentName, that.metricsComponentName)
 && Objects.equals(applicationName, that.applicationName);
 }

 @Override
 public int hashCode() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 return hash.get();
 }

public String getName() {
 return fullName;
private Integer computeHash() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 }


 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass())
 + ": applicationName=" + getApplicationName()
 + ", metricsComponentName=" + getMetricsComponentName()
 + ", prefix=" + getPrefix()
 + ", metricsDescription=" + getMetricsDescription();
 }
}

0
...he/ratis/metrics/RatisMetricRegistry.java → ...he/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop


File renamed without changes.


8 changes: 2 additions & 6 deletions
...rg/apache/ratis/metrics/RatisMetrics.java → ...rg/apache/ratis/metrics/RatisMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,7 @@ protected static <T extends Enum<T>> Map<T, Timekeeper> newTimerMap(
 protected static RatisMetricRegistry create(MetricRegistryInfo info) {
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 return metricRegistry.orElseGet(() -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Creating Metrics Registry : {}", info.getName());
 }
 LOG.debug("Creating {}", info);
 return MetricRegistries.global().create(info);
 });
 }
Expand All@@ -74,9 +72,7 @@ protected RatisMetrics(RatisMetricRegistry registry) {

 public void unregister() {
 MetricRegistryInfo info = registry.getMetricRegistryInfo();
 if (LOG.isDebugEnabled()) {
 LOG.debug("Unregistering Metrics Registry : {}", info.getName());
 }
 LOG.debug("Unregistering {}", info);
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 if (metricRegistry.isPresent()) {
 MetricRegistries.global().remove(info);
Expand Down

0
.../org/apache/ratis/metrics/Timekeeper.java → .../org/apache/ratis/metrics/Timekeeper.java

View file


Open in desktop


File renamed without changes.


8 changes: 6 additions & 2 deletions
ratis-metrics/pom.xml → ratis-metrics-default/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,14 @@
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics</artifactId>
 <name>Apache Ratis Metrics</name>
 <artifactId>ratis-metrics-default</artifactId>
 <name>Apache Ratis Metrics Default Implementation</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>
 <dependency>
 <artifactId>ratis-proto</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...s/metrics/impl/DefaultTimekeeperImpl.java → ...s/metrics/impl/DefaultTimekeeperImpl.java

View file


Open in desktop


File renamed without changes.


0
...apache/ratis/metrics/impl/JvmMetrics.java → ...apache/ratis/metrics/impl/JvmMetrics.java

View file


Open in desktop


File renamed without changes.


0
...is/metrics/impl/MetricRegistriesImpl.java → ...is/metrics/impl/MetricRegistriesImpl.java

View file


Open in desktop


File renamed without changes.


0
...trics/impl/MetricRegistryFactoryImpl.java → ...trics/impl/MetricRegistryFactoryImpl.java

View file


Open in desktop


File renamed without changes.


0
.../ratis/metrics/impl/MetricsReporting.java → .../ratis/metrics/impl/MetricsReporting.java

View file


Open in desktop


File renamed without changes.


8 changes: 5 additions & 3 deletions
...metrics/impl/RatisMetricRegistryImpl.java → ...metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;

import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
import java.util.function.Supplier;

Expand All@@ -49,13 +50,14 @@ static RatisMetricRegistryImpl cast(RatisMetricRegistry registry) {
 private final MetricRegistry metricRegistry = new MetricRegistry();

 private final MetricRegistryInfo info;
 private final String namePrefix;

 private JmxReporter jmxReporter;
 private ConsoleReporter consoleReporter;

 public RatisMetricRegistryImpl(MetricRegistryInfo info) {
super();
 this.info = info;
this.info = Objects.requireNonNull(info, "info == null");
 this.namePrefix = MetricRegistry.name(info.getApplicationName(), info.getMetricsComponentName(), info.getPrefix());
 }

 @Override
Expand DownExpand Up@@ -111,7 +113,7 @@ public Metric get(String shortName) {
 }

 private String getMetricName(String shortName) {
 return MetricRegistry.name(info.getName(), shortName);
 return MetricRegistry.name(namePrefix, shortName);
 }

 private <T extends Metric> T register(String name, T metric) throws IllegalArgumentException {
Expand Down

0
.../metrics/impl/RatisObjectNameFactory.java → .../metrics/impl/RatisObjectNameFactory.java

View file


Open in desktop


File renamed without changes.


0
...he/ratis/metrics/impl/RefCountingMap.java → ...he/ratis/metrics/impl/RefCountingMap.java

View file


Open in desktop


File renamed without changes.


0
...org.apache.ratis.metrics.MetricRegistries → ...org.apache.ratis.metrics.MetricRegistries

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...s/metrics/TestMetricRegistriesLoader.java → ...s/metrics/TestMetricRegistriesLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/**
/*
 * 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
Expand Down

0
...atis/metrics/impl/TestRefCountingMap.java → ...atis/metrics/impl/TestRefCountingMap.java

View file


Open in desktop


File renamed without changes.


45 changes: 0 additions & 45 deletions
ratis-metrics/src/test/resources/hadoop-metrics2.properties

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
ratis-server/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,15 +82,15 @@
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <type>test-jar</type>
 <artifactId>ratis-metrics-default</artifactId>
 <scope>test</scope>
 </dependency>


 <dependency>
 <groupId>com.github.spotbugs</groupId>
 <artifactId>spotbugs-annotations</artifactId>
Expand Down

6 changes: 6 additions & 0 deletions
ratis-test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,12 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <scope>test</scope>
 </dependency>

 <dependency>
 <artifactId>ratis-netty</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...is/grpc/server/TestGrpcServerMetrics.java → ...is/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop


File renamed without changes.


, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
RATIS-1710. Refactor metrics api and implementation to separated modules.#749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

szetszwo
merged 1 commit into

from

Sep 22, 2022
 Merged


RATIS-1710. Refactor metrics api and implementation to separated modules.
#749
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 15 additions & 9 deletions
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,8 @@

 <module>ratis-examples</module>
 <module>ratis-replicated-map</module>
 <module>ratis-metrics</module>
 <module>ratis-metrics-api</module>
 <module>ratis-metrics-default</module>
 <module>ratis-tools</module>
 <module>ratis-shell</module>
 <module>ratis-assembly</module>
Expand DownExpand Up@@ -271,16 +272,21 @@
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 </dependency>
 <dependency>
 <artifactId>ratis-metrics</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>${project.version}</version>
 <type>test-jar</type>
 <scope>test</scope>
<artifactId>ratis-metrics-default</artifactId>
<groupId>org.apache.ratis</groupId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
 </dependency>
 <dependency>
 <artifactId>ratis-tools</artifactId>
Expand Down

6 changes: 5 additions & 1 deletion
ratis-assembly/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,11 @@

 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics-default</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/bin.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,8 @@
 <include>org.apache.ratis:ratis-server-api</include>
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

3 changes: 2 additions & 1 deletion
ratis-assembly/src/main/assembly/src.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,8 @@
 <include>org.apache.ratis:ratis-server</include>
 <include>org.apache.ratis:ratis-shell</include>
 <include>org.apache.ratis:ratis-test</include>
 <include>org.apache.ratis:ratis-metrics</include>
 <include>org.apache.ratis:ratis-metrics-api</include>
 <include>org.apache.ratis:ratis-metrics-default</include>
 <include>org.apache.ratis:ratis-tools</include>
 <include>org.apache.ratis:ratis-resource-bundle</include>
 </includes>
Expand Down

5 changes: 5 additions & 0 deletions
ratis-examples/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,11 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <artifactId>ratis-grpc</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

38 changes: 38 additions & 0 deletions
ratis-metrics-api/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
 Licensed 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. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <parent>
 <artifactId>ratis</artifactId>
 <groupId>org.apache.ratis</groupId>
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics-api</artifactId>
 <name>Apache Ratis Metrics API</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-common</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>

 <dependency>
 <groupId>org.slf4j</groupId>
 <artifactId>slf4j-api</artifactId>
 </dependency>
 </dependencies>
</project>

0
...org/apache/ratis/metrics/LongCounter.java → ...org/apache/ratis/metrics/LongCounter.java

View file


Open in desktop


File renamed without changes.


0
...pache/ratis/metrics/MetricRegistries.java → ...pache/ratis/metrics/MetricRegistries.java

View file


Open in desktop


File renamed without changes.


0
...ratis/metrics/MetricRegistriesLoader.java → ...ratis/metrics/MetricRegistriesLoader.java

View file


Open in desktop


File renamed without changes.


5 changes: 1 addition & 4 deletions
.../ratis/metrics/MetricRegistryFactory.java → .../ratis/metrics/MetricRegistryFactory.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
/**
 *
/*
 * 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
Expand All@@ -16,8 +15,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */


package org.apache.ratis.metrics;

/**
Expand Down

41 changes: 27 additions & 14 deletions
...che/ratis/metrics/MetricRegistryInfo.java → ...che/ratis/metrics/MetricRegistryInfo.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,23 +18,25 @@

package org.apache.ratis.metrics;

import org.apache.ratis.thirdparty.com.codahale.metrics.MetricRegistry;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.MemoizedSupplier;

import java.util.Objects;
import java.util.function.Supplier;

/**
 *
 * This class holds the name and description and JMX related context names for such group of
 * metrics.
 * This class holds the name, description and JMX related context names for such group of metrics.
 * <p>
 * This class is immutable.
 */
public class MetricRegistryInfo {

 private final String prefix;
 private final String metricsDescription;
 private final String metricsComponentName;
 private final String fullName;
 private final String applicationName;

 private final Supplier<Integer> hash = MemoizedSupplier.valueOf(this::computeHash);

 /**
 * @param prefix className or component name this metric registry collects metric for
 * @param applicationName application Name needs to be in small case as it is used for hadoop2metrics
Expand All@@ -48,7 +50,6 @@ public MetricRegistryInfo(String prefix, String applicationName, String metricsC
 this.applicationName = applicationName;
 this.metricsComponentName = metricsComponentName;
 this.metricsDescription = metricsDescription;
 this.fullName = MetricRegistry.name(applicationName, metricsComponentName, prefix);
 }

 public String getApplicationName() {
Expand DownExpand Up@@ -79,21 +80,33 @@ public String getPrefix() {

 @Override
 public boolean equals(Object obj) {
 if (obj instanceof MetricRegistryInfo) {
 return this.hashCode() == obj.hashCode();
 } else {
 if (this == obj) {
 return true;
 } else if (!(obj instanceof MetricRegistryInfo)) {
 return false;
 }
 final MetricRegistryInfo that = (MetricRegistryInfo) obj;
 return Objects.equals(prefix, that.prefix)
 && Objects.equals(metricsDescription, that.metricsDescription)
 && Objects.equals(metricsComponentName, that.metricsComponentName)
 && Objects.equals(applicationName, that.applicationName);
 }

 @Override
 public int hashCode() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 return hash.get();
 }

public String getName() {
 return fullName;
private Integer computeHash() {
 return Objects.hash(prefix, metricsDescription, metricsComponentName);
 }


 @Override
 public String toString() {
 return JavaUtils.getClassSimpleName(getClass())
 + ": applicationName=" + getApplicationName()
 + ", metricsComponentName=" + getMetricsComponentName()
 + ", prefix=" + getPrefix()
 + ", metricsDescription=" + getMetricsDescription();
 }
}

0
...he/ratis/metrics/RatisMetricRegistry.java → ...he/ratis/metrics/RatisMetricRegistry.java

View file


Open in desktop


File renamed without changes.


8 changes: 2 additions & 6 deletions
...rg/apache/ratis/metrics/RatisMetrics.java → ...rg/apache/ratis/metrics/RatisMetrics.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,9 +59,7 @@ protected static <T extends Enum<T>> Map<T, Timekeeper> newTimerMap(
 protected static RatisMetricRegistry create(MetricRegistryInfo info) {
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 return metricRegistry.orElseGet(() -> {
 if (LOG.isDebugEnabled()) {
 LOG.debug("Creating Metrics Registry : {}", info.getName());
 }
 LOG.debug("Creating {}", info);
 return MetricRegistries.global().create(info);
 });
 }
Expand All@@ -74,9 +72,7 @@ protected RatisMetrics(RatisMetricRegistry registry) {

 public void unregister() {
 MetricRegistryInfo info = registry.getMetricRegistryInfo();
 if (LOG.isDebugEnabled()) {
 LOG.debug("Unregistering Metrics Registry : {}", info.getName());
 }
 LOG.debug("Unregistering {}", info);
 Optional<RatisMetricRegistry> metricRegistry = MetricRegistries.global().get(info);
 if (metricRegistry.isPresent()) {
 MetricRegistries.global().remove(info);
Expand Down

0
.../org/apache/ratis/metrics/Timekeeper.java → .../org/apache/ratis/metrics/Timekeeper.java

View file


Open in desktop


File renamed without changes.


8 changes: 6 additions & 2 deletions
ratis-metrics/pom.xml → ratis-metrics-default/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,10 +21,14 @@
 <version>3.0.0-SNAPSHOT</version>
 </parent>

 <artifactId>ratis-metrics</artifactId>
 <name>Apache Ratis Metrics</name>
 <artifactId>ratis-metrics-default</artifactId>
 <name>Apache Ratis Metrics Default Implementation</name>

 <dependencies>
 <dependency>
 <artifactId>ratis-metrics-api</artifactId>
 <groupId>org.apache.ratis</groupId>
 </dependency>
 <dependency>
 <artifactId>ratis-proto</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...s/metrics/impl/DefaultTimekeeperImpl.java → ...s/metrics/impl/DefaultTimekeeperImpl.java

View file


Open in desktop


File renamed without changes.


0
...apache/ratis/metrics/impl/JvmMetrics.java → ...apache/ratis/metrics/impl/JvmMetrics.java

View file


Open in desktop


File renamed without changes.


0
...is/metrics/impl/MetricRegistriesImpl.java → ...is/metrics/impl/MetricRegistriesImpl.java

View file


Open in desktop


File renamed without changes.


0
...trics/impl/MetricRegistryFactoryImpl.java → ...trics/impl/MetricRegistryFactoryImpl.java

View file


Open in desktop


File renamed without changes.


0
.../ratis/metrics/impl/MetricsReporting.java → .../ratis/metrics/impl/MetricsReporting.java

View file


Open in desktop


File renamed without changes.


8 changes: 5 additions & 3 deletions
...metrics/impl/RatisMetricRegistryImpl.java → ...metrics/impl/RatisMetricRegistryImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;

import java.util.Map;
import java.util.Objects;
import java.util.SortedMap;
import java.util.function.Supplier;

Expand All@@ -49,13 +50,14 @@ static RatisMetricRegistryImpl cast(RatisMetricRegistry registry) {
 private final MetricRegistry metricRegistry = new MetricRegistry();

 private final MetricRegistryInfo info;
 private final String namePrefix;

 private JmxReporter jmxReporter;
 private ConsoleReporter consoleReporter;

 public RatisMetricRegistryImpl(MetricRegistryInfo info) {
super();
 this.info = info;
this.info = Objects.requireNonNull(info, "info == null");
 this.namePrefix = MetricRegistry.name(info.getApplicationName(), info.getMetricsComponentName(), info.getPrefix());
 }

 @Override
Expand DownExpand Up@@ -111,7 +113,7 @@ public Metric get(String shortName) {
 }

 private String getMetricName(String shortName) {
 return MetricRegistry.name(info.getName(), shortName);
 return MetricRegistry.name(namePrefix, shortName);
 }

 private <T extends Metric> T register(String name, T metric) throws IllegalArgumentException {
Expand Down

0
.../metrics/impl/RatisObjectNameFactory.java → .../metrics/impl/RatisObjectNameFactory.java

View file


Open in desktop


File renamed without changes.


0
...he/ratis/metrics/impl/RefCountingMap.java → ...he/ratis/metrics/impl/RefCountingMap.java

View file


Open in desktop


File renamed without changes.


0
...org.apache.ratis.metrics.MetricRegistries → ...org.apache.ratis.metrics.MetricRegistries

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
...s/metrics/TestMetricRegistriesLoader.java → ...s/metrics/TestMetricRegistriesLoader.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
/**
/*
 * 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
Expand Down

0
...atis/metrics/impl/TestRefCountingMap.java → ...atis/metrics/impl/TestRefCountingMap.java

View file


Open in desktop


File renamed without changes.


45 changes: 0 additions & 45 deletions
ratis-metrics/src/test/resources/hadoop-metrics2.properties

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
ratis-server/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,15 +82,15 @@
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <artifactId>ratis-metrics-api</artifactId>
 </dependency>
 <dependency>
 <groupId>org.apache.ratis</groupId>
 <artifactId>ratis-metrics</artifactId>
 <type>test-jar</type>
 <artifactId>ratis-metrics-default</artifactId>
 <scope>test</scope>
 </dependency>


 <dependency>
 <groupId>com.github.spotbugs</groupId>
 <artifactId>spotbugs-annotations</artifactId>
Expand Down

6 changes: 6 additions & 0 deletions
ratis-test/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,12 @@
 <type>test-jar</type>
 </dependency>

 <dependency>
 <artifactId>ratis-metrics-default</artifactId>
 <groupId>org.apache.ratis</groupId>
 <scope>test</scope>
 </dependency>

 <dependency>
 <artifactId>ratis-netty</artifactId>
 <groupId>org.apache.ratis</groupId>
Expand Down

0
...is/grpc/server/TestGrpcServerMetrics.java → ...is/grpc/server/TestGrpcServerMetrics.java

View file


Open in desktop


File renamed without changes.