Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start building against Micrometer 1.14.0 snapshots

Browse Source 
See gh-42555
This commit is contained in:
Andy Wilkinson
2024-10-09 11:00:35 +01:00
parent 69162f4f9f
commit 83afef4f60
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -79,6 +79,12 @@ public class ElasticProperties extends StepRegistryProperties {
*/
private String apiKeyCredentials;
/**
* Whether to enable _source in the default index template when auto-creating the
* index.
*/
private boolean enableSource = false;
public String getHost() {
return this.host;
}
@@ -159,4 +165,12 @@ public class ElasticProperties extends StepRegistryProperties {
this.apiKeyCredentials = apiKeyCredentials;
}
public boolean isEnableSource() {
return this.enableSource;
}
public void setEnableSource(boolean enableSource) {
this.enableSource = enableSource;
}
}

7
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticPropertiesConfigAdapter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -87,4 +87,9 @@ class ElasticPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter
return get(ElasticProperties::getApiKeyCredentials, ElasticConfig.super::apiKeyCredentials);
}
@Override
public boolean enableSource() {
return get(ElasticProperties::isEnableSource, ElasticConfig.super::enableSource);
}
}

9
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticPropertiesConfigAdapterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -104,4 +104,11 @@ class ElasticPropertiesConfigAdapterTests
assertThat(new ElasticPropertiesConfigAdapter(properties).apiKeyCredentials()).isEqualTo("secret");
}
@Test
void whenPropertiesEnableSourceIsSetAdapterEnableSourceReturnsIt() {
ElasticProperties properties = new ElasticProperties();
properties.setEnableSource(true);
assertThat(new ElasticPropertiesConfigAdapter(properties).enableSource()).isTrue();
}
}

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -1305,7 +1305,7 @@ bom {
]
}
}
library("Micrometer", "1.14.0-M3") {
library("Micrometer", "1.14.0-SNAPSHOT") {
considerSnapshots()
group("io.micrometer") {
modules = [