Align with 2.7.x WF tile activation metrics (#4133)

tzolov · web-flow · commit ef4fe8e10844 · 2020-09-16T14:19:35.000+05:30
* Align with 2.7.x WF tile activation metrics

- Back port Server dashboard configurations.
- change the wavefront activation metrics to the spring.clodu.dataflow.server.*
- add SCDF application metrics tag to be the name of the jar.
- enable SCDF HTTP metrics percentiles.
- Upgrade to latest Prometheus Rsocket RPoxy 1.2.1
- Fix broken configurations in prometheus and influx dockcker-compose files.
- Update prometheus and Grafana container image versions.
- retrofit the scdf-servers.json dashboard for Grafana.

* Exclude the Task metrcis tags from the SCDF metrics

* Bump micrometer version to 1.5.3 to unify the LongTaskTimer metrics naming
diff --git a/pom.xml b/pom.xml
@@ -94,7 +94,8 @@
 		<findbugs.version>3.0.2</findbugs.version>
 		<aws-java-sdk-ecr.version>1.11.731</aws-java-sdk-ecr.version>
 		<commons-text.version>1.8</commons-text.version>
-		<prometheus-rsocket-spring.version>0.11.0</prometheus-rsocket-spring.version>
+		<prometheus-rsocket-spring.version>1.2.1</prometheus-rsocket-spring.version>
+		<micrometer.version>1.5.3</micrometer.version>
 	</properties>
 	<modules>
 		<module>spring-cloud-dataflow-configuration-metadata</module>
@@ -270,6 +271,26 @@
 				<artifactId>prometheus-rsocket-spring</artifactId>
 				<version>${prometheus-rsocket-spring.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>io.micrometer</groupId>
+				<artifactId>micrometer-core</artifactId>
+				<version>${micrometer.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.micrometer</groupId>
+				<artifactId>micrometer-registry-wavefront</artifactId>
+				<version>${micrometer.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.micrometer</groupId>
+				<artifactId>micrometer-registry-influx</artifactId>
+				<version>${micrometer.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.micrometer</groupId>
+				<artifactId>micrometer-registry-prometheus</artifactId>
+				<version>${micrometer.version}</version>
+			</dependency>
 
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-cloud-dataflow-composed-task-runner/src/test/java/org/springframework/cloud/dataflow/composedtaskrunner/configuration/DataFlowTestConfiguration.java b/spring-cloud-dataflow-composed-task-runner/src/test/java/org/springframework/cloud/dataflow/composedtaskrunner/configuration/DataFlowTestConfiguration.java
@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.dataflow.composedtaskrunner.configuration;
 
-import io.micrometer.prometheus.rsocket.autoconfigure.PrometheusRSocketAutoConfiguration;
+import io.micrometer.prometheus.rsocket.autoconfigure.PrometheusRSocketClientAutoConfiguration;
 
 import org.springframework.boot.actuate.autoconfigure.metrics.export.influx.InfluxMetricsExportAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus.PrometheusMetricsExportAutoConfiguration;
@@ -35,7 +35,7 @@
 @Configuration
 @EnableAutoConfiguration(exclude = { DataFlowClientAutoConfiguration.class,
 		WavefrontMetricsExportAutoConfiguration.class, PrometheusMetricsExportAutoConfiguration.class,
-		PrometheusRSocketAutoConfiguration.class, InfluxMetricsExportAutoConfiguration.class })
+		PrometheusRSocketClientAutoConfiguration.class, InfluxMetricsExportAutoConfiguration.class })
 public class DataFlowTestConfiguration {
 
 	@Bean
diff --git a/spring-cloud-dataflow-server-core/pom.xml b/spring-cloud-dataflow-server-core/pom.xml
@@ -9,6 +9,10 @@
 	<artifactId>spring-cloud-dataflow-server-core</artifactId>
 	<packaging>jar</packaging>
 	<dependencies>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-core</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-wavefront</artifactId>
diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/MetricsReplicationEnvironmentPostProcessor.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/MetricsReplicationEnvironmentPostProcessor.java
@@ -21,7 +21,7 @@
 import java.util.Properties;
 import java.util.function.Consumer;
 
-import io.micrometer.prometheus.rsocket.autoconfigure.PrometheusRSocketProperties;
+import io.micrometer.prometheus.rsocket.autoconfigure.PrometheusRSocketClientProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -96,7 +96,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
 			this.replicateServerMetricsPropertiesToStreamAndTask(environment, WavefrontProperties.class, propertyReplicator);
 			this.replicateServerMetricsPropertiesToStreamAndTask(environment, InfluxProperties.class, propertyReplicator);
 			this.replicateServerMetricsPropertiesToStreamAndTask(environment, PrometheusProperties.class, propertyReplicator);
-			this.replicateServerMetricsPropertiesToStreamAndTask(environment, PrometheusRSocketProperties.class, propertyReplicator);
+			this.replicateServerMetricsPropertiesToStreamAndTask(environment, PrometheusRSocketClientProperties.class, propertyReplicator);
 		}
 
 		// This post-processor is called multiple times but sets the properties only once.
diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/web/WebConfiguration.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/web/WebConfiguration.java
@@ -25,6 +25,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import io.micrometer.core.instrument.LongTaskTimer;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Tags;
 import org.h2.tools.Server;
 import org.slf4j.LoggerFactory;
 
@@ -76,6 +79,8 @@ public class WebConfiguration implements ServletContextInitializer, ApplicationL
 
 	private Server server = null;
 
+	private LongTaskTimer.Sample longTaskSample;
+
 	public Server initH2TCPServer() {
 		logger.info("Starting H2 Server with URL: " + dataSourceUrl);
 		try {
@@ -97,6 +102,11 @@ private String getH2Port(String url) {
 
 	@Override
 	public void onStartup(ServletContext servletContext) {
+		LongTaskTimer longTaskTimer = LongTaskTimer
+				.builder("spring.cloud.dataflow.server").description("Spring Cloud Data Flow duration timer")
+				.tags(Tags.empty()).register(Metrics.globalRegistry);
+		this.longTaskSample = longTaskTimer.start();
+
 		if (StringUtils.hasText(dataSourceUrl) && dataSourceUrl.startsWith("jdbc:h2:tcp://localhost:")) {
 			logger.info("Start Embedded H2");
 			initH2TCPServer();
@@ -161,6 +171,11 @@ public Object postProcessAfterInitialization(Object bean, String s) throws Beans
 
 	@Override
 	public void onApplicationEvent(ContextClosedEvent event) {
+		if (this.longTaskSample != null) {
+			this.longTaskSample.stop();
+			this.longTaskSample = null;
+		}
+
 		if (this.server != null) {
 			this.server.stop();
 			logger.info("Embedded H2 server stopped!");
diff --git a/spring-cloud-dataflow-server-core/src/main/resources/META-INF/dataflow-server-defaults.yml b/spring-cloud-dataflow-server-core/src/main/resources/META-INF/dataflow-server-defaults.yml
@@ -1,11 +1,14 @@
 management:
   metrics:
+    tags:
+      application: ${info.app.name}
+      application.version: ${info.app.version}
     web:
       server:
         request:
           autotime:
             enabled: true
-          metric-name: 'spring.cloud.dataflow.http.server.requests'
+            percentiles-histogram: true
     export:
       influx:
         enabled: false
@@ -41,11 +44,14 @@ spring:
     initialize-schema: never
   jpa:
     properties:
-      hibernate.id.new_generator_mappings: true
+      hibernate:
+        id.new_generator_mappings: true
+        # Statistics generation is required for publishing JPA micrometer metrics.
+        # generate_statistics: true
     hibernate:
-        naming:
-          physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-          implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
+      naming:
+        physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+        implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
   flyway:
     enabled: true
     baselineVersion: 1
diff --git a/spring-cloud-dataflow-server/docker-compose-influxdb.yml b/spring-cloud-dataflow-server/docker-compose-influxdb.yml
@@ -22,7 +22,7 @@ services:
           },
           "spring.cloud.dataflow.metrics.dashboard": {
              "url":"http://localhost:3000",
-             "type=GRAFANA"
+             "type":"GRAFANA"
           }
         }
 
diff --git a/spring-cloud-dataflow-server/docker-compose-prometheus.yml b/spring-cloud-dataflow-server/docker-compose-prometheus.yml
@@ -9,39 +9,42 @@ services:
       - |
         SPRING_APPLICATION_JSON=
         {
-          "spring.cloud.dataflow.applicationProperties":{
-             "task.management.metrics.export.prometheus":{
-                "enabled":true,
-                "rsocket.enabled":true,
-                "rsocket.host":"prometheus-rsocket-proxy",
-                "rsocket.port":7001
-             },
-             "stream.management.metrics.export.prometheus":{
-                "enabled":true,
-                "rsocket.enabled":true,
-                "rsocket.host":"prometheus-rsocket-proxy",
-                "rsocket.port":7001
-             }
+          "management.metrics.export.prometheus":{
+             "enabled":true,
+             "rsocket.enabled":true,
+             "rsocket.host":"prometheus-rsocket-proxy",
+             "rsocket.port":7001
           },
           "spring.cloud.dataflow.metrics.dashboard": {
              "url":"http://localhost:3000",
-             "type=GRAFANA"
-          }
+             "type": "GRAFANA"
+          },
+          "spring.jpa.properties.hibernate.generate_statistics":true
         }
 
+  skipper-server:
+    environment:
+      - management.metrics.export.prometheus.enabled=true
+      - management.metrics.export.prometheus.rsocket.enabled=true
+      - management.metrics.export.prometheus.rsocket.host=prometheus-rsocket-proxy
+      - management.metrics.export.prometheus.rsocket.port=7001
+      - spring.jpa.properties.hibernate.generate_statistics=true
+
   prometheus-rsocket-proxy:
-    image: micrometermetrics/prometheus-rsocket-proxy:0.11.0
+    image: micrometermetrics/prometheus-rsocket-proxy:1.2.1
     container_name: prometheus-rsocket-proxy
     expose:
       - '9096'
       - '7001'
-      - '8081'
+      - '8086'
     ports:
       - '9096:9096'
       - '7001:7001'
-      - '8081:8081'
+      - '8086:8086'
     environment:
       - server.port=9096
+      - micrometer.prometheus-proxy.tcp-port=7001
+      - micrometer.prometheus-proxy.websocket-port=8086
 
   grafana:
     image: springcloud/spring-cloud-dataflow-grafana-prometheus:${DATAFLOW_VERSION:?DATAFLOW_VERSION is not set! Use 'export DATAFLOW_VERSION=local-server-image-tag'}
diff --git a/spring-cloud-dataflow-server/docker-compose-wavefront.yml b/spring-cloud-dataflow-server/docker-compose-wavefront.yml
@@ -10,49 +10,16 @@ version: '3'
 services:
   dataflow-server:
     environment:
-#      - |
-#        SPRING_APPLICATION_JSON=
-#        {
-#           "management.metrics.export.wavefront":{
-#              "enabled":true,
-#              "api-token":"${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}",
-#              "uri":"${WAVEFRONT_URI:-https://vmware.wavefront.com}",
-#              "source":"${WAVEFRONT_SOURCE:-scdf-docker-compose}"
-#           },
-#           "management.metrics.export.prometheus":{
-#              "enabled":true,
-#              "rsocket.enabled":true,
-#              "rsocket.host":"prometheus-rsocket-proxy",
-#              "rsocket.port":7001
-#           },
-#           "management.metrics.export.influx":{
-#              "enabled":true,
-#              "db":"myinfluxdb",
-#              "uri":"http://influxdb:8086"
-#           }
-#        }
-
-#      - MANAGEMENT_METRICS_EXPORT_WAVEFRONT_ENABLED=true
-#      - MANAGEMENT_METRICS_EXPORT_WAVEFRONT_API-TOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
-#      - MANAGEMENT_METRICS_EXPORT_WAVEFRONT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
-#      - MANAGEMENT_METRICS_EXPORT_WAVEFRONT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
-
       - management.metrics.export.wavefront.enabled=true
       - management.metrics.export.wavefront.api-token=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
       - management.metrics.export.wavefront.uri=${WAVEFRONT_URI:-https://vmware.wavefront.com}
       - management.metrics.export.wavefront.source=${WAVEFRONT_SOURCE:-scdf-docker-compose}
+      - spring.jpa.properties.hibernate.generate_statistics=true
 
-
-#      - spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.wavefront.enabled=true
-#      - spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.wavefront.api-token=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
-#      - spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.wavefront.uri=${WAVEFRONT_URI:-https://vmware.wavefront.com}
-#      - spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.wavefront.source=${WAVEFRONT_SOURCE:-scdf-docker-compose}
-
-#      - spring.cloud.dataflow.applicationProperties.task.management.metrics.export.wavefront.enabled=true
-#      - spring.cloud.dataflow.applicationProperties.task.management.metrics.export.wavefront.api-token=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
-#      - spring.cloud.dataflow.applicationProperties.task.management.metrics.export.wavefront.uri=${WAVEFRONT_URI:-https://vmware.wavefront.com}
-#      - spring.cloud.dataflow.applicationProperties.task.management.metrics.export.wavefront.source=${WAVEFRONT_SOURCE:-scdf-docker-compose}
-
-#      - spring.cloud.dataflow.metrics.dashboard.url=http://vmware.wavefront.com
-#      - spring.cloud.dataflow.metrics.dashboard.type=WAVEFRONT
-#      - spring.cloud.dataflow.metrics.dashboard.wavefront.source=${WAVEFRONT_SOURCE:-scdf-docker-compose}
+  skipper-server:
+    environment:
+      - management.metrics.export.wavefront.enabled=true
+      - management.metrics.export.wavefront.api-token=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
+      - management.metrics.export.wavefront.uri=${WAVEFRONT_URI:-https://vmware.wavefront.com}
+      - management.metrics.export.wavefront.source=${WAVEFRONT_SOURCE:-scdf-docker-compose}
+      - spring.jpa.properties.hibernate.generate_statistics=true
diff --git a/spring-cloud-dataflow-server/src/main/java/org/springframework/cloud/dataflow/server/single/DataFlowServerApplication.java b/spring-cloud-dataflow-server/src/main/java/org/springframework/cloud/dataflow/server/single/DataFlowServerApplication.java
@@ -26,6 +26,7 @@
 import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration;
 import org.springframework.cloud.deployer.spi.kubernetes.KubernetesAutoConfiguration;
 import org.springframework.cloud.deployer.spi.local.LocalDeployerAutoConfiguration;
+import org.springframework.cloud.task.configuration.MetricsAutoConfiguration;
 
 /**
  * Bootstrap class for the Spring Cloud Data Flow Server.
@@ -35,6 +36,7 @@
  * @author Janne Valkealahti
  */
 @SpringBootApplication(exclude = {
+		MetricsAutoConfiguration.class,
 		SessionAutoConfiguration.class,
 		ManagementWebSecurityAutoConfiguration.class,
 		SecurityAutoConfiguration.class,
diff --git a/src/grafana/influxdb/docker/grafana/Dockerfile b/src/grafana/influxdb/docker/grafana/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana:6.3.5
+FROM grafana/grafana:7.1.5
 ADD ./provisioning /etc/grafana/provisioning
 ADD ./config.ini /etc/grafana/config.ini
 ADD ./dashboards /var/lib/grafana/dashboards
diff --git a/src/grafana/prometheus/docker/grafana/Dockerfile b/src/grafana/prometheus/docker/grafana/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana:6.3.5
+FROM grafana/grafana:7.1.5
 ADD ./provisioning /etc/grafana/provisioning
 ADD ./config.ini /etc/grafana/config.ini
 ADD ./dashboards /var/lib/grafana/dashboards
diff --git a/src/grafana/prometheus/docker/grafana/dashboards/scdf-servers.json b/src/grafana/prometheus/docker/grafana/dashboards/scdf-servers.json
diff --git a/src/grafana/prometheus/docker/prometheus-local/Dockerfile b/src/grafana/prometheus/docker/prometheus-local/Dockerfile
diff --git a/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml b/src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml
diff --git a/src/templates/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml b/src/templates/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ services:`
`22`	`22`	`},`
`23`	`23`	`"spring.cloud.dataflow.metrics.dashboard": {`
`24`	`24`	`"url":"http://localhost:3000",`
`25`		`- "type=GRAFANA"`
	`25`	`+ "type":"GRAFANA"`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`