Skip to content

Commit 3ac6d09

Browse files
authored
Avoid failures on spring boot 4-m1 (#14420)
1 parent a3b547a commit 3ac6d09

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
* any time.
2525
*/
2626
@ConditionalOnEnabledInstrumentation(module = "kafka")
27-
@ConditionalOnClass({KafkaTemplate.class, ConcurrentKafkaListenerContainerFactory.class})
27+
@ConditionalOnClass({
28+
KafkaTemplate.class,
29+
ConcurrentKafkaListenerContainerFactory.class,
30+
DefaultKafkaProducerFactoryCustomizer.class
31+
})
2832
@Configuration
2933
public class KafkaInstrumentationAutoConfiguration {
3034

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* any time.
2323
*/
2424
@ConditionalOnBean(OpenTelemetry.class)
25-
@ConditionalOnClass(MongoClientSettings.class)
25+
@ConditionalOnClass({MongoClientSettings.class, MongoClientSettingsBuilderCustomizer.class})
2626
@ConditionalOnEnabledInstrumentation(module = "mongo")
2727
@Configuration
2828
public class MongoClientInstrumentationAutoConfiguration {

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* at any time.
2525
*/
2626
@ConditionalOnEnabledInstrumentation(module = "spring-web")
27-
@ConditionalOnClass(RestTemplate.class)
27+
@ConditionalOnClass({RestTemplate.class, RestTemplateCustomizer.class})
2828
@Configuration
2929
public class SpringWebInstrumentationAutoConfiguration {
3030

instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* at any time.
2727
*/
2828
@ConditionalOnEnabledInstrumentation(module = "spring-web")
29-
@ConditionalOnClass(RestClient.class)
29+
@ConditionalOnClass({RestClient.class, RestClientCustomizer.class})
3030
@AutoConfiguration(after = RestClientAutoConfiguration.class)
3131
@Configuration
3232
public class RestClientInstrumentationAutoConfiguration {

0 commit comments

Comments
 (0)