From 9f13e85f72af6ad8664c39a3ad60efe56b36bd2f Mon Sep 17 00:00:00 2001
From: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Date: Tue, 16 May 2023 21:01:19 +0200
Subject: [PATCH] Remove deprecated getFlavor() methods from HTTP getters
 (#8497)

---
 .../http/HttpClientAttributesGetter.java      | 22 -------------------
 .../http/HttpServerAttributesGetter.java      | 15 -------------
 2 files changed, 37 deletions(-)

diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java
index 254ab3ad5f..9e105a67e1 100644
--- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java
+++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java
@@ -5,9 +5,6 @@
 
 package io.opentelemetry.instrumentation.api.instrumenter.http;
 
-import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesGetter;
 import javax.annotation.Nullable;
 
 /**
@@ -20,25 +17,6 @@ import javax.annotation.Nullable;
 public interface HttpClientAttributesGetter<REQUEST, RESPONSE>
     extends HttpCommonAttributesGetter<REQUEST, RESPONSE> {
 
-  // Attributes that always exist in a request
-
   @Nullable
   String getUrl(REQUEST request);
-
-  // Attributes which are not always available when the request is ready.
-
-  /**
-   * Extracts the {@code http.flavor} span attribute.
-   *
-   * <p>This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, whether
-   * {@code response} is {@code null} or not.
-   *
-   * @deprecated Use {@link NetClientAttributesGetter#getProtocolName(Object, Object)} and {@link
-   *     NetClientAttributesGetter#getProtocolVersion(Object, Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String getFlavor(REQUEST request, @Nullable RESPONSE response) {
-    return null;
-  }
 }
diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesGetter.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesGetter.java
index 25e665dd5c..f112719761 100644
--- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesGetter.java
+++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesGetter.java
@@ -5,7 +5,6 @@
 
 package io.opentelemetry.instrumentation.api.instrumenter.http;
 
-import io.opentelemetry.instrumentation.api.instrumenter.net.NetServerAttributesGetter;
 import javax.annotation.Nullable;
 
 /**
@@ -18,20 +17,6 @@ import javax.annotation.Nullable;
 public interface HttpServerAttributesGetter<REQUEST, RESPONSE>
     extends HttpCommonAttributesGetter<REQUEST, RESPONSE> {
 
-  // Attributes that always exist in a request
-
-  /**
-   * Extracts the {@code http.flavor} span attribute.
-   *
-   * @deprecated Use {@link NetServerAttributesGetter#getProtocolName(Object)} and {@link
-   *     NetServerAttributesGetter#getProtocolVersion(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String getFlavor(REQUEST request) {
-    return null;
-  }
-
   @Nullable
   String getScheme(REQUEST request);