Merge branch 'master' into joey/aws-sns

Author: joeyzhao2018

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/git/GitConfig.java

@@ -1,27 +1,25 @@
 package datadog.trace.civisibility.git;
 
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Represents a .git/config file. It uses a simple algorithm based on regex to parse line by line
  * the .git/config file (INI file format).
  */
 public class GitConfig {
 
-  private final Pattern section = Pattern.compile("\\s*\\[([^]]*)\\]\\s*");
-  private final Pattern keyValue = Pattern.compile("\\s*([^=]*)=(.*)");
   private final Map<String, Map<String, String>> entries = new HashMap<>();
 
   public GitConfig(final String path) {
     load(path);
   }
 
+  @SuppressForbidden // split with one-char String use a fast-path without regex usage
   private void load(final String path) {
     if (path == null || path.isEmpty()) {
       return;
@@ -36,26 +34,33 @@ private void load(final String path) {
       String line;
       String section = null;
       while ((line = br.readLine()) != null) {
+
         // Check if current line matches with the `section` regex:
-        Matcher m = this.section.matcher(line);
-        if (m.matches()) {
-          // Section found: (E.g: remote "origin")
-          section = m.group(1).trim();
-        } else if (section != null) {
+        int sectionStartIdx = line.indexOf('[');
+        if (sectionStartIdx >= 0) {
+          int sectionEndIdx = line.indexOf(']', sectionStartIdx + 1);
+          if (sectionEndIdx >= 0
+              && isWhitespace(line, 0, sectionStartIdx)
+              && isWhitespace(line, sectionEndIdx + 1, line.length())) {
+            // Section found: (E.g: remote "origin")
+            section = line.substring(sectionStartIdx + 1, sectionEndIdx);
+            continue;
+          }
+        }
+
+        if (section != null) {
           // Locate the concrete `section` in the `entries` map
           // and update it with the found key/value.
           // E.g: Map({`remote "origin"`: {`url`:`https://some-host/user/repository.git`}}
-          Map<String, String> kv = this.entries.get(section);
-          if (kv == null) {
-            this.entries.put(section, kv = new HashMap<>());
-          }
-          // Check if current line is a key/value inside of a certain section.
-          m = this.keyValue.matcher(line);
-          if (m.matches()) {
+          Map<String, String> sectionValues =
+              this.entries.computeIfAbsent(section, k -> new HashMap<>());
+
+          String[] parts = line.split("=");
+          if (parts.length >= 2) {
             // Key/value found: (E.g: key=url, value=https://some-host/user/repository.git)
-            final String key = m.group(1).trim();
-            final String value = m.group(2).trim();
-            kv.put(key, value);
+            final String key = parts[0].trim();
+            final String value = join(parts, 1, parts.length).trim();
+            sectionValues.put(key, value);
           }
         }
       }
@@ -67,6 +72,27 @@ private void load(final String path) {
     }
   }
 
+  private String join(String[] array, int from, int to) {
+    if (to - from == 1) {
+      return array[from];
+    } else {
+      StringBuilder joined = new StringBuilder();
+      for (int i = from; i < to; i++) {
+        joined.append(array[i]);
+      }
+      return joined.toString();
+    }
+  }
+
+  private boolean isWhitespace(String s, int from, int to) {
+    for (int i = from; i < to; i++) {
+      if (!Character.isWhitespace(s.charAt(i))) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   public String getString(final String section, final String key) {
     final Map<String, String> kv = entries.get(section);
     if (kv == null) {

dd-java-agent/agent-debugger/build.gradle

@@ -75,17 +75,11 @@ jar {
 
 tasks.withType(Test).configureEach {
   onlyIf { !project.rootProject.hasProperty("skipDebuggerTests") }
-  // DebuggerTransformerTest made some Reflective calls on java.lang package
-  // needs to open it since jdk16
-  def matcher = it.name =~ /testJava(\d+)Generated/
-  if (matcher) {
-    def javaVersion = matcher.group(1) as int
-    if (javaVersion >= 16) {
-      jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
-    }
-  }
 }
 
+// we want to test with no special reflective access (no --add-opens)
+ext.allowReflectiveAccessToJdk = false
+
 subprojects { Project subProj ->
   subProj.tasks.withType(Test).configureEach { subTask ->
     onlyIf { !project.rootProject.hasProperty("skipDebuggerTests") }

dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java

@@ -130,18 +130,18 @@ public Object getMember(Object target, String memberName) {
         }
       }
     } else {
-      Function<Object, CapturedValue> specialFieldAccess =
-          WellKnownClasses.getSpecialFieldAccess(target.getClass().getTypeName());
-      if (specialFieldAccess != null) {
-        CapturedValue specialField = specialFieldAccess.apply(target);
-        if (specialField != null && specialField.getName().equals(memberName)) {
-          return specialField.getValue();
-        } else {
-          target = Values.UNDEFINED_OBJECT;
+      Map<String, Function<Object, CapturedValue>> specialTypeAccess =
+          WellKnownClasses.getSpecialTypeAccess(target);
+      if (specialTypeAccess != null) {
+        Function<Object, CapturedValue> specialFieldAccess = specialTypeAccess.get(memberName);
+        if (specialFieldAccess != null) {
+          CapturedValue specialField = specialFieldAccess.apply(target);
+          if (specialField != null && specialField.getName().equals(memberName)) {
+            return specialField.getValue();
+          }
         }
-      } else {
-        target = ReflectiveFieldValueResolver.resolve(target, target.getClass(), memberName);
       }
+      target = ReflectiveFieldValueResolver.resolve(target, target.getClass(), memberName);
     }
     checkUndefined(target, memberName, "Cannot dereference to field: ");
     return target;

dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ReflectiveFieldValueResolver.java

@@ -165,13 +165,15 @@ private static Field safeGetField(Class<?> container, String name) {
 
   private static Field getField(Class<?> container, String name) {
     while (container != null) {
-      try {
-        Field fld = container.getDeclaredField(name);
-        fld.setAccessible(true);
-        return fld;
-      } catch (NoSuchFieldException ignored) {
-        container = container.getSuperclass();
+      Field[] declaredFields = container.getDeclaredFields();
+      for (int i = 0; i < declaredFields.length; i++) {
+        Field declaredField = declaredFields[i];
+        if (declaredField.getName().equals(name)) {
+          declaredField.setAccessible(true);
+          return declaredField;
+        }
       }
+      container = container.getSuperclass();
     }
     return null;
   }