Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -471,21 +471,6 @@ public class CommonParameter {
public boolean nodeMetricsEnable = false;
@Getter
@Setter
public boolean metricsStorageEnable = false;
@Getter
@Setter
public String influxDbIp;
@Getter
@Setter
public int influxDbPort;
@Getter
@Setter
public String influxDbDatabase;
@Getter
@Setter
public int metricsReportInterval = 10;
@Getter
@Setter
public boolean metricsPrometheusEnable = false;
@Getter
@Setter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@

/**
* Metrics configuration bean. Field names match config.conf keys under "node.metrics".
* Contains nested sub-beans for prometheus and influxdb sections.
* Contains nested sub-bean for the prometheus section.
*/
@Slf4j
@Getter
@Setter
public class MetricsConfig {

private boolean storageEnable = false;
private PrometheusConfig prometheus = new PrometheusConfig();
private InfluxDbConfig influxdb = new InfluxDbConfig();

@Getter
@Setter
Expand All @@ -26,15 +24,6 @@ public static class PrometheusConfig {
private int port = 9527;
}

@Getter
@Setter
public static class InfluxDbConfig {
private String ip = "";
private int port = 8086;
private String database = "metrics";
private int metricsReportInterval = 10;
}

// Defaults come from reference.conf (loaded globally via Configuration.java)

/**
Expand Down
9 changes: 0 additions & 9 deletions common/src/main/resources/reference.conf
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,6 @@ node.metrics = {
enable = false
port = 9527
}

storageEnable = false

influxdb {
ip = ""
port = 8086
database = "metrics"
metricsReportInterval = 10
}
}

node {
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ dependencies {
// end local libraries
implementation group: 'com.beust', name: 'jcommander', version: '1.78'
implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.1.2'
implementation group: 'com.github.davidb', name: 'metrics-influxdb', version: '0.8.2'
// http
implementation 'org.eclipse.jetty:jetty-server:9.4.57.v20241219'
implementation 'org.eclipse.jetty:jetty-servlet:9.4.57.v20241219'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.tron.core.config.args.Args;
import org.tron.core.consensus.ConsensusService;
import org.tron.core.db.Manager;
import org.tron.core.metrics.MetricsUtil;
import org.tron.core.net.TronNetService;
import org.tron.core.services.event.EventService;

Expand Down Expand Up @@ -46,7 +45,6 @@ public void startup() {
if ((!Args.getInstance().isSolidityNode()) && (!Args.getInstance().isP2pDisable())) {
tronNetService.start();
}
MetricsUtil.init();
}

@Override
Expand Down
6 changes: 0 additions & 6 deletions framework/src/main/java/org/tron/core/config/args/Args.java
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,6 @@ private static void applyEventConfig(EventConfig ec) {
* Note: node.metricsEnable is handled in applyNodeConfig (it's a node-level field).
*/
private static void applyMetricsConfig(MetricsConfig mc) {
PARAMETER.metricsStorageEnable = mc.isStorageEnable();
PARAMETER.influxDbIp = mc.getInfluxdb().getIp().isEmpty()
? Constant.LOCAL_HOST : mc.getInfluxdb().getIp();
PARAMETER.influxDbPort = mc.getInfluxdb().getPort();
PARAMETER.influxDbDatabase = mc.getInfluxdb().getDatabase();
PARAMETER.metricsReportInterval = mc.getInfluxdb().getMetricsReportInterval();
PARAMETER.metricsPrometheusEnable = mc.getPrometheus().isEnable();
PARAMETER.metricsPrometheusPort = mc.getPrometheus().getPort();
}
Expand Down
26 changes: 0 additions & 26 deletions framework/src/main/java/org/tron/core/metrics/MetricsUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,19 @@
import com.codahale.metrics.Counter;
import com.codahale.metrics.Histogram;
import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.ScheduledReporter;

import java.util.SortedMap;
import java.util.concurrent.TimeUnit;

import lombok.extern.slf4j.Slf4j;
import metrics_influxdb.InfluxdbReporter;
import metrics_influxdb.api.protocols.InfluxdbProtocols;
import org.tron.common.parameter.CommonParameter;
import org.tron.core.Constant;
import org.tron.core.metrics.net.RateInfo;

@Slf4j(topic = "metrics")
public class MetricsUtil {

private static MetricRegistry metricRegistry = new MetricRegistry();

public static void init() {
if (CommonParameter.getInstance().isNodeMetricsEnable()
&& CommonParameter.getInstance().isMetricsStorageEnable()) {
String ip = CommonParameter.getInstance().getInfluxDbIp();
int port = CommonParameter.getInstance().getInfluxDbPort();
String dataBase = CommonParameter.getInstance().getInfluxDbDatabase();
ScheduledReporter influxReport = InfluxdbReporter
.forRegistry(metricRegistry)
.protocol(InfluxdbProtocols.http(ip, port, dataBase))
.convertRatesTo(TimeUnit.SECONDS)
.convertDurationsTo(TimeUnit.MILLISECONDS)
.filter(MetricFilter.ALL)
.skipIdleMetrics(false)
.build();
int interval = CommonParameter.getInstance().getMetricsReportInterval()
* Constant.ONE_THOUSAND;
influxReport.start(interval, TimeUnit.MILLISECONDS);
}
}

public static Histogram getHistogram(String key) {
return metricRegistry.histogram(key);
}
Expand Down
8 changes: 0 additions & 8 deletions framework/src/main/resources/config.conf
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,6 @@ node.metrics = {
port = 9527
}

# influxdb metrics
storageEnable = false # Whether write metrics data into InfluxDb. Default: false.
influxdb {
ip = ""
port = 8086
database = ""
metricsReportInterval = 10
}
}

node {
Expand Down
10 changes: 0 additions & 10 deletions framework/src/test/java/org/tron/common/ParameterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,6 @@ public void testCommonParameter() {
assertEquals(500, parameter.getPendingTransactionTimeout());
parameter.setNodeMetricsEnable(false);
assertFalse(parameter.isNodeMetricsEnable());
parameter.setMetricsStorageEnable(false);
assertFalse(parameter.isMetricsStorageEnable());
parameter.setInfluxDbIp("127.0.0.1");
assertEquals("127.0.0.1", parameter.getInfluxDbIp());
parameter.setInfluxDbPort(90);
assertEquals(90, parameter.getInfluxDbPort());
parameter.setInfluxDbDatabase("InfluxDb");
assertEquals("InfluxDb", parameter.getInfluxDbDatabase());
parameter.setMetricsReportInterval(100);
assertEquals(100, parameter.getMetricsReportInterval());
parameter.setMetricsPrometheusPort(3000);
assertEquals(3000, parameter.getMetricsPrometheusPort());
parameter.setAgreeNodeCount(10);
Expand Down
Loading