|
14 | 14 | import io.opentelemetry.spring.smoketest.AbstractSpringStarterSmokeTest;
|
15 | 15 | import io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication;
|
16 | 16 | import io.opentelemetry.spring.smoketest.SpringSmokeOtelConfiguration;
|
17 |
| -import java.time.Duration; |
18 | 17 | import org.apache.kafka.clients.admin.NewTopic;
|
19 | 18 | import org.apache.kafka.clients.consumer.ConsumerRecord;
|
20 | 19 | import org.assertj.core.api.AbstractLongAssert;
|
21 | 20 | import org.assertj.core.api.AbstractStringAssert;
|
22 | 21 | import org.junit.jupiter.api.Test;
|
23 | 22 | import org.springframework.beans.factory.annotation.Autowired;
|
24 | 23 | import org.springframework.boot.test.context.SpringBootTest;
|
25 |
| -import org.springframework.boot.testcontainers.service.connection.ServiceConnection; |
26 | 24 | import org.springframework.context.annotation.Bean;
|
27 | 25 | import org.springframework.context.annotation.Configuration;
|
28 | 26 | import org.springframework.kafka.annotation.KafkaListener;
|
29 | 27 | import org.springframework.kafka.config.TopicBuilder;
|
30 | 28 | import org.springframework.kafka.core.KafkaTemplate;
|
31 |
| -import org.testcontainers.containers.KafkaContainer; |
32 |
| -import org.testcontainers.containers.wait.strategy.Wait; |
33 |
| -import org.testcontainers.junit.jupiter.Container; |
34 |
| -import org.testcontainers.junit.jupiter.Testcontainers; |
35 |
| -import org.testcontainers.utility.DockerImageName; |
36 | 29 |
|
37 |
| -@Testcontainers |
38 | 30 | @SpringBootTest(
|
39 | 31 | classes = {
|
40 | 32 | OtelSpringStarterSmokeTestApplication.class,
|
41 | 33 | SpringSmokeOtelConfiguration.class,
|
42 |
| - KafkaSpringStarterSmokeTest.KafkaConfig.class |
| 34 | + AbstractKafkaSpringStarterSmokeTest.KafkaConfig.class |
43 | 35 | },
|
44 | 36 | webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
|
45 | 37 | properties = {
|
46 | 38 | "spring.kafka.consumer.auto-offset-reset=earliest",
|
47 | 39 | "spring.kafka.consumer.linger-ms=10",
|
48 |
| - "spring.kafka.admin.operation-timeout=5m", |
49 | 40 | "spring.kafka.listener.idle-between-polls=1000",
|
50 | 41 | "spring.kafka.producer.transaction-id-prefix=test-"
|
51 | 42 | })
|
52 |
| -public class KafkaSpringStarterSmokeTest extends AbstractSpringStarterSmokeTest { |
53 |
| - |
54 |
| - @Container @ServiceConnection |
55 |
| - static KafkaContainer kafka = |
56 |
| - new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.10")) |
57 |
| - .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m") |
58 |
| - .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1)) |
59 |
| - .withStartupTimeout(Duration.ofMinutes(1)); |
| 43 | +abstract class AbstractKafkaSpringStarterSmokeTest extends AbstractSpringStarterSmokeTest { |
60 | 44 |
|
61 | 45 | @Autowired private KafkaTemplate<String, String> kafkaTemplate;
|
62 | 46 |
|
@@ -106,7 +90,7 @@ void shouldInstrumentProducerAndConsumer() {
|
106 | 90 | span.hasName("testTopic process")
|
107 | 91 | .hasKind(SpanKind.CONSUMER)
|
108 | 92 | .hasParent(trace.getSpan(1))
|
109 |
| - .hasAttributesSatisfyingExactly( |
| 93 | + .hasAttributesSatisfying( |
110 | 94 | equalTo(MessagingIncubatingAttributes.MESSAGING_SYSTEM, "kafka"),
|
111 | 95 | equalTo(
|
112 | 96 | MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME,
|
|
0 commit comments