Skip to content
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

Jump to bottom

Collect metrics for application instances #4270

Merged
merged 15 commits into from
Apr 25, 2024
Merged

Collect metrics for application instances #4270

merged 15 commits into from
Apr 25, 2024

Conversation

heowc
Copy link
Contributor

@heowc heowc commented Mar 24, 2024

Fixes #3685

OlgaMaciaszek
OlgaMaciaszek requested changes Mar 25, 2024
View reviewed changes
Copy link
Collaborator

@OlgaMaciaszek OlgaMaciaszek left a comment

Choose a reason for hiding this comment

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

Hello @heowc, thanks for providing the PR. I have added some comments - please address. When it comes to actual metrics, I'll also request review from @jonatan-ivanov who specialises in it. Please also document the feature in docs/modules/ROOT/pages/spring-cloud-netflix.adoc.

...ava/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsBinder.java Outdated Show resolved Hide resolved
...ava/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsBinder.java Outdated Show resolved Hide resolved
...ava/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsBinder.java Outdated Show resolved Hide resolved
...ingframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsAutoConfiguration.java Show resolved Hide resolved
...ingframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsAutoConfiguration.java Show resolved Hide resolved
...t/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMetricsBinderTests.java Outdated Show resolved Hide resolved
...t/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMetricsBinderTests.java Outdated Show resolved Hide resolved
@OlgaMaciaszek
Copy link
Collaborator

@jonatan-ivanov Could you please review the metrics-related code?

@OlgaMaciaszek OlgaMaciaszek self-assigned this Mar 25, 2024
jonatan-ivanov
jonatan-ivanov reviewed Mar 26, 2024
View reviewed changes
...ingframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsAutoConfiguration.java Show resolved Hide resolved
...ava/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsBinder.java Outdated Show resolved Hide resolved
...ava/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsBinder.java Outdated Show resolved Hide resolved
...ava/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsBinder.java Outdated Show resolved Hide resolved
...ver/src/test/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryTests.java Outdated Show resolved Hide resolved
...t/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMetricsBinderTests.java Outdated Show resolved Hide resolved
@OlgaMaciaszek
Copy link
Collaborator

Thanks a lot @jonatan-ivanov. @heowc please address the comments and don't hesitate to let us know if you need additional help.

OlgaMaciaszek
OlgaMaciaszek requested changes Mar 26, 2024
View reviewed changes
Copy link
Collaborator

@OlgaMaciaszek OlgaMaciaszek left a comment

Choose a reason for hiding this comment

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

Thanks @heowc. Waiting for the rest of the changes we've discussed.

@heowc heowc mentioned this pull request Mar 30, 2024
Merged
@OlgaMaciaszek
Copy link
Collaborator

OlgaMaciaszek commented Apr 2, 2024 •
edited

Thanks for updates, @heowc. It seems you're still working on it since there are TBD comments and not all the changes we've discussed have been implemented, I will not be reviewing it yet. Could you mark the PR as draft and then turn it back into regular PR once you're ready for review? Also, make sure to pull the changes from main and resolve existing conflicts. You can also add a comment for us to look at it when it's ready. If you have additional questions, also let us know. Please make sure you tag me in any comments so that we don't miss them.

@heowc heowc marked this pull request as draft April 4, 2024 15:24
@heowc
Merge branch 'main' into feature/3685
5cbcc88 
# Conflicts:
#	docs/modules/ROOT/partials/_configprops.adoc
#	spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryTests.java
@heowc
Add MultiGauge / Doc
07e55fa
@heowc heowc marked this pull request as ready for review April 13, 2024 09:15
OlgaMaciaszek
OlgaMaciaszek requested changes Apr 15, 2024
View reviewed changes
Copy link
Collaborator

@OlgaMaciaszek OlgaMaciaszek left a comment

Choose a reason for hiding this comment

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

Thanks @heowc. This looks better. Have added some comments. Please address.

...main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java Outdated Show resolved Hide resolved
...rc/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java Outdated Show resolved Hide resolved
...rc/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java Outdated Show resolved Hide resolved
...er/src/test/java/org/springframework/cloud/netflix/eureka/server/FixtureEurekaInstances.java Outdated Show resolved Hide resolved
...ingframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMetricsAutoConfiguration.java Outdated Show resolved Hide resolved
...rc/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java Show resolved Hide resolved
@OlgaMaciaszek
Copy link
Collaborator

@jonatan-ivanov Could you please review the reworked metrics?

OlgaMaciaszek
OlgaMaciaszek approved these changes Apr 18, 2024
View reviewed changes
Copy link
Collaborator

@OlgaMaciaszek OlgaMaciaszek left a comment

Choose a reason for hiding this comment

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

Thanks, @heowc. LGTM. Will still wait for an approval from @jonatan-ivanov before merging this, though.

@OlgaMaciaszek OlgaMaciaszek mentioned this pull request Apr 23, 2024
Closed
jonatan-ivanov
jonatan-ivanov reviewed Apr 24, 2024
View reviewed changes
...main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java Outdated Show resolved Hide resolved
...main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java Show resolved Hide resolved
...main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java Show resolved Hide resolved
...main/java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceMonitor.java Outdated Show resolved Hide resolved
...java/org/springframework/cloud/netflix/eureka/server/metrics/EurekaInstanceTagsProvider.java Outdated Show resolved Hide resolved
docs/modules/ROOT/pages/spring-cloud-netflix.adoc Outdated Show resolved Hide resolved
...g/springframework/cloud/netflix/eureka/server/metrics/DefaultEurekaInstanceTagsProvider.java Outdated Show resolved Hide resolved
...rc/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java Outdated Show resolved Hide resolved
...rc/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java Outdated Show resolved Hide resolved
...rc/test/java/org/springframework/cloud/netflix/eureka/server/EurekaInstanceMonitorTests.java Show resolved Hide resolved
@OlgaMaciaszek
Copy link
Collaborator

Thanks a lot @jonatan-ivanov.

OlgaMaciaszek
OlgaMaciaszek requested changes Apr 25, 2024
View reviewed changes
Copy link
Collaborator

@OlgaMaciaszek OlgaMaciaszek left a comment

Choose a reason for hiding this comment

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

Thanks @heowc. Have added a comment. Please address. Also, please remove the typos from doc entry that @jonatan-ivanov has indicated.

...gframework/cloud/netflix/eureka/server/EurekaInstanceMonitorWithCustomTagsProviderTests.java Outdated Show resolved Hide resolved
OlgaMaciaszek
OlgaMaciaszek approved these changes Apr 25, 2024
View reviewed changes
Copy link
Collaborator

@OlgaMaciaszek OlgaMaciaszek left a comment

Choose a reason for hiding this comment

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

Thanks @heowc. LGTM.

@OlgaMaciaszek OlgaMaciaszek merged commit de6d506 into spring-cloud:main Apr 25, 2024
1 check passed
@heowc heowc deleted the feature/3685 branch April 25, 2024 09:59
@heowc heowc mentioned this pull request May 19, 2024
Closed
natedanner pushed a commit to natedanner/spring-cloud__spring-cloud-netflix that referenced this pull request May 20, 2024
@heowc
Collect metrics for application instances (spring-cloud#4270)
7941fda
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonatan-ivanov jonatan-ivanov jonatan-ivanov requested changes

@OlgaMaciaszek OlgaMaciaszek OlgaMaciaszek approved these changes

Assignees

@OlgaMaciaszek OlgaMaciaszek

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Eureka server micrometer metrics for registered services
4 participants
@heowc @OlgaMaciaszek @jonatan-ivanov @spring-cloud-issues