Skip to content

Fixed formatting #1375

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
dhoard merged 1 commit into from
Jan 5, 2026
Merged

Fixed formatting #1375

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: 10 additions & 5 deletions collector/src/main/java/io/prometheus/jmx/JmxScraper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ public void doScrape() throws Exception {

SslRMIClientSocketFactory clientSocketFactory = new SslRMIClientSocketFactory();
environment.put(
RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, clientSocketFactory);
RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE,
clientSocketFactory);
if (!"true".equalsIgnoreCase(System.getenv("RMI_REGISTRY_SSL_DISABLED"))) {
environment.put("com.sun.jndi.rmi.factory.socket", clientSocketFactory);
}
Expand Down Expand Up @@ -200,9 +201,11 @@ public void doScrape() throws Exception {
}

/**
* Attempts to resolve the ssl configuration defined in the yaml file
* Next to that it also attempts to read the following system properties:
* Attempts to resolve the ssl configuration defined in the yaml file Next to that it also
* attempts to read the following system properties:
*
* <p>
*
* <pre>
* - javax.net.ssl.keyStore
* - javax.net.ssl.keyStorePassword
Expand Down Expand Up @@ -238,7 +241,8 @@ private SSLFactory createSslFactory() {
sslFactoryBuilder.withCiphers(sslProperties.ciphers.toArray(new String[0]));
}

callSafely(sslFactoryBuilder::withSystemPropertyDerivedIdentityMaterial,
callSafely(
sslFactoryBuilder::withSystemPropertyDerivedIdentityMaterial,
sslFactoryBuilder::withSystemPropertyDerivedTrustMaterial,
sslFactoryBuilder::withSystemPropertyDerivedProtocols,
sslFactoryBuilder::withSystemPropertyDerivedCiphers);
Expand All @@ -250,7 +254,8 @@ private void callSafely(Callable<?>... callables) {
for (Callable<?> callable : callables) {
try {
callable.call();
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
}
}

Expand Down