Add isGlobPattern for GlobUtil.

Add comments for copied methods.

Author: xiepuhuan

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/PeerServiceResolverImpl.java

@@ -49,7 +49,7 @@ class PeerServiceResolverImpl implements PeerServiceResolver {
                 return;
               }
 
-              if (host.contains("*") || host.contains("?")) {
+              if (GlobUtil.isGlobPattern(host)) {
                 ServiceMatcher serviceMatcher =
                     ServiceMatcher.create(GlobUrlParser.getPort(url), GlobUrlParser.getPath(url));
                 globMapping
@@ -72,22 +72,6 @@ public boolean isEmpty() {
     return mapping.isEmpty() && globMapping.isEmpty();
   }
 
-  @Nullable
-  static String matchService(
-      @Nullable Map<ServiceMatcher, String> matchers,
-      @Nullable Integer port,
-      @Nullable Supplier<String> pathSupplier) {
-    if (matchers == null) {
-      return null;
-    }
-
-    return matchers.entrySet().stream()
-        .filter(entry -> entry.getKey().matches(port, pathSupplier))
-        .findFirst()
-        .map(Map.Entry::getValue)
-        .orElse(null);
-  }
-
   @Override
   @Nullable
   public String resolveService(
@@ -112,6 +96,22 @@ public String resolveService(
     return null;
   }
 
+  @Nullable
+  static String matchService(
+      @Nullable Map<ServiceMatcher, String> matchers,
+      @Nullable Integer port,
+      @Nullable Supplier<String> pathSupplier) {
+    if (matchers == null) {
+      return null;
+    }
+
+    return matchers.entrySet().stream()
+        .filter(entry -> entry.getKey().matches(port, pathSupplier))
+        .findFirst()
+        .map(Map.Entry::getValue)
+        .orElse(null);
+  }
+
   @AutoValue
   abstract static class ServiceMatcher {
 

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/internal/GlobUrlParser.java

@@ -12,6 +12,7 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
+// Copied from UrlParser except for getHostEndIndexExclusive.
 public final class GlobUrlParser {
 
   @Nullable
@@ -105,7 +106,7 @@ private static int getHostStartIndex(String url) {
   private static int getHostEndIndexExclusive(String url, int startIndex) {
     // look for the end of the host:
     //   ':' ==> start of port, or
-    //   '/', '?', '#' ==> start of path
+    //   '/', '#' ==> start of path
     return getEndIndexExclusive(url, startIndex, c -> (c == ':' || c == '/' || c == '#'));
   }
 

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/util/internal/GlobUtil.java

@@ -14,6 +14,7 @@
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
  */
+// copied from io.opentelemetry.sdk.internal.GlobUtil except for isGlobString.
 public final class GlobUtil {
 
   private GlobUtil() {}
@@ -79,4 +80,9 @@ private static Pattern toRegexPattern(String globPattern) {
     }
     return Pattern.compile(patternBuilder.toString());
   }
+
+  /** Returns true if the {@code string} contains {@code *} or {@code .*}. */
+  public static boolean isGlobPattern(String string) {
+    return string.contains("*") || string.contains("?");
+  }
 }

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/net/internal/GlobUrlParserTest.java

@@ -52,6 +52,7 @@ void testGetHostWithPort() {
         .isEqualTo("*.example.???");
   }
 
+  // Copied from UrlParserTest
   @Test
   void testGetHostWithNoAuthority() {
     assertThat(GlobUrlParser.getHost("https:")).isNull();
@@ -70,6 +71,7 @@ void testGetHostWithNoAuthority() {
     assertThat(GlobUrlParser.getHost("https:/#fragment")).isNull();
   }
 
+  // Copied from UrlParserTest
   @Test
   void testGetHostWithNoScheme() {
     assertThat(GlobUrlParser.getHost("")).isNull();
@@ -124,6 +126,7 @@ void testGetPortWithPort() {
     assertThat(GlobUrlParser.getPort("https://*.example.???:8080/#fragment")).isEqualTo(8080);
   }
 
+  // Copied from UrlParserTest
   @Test
   void testGetPortWithNoAuthority() {
     assertThat(GlobUrlParser.getPort("https:")).isNull();
@@ -142,6 +145,7 @@ void testGetPortWithNoAuthority() {
     assertThat(GlobUrlParser.getPort("https:/#fragment")).isNull();
   }
 
+  // Copied from UrlParserTest
   @Test
   void testGetPortWithNoScheme() {
     assertThat(GlobUrlParser.getPort("")).isNull();
@@ -208,6 +212,7 @@ void testGetPathWithPort() {
         .isEqualTo("/api/v1");
   }
 
+  // Copied from UrlParserTest
   @Test
   void testGetPathWithNoAuthority() {
     assertThat(GlobUrlParser.getPath("https:")).isNull();
@@ -231,6 +236,7 @@ void testGetPathWithNoAuthority() {
     assertThat(GlobUrlParser.getPath("https:/api/v1#fragment")).isNull();
   }
 
+  // Copied from UrlParserTest
   @Test
   void testGetPathWithNoScheme() {
     assertThat(GlobUrlParser.getPath("")).isNull();

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/util/internal/GlobUtilTest.java

@@ -5,11 +5,13 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.util.internal;
 
+import static io.opentelemetry.instrumentation.api.incubator.semconv.util.internal.GlobUtil.isGlobPattern;
 import static io.opentelemetry.instrumentation.api.incubator.semconv.util.internal.GlobUtil.toGlobPatternPredicate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
+// copied from io.opentelemetry.sdk.internal.GlobUtilTest
 class GlobUtilTest {
 
   @Test
@@ -43,4 +45,20 @@ void matchesName() {
     assertThat(toGlobPatternPredicate("f()[]$^.{}|?").test("f()[]$^.{}|o")).isTrue();
     assertThat(toGlobPatternPredicate("f()[]$^.{}|*").test("f()[]$^.{}|ooo")).isTrue();
   }
+
+  @Test
+  void testIsGlobPattern() {
+    assertThat(isGlobPattern("foo")).isFalse();
+    assertThat(isGlobPattern("fo?")).isTrue();
+    assertThat(isGlobPattern("fo??")).isTrue();
+    assertThat(isGlobPattern("*")).isTrue();
+    assertThat(isGlobPattern("fo*")).isTrue();
+    assertThat(isGlobPattern("*bar")).isTrue();
+    assertThat(isGlobPattern("fo*b*")).isTrue();
+    assertThat(isGlobPattern("fo? b??")).isTrue();
+    assertThat(isGlobPattern("fo* ba?")).isTrue();
+    assertThat(isGlobPattern("f()[]$^.{}|")).isFalse();
+    assertThat(isGlobPattern("f()[]$^.{}|?")).isTrue();
+    assertThat(isGlobPattern("f()[]$^.{}|*")).isTrue();
+  }
 }