version 2.1.9: upgraded and activated p6spy for jdbc jaeger tracing, …

…bump spring boot to 2.7.0, bump more deps, activate db in docker-compose
perfana · Jul 2, 2022 · 2a148d6 · 2a148d6
1 parent 6c64c09
commit 2a148d6
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -357,6 +357,10 @@ The prometheus endpoint: http://localhost:8080/actuator/prometheus
 
 # database
 
+Clone https://github.com/datacharmer/test_db into /path/to/git/
+
+    git clone https://github.com/datacharmer/test_db.git
+
 Run MariaDB with the MySql employees database:
 
     docker run -d --name mariadbtest \
@@ -365,10 +369,6 @@ Run MariaDB with the MySql employees database:
       -p 3306:3306 \
       mariadb:10.6.5
 
-Clone https://github.com/datacharmer/test_db into /path/to/git/
-
-    git clone https://github.com/datacharmer/test_db.git
-
 Then ssh into this docker:
 
     docker exec -it mariadbtest /bin/bash

diff --git a/afterburner-java/pom.xml b/afterburner-java/pom.xml
@@ -16,11 +16,12 @@
     <properties>
         <java.version>8</java.version>
         <spring-cloud.version>2021.0.1</spring-cloud.version>
-        <spring-boot.version>2.6.6</spring-boot.version>
+        <spring-boot.version>2.7.0</spring-boot.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <encoding>UTF-8</encoding>
-        <docker-base-image>bellsoft/liberica-openjdk-alpine:11@sha256:3463a0c4fb127a9b71dbf5ced6888ca48e6b561068f5b683b079238b17154af8</docker-base-image>
+        <!-- find latest here: https://hub.docker.com/r/bellsoft/liberica-openjdk-alpine/tags -->
+        <docker-base-image>bellsoft/liberica-openjdk-alpine:11@sha256:321160f18a520a49a13f4b73fd87e4565fa20e1c528d343800a41393f40f819c</docker-base-image>
         <docker-target-image>stokpop/afterburner-jdk:${project.version}-jdk11</docker-target-image>
         <docker-arch>amd64</docker-arch>
     </properties>
@@ -45,6 +46,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.gavlyukovskiy</groupId>
+            <artifactId>p6spy-spring-boot-starter</artifactId>
+            <version>1.8.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -70,7 +76,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.0.4</version>
+            <version>3.0.5</version>
         </dependency>
         <!-- Micrometer Prometheus registry  -->
         <dependency>
@@ -80,7 +86,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.6.8</version>
+            <version>1.6.9</version>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
@@ -129,12 +135,12 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.10.0-RC1</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -148,7 +154,7 @@
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
-            <version>6.6</version>
+            <version>7.2</version>
         </dependency>
     </dependencies>
 

diff --git a/afterburner-java/src/main/resources/application.properties b/afterburner-java/src/main/resources/application.properties
@@ -40,9 +40,12 @@ spring.zipkin.enabled=false
 spring.zipkin.base-url=http://localhost:9411/
 
 # Creates span for every connection and query. Works only with p6spy or datasource-proxy.
-decorator.datasource.sleuth.enabled=true
+spring.sleuth.jdbc.enabled=true
 # Specify traces that will be created in zipkin: connection, query, fetch
-decorator.datasource.sleuth.include=query
+spring.sleuth.jdbc.includes=connection,query,fetch
+# use false (default) to exclude possible sensitive data (replace query params by ?)
+spring.sleuth.jdbc.p6spy.tracing.include-parameter-values=true
+
 decorator.datasource.p6spy.multiline=false
 
 afterburner.datasource.basket.jdbc-url=jdbc:h2:mem:testdb

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -2,15 +2,15 @@
 version: '3.7'
 services:
   afterburner:
-    image: stokpop/afterburner-jdk:2.1.6-jdk11
+    image: stokpop/afterburner-jdk:2.1.9-jdk11
     ports:
       - 38080:80
       - 35005:35005
     environment:
       server.port: 80
       spring.application.name: "F18 Hornet"
       afterburner.name: "F18 Hornet"
-      # spring.profiles.active: "employee-db"
+      spring.profiles.active: "employee-db"
       # server.tomcat.threads.max: 200
       afterburner.async_max_pool_size: 10
       afterburner.async_core_pool_size: 5
@@ -46,10 +46,10 @@ services:
       afterburner.datasource.employee.auto-commit: "false"
       afterburner.datasource.employee.initializationFailTimeout: -1
       afterburner.datasource.basket.auto-commit: "false"
-      logging.level.p6spy: "ERROR"
+      logging.level.p6spy: "INFO"
+      spring.sleuth.sampler.probability: 100
       spring.zipkin.enabled: "true"
       spring.zipkin.base-url: "http://jaeger:9411/"
-      spring.sleuth.sampler.probability: 100
     networks:
       - topgun
     volumes:
@@ -99,7 +99,7 @@ services:
       - ./byteman:/byteman
   wrk2:
     # do not forget to update the sed replace when updating image
-    image: docker.io/stokpop/wrk2:0.0.3
+    image: docker.io/stokpop/wrk2-aarch:0.0.2
     # tty to leave it running
     stdin_open: true
     tty: true

diff --git a/docker/start.sh b/docker/start.sh
@@ -2,7 +2,7 @@
 
 export COMPOSE_PROJECT_NAME=workshop
 
-ACTIVATE_EMPLOYEE_DB=false
+ACTIVATE_EMPLOYEE_DB=true
 
 # update wrk2 image for apple silicon
 if [[ $(uname -m) == 'arm64' ]]; then
@@ -25,8 +25,9 @@ if [ "$ACTIVATE_EMPLOYEE_DB" = true ]; then
     docker compose up -d mariadb
 fi
 docker compose up -d jaeger
+docker compose up -d prometheus
+docker compose up -d wrk2
 docker compose up -d afterburner
 docker compose up -d afterburner-reactive
-docker compose up -d wrk2
-docker compose up -d prometheus
+
 
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     </developers>
 
     <properties>
-        <revision>2.1.8</revision>
+        <revision>2.1.9</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>