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

Update Micrometer to 1.5.5 #12611

Merged
merged 1 commit into from
Oct 9, 2020
Merged

Update Micrometer to 1.5.5 #12611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ updates:
- dependency-name: com.amazonaws:aws-lambda-java-events
# Apache Commons
- dependency-name: commons-io:commons-io
# Micrometer
- dependency-name: io.micrometer:micrometer-bom
- dependency-name: io.micrometer:micrometer-registry-stackdriver
Copy link
Contributor

@gastaldi gastaldi Oct 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Why add the io.micrometer:micrometer-registry-stackdriver dependency here? Isn't already in the micrometer-bom?

Copy link
Member Author

Choose a reason for hiding this comment

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

As explained to me by Guillaume, because we include stackdriver specifically in the application bom (we have to because we need to exclude transitive dependencies), we need to include it here, too.

rebase-strategy: disabled
ebullient marked this conversation as resolved.
Show resolved Hide resolved
- package-ecosystem: gradle
directory: "/integration-tests/gradle"
Expand Down
36 changes: 10 additions & 26 deletions bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<quarkus-http.version>3.0.15.Final</quarkus-http.version>
<jboss-servlet-api_4.0_spec.version>1.0.0.Final</jboss-servlet-api_4.0_spec.version>
<threetenbp.version>1.4.3</threetenbp.version>
<micrometer.version>1.5.3</micrometer.version>
<micrometer.version>1.5.5</micrometer.version>
<microprofile-config-api.version>1.4</microprofile-config-api.version>
<microprofile-metrics-api.version>2.3</microprofile-metrics-api.version>
<microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>
Expand Down Expand Up @@ -294,6 +294,15 @@
<type>pom</type>
</dependency>

<!-- Micrometer Core and Registries, imported as BOM -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-bom</artifactId>
<version>${micrometer.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Quarkus core -->

<dependency>
Expand Down Expand Up @@ -4560,26 +4569,6 @@
<artifactId>threetenbp</artifactId>
<version>${threetenbp.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-datadog</artifactId>
<version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-jmx</artifactId>
<version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-stackdriver</artifactId>
Expand Down Expand Up @@ -4611,11 +4600,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-azure-monitor</artifactId>
<version>${micrometer.version}</version>
</dependency>

<!-- Picocli -->
<dependency>
Expand Down
13 changes: 6 additions & 7 deletions extensions/micrometer/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,34 +43,33 @@
<artifactId>quarkus-resteasy-common-spi</artifactId>
</dependency>

<!-- Registry providers (optional) -->
<!-- test -->

<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-datadog</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-jmx</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-stackdriver</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-azure-monitor</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>
<!-- test -->

<dependency>
<groupId>io.quarkus</groupId>
Expand Down