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

Remove deprecated micrometer.observations.annotations.enabled 

See gh-44320

Signed-off-by: Johnny Lim <izeye@naver.com>
This commit is contained in:
Johnny Lim 2025-02-18 19:03:19 +09:00 committed by Stéphane Nicoll
parent 5c49a76c82
commit 1c9bc7f336
5 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,11 +68,6 @@ public class MetricsAspectsAutoConfiguration {
super(ConfigurationPhase.PARSE_CONFIGURATION); super(ConfigurationPhase.PARSE_CONFIGURATION);
} }
@ConditionalOnBooleanProperty("micrometer.observations.annotations.enabled")
static class MicrometerObservationsEnabledCondition {
}
@ConditionalOnBooleanProperty("management.observations.annotations.enabled") @ConditionalOnBooleanProperty("management.observations.annotations.enabled")
static class ManagementObservationsEnabledCondition { static class ManagementObservationsEnabledCondition {

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfiguration.java
View File

@ -158,11 +158,6 @@ public class MicrometerTracingAutoConfiguration {
super(ConfigurationPhase.PARSE_CONFIGURATION); super(ConfigurationPhase.PARSE_CONFIGURATION);
} }
@ConditionalOnBooleanProperty("micrometer.observations.annotations.enabled")
static class MicrometerObservationsEnabledCondition {
}
@ConditionalOnBooleanProperty("management.observations.annotations.enabled") @ConditionalOnBooleanProperty("management.observations.annotations.enabled")
static class ManagementObservationsEnabledCondition { static class ManagementObservationsEnabledCondition {

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -2247,14 +2247,6 @@
"name": "management.zipkin.tracing.export.enabled", "name": "management.zipkin.tracing.export.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"description": "Whether auto-configuration of tracing is enabled to export Zipkin traces." "description": "Whether auto-configuration of tracing is enabled to export Zipkin traces."
},
{
"name": "micrometer.observations.annotations.enabled",
"type": "java.lang.Boolean",
"deprecation": {
"level": "error",
"replacement": "management.observations.annotations.enabled"
}
} }
], ],
"hints": [ "hints": [

11
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAspectsAutoConfigurationTests.java
View File

@ -54,17 +54,6 @@ class MetricsAspectsAutoConfigurationTests {
}); });
} }
@Test
void shouldConfigureAspectsWithLegacyProperty() {
new ApplicationContextRunner().with(MetricsRun.simple())
.withConfiguration(AutoConfigurations.of(MetricsAspectsAutoConfiguration.class))
.withPropertyValues("micrometer.observations.annotations.enabled=true")
.run((context) -> {
assertThat(context).hasSingleBean(CountedAspect.class);
assertThat(context).hasSingleBean(TimedAspect.class);
});
}
@Test @Test
void shouldConfigureAspects() { void shouldConfigureAspects() {
this.contextRunner.run((context) -> { this.contextRunner.run((context) -> {

12
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfigurationTests.java
View File

@ -145,18 +145,6 @@ class MicrometerTracingAutoConfigurationTests {
}); });
} }
@Test
void shouldSupplyAspectBeansIfLegacyPropertyIsEnabled() {
new ApplicationContextRunner().withPropertyValues("micrometer.observations.annotations.enabled=true")
.withConfiguration(AutoConfigurations.of(MicrometerTracingAutoConfiguration.class))
.withUserConfiguration(TracerConfiguration.class, PropagatorConfiguration.class)
.run((context) -> {
assertThat(context).hasSingleBean(DefaultNewSpanParser.class);
assertThat(context).hasSingleBean(ImperativeMethodInvocationProcessor.class);
assertThat(context).hasSingleBean(SpanAspect.class);
});
}
@Test @Test
void shouldNotSupplyBeansIfAspectjIsMissing() { void shouldNotSupplyBeansIfAspectjIsMissing() {
this.contextRunner.withUserConfiguration(TracerConfiguration.class) this.contextRunner.withUserConfiguration(TracerConfiguration.class)