Skip to content

Commit 41879d3

Browse files
committed
fix graal tests
1 parent 879cdde commit 41879d3

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

.github/graal-native-docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ services:
55
- "27017:27017"
66

77
zookeeper:
8-
image: confluentinc/cp-zookeeper:6.2.10
8+
image: confluentinc/cp-zookeeper:7.7.7
99
environment:
1010
ZOOKEEPER_CLIENT_PORT: 2181
1111
ZOOKEEPER_TICK_TIME: 2000
1212
ports:
1313
- "22181:2181"
1414

1515
kafka:
16-
image: confluentinc/cp-kafka:6.2.10
16+
image: confluentinc/cp-kafka:7.7.7
1717
ports:
1818
- 9094:9094
1919
depends_on:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
@Configuration
3030
public class KafkaInstrumentationAutoConfiguration {
3131

32-
// For error prone
3332
public KafkaInstrumentationAutoConfiguration() {}
3433

3534
@Bean

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@
2626
})
2727
@Configuration
2828
public class ProducerFactoryCustomizerConfiguration {
29+
30+
public ProducerFactoryCustomizerConfiguration() {}
31+
2932
@Bean
30-
DefaultKafkaProducerFactoryCustomizer otelKafkaProducerFactoryCustomizer(
33+
static DefaultKafkaProducerFactoryCustomizer otelKafkaProducerFactoryCustomizer(
3134
OpenTelemetry openTelemetry) {
3235
KafkaTelemetry kafkaTelemetry = KafkaTelemetry.create(openTelemetry);
3336
return producerFactory -> producerFactory.addPostProcessor(kafkaTelemetry::wrap);

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@
2525
}) // package changed in 4+
2626
@Configuration
2727
public class ProducerFactoryCustomizerSpringBoot4Configuration {
28+
29+
public ProducerFactoryCustomizerSpringBoot4Configuration() {}
30+
2831
@Bean
29-
DefaultKafkaProducerFactoryCustomizer otelKafkaProducerFactoryCustomizer(
32+
static DefaultKafkaProducerFactoryCustomizer otelKafkaProducerFactoryCustomizer(
3033
OpenTelemetry openTelemetry) {
3134
KafkaTelemetry kafkaTelemetry = KafkaTelemetry.create(openTelemetry);
3235
return producerFactory -> producerFactory.addPostProcessor(kafkaTelemetry::wrap);

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration
22
io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.annotations.InstrumentationAnnotationsAutoConfiguration
33
io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.kafka.KafkaInstrumentationAutoConfiguration
4+
io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.kafka.ProducerFactoryCustomizerSpringBoot4Configuration
5+
io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.kafka.ProducerFactoryCustomizerConfiguration
46
io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.mongo.MongoClientInstrumentationAutoConfiguration
57
io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.mongo.MongoClientInstrumentationSpringBoot4AutoConfiguration
68
io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.logging.OpenTelemetryAppenderAutoConfiguration

0 commit comments

Comments
 (0)