Skip to content

Commit 1c9bc7f

Browse files
izeyesnicoll
authored andcommitted
Remove deprecated micrometer.observations.annotations.enabled
See gh-44320 Signed-off-by: Johnny Lim <izeye@naver.com>
1 parent 5c49a76 commit 1c9bc7f

File tree

5 files changed

+0
-41
lines changed

5 files changed

+0
-41
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ static final class ObservationAnnotationsEnabledCondition extends AnyNestedCondi
6868
super(ConfigurationPhase.PARSE_CONFIGURATION);
6969
}
7070

71-
@ConditionalOnBooleanProperty("micrometer.observations.annotations.enabled")
72-
static class MicrometerObservationsEnabledCondition {
73-
74-
}
75-
7671
@ConditionalOnBooleanProperty("management.observations.annotations.enabled")
7772
static class ManagementObservationsEnabledCondition {
7873

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,6 @@ static final class ObservationAnnotationsEnabledCondition extends AnyNestedCondi
158158
super(ConfigurationPhase.PARSE_CONFIGURATION);
159159
}
160160

161-
@ConditionalOnBooleanProperty("micrometer.observations.annotations.enabled")
162-
static class MicrometerObservationsEnabledCondition {
163-
164-
}
165-
166161
@ConditionalOnBooleanProperty("management.observations.annotations.enabled")
167162
static class ManagementObservationsEnabledCondition {
168163

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,14 +2247,6 @@
22472247
"name": "management.zipkin.tracing.export.enabled",
22482248
"type": "java.lang.Boolean",
22492249
"description": "Whether auto-configuration of tracing is enabled to export Zipkin traces."
2250-
},
2251-
{
2252-
"name": "micrometer.observations.annotations.enabled",
2253-
"type": "java.lang.Boolean",
2254-
"deprecation": {
2255-
"level": "error",
2256-
"replacement": "management.observations.annotations.enabled"
2257-
}
22582250
}
22592251
],
22602252
"hints": [

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,6 @@ void shouldNotConfigureAspectsByDefault() {
5454
});
5555
}
5656

57-
@Test
58-
void shouldConfigureAspectsWithLegacyProperty() {
59-
new ApplicationContextRunner().with(MetricsRun.simple())
60-
.withConfiguration(AutoConfigurations.of(MetricsAspectsAutoConfiguration.class))
61-
.withPropertyValues("micrometer.observations.annotations.enabled=true")
62-
.run((context) -> {
63-
assertThat(context).hasSingleBean(CountedAspect.class);
64-
assertThat(context).hasSingleBean(TimedAspect.class);
65-
});
66-
}
67-
6857
@Test
6958
void shouldConfigureAspects() {
7059
this.contextRunner.run((context) -> {

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,6 @@ void shouldNotSupplyAspectBeansIfPropertyIsDisabled() {
145145
});
146146
}
147147

148-
@Test
149-
void shouldSupplyAspectBeansIfLegacyPropertyIsEnabled() {
150-
new ApplicationContextRunner().withPropertyValues("micrometer.observations.annotations.enabled=true")
151-
.withConfiguration(AutoConfigurations.of(MicrometerTracingAutoConfiguration.class))
152-
.withUserConfiguration(TracerConfiguration.class, PropagatorConfiguration.class)
153-
.run((context) -> {
154-
assertThat(context).hasSingleBean(DefaultNewSpanParser.class);
155-
assertThat(context).hasSingleBean(ImperativeMethodInvocationProcessor.class);
156-
assertThat(context).hasSingleBean(SpanAspect.class);
157-
});
158-
}
159-
160148
@Test
161149
void shouldNotSupplyBeansIfAspectjIsMissing() {
162150
this.contextRunner.withUserConfiguration(TracerConfiguration.class)

0 commit comments

Comments
 (0)