mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Upgrade to micrometer 1.3.0
Closes gh-18389
This commit is contained in:
parent
346c4bc014
commit
a36d2cd159
@ -32,6 +32,11 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
@ConfigurationProperties(prefix = "management.metrics.export.atlas")
|
||||
public class AtlasProperties extends StepRegistryProperties {
|
||||
|
||||
/**
|
||||
* Number of threads to use with the metrics publishing scheduler.
|
||||
*/
|
||||
private Integer numThreads = 4;
|
||||
|
||||
/**
|
||||
* URI of the Atlas server.
|
||||
*/
|
||||
@ -68,6 +73,16 @@ public class AtlasProperties extends StepRegistryProperties {
|
||||
*/
|
||||
private String evalUri = "http://localhost:7101/lwc/api/v1/evaluate";
|
||||
|
||||
@Override
|
||||
public Integer getNumThreads() {
|
||||
return this.numThreads;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setNumThreads(Integer numThreads) {
|
||||
this.numThreads = numThreads;
|
||||
}
|
||||
|
||||
public String getUri() {
|
||||
return this.uri;
|
||||
}
|
||||
|
@ -22,6 +22,7 @@ import java.util.Map;
|
||||
|
||||
import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.StepRegistryProperties;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
|
||||
|
||||
/**
|
||||
* {@link ConfigurationProperties @ConfigurationProperties} for configuring Humio metrics
|
||||
@ -46,7 +47,7 @@ public class HumioProperties extends StepRegistryProperties {
|
||||
/**
|
||||
* Name of the repository to publish metrics to.
|
||||
*/
|
||||
private String repository = "sandbox";
|
||||
private String repository = "";
|
||||
|
||||
/**
|
||||
* Humio tags describing the data source in which metrics will be stored. Humio tags
|
||||
@ -79,10 +80,13 @@ public class HumioProperties extends StepRegistryProperties {
|
||||
this.connectTimeout = connectTimeout;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@DeprecatedConfigurationProperty(reason = "No longer used as repository is resolved from the api token.")
|
||||
public String getRepository() {
|
||||
return this.repository;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public void setRepository(String repository) {
|
||||
this.repository = repository;
|
||||
}
|
||||
|
@ -44,6 +44,7 @@ class HumioPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter<H
|
||||
}
|
||||
|
||||
@Override
|
||||
@Deprecated
|
||||
public String repository() {
|
||||
return get(HumioProperties::getRepository, HumioConfig.super::repository);
|
||||
}
|
||||
|
@ -37,6 +37,7 @@ class HumioPropertiesConfigAdapterTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Deprecated
|
||||
void whenPropertiesRepositoryIsSetAdapterRepositoryReturnsIt() {
|
||||
HumioProperties properties = new HumioProperties();
|
||||
properties.setRepository("test");
|
||||
|
@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
class HumioPropertiesTests extends StepRegistryPropertiesTests {
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("deprecation")
|
||||
void defaultValuesAreConsistent() {
|
||||
HumioProperties properties = new HumioProperties();
|
||||
HumioConfig config = (key) -> null;
|
||||
|
@ -151,7 +151,7 @@
|
||||
<logback.version>1.2.3</logback.version>
|
||||
<lombok.version>1.18.10</lombok.version>
|
||||
<mariadb.version>2.4.4</mariadb.version>
|
||||
<micrometer.version>1.2.1</micrometer.version>
|
||||
<micrometer.version>1.3.0</micrometer.version>
|
||||
<mimepull.version>1.9.11</mimepull.version>
|
||||
<mockito.version>3.0.0</mockito.version>
|
||||
<mongo-driver-reactivestreams.version>1.12.0</mongo-driver-reactivestreams.version>
|
||||
@ -1046,118 +1046,10 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-core</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-jersey2</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-appoptics</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-atlas</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-azure-monitor</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-cloudwatch</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-cloudwatch2</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-dynatrace</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-elastic</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-ganglia</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-graphite</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-humio</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-influx</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-kairos</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-new-relic</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-signalfx</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-stackdriver</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-statsd</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-registry-wavefront</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.micrometer</groupId>
|
||||
<artifactId>micrometer-test</artifactId>
|
||||
<artifactId>micrometer-bom</artifactId>
|
||||
<version>${micrometer.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
|
Loading…
Reference in New Issue
Block a user