Merge pull request aballaci#2 from aballaci/feature/custom_metrics

liveness and rediness with actuator and instances in metrics

Author: aballaci

Dockerfile

@@ -8,8 +8,6 @@ COPY settings.xml "/root/.m2/settings.xml"
 
 COPY src src
 
-RUN mvn dependency:go-offline -B
-
 RUN mvn clean package -DskipTests
 
 RUN mkdir -p target/dependency && (cd target/dependency; jar -xf ../*.jar)
@@ -26,4 +24,4 @@ COPY --from=MAVEN_BUILD ${DEPENDENCY}/BOOT-INF/lib /app/lib
 COPY --from=MAVEN_BUILD ${DEPENDENCY}/META-INF /app/META-INF
 COPY --from=MAVEN_BUILD ${DEPENDENCY}/BOOT-INF/classes /app
 EXPOSE 8080
-ENTRYPOINT ["java","-cp","app:app/lib/*","de.ballaci.jpa.SakilaApplication"]
+ENTRYPOINT ["java","-cp","app:app/lib/*","de.ballaci.SakilaApplication"]

pom.xml

@@ -65,6 +65,10 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

springboot-jpa.yaml

@@ -14,7 +14,8 @@ metadata:
 spec:
   type: LoadBalancer
   ports:
-  - port: 8080
+    - port: 8080
+      name: http
   selector:
     app: springboot
 ---
@@ -34,7 +35,23 @@ spec:
     spec:
       containers:
       - name: springboot-jpa
-        image: aballaci/springboot-sakila-jpa:v3
+        image: aballaci/springboot-sakila-jpa:v4
+        readinessProbe:
+          httpGet:
+            path: /actuator/health
+            port: 8080
+          initialDelaySeconds: 10
+          timeoutSeconds: 2
+          periodSeconds: 3
+          failureThreshold: 1
+        livenessProbe:
+          httpGet:
+            path: /actuator/health
+            port: 8080
+          initialDelaySeconds: 20
+          timeoutSeconds: 2
+          periodSeconds: 8
+          failureThreshold: 1
         resources:
           requests:
             cpu: 100m
@@ -46,6 +63,10 @@ spec:
             value: "postgres"
           - name: PGSQL_PORT
             value: "5432"
+          - name: INSTANCE_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
           - name: PGSQL_PASSWORD
             valueFrom:
                 secretKeyRef:

src/main/java/de/ballaci/SakilaApplication.java

@@ -0,0 +1,43 @@
+package de.ballaci;
+
+import de.ballaci.jpa.domain.Film;
+import de.ballaci.services.FilmRentalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import reactor.core.publisher.Flux;
+
+import java.time.Duration;
+
+/**
+ * @author Armand.Ballaci
+ */
+
+@SpringBootApplication
+@EnableScheduling
+public class SakilaApplication {
+
+    @Autowired
+    private FilmRentalService rentalService;
+
+    public static void main(String[] args) {
+        SpringApplication.run(SakilaApplication.class, args);
+    }
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void bookFilms() {
+
+        Flux.interval(Duration.ofSeconds(2))
+                .map(SakilaApplication::toFilm)
+                .doOnEach(f -> rentalService.bookFilm(f.get()))
+                .subscribe();
+    }
+
+    private static Film toFilm(Long l) {
+        return new Film();
+    }
+}

src/main/java/de/ballaci/jpa/SakilaApplication.java

@@ -0,0 +1,68 @@
+package de.ballaci.services;
+
+import de.ballaci.jpa.domain.Film;
+import io.micrometer.core.annotation.Timed;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+
+@Component
+@PropertySource("classpath:application.properties")
+public class FilmRentalService {
+
+    private MeterRegistry meterRegistry;
+    private Counter requestedFilmCounter;
+
+    private List<Film> filmList;
+
+    private String instanceName;
+
+    private Environment env;
+
+    Random rand = new Random();
+
+    public FilmRentalService(MeterRegistry meterRegistry, Environment env) {
+        this.meterRegistry = meterRegistry;
+        this.env = env;
+        this.filmList = new ArrayList<>();
+        this.instanceName = env.getProperty("INSTANCE_NAME");
+        initOrderCounters();
+        Gauge.builder("film.bookings.in.queue", filmList, Collection::size)
+                .tag("isntance", instanceName)
+                .description("Number of unserved Films")
+                .register(meterRegistry);
+    }
+
+
+    private void initOrderCounters() {
+        requestedFilmCounter =  Counter.builder("film.bookings")
+                .tag("isntance", instanceName)
+                .register(meterRegistry);
+    }
+
+    public void bookFilm(Film film) {
+        filmList.add(film);
+        requestedFilmCounter.increment();
+    }
+
+    @Scheduled(fixedRate = 3000)
+    @Timed(description = "Do some work", longTask = true)
+    public void serveFilm() throws InterruptedException {
+        if(!filmList.isEmpty()) {
+            filmList.remove(0);
+            Thread.sleep((rand.nextInt(3 - 1) + 1) * 1000);
+        }
+    }
+}

src/main/java/de/ballaci/services/FilmRentalService.java

@@ -6,4 +6,10 @@ spring.datasource.password=${PGSQL_PASSWORD:s3hfUNDagb}
 management.endpoint.metrics.enabled=true
 management.endpoints.web.exposure.include=*
 management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
+management.metrics.export.prometheus.enabled=true
+
+instance.name=${INSTANCE_NAME:SPRINGBOOT}
+
+#server.port=8888
+
+debug=true