From 0b43a4b180059d45044b63f3a8f6d2a37f8d2430 Mon Sep 17 00:00:00 2001
From: Jonatan Ivanov <jonatan.ivanov@gmail.com>
Date: Fri, 7 Jul 2023 16:14:30 -0700
Subject: [PATCH] Remove pinned dependencies on main (1.2.0)

Closes gh-304
---
 dependencies.gradle                            | 18 +++++++++---------
 .../DefaultHttpClientAttributesGetter.java     |  6 +++++-
 .../DefaultHttpServerAttributesExtractor.java  |  6 +++++-
 ...ttpRequestNetServerAttributesExtractor.java |  4 +++-
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index b9d3a7fb..9e768ec6 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,7 +2,7 @@ def VERSIONS = [
 	'javax.servlet:javax.servlet-api:latest.release',
 	'jakarta.platform:jakarta.jakartaee-web-api:9.+',
 
-	'io.micrometer:context-propagation:1.0.3',
+	'io.micrometer:context-propagation:latest.release',
 
 	'aopalliance:aopalliance:1.0',
 	'org.aspectj:aspectjweaver:1.8.+',
@@ -14,12 +14,12 @@ def VERSIONS = [
 	'org.apache.logging.log4j:log4j-core:2.+',
 	'org.slf4j:slf4j-api:1.7.+',
 	// otel
-	'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.24.+',
+	'io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.+',
 	// zipkin
 	'io.zipkin.aws:brave-propagation-aws:latest.release',
 	// wavefront
-	'com.wavefront:wavefront-sdk-java:3.0.+',
-	'com.wavefront:wavefront-internal-reporter-java:1.7.+',
+	'com.wavefront:wavefront-sdk-java:3.+',
+	'com.wavefront:wavefront-internal-reporter-java:1.+',
 	// test
 	'org.assertj:assertj-core:latest.release',
 	'org.awaitility:awaitility:latest.release',
@@ -32,15 +32,15 @@ def VERSIONS = [
 ]
 
 def MICROMETER_PLATFORM_VERSIONS = [
-	'io.micrometer:micrometer-bom:1.11.2-SNAPSHOT'
+	'io.micrometer:micrometer-bom:1.12.0-SNAPSHOT'
 ]
 
 def PLATFORM_VERSIONS = [
-	'io.zipkin.brave:brave-bom:5.14.+',
+	'io.zipkin.brave:brave-bom:5.+',
 	// opentelemetry-instrumentation-api dependency above with this
-	'io.opentelemetry:opentelemetry-bom:1.25.+',
-	'io.opentelemetry:opentelemetry-bom-alpha:1.25.+',
-	'io.projectreactor:reactor-bom:2022.0.8',
+	'io.opentelemetry:opentelemetry-bom:1.+',
+	'io.opentelemetry:opentelemetry-bom-alpha:1.+',
+	'io.projectreactor:reactor-bom:latest.release',
 	'org.junit:junit-bom:5.9.+'
 ]
 
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpClientAttributesGetter.java b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpClientAttributesGetter.java
index a4c9ebeb..d27e6b40 100644
--- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpClientAttributesGetter.java
+++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpClientAttributesGetter.java
@@ -38,8 +38,12 @@ public String getUrl(HttpClientRequest httpClientRequest) {
         return httpClientRequest.url();
     }
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. It should not be used since
+     * always returned null in Micrometer Tracing.
+     */
     @Nullable
-    @Override
+    @Deprecated
     public String getFlavor(HttpClientRequest httpClientRequest, @Nullable HttpClientResponse httpClientResponse) {
         return null;
     }
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpServerAttributesExtractor.java b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpServerAttributesExtractor.java
index c8f2c068..382f83d8 100644
--- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpServerAttributesExtractor.java
+++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/DefaultHttpServerAttributesExtractor.java
@@ -33,8 +33,12 @@
 public class DefaultHttpServerAttributesExtractor
         implements HttpServerAttributesGetter<HttpServerRequest, HttpServerResponse> {
 
+    /**
+     * @deprecated This method was removed from OpenTelemetry. It should not be used since
+     * always returned null in Micrometer Tracing.
+     */
     @Nullable
-    @Override
+    @Deprecated
     public String getFlavor(HttpServerRequest httpServerRequest) {
         return null;
     }
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/HttpRequestNetServerAttributesExtractor.java b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/HttpRequestNetServerAttributesExtractor.java
index 98bb632b..fe4d4bf1 100644
--- a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/HttpRequestNetServerAttributesExtractor.java
+++ b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/src/main/java/io/micrometer/tracing/otel/bridge/HttpRequestNetServerAttributesExtractor.java
@@ -17,6 +17,7 @@
 
 import io.micrometer.common.lang.Nullable;
 import io.micrometer.tracing.http.HttpServerRequest;
+import io.micrometer.tracing.http.HttpServerResponse;
 import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
 
 import java.net.URI;
@@ -26,7 +27,8 @@
  *
  * @author Nikita Salnikov-Tarnovski
  */
-class HttpRequestNetServerAttributesExtractor implements NetServerAttributesGetter<HttpServerRequest> {
+class HttpRequestNetServerAttributesExtractor
+        implements NetServerAttributesGetter<HttpServerRequest, HttpServerResponse> {
 
     @Nullable
     @Override