Skip to content

Commit 62d41a5

Browse files
committed
log export interval and simplify a bit config further
1 parent 1271bba commit 62d41a5

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxScraperContainer.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public class JmxScraperContainer extends GenericContainer<JmxScraperContainer> {
2424
private final String endpoint;
2525
private final Set<String> targetSystems;
2626
private String serviceUrl;
27-
private int intervalMillis;
2827
private final Set<String> customYamlFiles;
2928
private String user;
3029
private String password;
@@ -44,7 +43,6 @@ public JmxScraperContainer(String otlpEndpoint, String baseImage) {
4443
this.endpoint = otlpEndpoint;
4544
this.targetSystems = new HashSet<>();
4645
this.customYamlFiles = new HashSet<>();
47-
this.intervalMillis = 1000;
4846
this.extraJars = new ArrayList<>();
4947
}
5048

@@ -54,12 +52,6 @@ public JmxScraperContainer withTargetSystem(String targetSystem) {
5452
return this;
5553
}
5654

57-
@CanIgnoreReturnValue
58-
public JmxScraperContainer withIntervalMillis(int intervalMillis) {
59-
this.intervalMillis = intervalMillis;
60-
return this;
61-
}
62-
6355
@CanIgnoreReturnValue
6456
public JmxScraperContainer withRmiServiceUrl(String host, int port) {
6557
// TODO: adding a way to provide 'host:port' syntax would make this easier for end users
@@ -132,7 +124,8 @@ public void start() {
132124
throw new IllegalStateException("Missing service URL");
133125
}
134126
arguments.add("-Dotel.jmx.service.url=" + serviceUrl);
135-
arguments.add("-Dotel.jmx.interval.milliseconds=" + intervalMillis);
127+
// always use a very short export interval for testing
128+
arguments.add("-Dotel.metric.export.interval=1s");
136129

137130
if (user != null) {
138131
arguments.add("-Dotel.jmx.username=" + user);

jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public static void main(String[] args) {
6666

6767
JmxScraperConfig scraperConfig = configCustomizer.getScraperConfig();
6868

69+
long exportSeconds = scraperConfig.getSamplingInterval().toMillis() / 1000;
70+
logger.log(Level.INFO, "metrics export interval (seconds) = " + exportSeconds);
71+
6972
JmxMetricInsight service =
7073
JmxMetricInsight.createService(
7174
GlobalOpenTelemetry.get(), scraperConfig.getSamplingInterval().toMillis());

jmx-scraper/src/test/resources/validConfig.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
otel.jmx.service.url=service:jmx:rmi:///jndi/rmi://myhost:12345/jmxrmi
22
otel.jmx.custom.scraping.config=/my/scraping-config.yaml
33
otel.jmx.target.system=jvm,cassandra
4-
otel.jmx.interval.milliseconds=20000
54
otel.metrics.exporter=otlp
65
otel.metric.export.interval=1000
76
otel.exporter.otlp.endpoint=https://myotlpendpoint
@@ -17,4 +16,3 @@ javax.net.ssl.keyStoreType=JKS
1716
javax.net.ssl.trustStore=/my/trust/store
1817
javax.net.ssl.trustStorePassword=def456
1918
javax.net.ssl.trustStoreType=JKS
20-
otel.jmx.aggregate.across.mbeans=true

0 commit comments

Comments
 (0)