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

Bump micrometer #282

Merged
merged 3 commits into from
Mar 22, 2024
Merged

Bump micrometer #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16214ef
bump micrometer to 1.12.4
galaxina Mar 22, 2024
1489a1c
bump micrometer to 1.12.4
galaxina Mar 22, 2024
e1ec4a6
bump micrometer to 1.12.4
galaxina Mar 22, 2024
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
1 change: 0 additions & 1 deletion oap-http/oap-http-prometheus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<version>${oap.deps.micrometer.version}</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion oap-stdlib-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>oap</groupId>
<artifactId>oap-stdlib</artifactId>
<version>${parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>oap</groupId>
Expand Down
1 change: 0 additions & 1 deletion oap-stdlib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>${oap.deps.micrometer.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
22 changes: 3 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>oap</groupId>
<artifactId>oap.maven</artifactId>
<version>21.1.11</version>
<version>21.1.14</version>
</parent>

<packaging>pom</packaging>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>oap</groupId>
<artifactId>oap-dependencies</artifactId>
<version>21.1.11</version>
<version>21.1.14</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -72,7 +72,7 @@
</distributionManagement>

<properties>
<oap.project.version>21.17.3</oap.project.version>
<oap.project.version>21.17.4</oap.project.version>

<oap.deps.config.version>21.0.0</oap.deps.config.version>
<oap.deps.oap-teamcity.version>21.0.1</oap.deps.oap-teamcity.version>
Expand All @@ -95,22 +95,6 @@

<oap.deps.jol.version>0.17</oap.deps.jol.version>
<oap.deps.bucket4j.version>8.7.0</oap.deps.bucket4j.version>
<!-- NOTE: micrometer version 1.10.x has an issue which causes to change metric's names
for instance "task_queue" in 1.6 is modified by adding a suffix "_total" unchanged for COUNTER type
and in later versions it is left unchanged so exception will arise.
In order to fix that we have to rename all GAUGEs with same name as COUNTER's to different ones,
for instance by adding "extra" suffix
Example:
Metrics.counter( "task_queue", Tags.of( "type", "total" ) );
Metrics.gauge( "task_queue", Tags.of( "type", "current" ), this, 5 );

should be changed to

Metrics.counter( "task_queue", Tags.of( "type", "total" ) );
Metrics.gauge( "task_queue_extra", Tags.of( "type", "current" ), this, 5 );

-->
<oap.deps.micrometer.version>1.11.3</oap.deps.micrometer.version>

<oap.deps.fastutil.version>8.5.12</oap.deps.fastutil.version>
<oap.deps.quartz.version>2.3.2</oap.deps.quartz.version>
Expand Down
Loading