Merge pull request #75 from bnc-projects/upgrade-java-and-restricted-metrics

Upgrade java and restricted metrics

Author: alphafoobar

.travis.yml

@@ -6,7 +6,7 @@ env:
   global:
   - TF_IN_AUTOMATION=1
   - SERVICE_NAME=spring-boot-java-base
-  - VERSION=0.12.21
+  - VERSION=0.12.24
   - DEPLOYMENT_ACCESS_KEY_ID=
   - DEPLOYMENT_SECRET_ACCESS_KEY=
   - AWS_DEFAULT_REGION=

service/Dockerfile

@@ -1,11 +1,11 @@
-FROM adoptopenjdk:11.0.7_10-jre-hotspot-bionic
+FROM adoptopenjdk:11.0.8_10-jre-hotspot-bionic
 
 RUN groupadd -g 999 appuser && useradd -r -u 999 -g appuser appuser
 USER appuser
 
 EXPOSE 8080
 
-ENTRYPOINT exec java -XX:MaxRAMPercentage=80 -XX:+AlwaysPreTouch -XX:+UseStringDeduplication -Djava.security.egd=file:/dev/./urandom $JAVA_OPTS -jar app.jar
+ENTRYPOINT exec java -XX:+UseG1GC -XX:MaxRAMPercentage=70 -XX:+AlwaysPreTouch -XX:+UseStringDeduplication -Djava.security.egd=file:/dev/./urandom $JAVA_OPTS -jar app.jar
 
 HEALTHCHECK --start-period=300s \
   CMD curl --silent --fail --max-time 30 http://localhost:8080/actuator/health || exit 1

service/build.gradle

@@ -42,6 +42,7 @@ dependencies {
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator'
     implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-sleuth', version: '2.2.2.RELEASE'
     implementation group: 'io.micrometer', name: 'micrometer-registry-new-relic'
+    implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '3.1.12'
 
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
 }

service/src/main/java/com/bnc/sbjb/metrics/ActuatorConfiguration.java

@@ -0,0 +1,56 @@
+package com.bnc.sbjb.metrics;
+
+import static io.micrometer.core.instrument.config.MeterFilterReply.ACCEPT;
+import static io.micrometer.core.instrument.config.MeterFilterReply.DENY;
+import static io.micrometer.core.instrument.config.MeterFilterReply.NEUTRAL;
+
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.config.MeterFilter;
+import io.micrometer.core.instrument.config.MeterFilterReply;
+import java.util.List;
+import javax.annotation.Nonnull;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ActuatorConfiguration {
+
+    private static final List<String> DESIRED = List.of(
+        "jvm.memory.max", "jvm.memory.used"
+    );
+    private static final List<String> JVM_MAX_TAGS = List.of(
+        "G1 Old Gen", "Tenured Gen"
+    );
+    private static final List<String> JVM_TAGS = List.of(
+        "G1 Old Gen", "G1 Eden Space", "Tenured Gen", "Eden Space"
+    );
+
+    @Bean
+    public MeterFilter meterFilter() {
+        return new MeterFilter() {
+            @Nonnull
+            @Override
+            public MeterFilterReply accept(@Nonnull Meter.Id id) {
+                final String name = id.getName();
+
+                if ("jvm.memory.max".equals(name) && "heap".equals(id.getTag("area"))) {
+                    return JVM_MAX_TAGS.contains(id.getTag("id")) ? ACCEPT : DENY;
+                }
+                if ("jvm.threads.live".equals(name)) {
+                    return ACCEPT;
+                }
+                if ("process.cpu.usage".equals(name)) {
+                    return ACCEPT;
+                }
+                if (name.startsWith("jvm.")) {
+                    return DESIRED.contains(name) && "heap".equals(id.getTag("area")) && JVM_TAGS.contains(id.getTag("id")) ? ACCEPT
+                        : DENY;
+                }
+                if (name.startsWith("system.")) {
+                    return DENY;
+                }
+                return NEUTRAL;
+            }
+        };
+    }
+}

service/src/main/resources/application.yml

@@ -25,13 +25,26 @@ management:
     health:
       show-details: ALWAYS
   metrics:
+    enable:
+      jvm: true
+      http: false
+      cache: false
+      hikaricp: false
+      system: false
+      jdbc: false
+      logback: false
+      tomcat: false
+      process:
+        enabled: false
+        cpu: true
     export:
       newrelic:
         enabled: false
         connect-timeout: 10s
     tags:
       application: ${spring.application.name}
       container: ${HOSTNAME:}${COMPUTERNAME:}
+
 ---
 spring:
   profiles: production