From 2b8a7d0866ae3ceba223a5e4cb003c6aac9f617b Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Thu, 27 Nov 2025 11:22:37 +0200
Subject: [PATCH] Remove duplicate virtual field

---
 .../servlet/v3_0/Servlet3FilterInitAdvice.java       |  5 ++---
 .../servlet/v3_0/Servlet3InitAdvice.java             |  5 ++---
 .../servlet/v3_0/Servlet3Singletons.java             | 12 ++----------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3FilterInitAdvice.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3FilterInitAdvice.java
index 5bddc729c9e1..3343b4238a5b 100644
--- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3FilterInitAdvice.java
+++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3FilterInitAdvice.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
 
-import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.FILTER_MAPPING_RESOLVER_FACTORY;
+import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.FILTER_MAPPING_RESOLVER;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterConfig;
@@ -20,7 +20,6 @@ public static void filterInit(
     if (filterConfig == null) {
       return;
     }
-    FILTER_MAPPING_RESOLVER_FACTORY.set(
-        filter, new Servlet3FilterMappingResolverFactory(filterConfig));
+    FILTER_MAPPING_RESOLVER.set(filter, new Servlet3FilterMappingResolverFactory(filterConfig));
   }
 }
diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InitAdvice.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InitAdvice.java
index 9c105d27464a..57fa29af91ba 100644
--- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InitAdvice.java
+++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3InitAdvice.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.servlet.v3_0;
 
-import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.SERVLET_MAPPING_RESOLVER_FACTORY;
+import static io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3Singletons.SERVLET_MAPPING_RESOLVER;
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
@@ -20,7 +20,6 @@ public static void servletInit(
     if (servletConfig == null) {
       return;
     }
-    SERVLET_MAPPING_RESOLVER_FACTORY.set(
-        servlet, new Servlet3MappingResolverFactory(servletConfig));
+    SERVLET_MAPPING_RESOLVER.set(servlet, new Servlet3MappingResolverFactory(servletConfig));
   }
 }
diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java
index 17c7082b6f52..73c3228d149d 100644
--- a/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java
+++ b/instrumentation/servlet/servlet-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3Singletons.java
@@ -24,14 +24,6 @@
 public final class Servlet3Singletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.servlet-3.0";
 
-  public static final VirtualField<Servlet, MappingResolver.Factory>
-      SERVLET_MAPPING_RESOLVER_FACTORY =
-          VirtualField.find(Servlet.class, MappingResolver.Factory.class);
-
-  public static final VirtualField<Filter, MappingResolver.Factory>
-      FILTER_MAPPING_RESOLVER_FACTORY =
-          VirtualField.find(Filter.class, MappingResolver.Factory.class);
-
   private static final Instrumenter<
           ServletRequestContext<HttpServletRequest>, ServletResponseContext<HttpServletResponse>>
       INSTRUMENTER =
@@ -41,9 +33,9 @@ public final class Servlet3Singletons {
   private static final ServletHelper<HttpServletRequest, HttpServletResponse> HELPER =
       new ServletHelper<>(INSTRUMENTER, Servlet3Accessor.INSTANCE);
 
-  private static final VirtualField<Servlet, MappingResolver.Factory> SERVLET_MAPPING_RESOLVER =
+  public static final VirtualField<Servlet, MappingResolver.Factory> SERVLET_MAPPING_RESOLVER =
       VirtualField.find(Servlet.class, MappingResolver.Factory.class);
-  private static final VirtualField<Filter, MappingResolver.Factory> FILTER_MAPPING_RESOLVER =
+  public static final VirtualField<Filter, MappingResolver.Factory> FILTER_MAPPING_RESOLVER =
       VirtualField.find(Filter.class, MappingResolver.Factory.class);
 
   private static final Instrumenter<ClassAndMethod, Void> RESPONSE_INSTRUMENTER =