Polish OpenTelemetryResourceAttributes

Update OpenTelemetryResourceAttributes to use StringUtils.uriDecode(...)
as it provides the same functionality as the custom decode(...) method.

Signed-off-by: Dmytro Nosan <[email protected]>

Author: nosan

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryResourceAttributes.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure.opentelemetry;
 
-import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -78,8 +77,8 @@ public OpenTelemetryResourceAttributes(Environment environment, Map<String, Stri
 	}
 
 	/**
-	 * Applies resource attributes to the provided BiConsumer after being combined from
-	 * environment variables and user-defined resource attributes.
+	 * Applies resource attributes to the provided {@link BiConsumer} after being combined
+	 * from environment variables and user-defined resource attributes.
 	 * <p>
 	 * If a key exists in both environment variables and user-defined resources, the value
 	 * from the user-defined resource takes precedence, even if it is empty.
@@ -97,13 +96,13 @@ public void applyTo(BiConsumer<String, String> consumer) {
 				attributes.put(name, value);
 			}
 		});
-		attributes.computeIfAbsent("service.name", (key) -> getApplicationName());
-		attributes.computeIfAbsent("service.group", (key) -> getApplicationGroup());
+		attributes.computeIfAbsent("service.name", (key) -> getServiceName());
+		attributes.computeIfAbsent("service.group", (key) -> getServiceGroup());
 		attributes.computeIfAbsent("service.namespace", (key) -> getServiceNamespace());
 		attributes.forEach(consumer);
 	}
 
-	private String getApplicationName() {
+	private String getServiceName() {
 		return this.environment.getProperty("spring.application.name", DEFAULT_SERVICE_NAME);
 	}
 
@@ -113,7 +112,7 @@ private String getApplicationName() {
 	 * @deprecated since 3.5.0 for removal in 3.7.0
 	 */
 	@Deprecated(since = "3.5.0", forRemoval = true)
-	private String getApplicationGroup() {
+	private String getServiceGroup() {
 		String applicationGroup = this.environment.getProperty("spring.application.group");
 		return (StringUtils.hasLength(applicationGroup)) ? applicationGroup : null;
 	}
@@ -139,7 +138,7 @@ private Map<String, String> getResourceAttributesFromEnv() {
 			if (index > 0) {
 				String key = attribute.substring(0, index);
 				String value = attribute.substring(index + 1);
-				attributes.put(key.trim(), decode(value.trim()));
+				attributes.put(key.trim(), StringUtils.uriDecode(value.trim(), StandardCharsets.UTF_8));
 			}
 		}
 		String otelServiceName = getEnv("OTEL_SERVICE_NAME");
@@ -153,43 +152,4 @@ private String getEnv(String name) {
 		return this.getEnv.apply(name);
 	}
 
-	/**
-	 * Decodes a percent-encoded string. Converts sequences like '%HH' (where HH
-	 * represents hexadecimal digits) back into their literal representations.
-	 * <p>
-	 * Inspired by {@code org.apache.commons.codec.net.PercentCodec}.
-	 * @param value value to decode
-	 * @return the decoded string
-	 */
-	private static String decode(String value) {
-		if (value.indexOf('%') < 0) {
-			return value;
-		}
-		byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
-		ByteArrayOutputStream bos = new ByteArrayOutputStream(bytes.length);
-		for (int i = 0; i < bytes.length; i++) {
-			byte b = bytes[i];
-			if (b != '%') {
-				bos.write(b);
-				continue;
-			}
-			int u = decodeHex(bytes, i + 1);
-			int l = decodeHex(bytes, i + 2);
-			if (u >= 0 && l >= 0) {
-				bos.write((u << 4) + l);
-			}
-			else {
-				throw new IllegalArgumentException(
-						"Failed to decode percent-encoded characters at index %d in the value: '%s'".formatted(i,
-								value));
-			}
-			i += 2;
-		}
-		return bos.toString(StandardCharsets.UTF_8);
-	}
-
-	private static int decodeHex(byte[] bytes, int index) {
-		return (index < bytes.length) ? Character.digit(bytes[index], 16) : -1;
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryResourceAttributesTests.java

@@ -121,7 +121,7 @@ void otelResourceAttributeValuesShouldBePercentDecoded() {
 	void illegalArgumentExceptionShouldBeThrownWhenDecodingIllegalHexCharPercentEncodedValue() {
 		this.environmentVariables.put("OTEL_RESOURCE_ATTRIBUTES", "key=abc%ß");
 		assertThatIllegalArgumentException().isThrownBy(this::getAttributes)
-			.withMessage("Failed to decode percent-encoded characters at index 3 in the value: 'abc%ß'");
+			.withMessage("Invalid encoded sequence \"%ß\"");
 	}
 
 	@Test
@@ -134,7 +134,7 @@ void replacementCharShouldBeUsedWhenDecodingNonUtf8Character() {
 	void illegalArgumentExceptionShouldBeThrownWhenDecodingInvalidPercentEncodedValue() {
 		this.environmentVariables.put("OTEL_RESOURCE_ATTRIBUTES", "key=%");
 		assertThatIllegalArgumentException().isThrownBy(this::getAttributes)
-			.withMessage("Failed to decode percent-encoded characters at index 0 in the value: '%'");
+			.withMessage("Invalid encoded sequence \"%\"");
 	}
 
 	@Test