Skip to content

Commit 86926bf

Browse files
philwebbphilwebb
committed
Upgrade to Micrometer 1.0.0-rc.1
Closes gh-10300
1 parent 324a00f commit 86926bf

File tree

6 files changed

+30
-29
lines changed

6 files changed

+30
-29
lines changed

‎spring-boot-actuator-autoconfigure/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,37 +94,37 @@
9494
</dependency>
9595
<dependency>
9696
<groupId>io.micrometer</groupId>
97-
<artifactId>micrometer-atlas-starter</artifactId>
97+
<artifactId>micrometer-registry-atlas</artifactId>
9898
<optional>true</optional>
9999
</dependency>
100100
<dependency>
101101
<groupId>io.micrometer</groupId>
102-
<artifactId>micrometer-datadog-starter</artifactId>
102+
<artifactId>micrometer-registry-datadog</artifactId>
103103
<optional>true</optional>
104104
</dependency>
105105
<dependency>
106106
<groupId>io.micrometer</groupId>
107-
<artifactId>micrometer-ganglia-starter</artifactId>
107+
<artifactId>micrometer-registry-ganglia</artifactId>
108108
<optional>true</optional>
109109
</dependency>
110110
<dependency>
111111
<groupId>io.micrometer</groupId>
112-
<artifactId>micrometer-graphite-starter</artifactId>
112+
<artifactId>micrometer-registry-graphite</artifactId>
113113
<optional>true</optional>
114114
</dependency>
115115
<dependency>
116116
<groupId>io.micrometer</groupId>
117-
<artifactId>micrometer-influx-starter</artifactId>
117+
<artifactId>micrometer-registry-influx</artifactId>
118118
<optional>true</optional>
119119
</dependency>
120120
<dependency>
121121
<groupId>io.micrometer</groupId>
122-
<artifactId>micrometer-jmx-starter</artifactId>
122+
<artifactId>micrometer-registry-jmx</artifactId>
123123
<optional>true</optional>
124124
</dependency>
125125
<dependency>
126126
<groupId>io.micrometer</groupId>
127-
<artifactId>micrometer-prometheus-starter</artifactId>
127+
<artifactId>micrometer-registry-prometheus</artifactId>
128128
<optional>true</optional>
129129
</dependency>
130130
<dependency>

‎spring-boot-actuator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</dependency>
5454
<dependency>
5555
<groupId>io.micrometer</groupId>
56-
<artifactId>micrometer-prometheus-starter</artifactId>
56+
<artifactId>micrometer-registry-prometheus</artifactId>
5757
<optional>true</optional>
5858
</dependency>
5959
<dependency>

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import io.micrometer.core.instrument.Measurement;
2828
import io.micrometer.core.instrument.Meter;
2929
import io.micrometer.core.instrument.MeterRegistry;
30+
import io.micrometer.core.instrument.NamingConvention;
3031
import io.micrometer.core.instrument.Statistic;
3132
import io.micrometer.core.instrument.util.HierarchicalNameMapper;
3233

@@ -75,7 +76,8 @@ private MeasurementSample getSample(Measurement measurement) {
7576
}
7677

7778
private String getHierarchicalName(Meter meter) {
78-
return HierarchicalNameMapper.DEFAULT.toHierarchicalName(meter.getId());
79+
return HierarchicalNameMapper.DEFAULT.toHierarchicalName(meter.getId(),
80+
NamingConvention.camelCase);
7981
}
8082

8183
private <T> Stream<T> stream(Iterable<T> measure) {

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public void selectByName() throws IOException {
6262
MetricsEndpointWebIntegrationTests.client.get()
6363
.uri("/application/metrics/jvm.memory.used").exchange().expectStatus()
6464
.isOk().expectBody()
65-
.jsonPath("['jvm_memory_used.area.nonheap.id.Compressed Class Space']")
66-
.exists().jsonPath("['jvm_memory_used.area.heap.id.PS Old Gen']");
65+
.jsonPath("['jvmMemoryUsed.area.nonheap.id.Compressed_Class_Space']")
66+
.exists().jsonPath("['jvmMemoryUsed.area.heap.id.PS_Old_Gen']");
6767
}
6868

6969
@Configuration

‎spring-boot-dependencies/pom.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<logback.version>1.2.3</logback.version>
133133
<lombok.version>1.16.18</lombok.version>
134134
<mariadb.version>2.1.1</mariadb.version>
135-
<micrometer.version>0.11.0.RELEASE</micrometer.version>
135+
<micrometer.version>1.0.0-rc.1</micrometer.version>
136136
<mssql-jdbc.version>6.2.1.jre8</mssql-jdbc.version>
137137
<mockito.version>2.9.0</mockito.version>
138138
<mongo-driver-reactivestreams.version>1.5.0</mongo-driver-reactivestreams.version>
@@ -568,7 +568,6 @@
568568
<artifactId>spring-boot-starter-web-services</artifactId>
569569
<version>2.0.0.BUILD-SNAPSHOT</version>
570570
</dependency>
571-
572571
<!-- Third Party -->
573572
<dependency>
574573
<groupId>antlr</groupId>
@@ -842,37 +841,37 @@
842841
</dependency>
843842
<dependency>
844843
<groupId>io.micrometer</groupId>
845-
<artifactId>micrometer-atlas-starter</artifactId>
844+
<artifactId>micrometer-registry-atlas</artifactId>
846845
<version>${micrometer.version}</version>
847846
</dependency>
848847
<dependency>
849848
<groupId>io.micrometer</groupId>
850-
<artifactId>micrometer-datadog-starter</artifactId>
849+
<artifactId>micrometer-registry-datadog</artifactId>
851850
<version>${micrometer.version}</version>
852851
</dependency>
853852
<dependency>
854853
<groupId>io.micrometer</groupId>
855-
<artifactId>micrometer-influx-starter</artifactId>
854+
<artifactId>micrometer-registry-influx</artifactId>
856855
<version>${micrometer.version}</version>
857856
</dependency>
858857
<dependency>
859858
<groupId>io.micrometer</groupId>
860-
<artifactId>micrometer-ganglia-starter</artifactId>
859+
<artifactId>micrometer-registry-ganglia</artifactId>
861860
<version>${micrometer.version}</version>
862861
</dependency>
863862
<dependency>
864863
<groupId>io.micrometer</groupId>
865-
<artifactId>micrometer-graphite-starter</artifactId>
864+
<artifactId>micrometer-registry-graphite</artifactId>
866865
<version>${micrometer.version}</version>
867866
</dependency>
868867
<dependency>
869868
<groupId>io.micrometer</groupId>
870-
<artifactId>micrometer-jmx-starter</artifactId>
869+
<artifactId>micrometer-registry-jmx</artifactId>
871870
<version>${micrometer.version}</version>
872871
</dependency>
873872
<dependency>
874873
<groupId>io.micrometer</groupId>
875-
<artifactId>micrometer-prometheus-starter</artifactId>
874+
<artifactId>micrometer-registry-prometheus</artifactId>
876875
<version>${micrometer.version}</version>
877876
</dependency>
878877
<dependency>
@@ -2008,7 +2007,7 @@
20082007
<version>${mongodb.version}</version>
20092008
</dependency>
20102009
<dependency>
2011-
<groupId>org.mongodb</groupId>
2010+
<groupId>org.mongodb</groupId>
20122011
<artifactId>mongodb-driver-reactivestreams</artifactId>
20132012
<version>${mongo-driver-reactivestreams.version}</version>
20142013
</dependency>

‎spring-boot-docs/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,42 +188,42 @@
188188
</dependency>
189189
<dependency>
190190
<groupId>io.micrometer</groupId>
191-
<artifactId>micrometer-atlas-starter</artifactId>
191+
<artifactId>micrometer-core</artifactId>
192192
<optional>true</optional>
193193
</dependency>
194194
<dependency>
195195
<groupId>io.micrometer</groupId>
196-
<artifactId>micrometer-core</artifactId>
196+
<artifactId>micrometer-registry-atlas</artifactId>
197197
<optional>true</optional>
198198
</dependency>
199199
<dependency>
200200
<groupId>io.micrometer</groupId>
201-
<artifactId>micrometer-datadog-starter</artifactId>
201+
<artifactId>micrometer-registry-datadog</artifactId>
202202
<optional>true</optional>
203203
</dependency>
204204
<dependency>
205205
<groupId>io.micrometer</groupId>
206-
<artifactId>micrometer-ganglia-starter</artifactId>
206+
<artifactId>micrometer-registry-ganglia</artifactId>
207207
<optional>true</optional>
208208
</dependency>
209209
<dependency>
210210
<groupId>io.micrometer</groupId>
211-
<artifactId>micrometer-graphite-starter</artifactId>
211+
<artifactId>micrometer-registry-graphite</artifactId>
212212
<optional>true</optional>
213213
</dependency>
214214
<dependency>
215215
<groupId>io.micrometer</groupId>
216-
<artifactId>micrometer-influx-starter</artifactId>
216+
<artifactId>micrometer-registry-influx</artifactId>
217217
<optional>true</optional>
218218
</dependency>
219219
<dependency>
220220
<groupId>io.micrometer</groupId>
221-
<artifactId>micrometer-jmx-starter</artifactId>
221+
<artifactId>micrometer-registry-jmx</artifactId>
222222
<optional>true</optional>
223223
</dependency>
224224
<dependency>
225225
<groupId>io.micrometer</groupId>
226-
<artifactId>micrometer-prometheus-starter</artifactId>
226+
<artifactId>micrometer-registry-prometheus</artifactId>
227227
<optional>true</optional>
228228
</dependency>
229229
<dependency>

0 commit comments

Comments
 (0)