Autofill homePageUrl and statusPageUrl of an InstanceInfo in Eureka using path properties.
#5465
Conversation
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
…reka using path properties. Motivation: Following up on the improvements introduced in line#5369, it's beneficial to extend the autofill feature to include `homePageUrl` and `statusPageUrl` of an `InstanceInfo`. This enhancement streamlines configuration by automatically populating these URLs based on corresponding path properties. Modifications: - Introduce `homePageUrlPath` and `statusPageUrlPath` properties to `InstanceInfo` and their respective builders. - Implement autofill functionality for `homePageUrl` and `statusPageUrl` using the configured path properties. Result: - `homePageUrl` and `statusPageUrl` of an `InstanceInfo` in Eureka are correctly set if corresponding path properties are configured. - Close line#5464
|
@codefromthecrypt Could you check this, please? 😉 |
|
cool this afternoon I will integration test this and let you know! |
| @CsvSource({ | ||
| "'',/,'',/,'',/", | ||
| "custom-health,/custom-health,home-page,/home-page,status-page,/status-page", | ||
| "/custom-health,/custom-health,/home-page,/home-page,/status-page,/status-page", |
|
🚢 diff --git a/pom.xml b/pom.xml
index 3560f8dbc..01f4ed50e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<!-- This allows you to test feature branches with jitpack -->
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
- <armeria.version>1.27.1</armeria.version>
+ <armeria.version>1.27.2-SNAPSHOT</armeria.version>
<!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
<netty.version>4.1.106.Final</netty.version>
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/eureka/ZipkinEurekaDiscoveryProperties.java b/zipkin-server/src/main/java/zipkin2/server/internal/eureka/ZipkinEurekaDiscoveryProperties.java
index b783dfbe5..8513a5cd6 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/eureka/ZipkinEurekaDiscoveryProperties.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/eureka/ZipkinEurekaDiscoveryProperties.java
@@ -106,7 +106,8 @@ class ZipkinEurekaDiscoveryProperties implements Serializable { // for Spark job
EurekaUpdatingListenerBuilder toBuilder() {
EurekaUpdatingListenerBuilder result = EurekaUpdatingListener.builder(serviceUrl)
- .healthCheckUrlPath("/health");
+ .healthCheckUrlPath("/health")
+ .statusPageUrlPath("/info");
if (auth != null) result.auth(auth);
if (appName != null) result.appName(appName);
if (instanceId != null) result.instanceId(instanceId);
|
ikhoon
approved these changes
Feb 15, 2024
| @@ -36,7 +36,8 @@ | |||
| /** | |||
| * An instance information. | |||
| */ | |||
| @JsonIgnoreProperties(value = { "healthCheckUrlPath" }, ignoreUnknown = true) | |||
| @JsonIgnoreProperties( | |||
| value = { "homePageUrlPath", "statusPageUrlPath", "healthCheckUrlPath" }, ignoreUnknown = true) | |||
There was a problem hiding this comment.
Optional) @JsonIgnore would be more maintainable to exclude some fields from serialization.
There was a problem hiding this comment.
Oh, I forgot about it. 😉
| }) | ||
| void customHealthCheckPath(String healthCheckUrlPath, String expectedHealthCheckUrlPath) | ||
| void customHealthCheckPath(String healthCheckUrlPath, String expectedHealthCheckUrlPath, |
There was a problem hiding this comment.
nit:
Suggested change
| void customHealthCheckPath(String healthCheckUrlPath, String expectedHealthCheckUrlPath, | |
| void customPaths(String healthCheckUrlPath, String expectedHealthCheckUrlPath, |
jrhee17
approved these changes
Feb 16, 2024
| hostnameOrIpAddr(hostnameOrIpAddr) + ':' + portWrapper.getPort(); | ||
| } | ||
|
|
||
| private static String concatPath(String baseURL, String oldHealthCheckUrlPath) { |
There was a problem hiding this comment.
style nit; since the method isn't specific to healthcheck
Suggested change
| private static String concatPath(String baseURL, String oldHealthCheckUrlPath) { | |
| private static String concatPath(String baseURL, String urlPath) { |
|
do you have an ETA for 1.28? I would like to release this fix and there isn't any clean way to work around it without the new code.. |
|
actually we could consider this 1.27.2 maybe if nothing else is merged |
|
We will release 1.27.2 this week. 😉 |
jrhee17
pushed a commit
to jrhee17/armeria
that referenced
this pull request
Mar 4, 2024
…reka using path properties. (line#5465) Motivation: Following up on the improvements introduced in line#5369, it's beneficial to extend the autofill feature to include `homePageUrl` and `statusPageUrl` of an `InstanceInfo`. This enhancement streamlines configuration by automatically populating these URLs based on corresponding path properties. Modifications: - Introduce `homePageUrlPath` and `statusPageUrlPath` properties to `InstanceInfo` and their respective builders. - Implement autofill functionality for `homePageUrl` and `statusPageUrl` using the configured path properties. Result: - `homePageUrl` and `statusPageUrl` of an `InstanceInfo` in Eureka are correctly set if corresponding path properties are configured. - Close line#5464
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation:
Following up on the improvements introduced in #5369, it's beneficial to extend the autofill feature to include
homePageUrlandstatusPageUrlof anInstanceInfo. This enhancement streamlines configuration by automatically populating these URLs based on corresponding path properties.Modifications:
homePageUrlPathandstatusPageUrlPathproperties toInstanceInfoand their respective builders.homePageUrlandstatusPageUrlusing the configured path properties.Result:
homePageUrlandstatusPageUrlof anInstanceInfoin Eureka are correctly set if corresponding path properties are configured.