Merge branch '1.2.x'

# Conflicts:
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-appoptics/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-cloudwatch2/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-cloudwatch2/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-datadog/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-dynatrace/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-elastic/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-humio/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-influx/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-jmx/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-kairos/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-new-relic/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-prometheus/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-signalfx/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-stackdriver/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-statsd/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/testCompileClasspath.lockfile
#	implementations/micrometer-registry-wavefront/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile
#	micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/testCompileClasspath.lockfile
#	micrometer-spring-legacy/gradle/dependency-locks/testRuntimeClasspath.lockfile
#	micrometer-test/gradle/dependency-locks/compileClasspath.lockfile
#	micrometer-test/gradle/dependency-locks/testCompileClasspath.lockfile
#	micrometer-test/gradle/dependency-locks/testRuntimeClasspath.lockfile

micrometer-core/src/main/java/io/micrometer/core/ipc/http/HttpSender.java

@@ -168,7 +168,7 @@ public final Builder withBasicAuthentication(@Nullable String user, @Nullable St
             }
 
             /**
-             * Set the request body as JSON.
+             * Set the request body as JSON content type.
              *
              * @param content The request body.
              * @return This request builder.
@@ -178,7 +178,7 @@ public final Builder withJsonContent(String content) {
             }
 
             /**
-             * Set the request body as JSON.
+             * Set the request body as plain text content type.
              *
              * @param content The request body.
              * @return This request builder.

micrometer-core/src/test/java/io/micrometer/core/ipc/http/HttpUrlConnectionSenderTests.java

@@ -17,6 +17,7 @@
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import ru.lanwen.wiremock.ext.WiremockResolver;
 
 import java.net.SocketTimeoutException;
@@ -25,11 +26,9 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-class HttpUrlConnectionSenderTests extends AbstractHttpSenderTests {
-    @Override
-    void setHttpSender() {
-        this.httpSender = new HttpUrlConnectionSender();
-    }
+@ExtendWith(WiremockResolver.class)
+class HttpUrlConnectionSenderTests {
+    HttpSender httpSender = new HttpUrlConnectionSender();
 
     @Test
     void customReadTimeoutHonored(@WiremockResolver.Wiremock WireMockServer server) throws Throwable {

micrometer-core/src/test/java/io/micrometer/core/ipc/http/OkHttpSenderTests.java

@@ -18,6 +18,7 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import okhttp3.OkHttpClient;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import ru.lanwen.wiremock.ext.WiremockResolver;
 
 import java.net.SocketTimeoutException;
@@ -26,11 +27,9 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-class OkHttpSenderTests extends AbstractHttpSenderTests {
-    @Override
-    void setHttpSender() {
-        this.httpSender = new OkHttpSender();
-    }
+@ExtendWith(WiremockResolver.class)
+class OkHttpSenderTests {
+    HttpSender httpSender = new OkHttpSender();
 
     @Test
     void customReadTimeoutHonored(@WiremockResolver.Wiremock WireMockServer server) throws Throwable {

micrometer-core/src/test/java/io/micrometer/core/ipc/http/ReactorNettySenderTests.java

@@ -20,6 +20,7 @@
 import io.netty.handler.timeout.ReadTimeoutHandler;
 import io.netty.handler.timeout.WriteTimeoutHandler;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import reactor.netty.http.client.HttpClient;
 import ru.lanwen.wiremock.ext.WiremockResolver;
 
@@ -28,11 +29,9 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-class ReactorNettySenderTests extends AbstractHttpSenderTests {
-    @Override
-    void setHttpSender() {
-        this.httpSender = new ReactorNettySender();
-    }
+@ExtendWith(WiremockResolver.class)
+class ReactorNettySenderTests {
+    HttpSender httpSender = new ReactorNettySender();
 
     @Test
     void customReadTimeoutHonored(@WiremockResolver.Wiremock WireMockServer server) throws Throwable {