jmx-scraper add ssl support #1710
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 tasks
SylvainJuge
force-pushed
the
jmx-scraper-server-ssl
branch
from
129ed8b to
057ba99
Compare
SylvainJuge
commented
Feb 17, 2025
Comment on lines
+163
to
+183
| logger.info("Connecting with SSL protected RMI registry to " + url); | ||
| String hostName; | ||
| int port; | ||
|
|
||
| if (url.getURLPath().startsWith("/jndi/")) { | ||
| String[] components = url.getURLPath().split("/", 3); | ||
| URI uri = URI.create(components[2]); | ||
| hostName = uri.getHost(); | ||
| port = uri.getPort(); | ||
| } else { | ||
| hostName = url.getHost(); | ||
| port = url.getPort(); | ||
| } | ||
|
|
||
| try { | ||
| JMXConnector jmxConn = new RMIConnector(getStub(hostName, port), null); | ||
| jmxConn.connect(env); | ||
| return jmxConn; | ||
| } catch (IOException e) { | ||
| throw new IllegalStateException("Unable to connect to " + url, e); | ||
| } |
There was a problem hiding this comment.
[for reviewer] copied almost as-is from jmx gatherer
robsunday
reviewed
Feb 18, 2025
jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java
Outdated
Show resolved
Hide resolved
jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java
Outdated
Show resolved
Hide resolved
jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| private void addKeyStore( | ||
| Path path, String password, boolean keyStore, Map<String, String> properties) { |
There was a problem hiding this comment.
boolean keyStore could be StoreTypeEnum storeType, where StoreTypeEnum would be KEY_STORE, TRUST_STORE
There was a problem hiding this comment.
Having any kind of strong typing is not really necessary here IMHO as there are only a few use-cases so I think a boolean is fine. We could also have introduced dedicated interfaces for trust and key stores but in practice it's the same file and only the usage we make of it makes it either a trust or a key store, we could even use a single key store for both trusted certificates and storing key pairs.
jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestKeyStoreUtil.java
Show resolved
Hide resolved
robsunday
approved these changes
Feb 19, 2025
jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java
Outdated
Show resolved
Hide resolved
trask
approved these changes
Feb 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is based on #1684 which is not merged yet, I'll rebase to minimize the diff once it's merged.Part of #1681
This adds the following features with proper integration tests for JMX with SSL:
Using other advanced JAAS configuration options for authentication is not part of this PR and will be implemented in a separate PR.