Fix breaking changes in opentelemetry-java-instrumentation 1.28.0

Closes gh-314
micrometer-metrics · Jul 21, 2023 · a202446 · a202446
1 parent 03a8fc8
commit a202446
Show file tree

Hide file tree

Showing 4 changed files with 165 additions and 26 deletions.
diff --git a/...el/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpClientAttributesGetter.java b/...el/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpClientAttributesGetter.java
@@ -34,10 +34,20 @@ public class DefaultHttpClientAttributesGetter
 
     @Nullable
     @Override
-    public String getUrl(HttpClientRequest httpClientRequest) {
+    public String getUrlFull(HttpClientRequest httpClientRequest) {
         return httpClientRequest.url();
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getUrlFull(HttpClientRequest)} instead.
+     */
+    @Nullable
+    @Deprecated
+    public String getUrl(HttpClientRequest httpClientRequest) {
+        return this.getUrlFull(httpClientRequest);
+    }
+
     /**
      * @deprecated This method was removed from OpenTelemetry. It should not be used since
      * always returned null in Micrometer Tracing.
@@ -48,33 +58,65 @@ public String getFlavor(HttpClientRequest httpClientRequest, @Nullable HttpClien
         return null;
     }
 
+    @Nullable
     @Override
-    public String getMethod(HttpClientRequest httpClientRequest) {
+    public String getHttpRequestMethod(HttpClientRequest httpClientRequest) {
         return httpClientRequest.method();
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getHttpRequestMethod(HttpClientRequest)} instead.
+     */
+    @Nullable
+    @Deprecated
+    public String getMethod(HttpClientRequest httpClientRequest) {
+        return this.getHttpRequestMethod(httpClientRequest);
+    }
+
     @Override
-    public List<String> getRequestHeader(HttpClientRequest httpClientRequest, String name) {
+    public List<String> getHttpRequestHeader(HttpClientRequest httpClientRequest, String name) {
         if (httpClientRequest == null) {
             return Collections.emptyList();
         }
         String value = httpClientRequest.header(name);
         return value == null ? Collections.emptyList() : Collections.singletonList(value);
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getHttpRequestHeader(HttpClientRequest, String)} instead.
+     */
+    @Deprecated
+    public List<String> getRequestHeader(HttpClientRequest httpClientRequest, String name) {
+        return this.getHttpRequestHeader(httpClientRequest, name);
+    }
+
     @Nullable
     @Override
-    public Integer getStatusCode(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse,
-            Throwable error) {
+    public Integer getHttpResponseStatusCode(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse,
+            @Nullable Throwable error) {
         if (httpClientResponse == null) {
             return null;
         }
         return httpClientResponse.statusCode();
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getHttpResponseStatusCode(HttpClientRequest, HttpClientResponse, Throwable)}
+     * instead.
+     */
+    @Nullable
+    @Deprecated
+    public Integer getStatusCode(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse,
+            Throwable error) {
+        return this.getHttpResponseStatusCode(httpClientRequest, httpClientResponse, error);
+    }
+
     @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();
         }
@@ -87,4 +129,15 @@ public List<String> getResponseHeader(HttpClientRequest httpClientRequest, HttpC
         }
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getHttpResponseHeader(HttpClientRequest, HttpClientResponse, String)}
+     * instead.
+     */
+    @Deprecated
+    public List<String> getResponseHeader(HttpClientRequest httpClientRequest, HttpClientResponse httpClientResponse,
+            String name) {
+        return this.getHttpResponseHeader(httpClientRequest, httpClientResponse, name);
+    }
+
 }
diff --git a/...src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpServerAttributesExtractor.java b/...src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpServerAttributesExtractor.java
@@ -45,12 +45,33 @@ public String getFlavor(HttpServerRequest httpServerRequest) {
 
     @Nullable
     @Override
-    public String getTarget(HttpServerRequest httpServerRequest) {
+    public String getUrlPath(HttpServerRequest httpServerRequest) {
+        URI uri = toUri(httpServerRequest);
+        if (uri == null) {
+            return null;
+        }
+        return uri.getPath();
+    }
+
+    @Nullable
+    @Override
+    public String getUrlQuery(HttpServerRequest httpServerRequest) {
         URI uri = toUri(httpServerRequest);
         if (uri == null) {
             return null;
         }
-        return uri.getPath() + queryPart(uri);
+        return queryPart(uri);
+    }
+
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getUrlPath(HttpServerRequest)} and {@link #getUrlQuery(HttpServerRequest)}
+     * instead.
+     */
+    @Nullable
+    @Deprecated
+    public String getTarget(HttpServerRequest httpServerRequest) {
+        return this.getUrlPath(httpServerRequest) + this.getUrlQuery(httpServerRequest);
     }
 
     private URI toUri(HttpServerRequest request) {
@@ -65,13 +86,23 @@ private String queryPart(URI uri) {
 
     @Nullable
     @Override
-    public String getRoute(HttpServerRequest httpServerRequest) {
+    public String getHttpRoute(HttpServerRequest httpServerRequest) {
         return httpServerRequest.route();
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getHttpRoute(HttpServerRequest)} instead.
+     */
+    @Nullable
+    @Deprecated
+    public String getRoute(HttpServerRequest httpServerRequest) {
+        return this.getHttpRoute(httpServerRequest);
+    }
+
     @Nullable
     @Override
-    public String getScheme(HttpServerRequest httpServerRequest) {
+    public String getUrlScheme(HttpServerRequest httpServerRequest) {
         String url = httpServerRequest.url();
         if (url == null) {
             return null;
@@ -85,30 +116,82 @@ public String getScheme(HttpServerRequest httpServerRequest) {
         return null;
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getUrlScheme(HttpServerRequest)} instead.
+     */
+    @Nullable
+    @Deprecated
+    public String getScheme(HttpServerRequest httpServerRequest) {
+        return this.getUrlScheme(httpServerRequest);
+    }
+
     @Nullable
     @Override
-    public String getMethod(HttpServerRequest httpServerRequest) {
+    public String getHttpRequestMethod(HttpServerRequest httpServerRequest) {
         return httpServerRequest.method();
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getHttpRequestMethod(HttpServerRequest)} instead.
+     */
+    @Nullable
+    @Deprecated
+    public String getMethod(HttpServerRequest httpServerRequest) {
+        return this.getHttpRequestMethod(httpServerRequest);
+    }
+
     @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);
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getHttpRequestHeader(HttpServerRequest, String)} instead.
+     */
+    @Deprecated
+    public List<String> getRequestHeader(HttpServerRequest httpServerRequest, String name) {
+        return this.getHttpRequestHeader(httpServerRequest, name);
+    }
+
     @Nullable
     @Override
+    public Integer getHttpResponseStatusCode(HttpServerRequest httpServerRequest, HttpServerResponse httpServerResponse,
+            @Nullable Throwable error) {
+        return httpServerResponse.statusCode();
+    }
+
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getHttpResponseStatusCode(HttpServerRequest, HttpServerResponse, Throwable)}
+     * instead.
+     */
+    @Nullable
+    @Deprecated
     public Integer getStatusCode(HttpServerRequest httpServerRequest, HttpServerResponse httpServerResponse,
             Throwable error) {
-        return httpServerResponse.statusCode();
+        return this.getHttpResponseStatusCode(httpServerRequest, httpServerResponse, error);
     }
 
     @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);
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. Please use
+     * {@link #getHttpResponseHeader(HttpServerRequest, HttpServerResponse, String)}
+     * instead.
+     */
+    @Deprecated
+    public List<String> getResponseHeader(HttpServerRequest httpServerRequest, HttpServerResponse httpServerResponse,
+            String name) {
+        return this.getHttpResponseHeader(httpServerRequest, httpServerResponse, name);
+    }
+
 }
diff --git a/.../main/java/io/micrometer/tracing/otel/bridge/HttpRequestNetClientAttributesExtractor.java b/.../main/java/io/micrometer/tracing/otel/bridge/HttpRequestNetClientAttributesExtractor.java
@@ -36,13 +36,13 @@ public String getTransport(HttpClientRequest httpClientRequest, @Nullable HttpCl
 
     @Nullable
     @Override
-    public String getPeerName(HttpClientRequest httpClientRequest) {
+    public String getServerAddress(HttpClientRequest httpClientRequest) {
         return null;
     }
 
     @Nullable
     @Override
-    public Integer getPeerPort(HttpClientRequest httpClientRequest) {
+    public Integer getServerPort(HttpClientRequest httpClientRequest) {
         return httpClientRequest == null ? null : httpClientRequest.remotePort();
     }
 

diff --git a/.../main/java/io/micrometer/tracing/otel/bridge/HttpRequestNetServerAttributesExtractor.java b/.../main/java/io/micrometer/tracing/otel/bridge/HttpRequestNetServerAttributesExtractor.java
@@ -43,30 +43,33 @@ public String getTransport(HttpServerRequest httpRequest) {
 
     @Nullable
     @Override
-    public String getHostName(HttpServerRequest httpRequest) {
-        String url = httpRequest.url();
+    public String getServerAddress(HttpServerRequest httpServerRequest) {
+        String url = httpServerRequest.url();
         if (url == null) {
             return null;
         }
         URI uri = URI.create(url);
         return uri.getHost();
     }
 
+    @Nullable
     @Override
-    public Integer getHostPort(HttpServerRequest httpRequest) {
-        return httpRequest.remotePort();
+    public Integer getServerPort(HttpServerRequest httpServerRequest) {
+        return httpServerRequest.remotePort();
     }
 
     @Nullable
     @Override
-    public String getSockPeerAddr(HttpServerRequest httpRequest) {
-        return httpRequest.remoteIp();
+    public String getClientSocketAddress(HttpServerRequest httpServerRequest,
+            @Nullable HttpServerResponse httpServerResponse) {
+        return httpServerRequest.remoteIp();
     }
 
     @Nullable
     @Override
-    public Integer getSockPeerPort(HttpServerRequest httpRequest) {
-        return httpRequest.remotePort();
+    public Integer getClientSocketPort(HttpServerRequest httpServerRequest,
+            @Nullable HttpServerResponse httpServerResponse) {
+        return httpServerRequest.remotePort();
     }
 
 }