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

Start building against Micrometer 1.12.0 snapshots 

See gh-37226
This commit is contained in:
Andy Wilkinson 2023-09-07 10:17:18 +01:00
parent 96368a4e61
commit 88f8311a59
4 changed files with 23 additions and 3 deletions
Show Stats 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/dynatrace/DynatraceProperties.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 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.
@ -140,6 +140,12 @@ public class DynatraceProperties extends StepRegistryProperties {
*/
private boolean useDynatraceSummaryInstruments = true;
/**
* Whether to export meter metadata (unit and description) to the Dynatrace
* backend.
*/
private boolean exportMeterMetadata = true;
public Map<String, String> getDefaultDimensions() {
return this.defaultDimensions;
}
@ -172,6 +178,14 @@ public class DynatraceProperties extends StepRegistryProperties {
this.useDynatraceSummaryInstruments = useDynatraceSummaryInstruments;
}
public boolean isExportMeterMetadata() {
return this.exportMeterMetadata;
}
public void setExportMeterMetadata(boolean exportMeterMetadata) {
this.exportMeterMetadata = exportMeterMetadata;
}
}
}

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 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.
@ -95,6 +95,11 @@ class DynatracePropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapt
return get(v2(V2::isUseDynatraceSummaryInstruments), DynatraceConfig.super::useDynatraceSummaryInstruments);
}
@Override
public boolean exportMeterMetadata() {
return (get(v2(V2::isExportMeterMetadata), DynatraceConfig.super::exportMeterMetadata));
}
private <V> Function<DynatraceProperties, V> v1(Function<V1, V> getter) {
return (properties) -> getter.apply(properties.getV1());
}

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

@ -38,6 +38,7 @@ class DynatracePropertiesTests extends StepRegistryPropertiesTests {
assertThat(properties.getV1().getTechnologyType()).isEqualTo(config.technologyType());
assertThat(properties.getV2().isUseDynatraceSummaryInstruments())
.isEqualTo(config.useDynatraceSummaryInstruments());
assertThat(properties.getV2().isExportMeterMetadata()).isEqualTo(config.exportMeterMetadata());
}
}

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

@ -988,7 +988,7 @@ bom {
]
}
}
library("Micrometer", "1.12.0-M2") {
library("Micrometer", "1.12.0-SNAPSHOT") {
considerSnapshots()
group("io.micrometer") {
modules = [