Bumped OTel to 1.28.0; fixes gh-169

spring-projects-experimental · Aug 18, 2023 · fece263 · fece263
1 parent 2cd2ce5
commit fece263
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 112 deletions.
diff --git a/pom.xml b/pom.xml
@@ -71,10 +71,10 @@
 		<spring-cloud-task.version>2.4.6</spring-cloud-task.version>
 		<spring-cloud-deployer.version>2.7.6</spring-cloud-deployer.version>
 		<opentracing.version>0.32.0</opentracing.version>
-		<opentelemetry.version>1.24.0</opentelemetry.version>
-		<opentelemetry-alpha.version>1.24.0-alpha</opentelemetry-alpha.version>
-		<opentelemetry-instrumentation.version>1.24.0</opentelemetry-instrumentation.version>
-		<opentelemetry-instrumentation-alpha.version>1.24.0-alpha</opentelemetry-instrumentation-alpha.version>
+		<opentelemetry.version>1.28.0</opentelemetry.version>
+		<opentelemetry-alpha.version>1.28.0-alpha</opentelemetry-alpha.version>
+		<opentelemetry-instrumentation.version>1.28.0</opentelemetry-instrumentation.version>
+		<opentelemetry-instrumentation-alpha.version>1.28.0-alpha</opentelemetry-instrumentation-alpha.version>
 		<opentelemetry-proto.version>0.11.0-alpha</opentelemetry-proto.version>
 		<wavefront.version>2.2.2</wavefront.version>
 		<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>

diff --git a/spring-cloud-sleuth-otel-autoconfigure/pom.xml b/spring-cloud-sleuth-otel-autoconfigure/pom.xml
@@ -106,10 +106,6 @@
 			<groupId>io.opentelemetry</groupId>
 			<artifactId>opentelemetry-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.opentelemetry</groupId>
-			<artifactId>opentelemetry-api-logs</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>io.opentelemetry</groupId>
 			<artifactId>opentelemetry-sdk-metrics</artifactId>

diff --git a/spring-cloud-sleuth-otel-dependencies/pom.xml b/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.24.0</opentelemetry.version>
+		<opentelemetry.version>1.28.0</opentelemetry.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

diff --git a/spring-cloud-sleuth-otel/pom.xml b/spring-cloud-sleuth-otel/pom.xml
@@ -82,16 +82,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>io.opentelemetry</groupId>
-			<artifactId>opentelemetry-api-logs</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>io.opentelemetry</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>io.opentelemetry</groupId>
 			<artifactId>opentelemetry-sdk-logs</artifactId>

diff --git a/...org/springframework/cloud/sleuth/otel/bridge/HttpRequestNetClientAttributesExtractor.java b/...org/springframework/cloud/sleuth/otel/bridge/HttpRequestNetClientAttributesExtractor.java
@@ -36,16 +36,4 @@ public String getTransport(HttpClientRequest httpClientRequest, @Nullable HttpCl
 		return null;
 	}
 
-	@Nullable
-	@Override
-	public String getPeerName(HttpClientRequest httpClientRequest) {
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public Integer getPeerPort(HttpClientRequest httpClientRequest) {
-		return httpClientRequest == null ? null : httpClientRequest.remotePort();
-	}
-
 }
diff --git a/...org/springframework/cloud/sleuth/otel/bridge/HttpRequestNetServerAttributesExtractor.java b/...org/springframework/cloud/sleuth/otel/bridge/HttpRequestNetServerAttributesExtractor.java
@@ -21,14 +21,16 @@
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
 
 import org.springframework.cloud.sleuth.http.HttpServerRequest;
+import org.springframework.cloud.sleuth.http.HttpServerResponse;
 import org.springframework.lang.Nullable;
 
 /**
  * Extracts OpenTelemetry network semantic attributes value for server http spans.
  *
  * @author Nikita Salnikov-Tarnovski
  */
-class HttpRequestNetServerAttributesExtractor implements NetServerAttributesGetter<HttpServerRequest> {
+class HttpRequestNetServerAttributesExtractor
+		implements NetServerAttributesGetter<HttpServerRequest, HttpServerResponse> {
 
 	@Nullable
 	@Override
@@ -41,32 +43,4 @@ public String getTransport(HttpServerRequest httpRequest) {
 		return uri.getScheme();
 	}
 
-	@Nullable
-	@Override
-	public String getHostName(HttpServerRequest httpRequest) {
-		String url = httpRequest.url();
-		if (url == null) {
-			return null;
-		}
-		URI uri = URI.create(url);
-		return uri.getHost();
-	}
-
-	@Override
-	public Integer getHostPort(HttpServerRequest httpRequest) {
-		return httpRequest.remotePort();
-	}
-
-	@Nullable
-	@Override
-	public String getSockPeerAddr(HttpServerRequest httpRequest) {
-		return httpRequest.remoteIp();
-	}
-
-	@Nullable
-	@Override
-	public Integer getSockPeerPort(HttpServerRequest httpRequest) {
-		return httpRequest.remotePort();
-	}
-
 }
diff --git a/...n/java/org/springframework/cloud/sleuth/otel/bridge/SpringHttpClientAttributesGetter.java b/...n/java/org/springframework/cloud/sleuth/otel/bridge/SpringHttpClientAttributesGetter.java
@@ -23,7 +23,6 @@
 
 import org.springframework.cloud.sleuth.http.HttpClientRequest;
 import org.springframework.cloud.sleuth.http.HttpClientResponse;
-import org.springframework.lang.Nullable;
 
 /**
  * Extracts OpenTelemetry http semantic attributes value for client http spans.
@@ -33,25 +32,13 @@
 public class SpringHttpClientAttributesGetter
 		implements HttpClientAttributesGetter<HttpClientRequest, HttpClientResponse> {
 
-	@Nullable
 	@Override
-	public String getUrl(HttpClientRequest httpClientRequest) {
-		return httpClientRequest.url();
-	}
-
-	@Nullable
-	@Override
-	public String getFlavor(HttpClientRequest httpClientRequest, @Nullable HttpClientResponse httpClientResponse) {
-		return null;
-	}
-
-	@Override
-	public String getMethod(HttpClientRequest httpClientRequest) {
+	public String getHttpRequestMethod(HttpClientRequest httpClientRequest) {
 		return httpClientRequest.method();
 	}
 
 	@Override
-	public List<String> getRequestHeader(HttpClientRequest httpClientRequest, String name) {
+	public List<String> getHttpRequestHeader(HttpClientRequest httpClientRequest, String name) {
 		if (httpClientRequest == null) {
 			return Collections.emptyList();
 		}
@@ -60,7 +47,7 @@ public List<String> getRequestHeader(HttpClientRequest httpClientRequest, String
 	}
 
 	@Override
-	public Integer getStatusCode(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse,
+	public Integer getHttpResponseStatusCode(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse,
 			Throwable error) {
 		if (httpClientResponse == null) {
 			return null;
@@ -69,8 +56,8 @@ public Integer getStatusCode(HttpClientRequest httpClientRequest, HttpClientResp
 	}
 
 	@Override
-	public List<String> getResponseHeader(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse,
-			String name) {
+	public List<String> getHttpResponseHeader(HttpClientRequest httpClientRequest,
+			HttpClientResponse httpClientResponse, String name) {
 		if (httpClientResponse == null) {
 			return Collections.emptyList();
 		}
@@ -83,4 +70,9 @@ public List<String> getResponseHeader(HttpClientRequest httpClientRequest, HttpC
 		}
 	}
 
+	@Override
+	public String getUrlFull(HttpClientRequest httpClientRequest) {
+		return httpClientRequest.url();
+	}
+
 }
diff --git a/...n/java/org/springframework/cloud/sleuth/otel/bridge/SpringHttpServerAttributesGetter.java b/...n/java/org/springframework/cloud/sleuth/otel/bridge/SpringHttpServerAttributesGetter.java
@@ -36,39 +36,13 @@ public class SpringHttpServerAttributesGetter
 
 	@Nullable
 	@Override
-	public String getFlavor(HttpServerRequest httpServerRequest) {
-		return null;
-	}
-
-	@Nullable
-	@Override
-	public String getTarget(HttpServerRequest httpServerRequest) {
-		URI uri = toUri(httpServerRequest);
-		if (uri == null) {
-			return null;
-		}
-		return uri.getPath() + queryPart(uri);
-	}
-
-	private URI toUri(HttpServerRequest request) {
-		String url = request.url();
-		return url == null ? null : URI.create(url);
-	}
-
-	private String queryPart(URI uri) {
-		String query = uri.getQuery();
-		return query != null ? "?" + query : "";
-	}
-
-	@Nullable
-	@Override
-	public String getRoute(HttpServerRequest httpServerRequest) {
+	public String getHttpRoute(HttpServerRequest httpServerRequest) {
 		return httpServerRequest.route();
 	}
 
 	@Nullable
 	@Override
-	public String getScheme(HttpServerRequest httpServerRequest) {
+	public String getUrlScheme(HttpServerRequest httpServerRequest) {
 		String url = httpServerRequest.url();
 		if (url == null) {
 			return null;
@@ -82,27 +56,50 @@ public String getScheme(HttpServerRequest httpServerRequest) {
 		return null;
 	}
 
+	@Override
+	public String getUrlPath(HttpServerRequest httpServerRequest) {
+		URI uri = toUri(httpServerRequest);
+		if (uri == null) {
+			return null;
+		}
+		return uri.getPath();
+	}
+
+	@Override
+	public String getUrlQuery(HttpServerRequest httpServerRequest) {
+		URI uri = toUri(httpServerRequest);
+		if (uri == null) {
+			return null;
+		}
+		return uri.getQuery();
+	}
+
+	private URI toUri(HttpServerRequest request) {
+		String url = request.url();
+		return url == null ? null : URI.create(url);
+	}
+
 	@Nullable
 	@Override
-	public String getMethod(HttpServerRequest httpServerRequest) {
+	public String getHttpRequestMethod(HttpServerRequest httpServerRequest) {
 		return httpServerRequest.method();
 	}
 
 	@Override
-	public List<String> getRequestHeader(HttpServerRequest httpServerRequest, String name) {
+	public List<String> getHttpRequestHeader(HttpServerRequest httpServerRequest, String name) {
 		String value = httpServerRequest.header(name);
 		return value == null ? Collections.emptyList() : Collections.singletonList(value);
 	}
 
 	@Override
-	public Integer getStatusCode(HttpServerRequest httpServerRequest, HttpServerResponse httpServerResponse,
+	public Integer getHttpResponseStatusCode(HttpServerRequest httpServerRequest, HttpServerResponse httpServerResponse,
 			Throwable error) {
 		return httpServerResponse.statusCode();
 	}
 
 	@Override
-	public List<String> getResponseHeader(HttpServerRequest httpServerRequest, HttpServerResponse httpServerResponse,
-			String name) {
+	public List<String> getHttpResponseHeader(HttpServerRequest httpServerRequest,
+			HttpServerResponse httpServerResponse, String name) {
 		String value = httpServerResponse.header(name);
 		return value == null ? Collections.emptyList() : Collections.singletonList(value);
 	}

diff --git a/tests/otel/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml b/tests/otel/spring-cloud-sleuth-instrumentation-kotlin-tests/pom.xml
@@ -22,7 +22,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cloud-sleuth-instrumentation-otel-tests</artifactId>
+	<artifactId>spring-cloud-sleuth-instrumentation-kotlin-otel-tests</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Sleuth OTel Kotlin Instrumentation Tests</name>
 	<description>Spring Cloud Sleuth OTel Kotlin Instrumentation Tests</description>