review fixes

Author: m.zharinova

buildSrc/src/main/kotlin/sb-ot-demo.java-compile.gradle.kts

@@ -24,8 +24,8 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     withSourcesJar()
 }
 

buildSrc/src/main/kotlin/sb-ot-demo.kotlin-conventions.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         freeCompilerArgs.add("-Xjsr305=strict")
-        jvmTarget = JvmTarget.JVM_21
+        jvmTarget = JvmTarget.JVM_17
     }
 }
 

config/checkstyle/checkstyle.xml

@@ -56,7 +56,7 @@
         <!-- <module name="FinalParameters"/> disabled here. Controlled by PMD.AvoidReassigningParameters -->
         <!-- <module name="HiddenField"/> invalid -->
         <!-- <module name="HideUtilityClassConstructor"/> invalid -->
-        <!--<module name="IllegalCatch"/> -->
+        <module name="IllegalCatch"/>
         <module name="IllegalIdentifierName"/>
         <module name="IllegalInstantiation"/>
         <module name="IllegalThrows"/>

db-migrations/src/main/resources/db/changelog/sql/add_span_column.sql

@@ -1,7 +1,7 @@
 --liquibase formatted sql
 
 --changeset marina.zharinova:2025.08.31:add span column
-alter table otel_demo.storage add column span_id varchar(64);
+alter table otel_demo.storage add column span_id text;
 
 --changeset marina.zharinova:2025.08.31:comment on span_id
 comment on column otel_demo.storage.span_id is 'SpanId of operation';

db-migrations/src/main/resources/db/changelog/sql/storage.sql

@@ -5,7 +5,7 @@ create table if not exists otel_demo.storage
 (
     id bigint generated always as identity,
     message text not null,
-    trace_id varchar(64) not null unique,
+    trace_id text not null unique,
     created_at timestamptz not null
 );
 

spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/KafkaReadingService.kt

@@ -12,6 +12,8 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.micrometer.tracing.Tracer
 import io.micrometer.tracing.propagation.Propagator
 import org.apache.kafka.clients.consumer.ConsumerRecord
+import org.springframework.dao.DataAccessException
+import org.springframework.kafka.KafkaException
 import org.springframework.kafka.annotation.KafkaListener
 import org.springframework.kafka.support.Acknowledgment
 import org.springframework.stereotype.Service
@@ -44,14 +46,13 @@ class KafkaReadingService(
     )
     fun listenAdditional(records: List<ConsumerRecord<UUID, String>>, ack: Acknowledgment) {
         val batchSpan = tracer.startScopedSpan("batch-processing")
-        logger.info { "current span: ${tracer.currentSpan()}" }
         try {
             logger.info {
                 "Received from Kafka ${records.size} records"
             }
             records.forEach { record -> restoreContextAndProcessSingleRecordIfNeed(record) }
             ack.acknowledge()
-        } catch (e: Throwable) {
+        } catch (e: KafkaException) {
             batchSpan.error(e)
             throw e
         } finally {
@@ -66,7 +67,7 @@ class KafkaReadingService(
             tracer.withSpan(spanFromRecord).use {
                 dbSaver.processSingleRecord(record)
             }
-        } catch (e: Throwable) {
+        } catch (e: DataAccessException) {
             spanFromRecord.error(e)
             throw e
         } finally {

spring-boot-3-demo-app-kotlin/src/main/resources/application.yml

@@ -54,9 +54,6 @@ spring:
             sasl:
                 mechanism: PLAIN
                 jaas.config: org.apache.kafka.common.security.plain.PlainLoginModule required username="${demo.kafka.opentelemetry.username}" password="${demo.kafka.opentelemetry.password}";
-        opentelemetry:
-            additional-topic: open.telemetry.sb3.queue.additional
-            additional-consumer-groupId: open.telemetry.sb3.queue.additional-group
     jdbc:
         template:
             query-timeout: 1s

spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/controllers/TimeControllerTest.kt

@@ -91,15 +91,15 @@ class TimeControllerTest : TestBase() {
         assertThat(output.all)
             .contains("Received record: " + received.value() + " with traceId " + traceId)
             .contains("\"tenant.name\":\"ru-a1-private\"")
-        val tracesFromDb = namedParameterJdbcTemplate
-            .query(
-                "select trace_id from otel_demo.storage where message like :message",
-                mapOf("message" to received.value())
-            ) { rs, _ ->
-                rs.getString("trace_id")
-            }
-        assertThat(tracesFromDb.size).isEqualTo(2)
-        assertThat(tracesFromDb.stream().filter { it == traceId }).hasSize(2)
+        val messageFromDb = namedParameterJdbcTemplate.queryForList(
+            "select message from otel_demo.storage where trace_id = :traceId",
+            mapOf("traceId" to traceId),
+            String::class.java
+        )
+        messageFromDb.forEach {
+            assertThat(it).isNotNull()
+            assertThat(it).isEqualTo(received.value())
+        }
     }
 
     @Order(2)

spring-boot-3-demo-app-reactive/src/main/java/io/github/mfvanek/spring/boot3/reactive/controllers/TimeController.java

@@ -35,14 +35,13 @@ public class TimeController {
     // http://localhost:8081/current-time
     @GetMapping(path = "/current-time")
     public Mono<LocalDateTime> getNow() {
-        return Mono.just(tracer)
-            .map(tracer -> {
-                log.trace("tracer {}", tracer);
-                return Optional.ofNullable(tracer.currentSpan())
+        log.trace("tracer {}", tracer);
+        return Mono.justOrEmpty(
+                Optional.ofNullable(tracer.currentSpan())
                     .map(Span::context)
                     .map(TraceContext::traceId)
-                    .orElse(null);
-            })
+                    .orElse(null)
+            )
             .doOnNext(traceId -> log.info("Called method getNow. TraceId = {}", traceId))
             .then(publicApiService.getZonedTime())
             .defaultIfEmpty(LocalDateTime.now(clock))

spring-boot-3-demo-app-reactive/src/main/java/io/github/mfvanek/spring/boot3/reactive/service/KafkaReadingService.java

@@ -15,6 +15,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.springframework.dao.DataAccessException;
+import org.springframework.kafka.KafkaException;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.support.Acknowledgment;
 import org.springframework.stereotype.Service;
@@ -47,14 +49,13 @@ public void listen(ConsumerRecord<UUID, String> record, Acknowledgment ack) {
     )
     public void listenAdditional(List<ConsumerRecord<UUID, String>> records, Acknowledgment ack) {
         final ScopedSpan batchSpan = tracer.startScopedSpan("batch-processing");
-        log.info("current span: {}", tracer.currentSpan());
         try {
             log.info(
                 "Received from Kafka {} records", records.size()
             );
             records.forEach(this::restoreContextAndProcessSingleRecordIfNeed);
             ack.acknowledge();
-        } catch (Exception e) {
+        } catch (KafkaException e) {
             batchSpan.error(e);
             throw e;
         } finally {
@@ -67,7 +68,7 @@ private void restoreContextAndProcessSingleRecordIfNeed(ConsumerRecord<UUID, Str
         final Span spanFromRecord = builder.name("processing-record-from-kafka").start();
         try (Tracer.SpanInScope ignored = tracer.withSpan(spanFromRecord)) {
             dbSaver.processSingleRecord(record);
-        } catch (Exception e) {
+        } catch (DataAccessException e) {
             spanFromRecord.error(e);
             throw e;
         } finally {