Merge branch '1.0.x'

Author: jonatan-ivanov

pom.xml

@@ -70,9 +70,9 @@
 		<spring-cloud-task.version>2.4.0-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.6.0</opentelemetry.version>
-		<opentelemetry.alpha.version>1.6.0-alpha</opentelemetry.alpha.version>
-		<opentelemetry-instrumentation.version>1.6.0-alpha</opentelemetry-instrumentation.version>
+		<opentelemetry.version>1.7.0</opentelemetry.version>
+		<opentelemetry.alpha.version>1.7.0-alpha</opentelemetry.alpha.version>
+		<opentelemetry-instrumentation.version>1.7.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.6.0</opentelemetry.version>
+		<opentelemetry.version>1.7.0</opentelemetry.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

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

@@ -153,6 +153,32 @@ protected String url(HttpServerRequest request) {
 		return request.url();
 	}
 
+	@Override
+	protected String scheme(HttpServerRequest request) {
+		return toUri(request).getScheme();
+	}
+
+	@Override
+	protected String host(HttpServerRequest request) {
+		return toUri(request).getHost();
+	}
+
+	@Override
+	protected String target(HttpServerRequest request) {
+		URI uri = toUri(request);
+		return uri.getPath() + queryPart(uri) + fragmentPart(uri);
+	}
+
+	private String queryPart(URI uri) {
+		String query = uri.getQuery();
+		return query != null ? "?" + query : "";
+	}
+
+	private String fragmentPart(URI uri) {
+		String fragment = uri.getFragment();
+		return fragment != null ? "#" + fragment : "";
+	}
+
 	protected URI toUri(HttpServerRequest request) {
 		return URI.create(request.url());
 	}