Add https to druid-influxdb-emitter extension #9938
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,12 +36,21 @@ public class InfluxdbEmitterConfig | |
| private static final int DEFAULT_QUEUE_SIZE = Integer.MAX_VALUE; | ||
| private static final int DEFAULT_FLUSH_PERIOD = 60000; // milliseconds | ||
| private static final List<String> DEFAULT_DIMENSION_WHITELIST = Arrays.asList("dataSource", "type", "numMetrics", "numDimensions", "threshold", "dimension", "taskType", "taskStatus", "tier"); | ||
| private static final String DEFAULT_PROTOCOL = "http"; | ||
|
|
||
| @JsonProperty | ||
| private final String hostname; | ||
| @JsonProperty | ||
| private final Integer port; | ||
| @JsonProperty | ||
| private final String protocol; | ||
| @JsonProperty | ||
| private final String trustStorePath; | ||
| @JsonProperty | ||
| private final String trustStoreType; | ||
| @JsonProperty | ||
| private final String trustStorePassword; | ||
| @JsonProperty | ||
| private final String databaseName; | ||
| @JsonProperty | ||
| private final Integer maxQueueSize; | ||
|
|
@@ -62,6 +71,10 @@ public class InfluxdbEmitterConfig | |
| public InfluxdbEmitterConfig( | ||
| @JsonProperty("hostname") String hostname, | ||
| @JsonProperty("port") Integer port, | ||
| @JsonProperty("protocol") String protocol, | ||
| @JsonProperty("trustStorePath") String trustStorePath, | ||
| @JsonProperty("trustStoreType") String trustStoreType, | ||
| @JsonProperty("trustStorePassword") String trustStorePassword, | ||
| @JsonProperty("databaseName") String databaseName, | ||
| @JsonProperty("maxQueueSize") Integer maxQueueSize, | ||
| @JsonProperty("flushPeriod") Integer flushPeriod, | ||
|
|
@@ -73,6 +86,10 @@ public InfluxdbEmitterConfig( | |
| { | ||
| this.hostname = Preconditions.checkNotNull(hostname, "hostname can not be null"); | ||
| this.port = port == null ? DEFAULT_PORT : port; | ||
| this.protocol = protocol == null ? DEFAULT_PROTOCOL : protocol; | ||
| this.trustStorePath = trustStorePath; | ||
| this.trustStoreType = trustStoreType; | ||
| this.trustStorePassword = trustStorePassword; | ||
| this.databaseName = Preconditions.checkNotNull(databaseName, "databaseName can not be null"); | ||
| this.maxQueueSize = maxQueueSize == null ? DEFAULT_QUEUE_SIZE : maxQueueSize; | ||
| this.flushPeriod = flushPeriod == null ? DEFAULT_FLUSH_PERIOD : flushPeriod; | ||
|
|
@@ -121,6 +138,18 @@ public boolean equals(Object o) | |
| if (!getDimensionWhitelist().equals(that.getDimensionWhitelist())) { | ||
| return false; | ||
| } | ||
| if (!getProtocol().equals(that.getProtocol())) { | ||
| return false; | ||
| } | ||
| if (getTrustStorePath() != null ? !getTrustStorePath().equals(that.getTrustStorePath()) : that.getTrustStorePath() != null) { | ||
| return false; | ||
| } | ||
| if (getTrustStoreType() != null ? !getTrustStoreType().equals(that.getTrustStoreType()) : that.getTrustStoreType() != null) { | ||
| return false; | ||
| } | ||
| if (getTrustStorePassword() != null ? !getTrustStorePassword().equals(that.getTrustStorePassword()) : that.getTrustStorePassword() != null) { | ||
| return false; | ||
| } | ||
| return true; | ||
|
|
||
| } | ||
|
|
@@ -130,6 +159,10 @@ public int hashCode() | |
| { | ||
| int result = getHostname().hashCode(); | ||
| result = 31 * result + getPort(); | ||
| result = 31 * result + getProtocol().hashCode(); | ||
|
There was a problem hiding this comment. Is there any reason not to use |
||
| result = 31 * result + (getTrustStorePath() != null ? getTrustStorePath().hashCode() : 0); | ||
| result = 31 * result + (getTrustStoreType() != null ? getTrustStoreType().hashCode() : 0); | ||
| result = 31 * result + (getTrustStorePassword() != null ? getTrustStorePassword().hashCode() : 0); | ||
|
There was a problem hiding this comment. Looks like CI is complaining about a lack of test coverage. You can add an There was a problem hiding this comment. How does
but if port is null then it gets set to a default value in the config's constructor. There was a problem hiding this comment. EqualsVerifier doesn't know that because that field is not marked as You could also tell the test that the field is not null with |
||
| result = 31 * result + getDatabaseName().hashCode(); | ||
| result = 31 * result + getFlushPeriod(); | ||
| result = 31 * result + getMaxQueueSize(); | ||
|
|
@@ -152,6 +185,30 @@ public int getPort() | |
| return port; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public String getProtocol() | ||
| { | ||
| return protocol; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public String getTrustStorePath() | ||
| { | ||
| return trustStorePath; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public String getTrustStoreType() | ||
| { | ||
| return trustStoreType; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public String getTrustStorePassword() | ||
| { | ||
| return trustStorePassword; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public String getDatabaseName() | ||
| { | ||
|
|
||
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be better to use
try-with-resources. You will not have to handle the IOException thrown inclose()by yourself.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your review - I think I've addressed these comments. Can you take another look please?