Skip to content

Commit 63360f3

Browse files
committed
Merge pull request #47072 from jonatan-ivanov
* pr/47072: Use isNoop() instead of Observation.NOOP Closes gh-47072
2 parents 6207e41 + 9e9e412 commit 63360f3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

module/spring-boot-micrometer-observation/src/test/java/org/springframework/boot/micrometer/observation/autoconfigure/ObservationAutoConfigurationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ void autoConfiguresObservationPredicates() {
9999
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
100100
// This is allowed by ObservationPredicates.customPredicate
101101
Observation observation = Observation.start("observation1", observationRegistry);
102-
assertThat(observation).isNotEqualTo(Observation.NOOP);
102+
assertThat(observation.isNoop()).isFalse();
103103
observation.stop();
104104
// This isn't allowed by ObservationPredicates.customPredicate
105105
observation = Observation.start("observation2", observationRegistry);
106-
assertThat(observation).isEqualTo(Observation.NOOP);
106+
assertThat(observation.isNoop()).isTrue();
107107
observation.stop();
108108
});
109109
}
@@ -150,7 +150,7 @@ void shouldNotDisableSpringSecurityObservationsByDefault() {
150150
this.contextRunner.run((context) -> {
151151
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
152152
Observation observation = Observation.start("spring.security.filterchains", observationRegistry);
153-
assertThat(observation).isNotEqualTo(Observation.NOOP);
153+
assertThat(observation.isNoop()).isFalse();
154154
observation.stop();
155155
});
156156
}
@@ -160,7 +160,7 @@ void shouldDisableSpringSecurityObservationsIfPropertyIsSet() {
160160
this.contextRunner.withPropertyValues("management.observations.enable.spring.security=false").run((context) -> {
161161
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
162162
Observation observation = Observation.start("spring.security.filterchains", observationRegistry);
163-
assertThat(observation).isEqualTo(Observation.NOOP);
163+
assertThat(observation.isNoop()).isTrue();
164164
observation.stop();
165165
});
166166
}

0 commit comments

Comments
 (0)