Skip to content

Commit 1793cee

Browse files
mhalbrittermhalbritter
committed
Start building against Micrometer 2.0.0-M3
See gh-29753
1 parent d79fb60 commit 1793cee

File tree

51 files changed

+109
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+109
-142
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ dependencies {
4848
optional("io.dropwizard.metrics:metrics-jmx")
4949
optional("io.lettuce:lettuce-core")
5050
optional("io.micrometer:micrometer-core")
51+
optional("io.micrometer:micrometer-binders")
5152
optional("io.micrometer:micrometer-registry-appoptics")
5253
optional("io.micrometer:micrometer-registry-atlas") {
5354
exclude group: "javax.inject", module: "javax.inject"

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfiguration.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19+
import io.micrometer.binder.jvm.ClassLoaderMetrics;
20+
import io.micrometer.binder.jvm.JvmGcMetrics;
21+
import io.micrometer.binder.jvm.JvmHeapPressureMetrics;
22+
import io.micrometer.binder.jvm.JvmMemoryMetrics;
23+
import io.micrometer.binder.jvm.JvmThreadMetrics;
1924
import io.micrometer.core.instrument.MeterRegistry;
20-
import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
21-
import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
22-
import io.micrometer.core.instrument.binder.jvm.JvmHeapPressureMetrics;
23-
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
24-
import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
2525

2626
import org.springframework.boot.autoconfigure.AutoConfiguration;
2727
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19+
import io.micrometer.binder.kafka.KafkaClientMetrics;
20+
import io.micrometer.binder.kafka.KafkaStreamsMetrics;
1921
import io.micrometer.core.instrument.MeterRegistry;
20-
import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
21-
import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics;
2222

2323
import org.springframework.boot.autoconfigure.AutoConfiguration;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19+
import io.micrometer.binder.logging.Log4j2Metrics;
1920
import io.micrometer.core.instrument.MeterRegistry;
20-
import io.micrometer.core.instrument.binder.logging.Log4j2Metrics;
2121
import org.apache.logging.log4j.LogManager;
2222
import org.apache.logging.log4j.spi.LoggerContext;
2323

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

1919
import ch.qos.logback.classic.LoggerContext;
20+
import io.micrometer.binder.logging.LogbackMetrics;
2021
import io.micrometer.core.instrument.MeterRegistry;
21-
import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
2222
import org.slf4j.ILoggerFactory;
2323
import org.slf4j.LoggerFactory;
2424

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import java.io.File;
2020
import java.util.List;
2121

22+
import io.micrometer.binder.system.FileDescriptorMetrics;
23+
import io.micrometer.binder.system.ProcessorMetrics;
24+
import io.micrometer.binder.system.UptimeMetrics;
2225
import io.micrometer.core.instrument.MeterRegistry;
2326
import io.micrometer.core.instrument.Tags;
24-
import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
25-
import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
26-
import io.micrometer.core.instrument.binder.system.UptimeMetrics;
2727

2828
import org.springframework.boot.actuate.metrics.system.DiskSpaceMetricsBinder;
2929
import org.springframework.boot.autoconfigure.AutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaProperties.java

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
2222
import info.ganglia.gmetric4j.gmetric.GMetric;
2323

2424
import org.springframework.boot.context.properties.ConfigurationProperties;
25-
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
2625

2726
/**
2827
* {@link ConfigurationProperties @ConfigurationProperties} for configuring Ganglia
@@ -97,17 +96,6 @@ public void setStep(Duration step) {
9796
this.step = step;
9897
}
9998

100-
@Deprecated
101-
@DeprecatedConfigurationProperty(reason = "No longer used by Micrometer.")
102-
public TimeUnit getRateUnits() {
103-
return this.rateUnits;
104-
}
105-
106-
@Deprecated
107-
public void setRateUnits(TimeUnit rateUnits) {
108-
this.rateUnits = rateUnits;
109-
}
110-
11199
public TimeUnit getDurationUnits() {
112100
return this.durationUnits;
113101
}
@@ -116,17 +104,6 @@ public void setDurationUnits(TimeUnit durationUnits) {
116104
this.durationUnits = durationUnits;
117105
}
118106

119-
@Deprecated
120-
@DeprecatedConfigurationProperty(reason = "No longer used by Micrometer.")
121-
public String getProtocolVersion() {
122-
return this.protocolVersion;
123-
}
124-
125-
@Deprecated
126-
public void setProtocolVersion(String protocolVersion) {
127-
this.protocolVersion = protocolVersion;
128-
}
129-
130107
public GMetric.UDPAddressingMode getAddressingMode() {
131108
return this.addressingMode;
132109
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaPropertiesConfigAdapter.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -56,23 +56,11 @@ public Duration step() {
5656
return get(GangliaProperties::getStep, GangliaConfig.super::step);
5757
}
5858

59-
@Override
60-
@Deprecated
61-
public TimeUnit rateUnits() {
62-
return get(GangliaProperties::getRateUnits, GangliaConfig.super::rateUnits);
63-
}
64-
6559
@Override
6660
public TimeUnit durationUnits() {
6761
return get(GangliaProperties::getDurationUnits, GangliaConfig.super::durationUnits);
6862
}
6963

70-
@Override
71-
@Deprecated
72-
public String protocolVersion() {
73-
return get(GangliaProperties::getProtocolVersion, GangliaConfig.super::protocolVersion);
74-
}
75-
7664
@Override
7765
public GMetric.UDPAddressingMode addressingMode() {
7866
return get(GangliaProperties::getAddressingMode, GangliaConfig.super::addressingMode);

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
package org.springframework.boot.actuate.autoconfigure.metrics.mongo;
1818

1919
import com.mongodb.MongoClientSettings;
20+
import io.micrometer.binder.mongodb.DefaultMongoCommandTagsProvider;
21+
import io.micrometer.binder.mongodb.DefaultMongoConnectionPoolTagsProvider;
22+
import io.micrometer.binder.mongodb.MongoCommandTagsProvider;
23+
import io.micrometer.binder.mongodb.MongoConnectionPoolTagsProvider;
24+
import io.micrometer.binder.mongodb.MongoMetricsCommandListener;
25+
import io.micrometer.binder.mongodb.MongoMetricsConnectionPoolListener;
2026
import io.micrometer.core.instrument.MeterRegistry;
21-
import io.micrometer.core.instrument.binder.mongodb.DefaultMongoCommandTagsProvider;
22-
import io.micrometer.core.instrument.binder.mongodb.DefaultMongoConnectionPoolTagsProvider;
23-
import io.micrometer.core.instrument.binder.mongodb.MongoCommandTagsProvider;
24-
import io.micrometer.core.instrument.binder.mongodb.MongoConnectionPoolTagsProvider;
25-
import io.micrometer.core.instrument.binder.mongodb.MongoMetricsCommandListener;
26-
import io.micrometer.core.instrument.binder.mongodb.MongoMetricsConnectionPoolListener;
2727

2828
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
2929
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/task/TaskExecutorMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import java.util.concurrent.Executor;
2222
import java.util.concurrent.ThreadPoolExecutor;
2323

24+
import io.micrometer.binder.jvm.ExecutorServiceMetrics;
2425
import io.micrometer.core.instrument.MeterRegistry;
25-
import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics;
2626

2727
import org.springframework.beans.factory.annotation.Autowired;
2828
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.web.jetty;
1818

19+
import io.micrometer.binder.jetty.JettyConnectionMetrics;
20+
import io.micrometer.binder.jetty.JettyServerThreadPoolMetrics;
21+
import io.micrometer.binder.jetty.JettySslHandshakeMetrics;
1922
import io.micrometer.core.instrument.MeterRegistry;
20-
import io.micrometer.core.instrument.binder.jetty.JettyConnectionMetrics;
21-
import io.micrometer.core.instrument.binder.jetty.JettyServerThreadPoolMetrics;
22-
import io.micrometer.core.instrument.binder.jetty.JettySslHandshakeMetrics;
2323
import org.eclipse.jetty.server.Server;
2424

2525
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.web.tomcat;
1818

19+
import io.micrometer.binder.tomcat.TomcatMetrics;
1920
import io.micrometer.core.instrument.MeterRegistry;
20-
import io.micrometer.core.instrument.binder.tomcat.TomcatMetrics;
2121
import org.apache.catalina.Manager;
2222

2323
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
1818

19+
import io.micrometer.binder.jvm.JvmMemoryMetrics;
1920
import io.micrometer.core.instrument.Statistic;
20-
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
2121
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
2222
import org.junit.jupiter.api.Test;
2323

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
1818

19+
import io.micrometer.binder.jvm.JvmMemoryMetrics;
1920
import io.micrometer.core.instrument.Clock;
20-
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
2121
import io.micrometer.prometheus.PrometheusMeterRegistry;
2222
import io.prometheus.client.CollectorRegistry;
2323
import io.prometheus.client.exporter.common.TextFormat;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/JvmMetricsAutoConfigurationTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
20-
import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
21-
import io.micrometer.core.instrument.binder.jvm.JvmHeapPressureMetrics;
22-
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
23-
import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
19+
import io.micrometer.binder.jvm.ClassLoaderMetrics;
20+
import io.micrometer.binder.jvm.JvmGcMetrics;
21+
import io.micrometer.binder.jvm.JvmHeapPressureMetrics;
22+
import io.micrometer.binder.jvm.JvmMemoryMetrics;
23+
import io.micrometer.binder.jvm.JvmThreadMetrics;
2424
import org.junit.jupiter.api.Test;
2525

2626
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithLog4jLoggerContextAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import io.micrometer.core.instrument.binder.logging.Log4j2Metrics;
19+
import io.micrometer.binder.logging.Log4j2Metrics;
2020
import org.apache.logging.log4j.LogManager;
2121
import org.junit.jupiter.api.Test;
2222

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/Log4J2MetricsWithSlf4jLoggerContextAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import io.micrometer.core.instrument.binder.logging.Log4j2Metrics;
19+
import io.micrometer.binder.logging.Log4j2Metrics;
2020
import org.apache.logging.log4j.LogManager;
2121
import org.apache.logging.slf4j.SLF4JLoggerContext;
2222
import org.junit.jupiter.api.Test;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/LogbackMetricsAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
19+
import io.micrometer.binder.logging.LogbackMetrics;
2020
import org.junit.jupiter.api.Test;
2121

2222
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
19+
import io.micrometer.binder.logging.LogbackMetrics;
2020
import org.junit.jupiter.api.Test;
2121

2222
import org.springframework.boot.autoconfigure.AutoConfigurations;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/SystemMetricsAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@
2020
import java.util.Arrays;
2121
import java.util.Collections;
2222

23+
import io.micrometer.binder.system.FileDescriptorMetrics;
24+
import io.micrometer.binder.system.ProcessorMetrics;
25+
import io.micrometer.binder.system.UptimeMetrics;
2326
import io.micrometer.core.instrument.Tags;
24-
import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
25-
import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
26-
import io.micrometer.core.instrument.binder.system.UptimeMetrics;
2727
import org.junit.jupiter.api.Test;
2828

2929
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaPropertiesTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -29,15 +29,12 @@
2929
class GangliaPropertiesTests {
3030

3131
@Test
32-
@SuppressWarnings("deprecation")
3332
void defaultValuesAreConsistent() {
3433
GangliaProperties properties = new GangliaProperties();
3534
GangliaConfig config = GangliaConfig.DEFAULT;
3635
assertThat(properties.isEnabled()).isEqualTo(config.enabled());
3736
assertThat(properties.getStep()).isEqualTo(config.step());
38-
assertThat(properties.getRateUnits()).isEqualTo(config.rateUnits());
3937
assertThat(properties.getDurationUnits()).isEqualTo(config.durationUnits());
40-
assertThat(properties.getProtocolVersion()).isEqualTo(config.protocolVersion());
4138
assertThat(properties.getAddressingMode()).isEqualTo(config.addressingMode());
4239
assertThat(properties.getTimeToLive()).isEqualTo(config.ttl());
4340
assertThat(properties.getHost()).isEqualTo(config.host());

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics.export.humio;
1818

19+
import io.micrometer.binder.jvm.JvmMemoryMetrics;
1920
import io.micrometer.core.instrument.Clock;
20-
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
2121
import io.micrometer.humio.HumioConfig;
2222
import io.micrometer.humio.HumioMeterRegistry;
2323
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)