root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.2.x' 

Closes gh-19375
This commit is contained in:
Stephane Nicoll 2019-12-15 09:05:27 +09:00
parent ef2eb2f652 c076b625da
commit bb3b6dbd7d
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceProperties.java
View File

@ -51,6 +51,12 @@ public class DynatraceProperties extends StepRegistryProperties {
*/
private String uri;
/**
* Group for exported metrics. Used to specify custom device group name in the
* Dynatrace UI.
*/
private String group;
public String getApiToken() {
return this.apiToken;
}
@ -83,4 +89,12 @@ public class DynatraceProperties extends StepRegistryProperties {
this.uri = uri;
}
public String getGroup() {
return this.group;
}
public void setGroup(String group) {
this.group = group;
}
}

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapter.java
View File

@ -52,4 +52,9 @@ class DynatracePropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapt
return get(DynatraceProperties::getUri, DynatraceConfig.super::uri);
}
@Override
public String group() {
return get(DynatraceProperties::getGroup, DynatraceConfig.super::group);
}
}

7
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapterTests.java
View File

@ -55,4 +55,11 @@ class DynatracePropertiesConfigAdapterTests {
assertThat(new DynatracePropertiesConfigAdapter(properties).technologyType()).isEqualTo("tech-1");
}
@Test
void whenPropertiesGroupIsSetAdapterGroupReturnsIt() {
DynatraceProperties properties = new DynatraceProperties();
properties.setGroup("group-1");
assertThat(new DynatracePropertiesConfigAdapter(properties).group()).isEqualTo("group-1");
}
}