Merge branch '1.9.x' into 1.10.x

Author: shakuzen

implementations/micrometer-registry-wavefront/src/main/java/io/micrometer/wavefront/WavefrontConfig.java

@@ -16,11 +16,13 @@
 package io.micrometer.wavefront;
 
 import io.micrometer.common.lang.Nullable;
+import io.micrometer.core.instrument.config.MeterRegistryConfig;
 import io.micrometer.core.instrument.config.validate.InvalidReason;
 import io.micrometer.core.instrument.config.validate.Validated;
 import io.micrometer.core.instrument.push.PushRegistryConfig;
 
 import java.net.InetAddress;
+import java.net.URI;
 import java.net.UnknownHostException;
 
 import static io.micrometer.core.instrument.config.MeterRegistryConfigValidator.*;
@@ -82,7 +84,7 @@ default String prefix() {
      * proxy://HOST:PORT format.
      */
     default String uri() {
-        return getUrlString(this, "uri").required().get();
+        return getUriString(this, "uri").required().get();
     }
 
     /**
@@ -174,4 +176,17 @@ default Validated<?> validateSenderConfiguration() {
                             "must be set whenever publishing directly to the Wavefront API", InvalidReason.MISSING)));
     }
 
+    // different from getUrlString for gh-3903
+    static Validated<String> getUriString(MeterRegistryConfig config, String property) {
+        String prefixedProperty = config.prefix() + '.' + property;
+        String value = config.get(prefixedProperty);
+
+        try {
+            return Validated.valid(prefixedProperty, value == null ? null : URI.create(value)).map(url -> value);
+        }
+        catch (IllegalArgumentException ex) {
+            return Validated.invalid(prefixedProperty, value, "must be a valid URI", InvalidReason.MALFORMED, ex);
+        }
+    }
+
 }

implementations/micrometer-registry-wavefront/src/test/java/io/micrometer/wavefront/WavefrontConfigTest.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2023 VMware, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micrometer.wavefront;
+
+import io.micrometer.core.Issue;
+import io.micrometer.core.instrument.config.validate.ValidationException;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThatCode;
+
+class WavefrontConfigTest {
+
+    @Issue("#3903")
+    @Test
+    void defaultUriImplementationWorksWithProxyUri() throws IOException {
+        Properties wavefrontProps = new Properties();
+        wavefrontProps.load(this.getClass().getResourceAsStream("/valid.properties"));
+        WavefrontConfig config = wavefrontProps::getProperty;
+        assertThatCode(config::uri).doesNotThrowAnyException();
+    }
+
+    @Test
+    void defaultUriImplementationThrowsForInvalidUri() throws IOException {
+        Properties wavefrontProps = new Properties();
+        wavefrontProps.load(this.getClass().getResourceAsStream("/invalid.properties"));
+        WavefrontConfig config = wavefrontProps::getProperty;
+        assertThatCode(config::uri).isExactlyInstanceOf(ValidationException.class)
+            .hasMessageContaining("it must be a valid URI");
+    }
+
+}

implementations/micrometer-registry-wavefront/src/test/resources/invalid.properties

@@ -0,0 +1,17 @@
+#
+# Copyright 2023 VMware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+wavefront.uri=:not-a-uri

implementations/micrometer-registry-wavefront/src/test/resources/valid.properties

@@ -0,0 +1,17 @@
+#
+# Copyright 2023 VMware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+wavefront.uri=proxy://example.com:2878