Merge branch 'master' into nikita-tkachenko/x-datadog-trace-id

.circleci/config.continue.yml.j2

@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit 2487cea5160a398549743d2cfd927a863792e3bd
+default_system_tests_commit: &default_system_tests_commit 6998b307ce0e8d206ca6eb99045651dcc8bc853f
 
 parameters:
   nightly:

dd-java-agent/agent-ci-visibility/build.gradle

@@ -73,6 +73,7 @@ excludedClassesCoverage += [
   "datadog.trace.civisibility.source.index.RepoIndexBuilder.RepoIndexingFileVisitor",
   "datadog.trace.civisibility.source.index.RepoIndexFetcher",
   "datadog.trace.civisibility.source.index.RepoIndexSourcePathResolver",
+  "datadog.trace.civisibility.source.Utils",
   "datadog.trace.civisibility.utils.ShellCommandExecutor",
   "datadog.trace.civisibility.utils.ShellCommandExecutor.OutputParser",
   "datadog.trace.civisibility.utils.SpanUtils"

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/Utils.java

@@ -7,7 +7,26 @@ public abstract class Utils {
 
   public static InputStream getClassStream(Class<?> clazz) throws IOException {
     String className = clazz.getName();
-    String classPath = "/" + className.replace('.', '/') + ".class";
-    return clazz.getResourceAsStream(classPath);
+    InputStream classStream = clazz.getResourceAsStream(toResourceName(className));
+    if (classStream != null) {
+      return classStream;
+    } else {
+      // might be auto-generated inner class (e.g. Mockito mock)
+      String topLevelClassName = stripNestedClassNames(clazz.getName());
+      return clazz.getResourceAsStream(toResourceName(topLevelClassName));
+    }
+  }
+
+  private static String toResourceName(String className) {
+    return "/" + className.replace('.', '/') + ".class";
+  }
+
+  public static String stripNestedClassNames(String className) {
+    int innerClassNameIdx = className.indexOf('$');
+    if (innerClassNameIdx >= 0) {
+      return className.substring(0, innerClassNameIdx);
+    } else {
+      return className;
+    }
   }
 }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/source/index/RepoIndex.java

@@ -50,7 +50,7 @@ public List<String> getRootPackages() {
 
   @Nullable
   public String getSourcePath(@Nonnull Class<?> c) {
-    String topLevelClassName = stripNestedClassNames(c.getName());
+    String topLevelClassName = Utils.stripNestedClassNames(c.getName());
     SourceType sourceType = detectSourceType(c);
     String extension = sourceType.getExtension();
     String classNameWithExtension = topLevelClassName + extension;
@@ -107,15 +107,6 @@ private SourceType detectSourceType(Class<?> c) {
     return SourceType.JAVA;
   }
 
-  private String stripNestedClassNames(String className) {
-    int innerClassNameIdx = className.indexOf('$');
-    if (innerClassNameIdx >= 0) {
-      return className.substring(0, innerClassNameIdx);
-    } else {
-      return className;
-    }
-  }
-
   /**
    * Names of package-private classes do not have to correspond to the names of their source code
    * files. For such classes filename is extracted from SourceFile attribute that is available in
@@ -126,6 +117,10 @@ private String getSourcePathForPackagePrivateOrNonJavaClass(Class<?> c) {
       SourceFileAttributeVisitor sourceFileAttributeVisitor = new SourceFileAttributeVisitor();
 
       try (InputStream classStream = Utils.getClassStream(c)) {
+        if (classStream == null) {
+          log.debug("Could not get input stream for class {}", c.getName());
+          return null;
+        }
         ClassReader classReader = new ClassReader(classStream);
         classReader.accept(
             sourceFileAttributeVisitor, ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES);

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/source/index/RepoIndexSourcePathResolverTest.groovy

@@ -72,6 +72,17 @@ class RepoIndexSourcePathResolverTest extends Specification {
     sourcePathResolver.getSourcePath(PackagePrivateClass) == expectedSourcePath
   }
 
+  def "test source path resolution for class nested into package-private class"() {
+    setup:
+    def expectedSourcePath = givenSourceFile(RepoIndexSourcePathResolverTest, repoRoot + "/src")
+
+    when:
+    def sourcePathResolver = new RepoIndexSourcePathResolver(repoRoot, packageResolver, fileSystem)
+
+    then:
+    sourcePathResolver.getSourcePath(PackagePrivateClass.NestedIntoPackagePrivateClass) == expectedSourcePath
+  }
+
   def "test source path resolution for non-java class whose file name is different from class name"() {
     setup:
     def expectedSourcePath = givenSourceFile(RepoIndexSourcePathResolverTest, repoRoot + "/src")
@@ -173,6 +184,7 @@ class RepoIndexSourcePathResolverTest extends Specification {
 
 @PackageScope
 class PackagePrivateClass {
+  class NestedIntoPackagePrivateClass {}
 }
 
 class PublicClassWhoseNameDoesNotCorrespondToFileName {

dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java

@@ -58,7 +58,12 @@ void testLineRangeSpan() throws Exception {
   void testSingleLineSpan() throws Exception {
     final String METHOD_NAME = "fullMethod";
     final String EXPECTED_UPLOADS = "2"; // 2 probe statuses: RECEIVED + ERROR
-    SpanProbe spanProbe = SpanProbe.builder().probeId(PROBE_ID).where(MAIN_CLASS_NAME, 80).build();
+    SpanProbe spanProbe =
+        SpanProbe.builder()
+            .probeId(PROBE_ID)
+            // on line: System.out.println("fullMethod");
+            .where(MAIN_CLASS_NAME, 88)
+            .build();
     setCurrentConfiguration(createSpanConfig(spanProbe));
     targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
     AtomicBoolean received = new AtomicBoolean(false);