Remove deprecated instrumentation-api-semconv code (#7838)

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesGetter.java

@@ -17,36 +17,8 @@ import javax.annotation.Nullable;
 public interface CodeAttributesGetter<REQUEST> {
 
   @Nullable
-  default Class<?> getCodeClass(REQUEST request) {
+  Class<?> getCodeClass(REQUEST request);
-    return codeClass(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getCodeClass(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Class<?> codeClass(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getMethodName(REQUEST request) {
+  String getMethodName(REQUEST request);
-    return methodName(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getMethodName(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String methodName(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientAttributesGetter.java

@@ -21,36 +21,8 @@ import javax.annotation.Nullable;
 public interface DbClientAttributesGetter<REQUEST> extends DbClientCommonAttributesGetter<REQUEST> {
 
   @Nullable
-  default String getStatement(REQUEST request) {
+  String getStatement(REQUEST request);
-    return statement(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getStatement(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String statement(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getOperation(REQUEST request) {
+  String getOperation(REQUEST request);
-    return operation(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getOperation(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String operation(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientCommonAttributesGetter.java

@@ -11,70 +11,14 @@ import javax.annotation.Nullable;
 public interface DbClientCommonAttributesGetter<REQUEST> {
 
   @Nullable
-  default String getSystem(REQUEST request) {
+  String getSystem(REQUEST request);
-    return system(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSystem(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String system(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getUser(REQUEST request) {
+  String getUser(REQUEST request);
-    return user(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getUser(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String user(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getName(REQUEST request) {
+  String getName(REQUEST request);
-    return name(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getName(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String name(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getConnectionString(REQUEST request) {
+  String getConnectionString(REQUEST request);
-    return connectionString(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getConnectionString(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String connectionString(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesGetter.java

@@ -26,22 +26,5 @@ public interface SqlClientAttributesGetter<REQUEST>
    * SqlClientAttributesExtractor} before being set as span attribute.
    */
   @Nullable
-  default String getRawStatement(REQUEST request) {
+  String getRawStatement(REQUEST request);
-    return rawStatement(request);
-  }
-
-  /**
-   * Get the raw SQL statement. The value returned by this method is later sanitized by the {@link
-   * SqlClientAttributesExtractor} before being set as span attribute.
-   *
-   * <p>This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getRawStatement(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String rawStatement(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractor.java

@@ -32,17 +32,6 @@ public final class HttpClientAttributesExtractor<REQUEST, RESPONSE>
         REQUEST, RESPONSE, HttpClientAttributesGetter<REQUEST, RESPONSE>>
     implements SpanKeyProvider {
 
-  /**
-   * Creates the HTTP client attributes extractor with default configuration.
-   *
-   * @deprecated Use {@link #create(HttpClientAttributesGetter, NetClientAttributesGetter)} instead.
-   */
-  @Deprecated
-  public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
-      HttpClientAttributesGetter<REQUEST, RESPONSE> getter) {
-    return builder(getter).build();
-  }
-
   /** Creates the HTTP client attributes extractor with default configuration. */
   public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
       HttpClientAttributesGetter<REQUEST, RESPONSE> httpAttributesGetter,
@@ -50,19 +39,6 @@ public final class HttpClientAttributesExtractor<REQUEST, RESPONSE>
     return builder(httpAttributesGetter, netAttributesGetter).build();
   }
 
-  /**
-   * Returns a new {@link HttpClientAttributesExtractorBuilder} that can be used to configure the
-   * HTTP client attributes extractor.
-   *
-   * @deprecated Use {@link #builder(HttpClientAttributesGetter, NetClientAttributesGetter)}
-   *     instead.
-   */
-  @Deprecated
-  public static <REQUEST, RESPONSE> HttpClientAttributesExtractorBuilder<REQUEST, RESPONSE> builder(
-      HttpClientAttributesGetter<REQUEST, RESPONSE> httpAttributesGetter) {
-    return builder(httpAttributesGetter, new NoopNetClientAttributesGetter<>());
-  }
-
   /**
    * Returns a new {@link HttpClientAttributesExtractorBuilder} that can be used to configure the
    * HTTP client attributes extractor.
@@ -175,26 +151,4 @@ public final class HttpClientAttributesExtractor<REQUEST, RESPONSE>
   public SpanKey internalGetSpanKey() {
     return SpanKey.HTTP_CLIENT;
   }
-
-  private static final class NoopNetClientAttributesGetter<REQUEST, RESPONSE>
-      implements NetClientAttributesGetter<REQUEST, RESPONSE> {
-
-    @Nullable
-    @Override
-    public String getTransport(REQUEST request, @Nullable RESPONSE response) {
-      return null;
-    }
-
-    @Nullable
-    @Override
-    public String getPeerName(REQUEST request) {
-      return null;
-    }
-
-    @Nullable
-    @Override
-    public Integer getPeerPort(REQUEST request) {
-      return null;
-    }
-  }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesGetter.java

@@ -22,21 +22,7 @@ public interface HttpClientAttributesGetter<REQUEST, RESPONSE>
   // Attributes that always exist in a request
 
   @Nullable
-  default String getUrl(REQUEST request) {
+  String getUrl(REQUEST request);
-    return url(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getUrl(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String url(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   // Attributes which are not always available when the request is ready.
 
@@ -47,24 +33,5 @@ public interface HttpClientAttributesGetter<REQUEST, RESPONSE>
    * {@code response} is {@code null} or not.
    */
   @Nullable
-  default String getFlavor(REQUEST request, @Nullable RESPONSE response) {
+  String getFlavor(REQUEST request, @Nullable RESPONSE response);
-    return flavor(request, response);
-  }
-
-  /**
-   * 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.
-   *
-   * <p>This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getFlavor(Object, Object)}.
-   */
-  @Deprecated
-  @Nullable
-  default String flavor(REQUEST request, @Nullable RESPONSE response) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesGetter.java

@@ -16,21 +16,7 @@ public interface HttpCommonAttributesGetter<REQUEST, RESPONSE> {
   // Attributes that always exist in a request
 
   @Nullable
-  default String getMethod(REQUEST request) {
+  String getMethod(REQUEST request);
-    return method(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getMethod(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String method(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   /**
    * Extracts all values of header named {@code name} from the request, or an empty list if there
@@ -39,26 +25,7 @@ public interface HttpCommonAttributesGetter<REQUEST, RESPONSE> {
    * <p>Implementations of this method <b>must not</b> return a null value; an empty list should be
    * returned instead.
    */
-  default List<String> getRequestHeader(REQUEST request, String name) {
+  List<String> getRequestHeader(REQUEST request, String name);
-    return requestHeader(request, name);
-  }
-
-  /**
-   * Extracts all values of header named {@code name} from the request, or an empty list if there
-   * were none.
-   *
-   * <p>Implementations of this method <b>must not</b> return a null value; an empty list should be
-   * returned instead.
-   *
-   * <p>This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getRequestHeader(Object, String)} instead.
-   */
-  @Deprecated
-  default List<String> requestHeader(REQUEST request, String name) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   // Attributes which are not always available when the request is ready.
 
@@ -69,26 +36,7 @@ public interface HttpCommonAttributesGetter<REQUEST, RESPONSE> {
    * {@code response} is non-{@code null}.
    */
   @Nullable
-  default Integer getStatusCode(REQUEST request, RESPONSE response, @Nullable Throwable error) {
+  Integer getStatusCode(REQUEST request, RESPONSE response, @Nullable Throwable error);
-    return statusCode(request, response, error);
-  }
-
-  /**
-   * Extracts the {@code http.status_code} span attribute.
-   *
-   * <p>This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, only when
-   * {@code response} is non-{@code null}.
-   *
-   * <p>This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getStatusCode(Object, Object, Throwable)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Integer statusCode(REQUEST request, RESPONSE response, @Nullable Throwable error) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   /**
    * Extracts all values of header named {@code name} from the response, or an empty list if there
@@ -100,27 +48,5 @@ public interface HttpCommonAttributesGetter<REQUEST, RESPONSE> {
    * <p>Implementations of this method <b>must not</b> return a null value; an empty list should be
    * returned instead.
    */
-  default List<String> getResponseHeader(REQUEST request, RESPONSE response, String name) {
+  List<String> getResponseHeader(REQUEST request, RESPONSE response, String name);
-    return responseHeader(request, response, name);
-  }
-
-  /**
-   * Extracts all values of header named {@code name} from the response, or an empty list if there
-   * were none.
-   *
-   * <p>This is called from {@link Instrumenter#end(Context, Object, Object, Throwable)}, only when
-   * {@code response} is non-{@code null}.
-   *
-   * <p>Implementations of this method <b>must not</b> return a null value; an empty list should be
-   * returned instead.
-   *
-   * <p>This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getResponseHeader(Object, Object, String)} instead.
-   */
-  @Deprecated
-  default List<String> responseHeader(REQUEST request, RESPONSE response, String name) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpRouteHolder.java

@@ -25,22 +25,6 @@ import javax.annotation.Nullable;
  */
 public final class HttpRouteHolder {
 
-  /**
-   * Returns a {@link ContextCustomizer} that initializes a {@link HttpRouteHolder} in the {@link
-   * Context} returned from {@link Instrumenter#start(Context, Object)}.
-   *
-   * @deprecated Use {@link #create(HttpServerAttributesGetter)} instead.
-   */
-  @Deprecated
-  public static <REQUEST> ContextCustomizer<REQUEST> get() {
-    return (context, request, startAttributes) -> {
-      if (HttpRouteState.fromContextOrNull(context) != null) {
-        return context;
-      }
-      return context.with(HttpRouteState.create(null, null, 0));
-    };
-  }
-
   /**
    * Returns a {@link ContextCustomizer} that initializes a {@link HttpRouteHolder} in the {@link
    * Context} returned from {@link Instrumenter#start(Context, Object)}.

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesGetter.java

@@ -20,70 +20,16 @@ public interface HttpServerAttributesGetter<REQUEST, RESPONSE>
   // Attributes that always exist in a request
 
   @Nullable
-  default String getFlavor(REQUEST request) {
+  String getFlavor(REQUEST request);
-    return flavor(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getFlavor(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String flavor(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getTarget(REQUEST request) {
+  String getTarget(REQUEST request);
-    return target(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getTarget(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String target(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
   default String getRoute(REQUEST request) {
-    return route(request);
+    return null;
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getRoute(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String route(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
   }
 
   @Nullable
-  default String getScheme(REQUEST request) {
+  String getScheme(REQUEST request);
-    return scheme(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getScheme(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String scheme(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesGetter.java

@@ -5,7 +5,8 @@
 
 package io.opentelemetry.instrumentation.api.instrumenter.messaging;
 
-import java.util.Collections;
+import static java.util.Collections.emptyList;
+
 import java.util.List;
 import javax.annotation.Nullable;
 
@@ -19,189 +20,36 @@ import javax.annotation.Nullable;
 public interface MessagingAttributesGetter<REQUEST, RESPONSE> {
 
   @Nullable
-  default String getSystem(REQUEST request) {
+  String getSystem(REQUEST request);
-    return system(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSystem(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String system(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getDestinationKind(REQUEST request) {
+  String getDestinationKind(REQUEST request);
-    return destinationKind(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getDestinationKind(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String destinationKind(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getDestination(REQUEST request) {
+  String getDestination(REQUEST request);
-    return destination(request);
-  }
 
-  /**
+  boolean isTemporaryDestination(REQUEST request);
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getDestination(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String destination(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
-
-  default boolean isTemporaryDestination(REQUEST request) {
-    return temporaryDestination(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #isTemporaryDestination(Object)} instead.
-   */
-  @Deprecated
-  default boolean temporaryDestination(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getProtocol(REQUEST request) {
+  String getProtocol(REQUEST request);
-    return protocol(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getProtocol(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String protocol(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getProtocolVersion(REQUEST request) {
+  String getProtocolVersion(REQUEST request);
-    return protocolVersion(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getProtocolVersion(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String protocolVersion(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getUrl(REQUEST request) {
+  String getUrl(REQUEST request);
-    return url(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getUrl(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String url(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getConversationId(REQUEST request) {
+  String getConversationId(REQUEST request);
-    return conversationId(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getConversationId(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String conversationId(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default Long getMessagePayloadSize(REQUEST request) {
+  Long getMessagePayloadSize(REQUEST request);
-    return messagePayloadSize(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getMessagePayloadSize(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Long messagePayloadSize(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default Long getMessagePayloadCompressedSize(REQUEST request) {
+  Long getMessagePayloadCompressedSize(REQUEST request);
-    return messagePayloadCompressedSize(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getMessagePayloadCompressedSize(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Long messagePayloadCompressedSize(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getMessageId(REQUEST request, @Nullable RESPONSE response) {
+  String getMessageId(REQUEST request, @Nullable RESPONSE response);
-    return messageId(request, response);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getMessageId(Object, Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String messageId(REQUEST request, @Nullable RESPONSE response) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   /**
    * Extracts all values of header named {@code name} from the request, or an empty list if there
@@ -210,24 +58,7 @@ public interface MessagingAttributesGetter<REQUEST, RESPONSE> {
    * <p>Implementations of this method <b>must not</b> return a null value; an empty list should be
    * returned instead.
    */
-  // TODO: when removing header(), make sure this method returns emptyList() by default
   default List<String> getMessageHeader(REQUEST request, String name) {
-    return header(request, name);
+    return emptyList();
-  }
-
-  /**
-   * Extracts all values of header named {@code name} from the request, or an empty list if there
-   * were none.
-   *
-   * <p>Implementations of this method <b>must not</b> return a null value; an empty list should be
-   * returned instead.
-   *
-   * <p>This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getMessageHeader(Object, String)} instead.
-   */
-  @Deprecated
-  default List<String> header(REQUEST request, String name) {
-    return Collections.emptyList();
   }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetClientAttributesGetter.java

@@ -18,121 +18,31 @@ import javax.annotation.Nullable;
 public interface NetClientAttributesGetter<REQUEST, RESPONSE> {
 
   @Nullable
-  default String getTransport(REQUEST request, @Nullable RESPONSE response) {
+  String getTransport(REQUEST request, @Nullable RESPONSE response);
-    return transport(request, response);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getTransport(Object, Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String transport(REQUEST request, @Nullable RESPONSE response) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getPeerName(REQUEST request) {
+  String getPeerName(REQUEST request);
-    return peerName(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getPeerName(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String peerName(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default Integer getPeerPort(REQUEST request) {
+  Integer getPeerPort(REQUEST request);
-    return peerPort(request);
-  }
 
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getPeerPort(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Integer peerPort(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
-
-  // TODO: when removing sockFamily(), make sure this method returns null by default
   @Nullable
   default String getSockFamily(REQUEST request, @Nullable RESPONSE response) {
-    return sockFamily(request, response);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSockFamily(Object, Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String sockFamily(REQUEST request, @Nullable RESPONSE response) {
     return null;
   }
 
-  // TODO: when removing sockPeerAddr(), make sure this method returns null by default
   @Nullable
   default String getSockPeerAddr(REQUEST request, @Nullable RESPONSE response) {
-    return sockPeerAddr(request, response);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSockPeerAddr(Object, Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String sockPeerAddr(REQUEST request, @Nullable RESPONSE response) {
     return null;
   }
 
-  // TODO: when removing sockPeerName(), make sure this method returns null by default
   @Nullable
   default String getSockPeerName(REQUEST request, @Nullable RESPONSE response) {
-    return sockPeerName(request, response);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSockPeerName(Object, Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String sockPeerName(REQUEST request, @Nullable RESPONSE response) {
     return null;
   }
 
-  // TODO: when removing sockPeerPort(), make sure this method returns null by default
   @Nullable
   default Integer getSockPeerPort(REQUEST request, @Nullable RESPONSE response) {
-    return sockPeerPort(request, response);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSockPeerName(Object, Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Integer sockPeerPort(REQUEST request, @Nullable RESPONSE response) {
     return null;
   }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/NetServerAttributesGetter.java

@@ -18,138 +18,36 @@ import javax.annotation.Nullable;
 public interface NetServerAttributesGetter<REQUEST> {
 
   @Nullable
-  default String getTransport(REQUEST request) {
+  String getTransport(REQUEST request);
-    return transport(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getTransport(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String transport(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getHostName(REQUEST request) {
+  String getHostName(REQUEST request);
-    return hostName(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getHostName(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String hostName(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default Integer getHostPort(REQUEST request) {
+  Integer getHostPort(REQUEST request);
-    return hostPort(request);
-  }
 
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getHostPort(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Integer hostPort(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
-
-  // TODO: when removing sockFamily(), make sure this method returns null by default
   @Nullable
   default String getSockFamily(REQUEST request) {
-    return sockFamily(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSockFamily(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String sockFamily(REQUEST request) {
     return null;
   }
 
-  // TODO: when removing sockPeerAddr(), make sure this method returns null by default
   @Nullable
   default String getSockPeerAddr(REQUEST request) {
-    return sockPeerAddr(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSockPeerAddr(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String sockPeerAddr(REQUEST request) {
     return null;
   }
 
-  // TODO: when removing sockPeerPort(), make sure this method returns null by default
   @Nullable
   default Integer getSockPeerPort(REQUEST request) {
-    return sockPeerPort(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSockPeerPort(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Integer sockPeerPort(REQUEST request) {
     return null;
   }
 
-  // TODO: when removing sockHostAddr(), make sure this method returns null by default
   @Nullable
   default String getSockHostAddr(REQUEST request) {
-    return sockHostAddr(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSockHostAddr(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String sockHostAddr(REQUEST request) {
     return null;
   }
 
-  // TODO: when removing sockHostPort(), make sure this method returns null by default
   @Nullable
   default Integer getSockHostPort(REQUEST request) {
-    return sockHostPort(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSockHostPort(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default Integer sockHostPort(REQUEST request) {
     return null;
   }
 }

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/rpc/RpcAttributesGetter.java

@@ -17,53 +17,11 @@ import javax.annotation.Nullable;
 public interface RpcAttributesGetter<REQUEST> {
 
   @Nullable
-  default String getSystem(REQUEST request) {
+  String getSystem(REQUEST request);
-    return system(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getSystem(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String system(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getService(REQUEST request) {
+  String getService(REQUEST request);
-    return service(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getService(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String service(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 
   @Nullable
-  default String getMethod(REQUEST request) {
+  String getMethod(REQUEST request);
-    return method(request);
-  }
-
-  /**
-   * This method is deprecated and will be removed in the subsequent release.
-   *
-   * @deprecated Use {@link #getMethod(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String method(REQUEST request) {
-    throw new UnsupportedOperationException(
-        "This method is deprecated and will be removed in the subsequent release.");
-  }
 }

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerAttributesGetter.java

@@ -53,12 +53,6 @@ class AkkaHttpServerAttributesGetter
     return target;
   }
 
-  @Override
-  @Nullable
-  public String getRoute(HttpRequest request) {
-    return null;
-  }
-
   @Override
   public String getScheme(HttpRequest request) {
     return request.uri().scheme();

instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpAttributesGetter.java

@@ -68,12 +68,6 @@ final class GrizzlyHttpAttributesGetter
     return target;
   }
 
-  @Nullable
-  @Override
-  public String getRoute(HttpRequestPacket request) {
-    return null;
-  }
-
   @Override
   public String getScheme(HttpRequestPacket request) {
     return request.isSecure() ? "https" : "http";

instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerAttributesGetter.kt

@@ -43,10 +43,6 @@ internal enum class KtorHttpServerAttributesGetter :
     return request.uri
   }
 
-  override fun getRoute(request: ApplicationRequest): String? {
-    return null
-  }
-
   override fun getScheme(request: ApplicationRequest): String {
     return request.origin.scheme
   }

instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorHttpServerAttributesGetter.kt

@@ -43,10 +43,6 @@ internal enum class KtorHttpServerAttributesGetter :
     return request.uri
   }
 
-  override fun getRoute(request: ApplicationRequest): String? {
-    return null
-  }
-
   override fun getScheme(request: ApplicationRequest): String {
     return request.origin.scheme
   }

instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java

@@ -65,10 +65,4 @@ public class LibertyDispatcherHttpAttributesGetter
   public String getScheme(LibertyRequest libertyRequest) {
     return libertyRequest.getScheme();
   }
-
-  @Override
-  @Nullable
-  public String getRoute(LibertyRequest libertyRequest) {
-    return null;
-  }
 }

instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerAttributesGetter.java

@@ -51,12 +51,6 @@ final class NettyHttpServerAttributesGetter
     return requestAndChannel.request().getUri();
   }
 
-  @Override
-  @Nullable
-  public String getRoute(HttpRequestAndChannel requestAndChannel) {
-    return null;
-  }
-
   @Override
   public String getScheme(HttpRequestAndChannel requestAndChannel) {
     return HttpSchemeUtil.getScheme(requestAndChannel);

instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/server/NettyHttpServerAttributesGetter.java

@@ -51,12 +51,6 @@ final class NettyHttpServerAttributesGetter
     return requestAndChannel.request().getUri();
   }
 
-  @Override
-  @Nullable
-  public String getRoute(HttpRequestAndChannel requestAndChannel) {
-    return null;
-  }
-
   @Override
   public String getScheme(HttpRequestAndChannel requestAndChannel) {
     return HttpSchemeUtil.getScheme(requestAndChannel);

instrumentation/opentelemetry-instrumentation-api/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/testing/MockHttpServerAttributesGetter.java

@@ -49,12 +49,6 @@ enum MockHttpServerAttributesGetter implements HttpServerAttributesGetter<String
     return null;
   }
 
-  @Nullable
-  @Override
-  public String getRoute(String s) {
-    return null;
-  }
-
   @Nullable
   @Override
   public String getScheme(String s) {

instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/RatpackHttpAttributesGetter.java

@@ -28,13 +28,6 @@ enum RatpackHttpAttributesGetter implements HttpServerAttributesGetter<Request,
     return request.getUri();
   }
 
-  @Override
-  @Nullable
-  public String getRoute(Request request) {
-    // Ratpack route not available at the beginning of request.
-    return null;
-  }
-
   @Override
   @Nullable
   public String getScheme(Request request) {

instrumentation/restlet/restlet-1.1/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/RestletHttpAttributesGetter.java

@@ -36,12 +36,6 @@ enum RestletHttpAttributesGetter implements HttpServerAttributesGetter<Request,
     return ref.hasQuery() ? path + "?" + ref.getQuery() : path;
   }
 
-  @Override
-  @Nullable
-  public String getRoute(Request request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getScheme(Request request) {

instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHttpAttributesGetter.java

@@ -38,12 +38,6 @@ public enum RestletHttpAttributesGetter implements HttpServerAttributesGetter<Re
     return ref.hasQuery() ? path + "?" + ref.getQuery() : path;
   }
 
-  @Override
-  @Nullable
-  public String getRoute(Request request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getScheme(Request request) {

instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletHttpAttributesGetter.java

@@ -93,10 +93,4 @@ public class ServletHttpAttributesGetter<REQUEST, RESPONSE>
       String name) {
     return accessor.getResponseHeaderValues(responseContext.response(), name);
   }
-
-  @Override
-  @Nullable
-  public String getRoute(ServletRequestContext<REQUEST> requestContext) {
-    return null;
-  }
 }

instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/SpringWebMvcHttpAttributesGetter.java

@@ -87,12 +87,6 @@ enum SpringWebMvcHttpAttributesGetter
     return target;
   }
 
-  @Override
-  @Nullable
-  public String getRoute(HttpServletRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getScheme(HttpServletRequest request) {

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/SpringWebMvcHttpAttributesGetter.java

@@ -87,12 +87,6 @@ enum SpringWebMvcHttpAttributesGetter
     return target;
   }
 
-  @Override
-  @Nullable
-  public String getRoute(HttpServletRequest request) {
-    return null;
-  }
-
   @Override
   @Nullable
   public String getScheme(HttpServletRequest request) {

instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatHttpAttributesGetter.java

@@ -68,10 +68,4 @@ public class TomcatHttpAttributesGetter implements HttpServerAttributesGetter<Re
   public List<String> getResponseHeader(Request request, Response response, String name) {
     return Collections.list(response.getMimeHeaders().values(name));
   }
-
-  @Override
-  @Nullable
-  public String getRoute(Request request) {
-    return null;
-  }
 }

instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHttpAttributesGetter.java

@@ -65,10 +65,4 @@ public class UndertowHttpAttributesGetter
   public String getScheme(HttpServerExchange exchange) {
     return exchange.getRequestScheme();
   }
-
-  @Override
-  @Nullable
-  public String getRoute(HttpServerExchange exchange) {
-    return null;
-  }
 }