Merge branch '1.0.x' into main

Author: marcingrzejszczak

benchmarks/pom.xml

@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.1</version>
+		<version>2.5.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

pom.xml

@@ -70,9 +70,9 @@
 		<spring-cloud-task.version>2.3.3-SNAPSHOT</spring-cloud-task.version>
 		<spring-cloud-deployer.version>2.7.0-SNAPSHOT</spring-cloud-deployer.version>
 		<opentracing.version>0.32.0</opentracing.version>
-		<opentelemetry.version>1.3.0</opentelemetry.version>
-		<opentelemetry.alpha.version>1.3.0-alpha</opentelemetry.alpha.version>
-		<opentelemetry-instrumentation.version>1.3.0-alpha</opentelemetry-instrumentation.version>
+		<opentelemetry.version>1.4.1</opentelemetry.version>
+		<opentelemetry.alpha.version>1.4.0-alpha</opentelemetry.alpha.version>
+		<opentelemetry-instrumentation.version>1.4.0-alpha</opentelemetry-instrumentation.version>
 		<wavefront.version>2.2.0</wavefront.version>
 		<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>
 		<disable.nohttp.checks>false</disable.nohttp.checks>

spring-cloud-sleuth-otel-dependencies/pom.xml

@@ -31,7 +31,7 @@
 	<name>spring-cloud-sleuth-otel-dependencies</name>
 	<description>Spring Cloud Sleuth OTel Dependencies</description>
 	<properties>
-		<opentelemetry.version>1.3.0</opentelemetry.version>
+		<opentelemetry.version>1.4.1</opentelemetry.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelHttpServerHandler.java

@@ -124,7 +124,7 @@ protected Integer peerPort(HttpServerRequest request) {
 	}
 
 	@Override
-	protected String peerHostIP(HttpServerRequest request) {
+	protected String peerHostIp(HttpServerRequest request) {
 		return toUri(request).getHost();
 	}