Merge branch 'main-3' into corneil/main3-junit5

.gitignore

@@ -22,6 +22,7 @@ logs/
 scdf-logs/
 .attach_pid*
 .jfrog/
+.gradle
 
 # Eclipse artifacts, including WTP generated manifests
 .classpath

.vscode/settings.json

@@ -1,4 +1,11 @@
 {
+    "java.completion.importOrder": [
+        "java",
+        "javax",
+        "",
+        "org.springframework",
+        "#"
+    ],
     "java.configuration.maven.userSettings": ".settings.xml",
     "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable"
 }

spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml

@@ -29,7 +29,7 @@
 		<nimbus-jose-jwt.version>9.39.3</nimbus-jose-jwt.version>
 		<snappy-java.version>1.1.10.5</snappy-java.version>
 		<commons-compress.version>1.26.2</commons-compress.version>
-		<prometheus-rsocket.version>1.6.0-SNAPSHOT</prometheus-rsocket.version>
+		<prometheus-rsocket.version>2.0.0-M1</prometheus-rsocket.version>
 		<java-cfenv.version>2.3.0</java-cfenv.version>
 		<spring-cloud-services-starter-config-client.version>3.5.4</spring-cloud-services-starter-config-client.version>
 		<kubernetes-fabric8-client.version>5.12.4</kubernetes-fabric8-client.version>

spring-cloud-dataflow-docs/src/main/asciidoc/spring-boot-3x.adoc

@@ -20,8 +20,6 @@ The naming of the metrics registry-specific properties differ as follows:
 * `2.x`: `management.metrics.export.prometheus.enabled=true`
 * `3.x`: `management.prometheus.metrics.export.enabled=true`
 
-NOTE: One exception to this rule is the Prometheus RSocket Proxy which still runs on Spring Boot `2.x` and therefore expects the properties in the `management.metrics.export.prometheus.rsocket.*` format.
-
 Be sure that you use the `2.x` format when configuring `2.x` based stream apps and the `3.x` format when configuring `3.x` based stream apps.
 
 ===== Dataflow Metrics Property Replication

spring-cloud-dataflow-server/pom.xml

@@ -17,7 +17,6 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
 		<oracle-driver-ojdbc8.version>21.9.0.0</oracle-driver-ojdbc8.version>
 		<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
 		<maven-source-plugin.version>3.3.0</maven-source-plugin.version>

src/carvel/config/dataflow.lib.yml

@@ -47,9 +47,9 @@ config: #@ data.values.scdf.server.config
 #@overlay/match-child-defaults missing_ok=True
 config:
   management:
-    metrics:
-      export:
-        prometheus:
+    prometheus:
+      metrics:
+        export:
           enabled: true
           rsocket:
             enabled: true

src/carvel/config/dataflow.star

@@ -41,10 +41,10 @@ def dataflow_container_env():
     envs.extend([{"name": "SPRING_JPA_DATABASE_PLATFORM", "value": dataflow_db_dialect()}])
   end
   if grafana_enabled():
-    envs.extend([{"name": "MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED", "value": "true"}])
+    envs.extend([{"name": "MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED", "value": "true"}])
   end
   if prometheus_rsocket_proxy_enabled():
-    envs.extend([{"name": "MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED", "value": "true"}])
+    envs.extend([{"name": "MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED", "value": "true"}])
   end
   if non_empty_string(data.values.scdf.server.database.secretName):
     if non_empty_string(data.values.scdf.server.database.secretUsernameKey):
@@ -105,4 +105,4 @@ end
 
 def dataflow_has_password():
   return non_empty_string(data.values.scdf.server.database.password)
-end
+end

src/carvel/config/skipper.lib.yml

@@ -45,9 +45,9 @@ config: #@ data.values.scdf.skipper.config
 #@overlay/match-child-defaults missing_ok=True
 config:
   management:
-    metrics:
-      export:
-        prometheus:
+    prometheus:
+      metrics:
+        export:
           enabled: true
           rsocket:
             enabled: true

src/carvel/config/skipper.star

@@ -59,10 +59,10 @@ def skipper_container_env():
     end
   end
   if grafana_enabled():
-    envs.extend([{"name": "MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED", "value": "true"}])
+    envs.extend([{"name": "MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED", "value": "true"}])
   end
   if prometheus_rsocket_proxy_enabled():
-    envs.extend([{"name": "MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED", "value": "true"}])
+    envs.extend([{"name": "MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED", "value": "true"}])
   end
   for e in data.values.scdf.skipper.env:
     envs.extend([{"name": e.name, "value": e.value}])
@@ -88,4 +88,4 @@ end
 
 def skipper_has_password():
   return non_empty_string(data.values.scdf.skipper.database.password)
-end
+end

src/carvel/config/values/values.yml

@@ -108,5 +108,5 @@ scdf:
         enabled: false
         image:
           repository: micrometermetrics/prometheus-rsocket-proxy
-          tag: 1.6.0-SNAPSHOT
+          tag: 2.0.0-M1
           digest: ""

src/carvel/test/servers.test.ts

@@ -300,11 +300,11 @@ describe('servers', () => {
     expect(envs).toEqual(
       expect.arrayContaining([
         expect.objectContaining({
-          name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED',
+          name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED',
           value: 'true'
         }),
         expect.objectContaining({
-          name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED',
+          name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED',
           value: 'true'
         })
       ])
@@ -454,8 +454,8 @@ describe('servers', () => {
     expect(envs).toBeTruthy();
     expect(envs).toEqual(
       expect.arrayContaining([
-        expect.objectContaining({ name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED', value: 'true' }),
-        expect.objectContaining({ name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED', value: 'true' })
+        expect.objectContaining({ name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED', value: 'true' }),
+        expect.objectContaining({ name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED', value: 'true' })
       ])
     );
   });
@@ -485,14 +485,14 @@ describe('servers', () => {
 
     const dataflowDoc = parseYamlDocument(dataflowApplicationYaml);
     const dataflowJson = dataflowDoc.toJSON();
-    const enabled1 = lodash.get(dataflowJson, 'management.metrics.export.prometheus.enabled') as boolean;
+    const enabled1 = lodash.get(dataflowJson, 'management.prometheus.metrics.export.enabled') as boolean;
     expect(enabled1).toBeTrue();
     const url = lodash.get(dataflowJson, 'spring.cloud.dataflow.metrics.dashboard.url') as string;
     expect(url).toBeFalsy();
 
     const skipperDoc = parseYamlDocument(skipperApplicationYaml);
     const skipperJson = skipperDoc.toJSON();
-    const enabled2 = lodash.get(skipperJson, 'management.metrics.export.prometheus.enabled') as boolean;
+    const enabled2 = lodash.get(skipperJson, 'management.prometheus.metrics.export.enabled') as boolean;
     expect(enabled2).toBeTrue();
   });
 

src/deploy/carvel/configure-prometheus-proxy.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 function set_properties() {
     PREFIX=$1
-    yq "${PREFIX}.management.metrics.export.prometheus.rsocket.host=\"$HOST\"" -i ./scdf-values.yml
-    yq "${PREFIX}.management.metrics.export.prometheus.pushgateway.base-url=\"http://$HOST:$PORT\"" -i ./scdf-values.yml
-    yq "${PREFIX}.management.metrics.export.prometheus.pushgateway.enabled=true" -i ./scdf-values.yml
-    yq "${PREFIX}.management.metrics.export.prometheus.pushgateway.shutdown-operation=\"PUSH\"" -i ./scdf-values.yml
-    yq "${PREFIX}.management.metrics.export.prometheus.step=\"$STEP\"" -i ./scdf-values.yml
+    yq "${PREFIX}.micrometer.prometheus.rsocket.host=\"$HOST\"" -i ./scdf-values.yml
+    yq "${PREFIX}.management.prometheus.metrics.export.pushgateway.base-url=\"http://$HOST:$PORT\"" -i ./scdf-values.yml
+    yq "${PREFIX}.management.prometheus.metrics.export.pushgateway.enabled=true" -i ./scdf-values.yml
+    yq "${PREFIX}.management.prometheus.metrics.export.pushgateway.shutdown-operation=\"PUSH\"" -i ./scdf-values.yml
+    yq "${PREFIX}.management.prometheus.metrics.export.step=\"$STEP\"" -i ./scdf-values.yml
 }
 if [ "$2" = "" ]; then
     echo "Usage is: <host> <port> [step]"

src/deploy/carvel/load-images.sh

@@ -67,7 +67,7 @@ else
     sh "$K8S/load-image.sh" "springcloud/spring-cloud-dataflow-server" "$DATAFLOW_VERSION" true
 fi
 if [ "$PROMETHEUS" = "true" ]; then
-    sh "$K8S/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy" "1.6.0-SNAPSHOT" false
+    sh "$K8S/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy" "2.0.0-M1" false
 fi
 if [ "$REGISTRY" = "" ]; then
     REGISTRY=springcloud

src/deploy/images/pull-prometheus-rsocket-proxy.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker pull "micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT"
+docker pull "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1"

src/deploy/k8s/deploy-scdf.sh

@@ -171,7 +171,7 @@ if [ "$PROMETHEUS" = "true" ] || [ "$METRICS" = "prometheus" ]; then
     if [ "$K8S_DRIVER" != "tmc" ] && [ "$K8S_DRIVER" != "gke" ]; then
         sh "$SCDIR/load-image.sh" "springcloud/spring-cloud-dataflow-grafana-prometheus:$DATAFLOW_VERSION" false
         sh "$SCDIR/load-image.sh" "prom/prometheus:v2.37.8"
-        sh "$SCDIR/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT"
+        sh "$SCDIR/load-image.sh" "micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1"
     fi
     set +e
     kubectl create --namespace "$NS" serviceaccount prometheus-rsocket-proxy

src/deploy/k8s/yaml/server-deployment.yaml

@@ -128,9 +128,9 @@ spec:
                 configMapKeyRef:
                   key: SPRING_JPA_DATABASE_PLATFORM
                   name: scdf-datasource
-            - name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED'
+            - name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED'
               value: 'true'
-            - name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED'
+            - name: 'MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED'
               value: 'true'
             - name: 'SPRING_CLOUD_DATAFLOW_METRICS_DASHBOARD_URL'
               value: 'http://localhost:3000'

src/deploy/k8s/yaml/skipper-deployment-pro.yaml

@@ -115,9 +115,9 @@ spec:
               configMapKeyRef:
                 key: SPRING_JPA_DATABASE_PLATFORM
                 name: scdf-datasource
-          - name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED
+          - name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED
             value: 'true'
-          - name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED
+          - name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED
             value: 'true'
       serviceAccountName: scdf-sa
       volumes:

src/deploy/k8s/yaml/skipper-deployment.yaml

@@ -115,9 +115,9 @@ spec:
               configMapKeyRef:
                 key: SPRING_JPA_DATABASE_PLATFORM
                 name: scdf-datasource
-          - name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED
+          - name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED
             value: 'true'
-          - name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED
+          - name: MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED
             value: 'true'
       serviceAccountName: scdf-sa
       volumes:

src/docker-compose/docker-compose-influxdb.yml

@@ -8,7 +8,7 @@ services:
       - |
         SPRING_APPLICATION_JSON=
         {
-          "management.metrics.export.influx":{
+          "management.influx.metrics.export":{
               "enabled":true,
               "db":"myinfluxdb",
               "uri":"http://influxdb:8086"
@@ -29,4 +29,3 @@ services:
     container_name: grafana
     ports:
       - '3000:3000'
-

src/docker-compose/docker-compose-prometheus.yml

@@ -6,23 +6,23 @@ services:
 
   dataflow-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
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED=true
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_HOST=prometheus-rsocket-proxy
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_PORT=7001
       #- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
       - SPRING_CLOUD_DATAFLOW_METRICS_DASHBOARD_URL=http://localhost:3000
 
   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
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED=true
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_HOST=prometheus-rsocket-proxy
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_PORT=7001
       #- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
 
   prometheus-rsocket-proxy:
-    image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
+    image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
     container_name: prometheus-rsocket-proxy
     expose:
       - '9096'

src/docker-compose/docker-compose-wavefront.yml

@@ -10,16 +10,16 @@ version: '3'
 services:
   dataflow-server:
     environment:
-      - MANAGEMENT_METRICS_EXPORT_WAVEFRONT_ENABLED=true
-      - MANAGEMENT_METRICS_EXPORT_WAVEFRONT_APITOKEN=${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_WAVEFRONT_METRICS_EXPORT_ENABLED=true
+      - MANAGEMENT_WAVEFRONT_METRICS_EXPORT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
+      - MANAGEMENT_WAVEFRONT_METRICS_EXPORT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
+      - MANAGEMENT_WAVEFRONT_METRICS_EXPORT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
       - SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
 
   skipper-server:
     environment:
-      - MANAGEMENT_METRICS_EXPORT_WAVEFRONT_ENABLED=true
-      - MANAGEMENT_METRICS_EXPORT_WAVEFRONT_APITOKEN=${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_WAVEFRONT_METRICS_EXPORT_ENABLED=true
+      - MANAGEMENT_WAVEFRONT_METRICS_EXPORT_APITOKEN=${WAVEFRONT_KEY:?WAVEFRONT_KEY is not set!}
+      - MANAGEMENT_WAVEFRONT_METRICS_EXPORT_URI=${WAVEFRONT_URI:-https://vmware.wavefront.com}
+      - MANAGEMENT_WAVEFRONT_METRICS_EXPORT_SOURCE=${WAVEFRONT_SOURCE:-scdf-docker-compose}
       - SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}

src/kubernetes/prometheus-proxy/prometheus-proxy-deployment.yaml

@@ -17,7 +17,7 @@ spec:
       serviceAccountName: prometheus-rsocket-proxy
       containers:
         - name: prometheus-rsocket-proxy
-          image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
+          image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
           imagePullPolicy: IfNotPresent
           ports:
             - name: scrape

src/kubernetes/server/server-config.yaml

@@ -7,9 +7,9 @@ metadata:
 data:
   application.yaml: |-
     management:
-      metrics:
-        export:
-          prometheus:
+      prometheus:
+        metrics:
+          export:
             enabled: true
             rsocket:
               enabled: true
@@ -36,4 +36,3 @@ data:
         driverClassName: org.mariadb.jdbc.Driver
         testOnBorrow: true
         validationQuery: "SELECT 1"
-        

src/templates/docker-compose/docker-compose-influxdb.yml

@@ -8,7 +8,7 @@ services:
       - |
         SPRING_APPLICATION_JSON=
         {
-          "management.metrics.export.influx":{
+          "management.influx.metrics.export":{
               "enabled":true,
               "db":"myinfluxdb",
               "uri":"http://influxdb:8086"
@@ -29,4 +29,3 @@ services:
     container_name: grafana
     ports:
       - '3000:3000'
-

src/templates/docker-compose/docker-compose-prometheus.yml

@@ -6,23 +6,23 @@ services:
 
   dataflow-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
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED=true
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_HOST=prometheus-rsocket-proxy
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_PORT=7001
       #- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
       - SPRING_CLOUD_DATAFLOW_METRICS_DASHBOARD_URL=http://localhost:3000
 
   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
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_ENABLED=true
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_ENABLED=true
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_HOST=prometheus-rsocket-proxy
+      - MANAGEMENT_PROMETHEUS_METRICS_EXPORT_RSOCKET_PORT=7001
       #- SPRING_APPLICATION_JSON={"spring.jpa.properties.hibernate.generate_statistics":true}
 
   prometheus-rsocket-proxy:
-    image: micrometermetrics/prometheus-rsocket-proxy:1.6.0-SNAPSHOT
+    image: micrometermetrics/prometheus-rsocket-proxy:2.0.0-M1
     container_name: prometheus-rsocket-proxy
     expose:
       - '9096'