merge from master

Author: m.zharinova

.editorconfig

@@ -8,7 +8,7 @@ max_line_length = 199
 tab_width = 4
 ij_continuation_indent_size = 4
 
-[*.{java,kt}]
+[*.java]
 ij_java_imports_layout = *,|,java.**,javax.**,|,$*
 ij_java_align_multiline_parameters = true
 ij_java_blank_lines_after_class_header = 1
@@ -110,3 +110,89 @@ ij_java_spaces_within_try_parentheses = false
 ij_java_spaces_within_while_parentheses = false
 ij_java_special_else_if_treatment = true
 ij_java_use_single_class_imports = true
+
+[{*.kt,*.kts}]
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_assignment_wrap = normal
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_add_space = false
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = true
+ij_kotlin_call_parameters_right_paren_on_new_line = true
+ij_kotlin_call_parameters_wrap = on_every_item
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_continuation_indent_for_chained_calls = false
+ij_kotlin_continuation_indent_for_expression_bodies = false
+ij_kotlin_continuation_indent_in_argument_lists = false
+ij_kotlin_continuation_indent_in_elvis = false
+ij_kotlin_continuation_indent_in_if_conditions = false
+ij_kotlin_continuation_indent_in_parameter_lists = false
+ij_kotlin_continuation_indent_in_supertype_lists = false
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = normal
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = true
+ij_kotlin_import_nested_classes = false
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_indent_before_arrow_on_new_line = true
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_break_after_multiline_when_entry = true
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_add_space_on_reformat = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = normal
+ij_kotlin_method_parameters_new_line_after_left_paren = true
+ij_kotlin_method_parameters_right_paren_on_new_line = true
+ij_kotlin_method_parameters_wrap = on_every_item
+ij_kotlin_name_count_to_use_star_import = 2147483647
+ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_elvis = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 1
+ij_kotlin_wrap_first_method_in_call_chain = false

README.md

@@ -1,8 +1,14 @@
-# Spring Boot Open Telemetry Demo
+# Spring Boot OpenTelemetry Demo
+
+A set of small Spring Boot applications to demonstrate OpenTelemetry capabilities and nuances
 
 [![Java CI](https://github.com/mfvanek/spring-boot-open-telemetry-demo/actions/workflows/tests.yml/badge.svg)](https://github.com/mfvanek/spring-boot-open-telemetry-demo/actions/workflows/tests.yml)
 [![codecov](https://codecov.io/gh/mfvanek/spring-boot-open-telemetry-demo/graph/badge.svg?token=NUWI02T68G)](https://codecov.io/gh/mfvanek/spring-boot-open-telemetry-demo)
 
+## Spring Cloud Sleuth example
+
+If you are looking for a **Spring Boot 2.7.x** example with [Spring Cloud Sleuth](https://spring.io/projects/spring-cloud-sleuth), take a look at version [0.4.1](https://github.com/mfvanek/spring-boot-open-telemetry-demo/releases/tag/v.0.4.1)
+
 ## Local run from IDEA
 
 ### Start containers
@@ -19,7 +25,7 @@ docker-compose --file docker/docker-compose-base.yml  --project-name="spring-boo
 ### Start applications
 
 ```shell
-./gradlew spring-boot-2-demo-app:bootRun
+./gradlew spring-boot-3-demo-app-kotlin:bootRun
 ```
 
 ```shell
@@ -38,9 +44,9 @@ curl http://localhost:8080/current-time
 
 #### Other endpoints
 
-* [Swagger UI SB2](http://localhost:8091/actuator/swagger-ui)
-* [Prometheus metrics SB2](http://localhost:8091/actuator/prometheus)
-* [Health SB2](http://localhost:8091/actuator/health)
+* [Swagger UI](http://localhost:8085/actuator/swagger-ui)
+* [Prometheus metrics](http://localhost:8085/actuator/prometheus)
+* [Health](http://localhost:8085/actuator/health)
 
 ## Run in Docker
 

build.gradle.kts

@@ -9,7 +9,7 @@ description = "Experiments with Java"
 
 allprojects {
     group = "io.github.mfvanek"
-    version = "0.4.0"
+    version = "0.5.0"
 
     repositories {
         mavenLocal()
@@ -19,7 +19,7 @@ allprojects {
 
 tasks {
     wrapper {
-        gradleVersion = "8.13"
+        gradleVersion = "8.14.3"
     }
 }
 

buildSrc/build.gradle.kts

@@ -7,12 +7,12 @@ repositories {
 }
 
 dependencies {
-    implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
-    implementation("io.freefair.gradle:lombok-plugin:8.13.1")
+    implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
+    implementation("io.freefair.gradle:lombok-plugin:8.14")
     implementation("com.bmuschko:gradle-docker-plugin:9.4.0")
     implementation("gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.7.3")
     implementation("de.thetaphi:forbiddenapis:3.9")
-    implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.7")
+    implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.13")
     implementation("org.gradle:test-retry-gradle-plugin:1.6.2")
     val kotlinVersion = "2.0.21"
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")

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

@@ -26,7 +26,6 @@ dependencies {
 java {
     sourceCompatibility = JavaVersion.VERSION_21
     targetCompatibility = JavaVersion.VERSION_21
-    withJavadocJar()
     withSourcesJar()
 }
 

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

@@ -37,30 +37,31 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
-    errorprone("com.google.errorprone:error_prone_core:2.36.0")
-    errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.28")
+    errorprone("com.google.errorprone:error_prone_core:2.39.0")
+    errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.29")
 
     spotbugsPlugins("jp.skypencil.findbugs.slf4j:bug-pattern:1.5.0")
-    spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0")
-    spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.9")
+    spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0")
+    spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.11")
 }
 
 checkstyle {
-    toolVersion = "10.21.1"
+    toolVersion = "10.24.0"
     configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")
     isIgnoreFailures = false
     maxWarnings = 0
     maxErrors = 0
 }
 
 pmd {
-    toolVersion = "7.9.0"
+    toolVersion = "7.14.0"
     isConsoleOutput = true
     ruleSetFiles = files("${rootDir}/config/pmd/pmd.xml")
     ruleSets = listOf()
 }
 
 spotbugs {
+    toolVersion.set("4.9.3")
     showProgress.set(true)
     effort.set(Effort.MAX)
     reportLevel.set(Confidence.LOW)

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

@@ -43,3 +43,9 @@ detekt {
     buildUponDefaultConfig = true
     autoCorrect = true
 }
+
+tasks {
+    test {
+        dependsOn(detektMain, detektTest)
+    }
+}

common-internal-bom/build.gradle.kts

@@ -17,15 +17,15 @@ javaPlatform {
 
 dependencies {
     api(platform("org.assertj:assertj-bom:3.27.3"))
-    api(platform("org.testcontainers:testcontainers-bom:1.21.0"))
-    api(platform("org.junit:junit-bom:5.12.2"))
-    api(platform("io.github.mfvanek:pg-index-health-bom:0.14.6"))
+    api(platform("org.testcontainers:testcontainers-bom:1.21.3"))
+    api(platform("org.junit:junit-bom:5.13.3"))
+    api(platform("io.github.mfvanek:pg-index-health-bom:0.20.2"))
 
     constraints {
         api("org.liquibase:liquibase-core:4.32.0")
         api("com.github.blagerweij:liquibase-sessionlock:1.6.9")
         api("org.awaitility:awaitility:4.3.0")
         api("com.zaxxer:HikariCP:6.3.0")
-        api("org.postgresql:postgresql:42.7.5")
+        api("org.postgresql:postgresql:42.7.7")
     }
 }

docker/docker-compose-full.yml

@@ -2,14 +2,14 @@ include:
     - docker-compose-base.yml
 
 services:
-    spring-boot-2-demo-app:
-        container_name: spring_boot_2_demo_app
-        image: spring-boot-2-demo-app:latest
+    spring-boot-3-demo-app:
+        container_name: spring_boot_3_demo_app
+        image: spring-boot-3-demo-app:latest
         environment:
             - SPRING_PROFILES_ACTIVE=docker
         ports:
-            - "8090:8090"
-            - "8091:8091"
+            - "8080:8080"
+            - "8085:8085"
         restart: unless-stopped
         depends_on:
             jaeger:
@@ -22,14 +22,14 @@ services:
         networks:
             - jaeger-example
 
-    spring-boot-3-demo-app:
-        container_name: spring_boot_3_demo_app
-        image: spring-boot-3-demo-app:latest
+    spring-boot-3-demo-app-kotlin:
+        container_name: spring_boot_3_demo_app_kotlin
+        image: spring-boot-3-demo-app-kotlin:latest
         environment:
             - SPRING_PROFILES_ACTIVE=docker
         ports:
-            - "8080:8080"
-            - "8085:8085"
+            - "8090:8090"
+            - "8091:8091"
         restart: unless-stopped
         depends_on:
             jaeger:

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
 detekt = "1.23.8"
-spring-boot-v3 = "3.4.4"
+spring-boot-v3 = "3.5.3"
 
 [libraries]
 detekt = { group = "io.gitlab.arturbosch.detekt", name = "detekt-gradle-plugin", version.ref = "detekt" }
 detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
 detekt-libraries = { group = "io.gitlab.arturbosch.detekt", name = "detekt-rules-libraries", version.ref = "detekt" }
 spring-boot-v3-dependencies = { group = "org.springframework.boot", name = "spring-boot-dependencies", version.ref = "spring-boot-v3" }
-springdoc-openapi = "org.springdoc:springdoc-openapi:2.8.6"
-spring-cloud = "org.springframework.cloud:spring-cloud-dependencies:2024.0.1"
-datasource-micrometer = "net.ttddyy.observation:datasource-micrometer-spring-boot:1.1.1"
-logstash = "net.logstash.logback:logstash-logback-encoder:8.0"
+springdoc-openapi = "org.springdoc:springdoc-openapi-bom:2.8.9"
+spring-cloud = "org.springframework.cloud:spring-cloud-dependencies:2025.0.0"
+datasource-micrometer = "net.ttddyy.observation:datasource-micrometer-spring-boot:1.1.2"
+logstash = "net.logstash.logback:logstash-logback-encoder:8.1"
 
 [plugins]
 spring-boot-v3 = { id = "org.springframework.boot", version.ref = "spring-boot-v3" }