Skip to content

Commit 91cfae4

Browse files
authored
refactor(metrics): delete influxdb storage for metrics (#6725)
1 parent 54342dc commit 91cfae4

10 files changed

Lines changed: 1 addition & 137 deletions

File tree

common/src/main/java/org/tron/common/parameter/CommonParameter.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -492,21 +492,6 @@ public class CommonParameter {
492492
public boolean nodeMetricsEnable = false;
493493
@Getter
494494
@Setter
495-
public boolean metricsStorageEnable = false;
496-
@Getter
497-
@Setter
498-
public String influxDbIp;
499-
@Getter
500-
@Setter
501-
public int influxDbPort;
502-
@Getter
503-
@Setter
504-
public String influxDbDatabase;
505-
@Getter
506-
@Setter
507-
public int metricsReportInterval = 10;
508-
@Getter
509-
@Setter
510495
public boolean metricsPrometheusEnable = false;
511496
@Getter
512497
@Setter

common/src/main/java/org/tron/core/config/args/MetricsConfig.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88

99
/**
1010
* Metrics configuration bean. Field names match config.conf keys under "node.metrics".
11-
* Contains nested sub-beans for prometheus and influxdb sections.
11+
* Contains nested sub-bean for the prometheus section.
1212
*/
1313
@Slf4j
1414
@Getter
1515
@Setter
1616
public class MetricsConfig {
1717

18-
private boolean storageEnable = false;
1918
private PrometheusConfig prometheus = new PrometheusConfig();
20-
private InfluxDbConfig influxdb = new InfluxDbConfig();
2119

2220
@Getter
2321
@Setter
@@ -26,15 +24,6 @@ public static class PrometheusConfig {
2624
private int port = 9527;
2725
}
2826

29-
@Getter
30-
@Setter
31-
public static class InfluxDbConfig {
32-
private String ip = "";
33-
private int port = 8086;
34-
private String database = "metrics";
35-
private int metricsReportInterval = 10;
36-
}
37-
3827
// Defaults come from reference.conf (loaded globally via Configuration.java)
3928

4029
/**

common/src/main/resources/reference.conf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,6 @@ node.metrics = {
171171
enable = false
172172
port = 9527
173173
}
174-
175-
storageEnable = false
176-
177-
influxdb {
178-
ip = ""
179-
port = 8086
180-
database = "metrics"
181-
metricsReportInterval = 10
182-
}
183174
}
184175

185176
node {

common/src/test/java/org/tron/core/config/args/MetricsConfigTest.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

framework/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ dependencies {
4040
// end local libraries
4141
implementation group: 'com.beust', name: 'jcommander', version: '1.78'
4242
implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.1.2'
43-
implementation group: 'com.github.davidb', name: 'metrics-influxdb', version: '0.8.2'
4443
// http
4544
implementation 'org.eclipse.jetty:jetty-server:9.4.58.v20250814'
4645
implementation 'org.eclipse.jetty:jetty-servlet:9.4.58.v20250814'

framework/src/main/java/org/tron/common/application/ApplicationImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.tron.core.config.args.Args;
99
import org.tron.core.consensus.ConsensusService;
1010
import org.tron.core.db.Manager;
11-
import org.tron.core.metrics.MetricsUtil;
1211
import org.tron.core.net.TronNetService;
1312
import org.tron.core.services.event.EventService;
1413

@@ -46,7 +45,6 @@ public void startup() {
4645
if ((!Args.getInstance().isSolidityNode()) && (!Args.getInstance().isP2pDisable())) {
4746
tronNetService.start();
4847
}
49-
MetricsUtil.init();
5048
}
5149

5250
@Override

framework/src/main/java/org/tron/core/config/args/Args.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -459,12 +459,6 @@ private static void applyEventConfig(EventConfig ec) {
459459
* Note: node.metricsEnable is handled in applyNodeConfig (it's a node-level field).
460460
*/
461461
private static void applyMetricsConfig(MetricsConfig mc) {
462-
PARAMETER.metricsStorageEnable = mc.isStorageEnable();
463-
PARAMETER.influxDbIp = mc.getInfluxdb().getIp().isEmpty()
464-
? Constant.LOCAL_HOST : mc.getInfluxdb().getIp();
465-
PARAMETER.influxDbPort = mc.getInfluxdb().getPort();
466-
PARAMETER.influxDbDatabase = mc.getInfluxdb().getDatabase();
467-
PARAMETER.metricsReportInterval = mc.getInfluxdb().getMetricsReportInterval();
468462
PARAMETER.metricsPrometheusEnable = mc.getPrometheus().isEnable();
469463
PARAMETER.metricsPrometheusPort = mc.getPrometheus().getPort();
470464
}

framework/src/main/java/org/tron/core/metrics/MetricsUtil.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,19 @@
33
import com.codahale.metrics.Counter;
44
import com.codahale.metrics.Histogram;
55
import com.codahale.metrics.Meter;
6-
import com.codahale.metrics.MetricFilter;
76
import com.codahale.metrics.MetricRegistry;
8-
import com.codahale.metrics.ScheduledReporter;
97

108
import java.util.SortedMap;
11-
import java.util.concurrent.TimeUnit;
129

1310
import lombok.extern.slf4j.Slf4j;
14-
import metrics_influxdb.InfluxdbReporter;
15-
import metrics_influxdb.api.protocols.InfluxdbProtocols;
1611
import org.tron.common.parameter.CommonParameter;
17-
import org.tron.core.Constant;
1812
import org.tron.core.metrics.net.RateInfo;
1913

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

2317
private static MetricRegistry metricRegistry = new MetricRegistry();
2418

25-
public static void init() {
26-
if (CommonParameter.getInstance().isNodeMetricsEnable()
27-
&& CommonParameter.getInstance().isMetricsStorageEnable()) {
28-
String ip = CommonParameter.getInstance().getInfluxDbIp();
29-
int port = CommonParameter.getInstance().getInfluxDbPort();
30-
String dataBase = CommonParameter.getInstance().getInfluxDbDatabase();
31-
ScheduledReporter influxReport = InfluxdbReporter
32-
.forRegistry(metricRegistry)
33-
.protocol(InfluxdbProtocols.http(ip, port, dataBase))
34-
.convertRatesTo(TimeUnit.SECONDS)
35-
.convertDurationsTo(TimeUnit.MILLISECONDS)
36-
.filter(MetricFilter.ALL)
37-
.skipIdleMetrics(false)
38-
.build();
39-
int interval = CommonParameter.getInstance().getMetricsReportInterval()
40-
* Constant.ONE_THOUSAND;
41-
influxReport.start(interval, TimeUnit.MILLISECONDS);
42-
}
43-
}
44-
4519
public static Histogram getHistogram(String key) {
4620
return metricRegistry.histogram(key);
4721
}

framework/src/main/resources/config.conf

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,6 @@ node.metrics = {
138138
port = 9527
139139
}
140140

141-
# influxdb metrics
142-
storageEnable = false # Whether write metrics data into InfluxDb. Default: false.
143-
influxdb {
144-
ip = ""
145-
port = 8086
146-
database = ""
147-
metricsReportInterval = 10
148-
}
149141
}
150142

151143
node {

framework/src/test/java/org/tron/common/ParameterTest.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,16 +239,6 @@ public void testCommonParameter() {
239239
assertEquals(500, parameter.getPendingTransactionTimeout());
240240
parameter.setNodeMetricsEnable(false);
241241
assertFalse(parameter.isNodeMetricsEnable());
242-
parameter.setMetricsStorageEnable(false);
243-
assertFalse(parameter.isMetricsStorageEnable());
244-
parameter.setInfluxDbIp("127.0.0.1");
245-
assertEquals("127.0.0.1", parameter.getInfluxDbIp());
246-
parameter.setInfluxDbPort(90);
247-
assertEquals(90, parameter.getInfluxDbPort());
248-
parameter.setInfluxDbDatabase("InfluxDb");
249-
assertEquals("InfluxDb", parameter.getInfluxDbDatabase());
250-
parameter.setMetricsReportInterval(100);
251-
assertEquals(100, parameter.getMetricsReportInterval());
252242
parameter.setMetricsPrometheusPort(3000);
253243
assertEquals(3000, parameter.getMetricsPrometheusPort());
254244
parameter.setAgreeNodeCount(10);

0 commit comments

Comments
 (0)