Skip to content

Fixed code to use the Java system properties for keystore and truststo…#1126

Merged
dhoard merged 2 commits intoprometheus:mainfrom
dhoard:fix-keystore-truststore-default-types
Feb 7, 2025
Merged

Fixed code to use the Java system properties for keystore and truststo…#1126
dhoard merged 2 commits intoprometheus:mainfrom
dhoard:fix-keystore-truststore-default-types

Conversation

@dhoard
Copy link
Collaborator

@dhoard dhoard commented Jan 31, 2025

…re types if not configured in exporter.yaml

@dhoard
Copy link
Collaborator Author

dhoard commented Jan 31, 2025

@gtully I found some inconsistency in the keystore/truststore type handling in the existing HTTPServerFactory code.

The code didn't use the Java system property (if defined). I made some changes to be more consistent.

Can you take a look?

Thanks!

@dhoard dhoard changed the title Fixe code to use the Java system properties for keystore and truststo… Fixed code to use the Java system properties for keystore and truststo… Jan 31, 2025
…ore types if not configured in exporter.yaml

Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard dhoard force-pushed the fix-keystore-truststore-default-types branch from daff41a to 86ec112 Compare February 1, 2025 04:20
@dhoard dhoard merged commit a550f7c into prometheus:main Feb 7, 2025
2 checks passed
Copy link
Contributor

@gtully gtully left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that looks sensible to me.

@dhoard dhoard deleted the fix-keystore-truststore-default-types branch February 28, 2025 01:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants