Skip to content

ENG-58332:Upgrade Micrometer version #115

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

Merged
harshit-kumar-v2 merged 6 commits into from
Mar 6, 2025
Merged

ENG-58332:Upgrade Micrometer version #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0115b2
upgrade micrometer version
harshit-kumar-v2 Mar 5, 2025
b1fe323
use key
harshit-kumar-v2 Mar 6, 2025
b3a2315
update version
harshit-kumar-v2 Mar 6, 2025
2cb62a6
version change
harshit-kumar-v2 Mar 6, 2025
c9c5db9
version change
harshit-kumar-v2 Mar 6, 2025
3f04349
suppress
harshit-kumar-v2 Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,5 @@ jobs:
steps:
- name: Dependency Check
uses: hypertrace/github-actions/dependency-check@main
with:
nvd-api-key: ${{ secrets.NVD_API_KEY }}
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
id("org.hypertrace.publish-plugin") version "1.0.2" apply false
id("org.hypertrace.jacoco-report-plugin") version "0.2.1" apply false
id("org.hypertrace.code-style-plugin") version "1.1.2" apply false
id("org.owasp.dependencycheck") version "8.3.1"
id("org.owasp.dependencycheck") version "12.1.0"
}

subprojects {
Expand Down
7 changes: 7 additions & 0 deletions owasp-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<suppress until="2025-05-31Z">
<notes><![CDATA[
file name: micrometer-registry-prometheus-simpleclient-1.14.4.jar, fix not available yet
]]></notes>
<packageUrl regex="true">^pkg:maven/io\.micrometer/micrometer-registry-prometheus-simpleclient@.*$</packageUrl>
<cve>CVE-2019-3826</cve>
Copy link
Contributor

@aaron-steinfeld aaron-steinfeld Mar 6, 2025

Choose a reason for hiding this comment

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

This is a FP, please use a CPE suppression with no expiration and move it to the global suppression file. The vulnerability is in the prom server, not client.

Copy link
Contributor Author

@harshit-kumar-v2 harshit-kumar-v2 Mar 6, 2025

Choose a reason for hiding this comment

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

why do we need CPE suppression? what does it do?

made the changes

  1. Add FP suppression micrometer client github-actions#74
  2. http://github.com/hypertrace/service-framework/pull/116

Copy link
Contributor

@aaron-steinfeld aaron-steinfeld Mar 6, 2025

Choose a reason for hiding this comment

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

By suppressing the CPE instead of the CVE we prevent future issues from popping up here too. The CVE suppression says "CVE-2019-3826 is not applicable to the micrometer prom client". The CPE suppression says "the micrometer prom client isn't the same thing as the prometheus server, and thus should not inherit prometheus server vulnerabilities".

Hope that helps.

</suppress>
</suppressions>
6 changes: 4 additions & 2 deletions platform-metrics/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ tasks.test {
dependencies {
api("com.typesafe:config:1.4.2")
api("io.dropwizard.metrics:metrics-jakarta-servlet:4.2.25")
api("io.micrometer:micrometer-core:1.10.2")
api("io.micrometer:micrometer-core:1.14.4")
api("jakarta.servlet:jakarta.servlet-api:6.0.0")

implementation("io.micrometer:micrometer-registry-prometheus:1.10.2")
// Using simpleclient flavour since with version >= 1.13.0 micrometer does not support io.prometheus.simpleclient dependencies
// https://github.com/micrometer-metrics/micrometer/wiki/1.13-Migration-Guide
implementation("io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4")

implementation("io.github.mweirauch:micrometer-jvm-extras:0.2.2")
implementation("org.slf4j:slf4j-api:1.7.36")
Expand Down
Loading