Merge branch '2.2.x'

Closes gh-19375

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceProperties.java

@@ -51,6 +51,12 @@ public class DynatraceProperties extends StepRegistryProperties {
 	 */
 	private String uri;
 
+	/**
+	 * Group for exported metrics. Used to specify custom device group name in the
+	 * Dynatrace UI.
+	 */
+	private String group;
+
 	public String getApiToken() {
 		return this.apiToken;
 	}
@@ -83,4 +89,12 @@ public class DynatraceProperties extends StepRegistryProperties {
 		this.uri = uri;
 	}
 
+	public String getGroup() {
+		return this.group;
+	}
+
+	public void setGroup(String group) {
+		this.group = group;
+	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapter.java

@@ -52,4 +52,9 @@ class DynatracePropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapt
 		return get(DynatraceProperties::getUri, DynatraceConfig.super::uri);
 	}
 
+	@Override
+	public String group() {
+		return get(DynatraceProperties::getGroup, DynatraceConfig.super::group);
+	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapterTests.java

@@ -55,4 +55,11 @@ class DynatracePropertiesConfigAdapterTests {
 		assertThat(new DynatracePropertiesConfigAdapter(properties).technologyType()).isEqualTo("tech-1");
 	}
 
+	@Test
+	void whenPropertiesGroupIsSetAdapterGroupReturnsIt() {
+		DynatraceProperties properties = new DynatraceProperties();
+		properties.setGroup("group-1");
+		assertThat(new DynatracePropertiesConfigAdapter(properties).group()).isEqualTo("group-1");
+	}
+
 }