Upgrade to Spring Cloud 2022.2, Spring Boot 3 and Java 17 #217

.github/workflows/maven-build.yml

@@ -13,13 +13,16 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '17' ]
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK ${{matrix.java}}
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: ${{matrix.java}}
         distribution: 'adopt'
         cache: maven
     - name: Build with Maven

README.md

@@ -33,7 +33,7 @@ After starting services, it takes a while for API Gateway to be in sync with ser
 so don't be scared of initial Spring Cloud Gateway timeouts. You can track services availability using Eureka dashboard
 available by default at http://localhost:8761.
 
-The `master` branch uses an  Alpine linux  with JRE 8 as Docker base. You will find a Java 11 version in the `release/java11` branch.
+The `master` branch uses an Eclipse Temurin with Java 17 as Docker base image.
 
 *NOTE: Under MacOSX or Windows, make sure that the Docker VM has enough memory to run the microservices. The default settings
 are usually not enough and make the `docker-compose up` painfully slow.*

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11-jre as builder
+FROM eclipse-temurin:17 as builder
 WORKDIR application
 ARG ARTIFACT_NAME
 COPY ${ARTIFACT_NAME}.jar application.jar
@@ -11,8 +11,7 @@ RUN tar xzf dockerize.tar.gz
 RUN chmod +x dockerize
 
 
-# wget is not installed on adoptopenjdk:11-jre-hotspot
-FROM adoptopenjdk:11-jre-hotspot
+FROM eclipse-temurin:17
 
 WORKDIR application
 

docker/grafana/dashboards/grafana-petclinic-dashboard.json

@@ -283,7 +283,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(petclinic_owner_seconds_count{method=\"PUT\", status=\"204\"})",
+          "expr": "sum(petclinic_owner_seconds_count{method=\"updateOwner\", exception=\"none\"})",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 1,
@@ -364,7 +364,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(petclinic_owner_seconds_count{method=\"POST\", status=\"201\"})",
+          "expr": "sum(petclinic_owner_seconds_count{method=\"createOwner\", exception=\"none\"})",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 1,
@@ -446,7 +446,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(petclinic_pet_seconds_count{method=\"POST\", status=\"201\"})",
+          "expr": "sum(petclinic_pet_seconds_count{method=\"processCreationForm\", exception=\"none\"})",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 1,
@@ -528,7 +528,7 @@
       "tableColumn": "Value",
       "targets": [
         {
-          "expr": "sum(petclinic_visit_seconds_count{method=\"POST\", status=\"201\"})",
+          "expr": "sum(petclinic_visit_seconds_count{method=\"read\", exception=\"none\"})",
           "format": "time_series",
           "instant": true,
           "intervalFactor": 1,
@@ -590,29 +590,29 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(petclinic_owner_seconds_count{method=\"POST\", status=\"201\"})",
+          "expr": "sum(petclinic_owner_seconds_count{method=\"createOwner\", exception=\"none\"})",
           "format": "time_series",
           "instant": false,
           "intervalFactor": 1,
           "legendFormat": "owner create",
           "refId": "A"
         },
         {
-          "expr": "sum(petclinic_pet_seconds_count{method=\"POST\", status=\"201\"})",
+          "expr": "sum(petclinic_pet_seconds_count{method=\"processCreationForm\", exception=\"none\"})",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "pet create",
           "refId": "B"
         },
         {
-          "expr": "sum(petclinic_visit_seconds_count{method=\"POST\", status=\"201\"})",
+          "expr": "sum(petclinic_visit_seconds_count{method=\"create\", exception=\"none\"})",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "visit create",
           "refId": "C"
         },
         {
-          "expr": "sum(petclinic_owner_seconds_count{method=\"PUT\", status=\"204\"})",
+          "expr": "sum(petclinic_owner_seconds_count{method=\"updateOwner\", exception=\"none\"})",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "owner update",

pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.7</version>
+        <version>3.0.1</version>
     </parent>
 
     <groupId>org.springframework.samples</groupId>
     <artifactId>spring-petclinic-microservices</artifactId>
-    <version>2.6.7</version>
+    <version>3.0.1</version>
     <name>${project.artifactId}</name>
     <packaging>pom</packaging>
 
@@ -26,12 +26,12 @@
     </modules>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <assertj.version>3.17.1</assertj.version>
 
-        <spring-boot.version>2.6.0</spring-boot.version>
-        <spring-cloud.version>2021.0.2</spring-cloud.version>
+        <spring-cloud.version>2022.0.0</spring-cloud.version>
         <chaos-monkey-spring-boot.version>2.3.10</chaos-monkey-spring-boot.version>
+        <jolokia-core.version>1.7.1</jolokia-core.version>
 
         <docker.image.prefix>springcommunity</docker.image.prefix>
         <docker.image.exposed.port>9090</docker.image.exposed.port>
@@ -54,6 +54,11 @@
                 <artifactId>chaos-monkey-spring-boot</artifactId>
                 <version>${chaos-monkey-spring-boot.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jolokia</groupId>
+                <artifactId>jolokia-core</artifactId>
+                <version>${jolokia-core.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
@@ -97,8 +102,8 @@
 
                     <!-- Spring Boot Actuator displays build-related information if a META-INF/build-info.properties file is present -->
                     <plugin>
-                        <groupId>pl.project13.maven</groupId>
-                        <artifactId>git-commit-id-plugin</artifactId>
+                        <groupId>io.github.git-commit-id</groupId>
+                        <artifactId>git-commit-id-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <goals>

spring-petclinic-admin-server/pom.xml

@@ -12,11 +12,11 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>2.6.7</version>
+        <version>3.0.1</version>
     </parent>
 
     <properties>
-        <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
+        <spring-boot-admin.version>3.0.0-M8</spring-boot-admin.version>
         <docker.image.exposed.port>9090</docker.image.exposed.port>
         <docker.image.dockerfile.dir>${basedir}/../docker</docker.image.dockerfile.dir>
     </properties>

spring-petclinic-api-gateway/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>2.6.7</version>
+        <version>3.0.1</version>
     </parent>
 
     <properties>
@@ -47,10 +47,6 @@
         </dependency>
 
         <!-- Spring Cloud -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-circuitbreaker-reactor-resilience4j</artifactId>
@@ -63,10 +59,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sleuth</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
@@ -90,6 +82,10 @@
             <groupId>io.github.resilience4j</groupId>
             <artifactId>resilience4j-micrometer</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-exporter-zipkin</artifactId>
+        </dependency>
 
         <!-- Webjars -->
         <dependency>

spring-petclinic-config-server/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.samples</groupId>
         <artifactId>spring-petclinic-microservices</artifactId>
-        <version>2.6.7</version>
+        <version>3.0.1</version>
     </parent>
 
     <properties>

spring-petclinic-customers-service/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.samples</groupId>
 		<artifactId>spring-petclinic-microservices</artifactId>
-        <version>2.6.7</version>
+        <version>3.0.1</version>
 	</parent>
 
     <properties>
@@ -49,19 +49,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sleuth</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
-        </dependency>
 
         <!-- Third parties -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -86,6 +78,10 @@
             <groupId>de.codecentric</groupId>
             <artifactId>chaos-monkey-spring-boot</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-exporter-zipkin</artifactId>
+        </dependency>
 
         <!-- Testing -->
         <dependency>

spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/config/MetricConfig.java

@@ -0,0 +1,22 @@
+package org.springframework.samples.petclinic.customers.config;
+
+import io.micrometer.core.aop.TimedAspect;
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MetricConfig {
+
+  @Bean
+  MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+      return registry -> registry.config().commonTags("application", "petclinic");
+  }
+
+  @Bean
+  TimedAspect timedAspect(MeterRegistry registry) {
+    return new TimedAspect(registry);
+  }
+
+}

spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Owner.java

@@ -21,17 +21,17 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.NotBlank;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotBlank;
 
 import lombok.Getter;
 import lombok.Setter;

spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/Pet.java

@@ -17,16 +17,16 @@
 
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;

spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/model/PetType.java

@@ -18,12 +18,12 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * @author Juergen Hoeller

spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/OwnerResource.java

@@ -23,8 +23,8 @@
 import org.springframework.samples.petclinic.customers.model.OwnerRepository;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
 import java.util.List;
 import java.util.Optional;
 

spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/PetRequest.java

@@ -19,7 +19,7 @@
 
 import java.util.Date;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonFormat;