Skip to content

Commit 0634f1e

Browse files
committed
fix ci & test
1 parent e7d7485 commit 0634f1e

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ void setUpContext() {
6161
"spring.kafka.consumer.linger-ms=10",
6262
"spring.kafka.listener.idle-between-polls=1000",
6363
"spring.kafka.producer.transaction-id-prefix=test-");
64-
System.setProperty(
65-
"otel.instrumentation.kafka.experimental-span-attributes", String.valueOf(true));
6664
}
6765

6866
@SuppressWarnings("unchecked")

smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractKafkaSpringStarterSmokeTest.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,11 @@ abstract class AbstractKafkaSpringStarterSmokeTest extends AbstractSpringStarter
3939
protected static AttributeAssertion bootstrapServersAssertion() {
4040
return satisfies(
4141
MESSAGING_KAFKA_BOOTSTRAP_SERVERS,
42-
listAssert -> {
43-
if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) {
42+
listAssert ->
4443
listAssert
4544
.isNotEmpty()
4645
.allSatisfy(
47-
server -> org.assertj.core.api.Assertions.assertThat(server).isNotEmpty());
48-
} else {
49-
listAssert.isNullOrEmpty();
50-
}
51-
});
46+
server -> org.assertj.core.api.Assertions.assertThat(server).isNotEmpty()));
5247
}
5348

5449
@SuppressWarnings("deprecation") // using deprecated semconv

0 commit comments

Comments
 (0)