Skip to content

feature(metrics): delete influxdb storage for metrics #73

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

Open
317787106 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feature(metrics): delete influxdb storage for metrics #73

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
15 changes: 0 additions & 15 deletions common/src/main/java/org/tron/common/parameter/CommonParameter.java
View file
Open in desktop
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
1 change: 0 additions & 1 deletion framework/build.gradle
View file
Open in desktop
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
2 changes: 0 additions & 2 deletions framework/src/main/java/org/tron/common/application/ApplicationImpl.java
View file
Open in desktop
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
11 changes: 0 additions & 11 deletions framework/src/main/java/org/tron/core/config/args/Args.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,17 +851,6 @@ public static void applyConfigParams(
PARAMETER.nodeMetricsEnable = config.getBoolean(ConfigKey.NODE_METRICS_ENABLE);
}

PARAMETER.metricsStorageEnable = config.hasPath(ConfigKey.METRICS_STORAGE_ENABLE) && config
.getBoolean(ConfigKey.METRICS_STORAGE_ENABLE);
PARAMETER.influxDbIp = config.hasPath(ConfigKey.METRICS_INFLUXDB_IP) ? config
.getString(ConfigKey.METRICS_INFLUXDB_IP) : Constant.LOCAL_HOST;
PARAMETER.influxDbPort = config.hasPath(ConfigKey.METRICS_INFLUXDB_PORT) ? config
.getInt(ConfigKey.METRICS_INFLUXDB_PORT) : 8086;
PARAMETER.influxDbDatabase = config.hasPath(ConfigKey.METRICS_INFLUXDB_DATABASE) ? config
.getString(ConfigKey.METRICS_INFLUXDB_DATABASE) : "metrics";
PARAMETER.metricsReportInterval = config.hasPath(ConfigKey.METRICS_REPORT_INTERVAL) ? config
.getInt(ConfigKey.METRICS_REPORT_INTERVAL) : 10;

PARAMETER.metricsPrometheusEnable =
config.hasPath(ConfigKey.METRICS_PROMETHEUS_ENABLE)
&& config.getBoolean(ConfigKey.METRICS_PROMETHEUS_ENABLE);
Expand Down
6 changes: 0 additions & 6 deletions framework/src/main/java/org/tron/core/config/args/ConfigKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,6 @@ private ConfigKey() {
public static final String RATE_LIMITER_P2P_DISCONNECT = "rate.limiter.p2p.disconnect";

// metrics
public static final String METRICS_STORAGE_ENABLE = "node.metrics.storageEnable";
public static final String METRICS_INFLUXDB_IP = "node.metrics.influxdb.ip";
public static final String METRICS_INFLUXDB_PORT = "node.metrics.influxdb.port";
public static final String METRICS_INFLUXDB_DATABASE = "node.metrics.influxdb.database";
public static final String METRICS_REPORT_INTERVAL =
"node.metrics.influxdb.metricsReportInterval";
public static final String METRICS_PROMETHEUS_ENABLE = "node.metrics.prometheus.enable";
public static final String METRICS_PROMETHEUS_PORT = "node.metrics.prometheus.port";

Expand Down
26 changes: 0 additions & 26 deletions framework/src/main/java/org/tron/core/metrics/MetricsUtil.java
View file
Open in desktop
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
View file
Open in desktop
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
Loading