From bd14292b6b10760ed096778eff0180e2abb57bf2 Mon Sep 17 00:00:00 2001
From: Jack Berg <34418638+jack-berg@users.noreply.github.com>
Date: Thu, 25 Jun 2026 15:53:27 -0500
Subject: [PATCH] Remove deprecated
 InstrumentationConfigUtil.peerServiceMapping

---
 .../config/InstrumentationConfigUtil.java     | 34 -------------------
 .../config/InstrumentationConfigUtilTest.java | 11 ------
 2 files changed, 45 deletions(-)

diff --git a/api/incubator/src/main/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtil.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtil.java
index 4ec91325f46..addd6364b69 100644
--- a/api/incubator/src/main/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtil.java
+++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtil.java
@@ -6,7 +6,6 @@
 package io.opentelemetry.api.incubator.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -18,39 +17,6 @@
  */
 public class InstrumentationConfigUtil {
 
-  /**
-   * Return a map representation of the peer service map entries in {@code
-   * .instrumentation.general.peer.service_mapping}, or null if none is configured.
-   *
-   * @throws DeclarativeConfigException if an unexpected type is encountered accessing the property
-   * @deprecated Peer service mapping was removed from the general instrumentation configuration
-   *     schema. See <a
-   *     href="https://github.com/open-telemetry/opentelemetry-configuration/pull/526">opentelemetry-configuration#526</a>.
-   */
-  @Deprecated
-  @Nullable
-  public static Map<String, String> peerServiceMapping(ConfigProvider configProvider) {
-    List<DeclarativeConfigProperties> serviceMappingList =
-        getOrNull(
-            configProvider,
-            config -> config.getStructuredList("service_mapping"),
-            "general",
-            "peer");
-    if (serviceMappingList == null) {
-      return null;
-    }
-    Map<String, String> serviceMapping = new LinkedHashMap<>();
-    serviceMappingList.forEach(
-        entry -> {
-          String peer = entry.getString("peer");
-          String service = entry.getString("service");
-          if (peer != null && service != null) {
-            serviceMapping.put(peer, service);
-          }
-        });
-    return serviceMapping.isEmpty() ? null : serviceMapping;
-  }
-
   /**
    * Return {@code .instrumentation.general.http.client.request_captured_headers}, or null if none
    * is configured.
diff --git a/api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java
index a8860fc8d75..1c9b8340a4b 100644
--- a/api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java
+++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/config/InstrumentationConfigUtilTest.java
@@ -65,17 +65,6 @@ private static ConfigProvider toConfigProvider(String configYaml) {
             new ByteArrayInputStream(configYaml.getBytes(StandardCharsets.UTF_8))));
   }
 
-  @SuppressWarnings("deprecation") // testing deprecated method
-  @Test
-  void peerServiceMapping() {
-    assertThat(InstrumentationConfigUtil.peerServiceMapping(kitchenSinkConfigProvider))
-        .isEqualTo(ImmutableMap.of("1.2.3.4", "FooService", "2.3.4.5", "BarService"));
-    assertThat(InstrumentationConfigUtil.peerServiceMapping(emptyInstrumentationConfigProvider))
-        .isNull();
-    assertThat(InstrumentationConfigUtil.peerServiceMapping(emptyGeneralConfigProvider)).isNull();
-    assertThat(InstrumentationConfigUtil.peerServiceMapping(emptyHttpConfigProvider)).isNull();
-  }
-
   @Test
   void httpClientRequestCapturedHeaders() {
     assertThat(