-
Notifications
You must be signed in to change notification settings - Fork 695
Upgrade micrometer to version 1.14.0 #7901
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.
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
Conversation
|
@niallkp: As per mailing list discussion, any chance you're able to review this? |
|
@JinwooHwang-SAS Looks like there are build failures, do you think they are related to your changes? |
|
@scmbuildguy , I see -Werror in the build option which causes errors on warnings such as this deprecation message: import static io.micrometer.core.instrument.util.StringUtils.isNotBlank;
|
|
@niallkp and @scmbuildguy, I would appreciate it if you could kindly provide your response at your earliest convenience. Thank you. |
|
If you click the failing |
|
Thank you for pointing that out and for sharing the detailed logs, @raboof. I really appreciate your guidance. I’ll review the develop / build failure carefully and see what steps we can take to address it. Your insights are very helpful in moving this forward. |
raboof
left a comment
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.
OK if CI agrees
|
Thank you @raboof |
|
The IntegrationTest failure seems (at least partly) related to this PR: |
|
Thank you for bringing the IntegrationTest failure to my attention, @raboof. Let me investigate the issue in detail in order to determine the appropriate fix. I truly appreciate your careful review. |
|
@JinwooHwang: Did merging this PR ultimately become unnecessary? Should this work be addressed, merged, or closed? |
|
I am so sorry @semioticrobotic. I did not have time for this project due to the migration projects. Let me work on this after the other PR get merged. Thank you. |
This commit updates the expected dependency classpaths in integration tests to reflect the addition of Micrometer dependencies to the Apache Geode build. Changes include: - Add micrometer-observation-1.14.0.jar to bundled jars - Add micrometer-commons-1.14.0.jar to bundled jars - Upgrade HdrHistogram from 2.1.12 to 2.2.2 (transitive dependency) Updated files: - geode-assembly/src/integrationTest/resources/expected_jars.txt * Updated bundled jars list for BundledJarsJUnitTest - geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt * Updated gfsh-dependencies.jar manifest classpath for GfshDependencyJarIntegrationTest - geode-server-all/src/integrationTest/resources/dependency_classpath.txt * Updated geode-server-all.jar manifest classpath for GeodeServerAllJarIntegrationTest These changes ensure all assembly integration tests pass with the new Micrometer metrics dependencies introduced in the micrometer branch. Tests verified: - AssemblyContentsIntegrationTest.verifyAssemblyContents ✓ - BundledJarsJUnitTest.verifyBundledJarsHaveNotChanged ✓ - GfshDependencyJarIntegrationTest.verifyManifestClassPath ✓ - GeodeServerAllJarIntegrationTest.verifyManifestClassPath ✓
Add micrometer-observation and micrometer-commons to the expected assembly contents and update HdrHistogram from 2.1.12 to 2.2.2. This fixes the AssemblyContentsIntegrationTest failure on CI server. Changes: - lib/HdrHistogram-2.1.12.jar → lib/HdrHistogram-2.2.2.jar - Added lib/micrometer-commons-1.14.0.jar - Added lib/micrometer-observation-1.14.0.jar (micrometer-core was already present) Test verified: AssemblyContentsIntegrationTest.verifyAssemblyContents ✓
Synchronize dependency versions across test resource files: - HdrHistogram: 2.2.2 → 2.1.12 (in assembly_content.txt) - swagger-annotations: 2.2.1 → 2.2.22 - commons-io: 2.15.1 → 2.18.0 - joda-time: 2.10.14 → 2.12.7 These updates reflect the actual dependency versions in the current build and ensure all integration tests pass. Tests verified: - AssemblyContentsIntegrationTest.verifyAssemblyContents ✓ - GeodeServerAllJarIntegrationTest.verifyManifestClassPath ✓
Revert HdrHistogram back to 2.2.2 to match the actual assembly build. The CI server builds with HdrHistogram 2.2.2, not 2.1.12. This fixes the AssemblyContentsIntegrationTest failure on CI.
Update swagger-annotations from 2.2.1 to 2.2.22 to match the actual dependency version in the build. This fixes the GfshDependencyJarIntegrationTest failure on CI.
- Updated HdrHistogram from 2.1.12 to 2.2.2 (following upstream changes) - Kept micrometer 1.14.0 dependencies (observation and commons) - Resolved assembly content and dependency classpath conflicts
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
Has your PR been rebased against the latest commit within the target branch (typically
develop)?Is your initial contribution a single, squashed commit?
Does
gradlew buildrun cleanly?Have you written or updated unit tests to verify your changes?
If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?