From 7ca6359b433105ddca486a6456519653c619f8b3 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Sun, 5 Apr 2020 15:32:39 +0200
Subject: [PATCH] Remove PushRegistry's numThreads deprecated property

See gh-20835
---
 .../properties/PushRegistryProperties.java    |  15 ---
 .../PushRegistryPropertiesConfigAdapter.java  |   6 --
 ...itional-spring-configuration-metadata.json | 100 +++++++++++++++++-
 ...hRegistryPropertiesConfigAdapterTests.java |   7 --
 .../PushRegistryPropertiesTests.java          |   3 +-
 5 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryProperties.java
index 6de5b7ae2b..a6cf7cc2b5 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryProperties.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryProperties.java
@@ -49,11 +49,6 @@ public abstract class PushRegistryProperties {
 	 */
 	private Duration readTimeout = Duration.ofSeconds(10);
 
-	/**
-	 * Number of threads to use with the metrics publishing scheduler.
-	 */
-	private Integer numThreads = 2;
-
 	/**
 	 * Number of measurements per request to use for this backend. If more measurements
 	 * are found, then multiple requests will be made.
@@ -92,16 +87,6 @@ public abstract class PushRegistryProperties {
 		this.readTimeout = readTimeout;
 	}
 
-	@Deprecated
-	public Integer getNumThreads() {
-		return this.numThreads;
-	}
-
-	@Deprecated
-	public void setNumThreads(Integer numThreads) {
-		this.numThreads = numThreads;
-	}
-
 	public Integer getBatchSize() {
 		return this.batchSize;
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesConfigAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesConfigAdapter.java
index cded0b855b..e05037ca8f 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesConfigAdapter.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesConfigAdapter.java
@@ -56,12 +56,6 @@ public abstract class PushRegistryPropertiesConfigAdapter<T extends PushRegistry
 		return get(T::isEnabled, PushRegistryConfig.super::enabled);
 	}
 
-	@Override
-	@SuppressWarnings("deprecation")
-	public int numThreads() {
-		return get(T::getNumThreads, PushRegistryConfig.super::numThreads);
-	}
-
 	@Override
 	public int batchSize() {
 		return get(T::getBatchSize, PushRegistryConfig.super::batchSize);
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 78e641908d..3b0f026927 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -220,10 +220,40 @@
       "defaultValue": "simple"
     },
     {
-      "name": "management.metrics.export.jmx.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether exporting of metrics to JMX is enabled.",
-      "defaultValue": true
+      "name": "management.metrics.export.appoptics.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.metrics.export.datadog.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.metrics.export.dynatrace.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.metrics.export.elastic.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
+      "deprecation": {
+        "level": "error"
+      }
     },
     {
       "name": "management.metrics.export.ganglia.addressing-mode",
@@ -249,12 +279,45 @@
       "name": "management.metrics.export.graphite.rate-units",
       "defaultValue": "seconds"
     },
+    {
+      "name": "management.metrics.export.humio.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.metrics.export.humio.repository",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "management.metrics.export.influx.consistency",
       "defaultValue": "one"
     },
     {
-      "name": "management.metrics.export.humio.repository",
+      "name": "management.metrics.export.influx.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
+      "deprecation": {
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.metrics.export.jmx.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether exporting of metrics to JMX is enabled.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.metrics.export.newrelic.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
       "deprecation": {
         "level": "error"
       }
@@ -265,6 +328,15 @@
       "description": "Whether exporting of metrics to Prometheus is enabled.",
       "defaultValue": true
     },
+    {
+      "name": "management.metrics.export.signalfx.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "management.metrics.export.simple.enabled",
       "type": "java.lang.Boolean",
@@ -275,6 +347,15 @@
       "name": "management.metrics.export.simple.mode",
       "defaultValue": "cumulative"
     },
+    {
+      "name": "management.metrics.export.stackdriver.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "management.metrics.export.statsd.flavor",
       "defaultValue": "datadog"
@@ -286,6 +367,15 @@
         "level": "error"
       }
     },
+    {
+      "name": "management.metrics.export.wavefront.num-threads",
+      "type": "java.lang.Integer",
+      "description": "Number of threads to use with the metrics publishing scheduler.",
+      "defaultValue": 2,
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "management.metrics.web.client.request.autotime.enabled",
       "description": "Whether to automatically time web client requests.",
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesConfigAdapterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesConfigAdapterTests.java
index 97b40d597c..29b2a1ec5c 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesConfigAdapterTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesConfigAdapterTests.java
@@ -50,13 +50,6 @@ public abstract class PushRegistryPropertiesConfigAdapterTests<P extends PushReg
 		assertThat(createConfigAdapter(properties).enabled()).isFalse();
 	}
 
-	@Test
-	void whenPropertiesNumThreadsIsSetAdapterNumThreadsReturnsIt() {
-		P properties = createProperties();
-		properties.setNumThreads(42);
-		assertThat(createConfigAdapter(properties).numThreads()).isEqualTo(42);
-	}
-
 	@Test
 	void whenPropertiesBatchSizeIsSetAdapterBatchSizeReturnsIt() {
 		P properties = createProperties();
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesTests.java
index 5fb2cad444..0d86a19143 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/PushRegistryPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ public abstract class PushRegistryPropertiesTests {
 		assertThat(properties.isEnabled()).isEqualTo(config.enabled());
 		assertThat(properties.getConnectTimeout()).isEqualTo(config.connectTimeout());
 		assertThat(properties.getReadTimeout()).isEqualTo(config.readTimeout());
-		assertThat(properties.getNumThreads()).isEqualTo(config.numThreads());
 		assertThat(properties.getBatchSize()).isEqualTo(config.batchSize());
 	}