update the way we validate scope

Author: jaydeluca

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/MetricParser.java

@@ -20,7 +20,7 @@
  * This class is responsible for parsing metric files from the `.telemetry` directory of an
  * instrumentation module and filtering them by scope.
  */
-public class MetricParser extends TelemetryParser {
+public class MetricParser {
 
   /**
    * Retrieves metrics for a given instrumentation module, filtered by scope.
@@ -109,10 +109,7 @@ public static Map<String, Map<String, AggregatedMetricInfo>> aggregateMetrics(
           aggregatedMetrics.computeIfAbsent(when, k -> new HashMap<>());
 
       for (EmittedMetrics.MetricsByScope metricsByScope : metrics.getMetricsByScope()) {
-        if (metricsByScope.getScope().equals(targetScopeName)
-            || scopeAllowList
-                .getOrDefault(targetScopeName, Set.of())
-                .contains(metricsByScope.getScope())) {
+        if (TelemetryParser.scopeIsValid(metricsByScope.getScope(), targetScopeName)) {
           for (EmittedMetrics.Metric metric : metricsByScope.getMetrics()) {
             AggregatedMetricInfo aggInfo =
                 metricKindMap.computeIfAbsent(

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/SpanParser.java

@@ -21,7 +21,7 @@
  * This class is responsible for parsing span files from the `.telemetry` directory of an
  * instrumentation module and filtering them by scope.
  */
-public class SpanParser extends TelemetryParser {
+public class SpanParser {
 
   // We want to ignore test related attributes
   private static final List<String> EXCLUDED_ATTRIBUTES =
@@ -87,10 +87,7 @@ public static Map<String, Map<String, Set<TelemetryAttribute>>> aggregateSpans(
           aggregatedAttributes.computeIfAbsent(when, k -> new HashMap<>());
 
       for (EmittedSpans.SpansByScope spansByScope : spans.getSpansByScope()) {
-        if (spansByScope.getScope().equals(targetScopeName)
-            || scopeAllowList
-                .getOrDefault(targetScopeName, Set.of())
-                .contains(spansByScope.getScope())) {
+        if (TelemetryParser.scopeIsValid(spansByScope.getScope(), targetScopeName)) {
           processSpansForScope(spansByScope, spanKindMap);
         }
       }

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/parsers/TelemetryParser.java

@@ -8,13 +8,28 @@
 import java.util.Map;
 import java.util.Set;
 
-abstract class TelemetryParser {
+class TelemetryParser {
 
-  // If an instrumentation module uses an instrumenter or telemetry class from another module, it
-  // might report telemetry with a different scope name, resulting in us excluding it. There are
-  // cases where we want to include this data, so we provide this way to override that exclusion
-  // filter. The key is the scope of the module being analyzed, the value is a set of additional
-  // allowed scopes.
-  protected static final Map<String, Set<String>> scopeAllowList =
+  // Key is the scope of the module being analyzed, value is a set of additional allowed scopes.
+  private static final Map<String, Set<String>> scopeAllowList =
       Map.of("io.opentelemetry.armeria-grpc-1.14", Set.of("io.opentelemetry.grpc-1.6"));
+
+  /**
+   * Checks if the given telemetry scope is valid for the specified module scope.
+   *
+   * <p>If an instrumentation module uses an instrumenter or telemetry class from another module, it
+   * might report telemetry with a different scope name, resulting in us excluding it. There are
+   * cases where we want to include this data, so we provide this way to override that exclusion
+   * filter.
+   *
+   * @param telemetryScope the scope of the telemetry signal
+   * @param moduleScope the scope of the module being analyzed
+   * @return true if the telemetry scope is valid for the module, false otherwise
+   */
+  static boolean scopeIsValid(String telemetryScope, String moduleScope) {
+    return telemetryScope.equals(moduleScope)
+        || scopeAllowList.getOrDefault(moduleScope, Set.of()).contains(telemetryScope);
+  }
+
+  private TelemetryParser() {}
 }