Merge branch 'master' into jb/crash_track_unredacted

Author: jbachorik

.github/workflows/README.md

@@ -20,6 +20,14 @@ _Action:_ Append the new release to the Cloud Foundry repository.
 
 _Recovery:_ Manually edit and push the `index.yml` file from [the cloudfoundry branch](https://github.com/DataDog/dd-trace-java/tree/cloudfoundry).
 
+### check-pull-requests [🔗](check-pull-requests.yaml)
+
+_Trigger:_ When creating or updating a pull request.
+
+_Action:_ Check the pull request complies with [the contribution guidelines](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md).
+
+_Recovery:_ Manually verify the guideline compliance.
+
 ### create-next-milestone [🔗](create-next-milestone.yaml)
 
 _Trigger:_ When closing a milestone.

.github/workflows/analyze-changes.yaml

@@ -140,6 +140,9 @@ jobs:
           output: 'trivy-results.sarif'
           severity: 'CRITICAL,HIGH'
           limit-severities-for-sarif: true
+        env:
+          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
+          TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
 
       - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6

.github/workflows/check-pull-requests.yaml

@@ -0,0 +1,53 @@
+name: Check pull requests
+on:
+  pull_request:
+    types: [opened, reopened, edited, labeled, unlabeled]
+    branches:
+    - master
+    - release/v*
+jobs:
+  check_pull_requests:
+    name: Check pull requests
+    permissions:
+      issues: write # Required to create a comment on the pull request
+      pull-requests: write # Required to create a comment on the pull request
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check pull requests
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # 7.0.1
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            // Skip draft pull requests
+            if (context.payload.pull_request.draft) {
+              return
+            }
+            // Check at least one type and (component or instrumentation) label is set
+            const labels = context.payload.pull_request.labels.map(label => label.name)
+            const ignoreReleaseNotes = labels.filter(label => label == 'tag: no release notes').length > 0
+            const hasTypeLabel = labels.filter(label => label.startsWith('type:')).length > 0
+            const hasComponentLabel = labels.filter(label => label.startsWith('comp:')).length > 0
+            const hasInstrumentationLabel = labels.filter(label => label.startsWith('instr:')).length > 0
+            const labelsCheckFailed = !ignoreReleaseNotes && (!hasTypeLabel || (!hasComponentLabel && !hasInstrumentationLabel));
+            if (labelsCheckFailed) {
+              core.setFailed('Please add at least one type, and one component or instrumentation label to the pull request.')
+            }
+            // Check title does not contain tag
+            const title = context.payload.pull_request.title
+            const titleCheckFailed = title.match(/\[.*\]/)
+            if (titleCheckFailed) {
+              core.setFailed('Please remove the tag from the pull request title.')
+            }
+            // Add comment to the pull request
+            if (labelsCheckFailed || titleCheckFailed) {
+              await github.rest.issues.createComment({
+                issue_number: context.payload.pull_request.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: 'Hi! 👋 Thanks for your pull request! 🎉\n\n' +
+                  'To help us review it, please make sure to:\n\n' +
+                  (labelsCheckFailed ? '* Add at least one type, and one component or instrumentation label to the pull request\n' : '') +
+                  (titleCheckFailed ? '* Remove the tag from the pull request title\n' : '') +
+                  '\nIf you need help, please check our [contributing guidelines](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md).'
+              })
+            }

.github/workflows/tests/check-pull-requests/payload-pull-request-draft.json

@@ -0,0 +1,8 @@
+{
+    "pull_request": {
+        "number": 7884,
+        "draft": true,
+        "labels": [],
+        "title": "Adding some new features"
+    }
+}

.github/workflows/tests/check-pull-requests/payload-pull-request-missing-label.json

@@ -0,0 +1,12 @@
+{
+    "pull_request": {
+        "number": 7884,
+        "draft": false,
+        "labels": [
+            {
+                "name": "comp: api"
+            }
+        ],
+        "title": "Adding some new features"
+    }
+}

.github/workflows/tests/check-pull-requests/payload-pull-request-no-release-notes.json

@@ -0,0 +1,12 @@
+{
+    "pull_request": {
+        "number": 7884,
+        "draft": false,
+        "labels": [
+            {
+                "name": "tag: no release notes"
+            }
+        ],
+        "title": "Adding some new features"
+    }
+}

.github/workflows/tests/check-pull-requests/payload-pull-request-title-tag.json

@@ -0,0 +1,15 @@
+{
+    "pull_request": {
+        "number": 7884,
+        "draft": false,
+        "labels": [
+            {
+                "name": "comp: api"
+            },
+            {
+                "name": "type: enhancement"
+            }
+        ],
+        "title": "[API] Adding some new features"
+    }
+}

.github/workflows/tests/check-pull-requests/payload-pull-request.json

@@ -0,0 +1,15 @@
+{
+    "pull_request": {
+        "number": 7884,
+        "draft": false,
+        "labels": [
+            {
+                "name": "comp: api"
+            },
+            {
+                "name": "type: enhancement"
+            }
+        ],
+        "title": "Adding some new features"
+    }
+}

.github/workflows/tests/check-pull-requests/test-pull-request.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+source "$(dirname "$0")/../env.sh"
+testworkflow pull_request && \
+testworkflow pull_request draft && \
+testworkflow pull_request no-release-notes && \
+! testworkflow pull_request missing-label && \
+! testworkflow pull_request title-tag

.github/workflows/tests/env.sh

@@ -2,17 +2,23 @@
 
 function testworkflow() {
     local EVENT_TYPE=$1
+    local SCENARIO=$2
     # Get workflow name
     local TEST_PATH
     TEST_PATH=$(dirname "$(readlink -f "${BASH_SOURCE[1]}")")
     local WORKFLOW_NAME
     WORKFLOW_NAME=$(basename "$TEST_PATH")
     local WORKFLOW_FILE=.github/workflows/${WORKFLOW_NAME}.yaml
-    local PAYLOAD_FILE=${TEST_PATH}/payload-${EVENT_TYPE//_/-}.json
+    local PAYLOAD_FILE
+    PAYLOAD_FILE=${TEST_PATH}/payload-${EVENT_TYPE//_/-}
+    if [ "$SCENARIO" != "" ]; then
+        PAYLOAD_FILE=${PAYLOAD_FILE}-${SCENARIO}
+    fi
+    PAYLOAD_FILE=${PAYLOAD_FILE}.json
     # Move to project root directory
     local FILE_PATH
     FILE_PATH=$(dirname "$0")
-    cd "$FILE_PATH/../../../../" || exit 1
+    pushd "$FILE_PATH/../../../../" || exit 1
     # Check if workflow file and payload file exist
     if [ ! -f "$WORKFLOW_FILE" ]; then
         echo "Workflow file not found: $WORKFLOW_FILE"
@@ -29,4 +35,10 @@ function testworkflow() {
         --container-architecture linux/amd64 \
         --secret GITHUB_TOKEN="$(gh auth token)" \
         --verbose
+    # Capture the exit code
+    local EXIT_CODE=$?
+    # Move back to initial directory
+    popd || exit 1
+    # Return the test exit code
+    return $EXIT_CODE
 }

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java

@@ -4,6 +4,7 @@
 import datadog.trace.api.config.ProfilingConfig;
 import datadog.trace.api.profiling.QueueTiming;
 import datadog.trace.api.profiling.Timer;
+import datadog.trace.api.profiling.Timing;
 import datadog.trace.api.sampling.PerRecordingRateLimiter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
@@ -35,21 +36,28 @@ public static <T> void startQueuingTimer(
   }
 
   public static void startQueuingTimer(State state, Class<?> schedulerClass, Object task) {
-    if (Platform.isNativeImageBuilder()) {
+    if (Platform.isNativeImage()) {
       // explicitly not supported for Graal native image
       return;
     }
     // avoid calling this before JFR is initialised because it will lead to reading the wrong
     // TSC frequency before JFR has set it up properly
-    if (task != null
-        && state != null
-        && InstrumentationBasedProfiling.isJFRReady()
-        && RateLimiterHolder.RATE_LIMITER.permit()) {
+    if (task != null && state != null && InstrumentationBasedProfiling.isJFRReady()) {
       QueueTiming timing =
           (QueueTiming) AgentTracer.get().getProfilingContext().start(Timer.TimerType.QUEUEING);
       timing.setTask(task);
       timing.setScheduler(schedulerClass);
       state.setTiming(timing);
     }
   }
+
+  public static void stopQueuingTimer(Timing timing) {
+    if (Platform.isNativeImage()) {
+      // explicitly not supported for Graal native image
+      return;
+    }
+    if (timing != null && timing.sample() && RateLimiterHolder.RATE_LIMITER.permit()) {
+      timing.report();
+    }
+  }
 }

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/State.java

@@ -85,7 +85,7 @@ public boolean isTimed() {
   public void stopTiming() {
     Timing timing = TIMING.getAndSet(this, null);
     if (timing != null) {
-      timing.close();
+      QueueTimerHelper.stopQueuingTimer(timing);
     }
   }
 }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/coverage/percentage/JacocoCoverageCalculator.java

@@ -16,6 +16,7 @@
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -43,6 +44,7 @@
 import org.jacoco.report.IReportVisitor;
 import org.jacoco.report.InputStreamSourceFileLocator;
 import org.jacoco.report.html.HTMLFormatter;
+import org.jacoco.report.xml.XMLFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -290,12 +292,23 @@ private void dumpCoverageReport(IBundleCoverage coverageBundle, File reportFolde
     }
     try {
       final HTMLFormatter htmlFormatter = new HTMLFormatter();
-      final IReportVisitor visitor =
+
+      final IReportVisitor htmlVisitor =
           htmlFormatter.createVisitor(new FileMultiReportOutput(reportFolder));
-      visitor.visitInfo(Collections.emptyList(), Collections.emptyList());
-      visitor.visitBundle(
+      htmlVisitor.visitInfo(Collections.emptyList(), Collections.emptyList());
+      htmlVisitor.visitBundle(
           coverageBundle, new RepoIndexFileLocator(repoIndexProvider.getIndex(), repoRoot));
-      visitor.visitEnd();
+      htmlVisitor.visitEnd();
+
+      File xmlReport = new File(reportFolder, "jacoco.xml");
+      try (FileOutputStream xmlReportStream = new FileOutputStream(xmlReport)) {
+        XMLFormatter xmlFormatter = new XMLFormatter();
+        IReportVisitor xmlVisitor = xmlFormatter.createVisitor(xmlReportStream);
+        xmlVisitor.visitInfo(Collections.emptyList(), Collections.emptyList());
+        xmlVisitor.visitBundle(
+            coverageBundle, new RepoIndexFileLocator(repoIndexProvider.getIndex(), repoRoot));
+        xmlVisitor.visitEnd();
+      }
     } catch (Exception e) {
       LOGGER.error("Error while creating report in {}", reportFolder, e);
     }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java

@@ -2,6 +2,7 @@
 
 import static datadog.trace.api.civisibility.CIConstants.CI_VISIBILITY_INSTRUMENTATION_NAME;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
+import static datadog.trace.util.Strings.toJson;
 
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.DDTestSuite;
@@ -22,6 +23,7 @@
 import datadog.trace.civisibility.source.SourceResolutionException;
 import datadog.trace.civisibility.utils.SpanUtils;
 import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.function.Consumer;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
@@ -113,7 +115,7 @@ public TestSuiteImpl(
     this.testClass = testClass;
 
     if (config.isCiVisibilitySourceDataEnabled()) {
-      populateSourceDataTags(testClass, sourcePathResolver);
+      populateSourceDataTags(span, testClass, sourcePathResolver, codeowners);
     }
 
     testDecorator.afterStart(span);
@@ -130,17 +132,31 @@ public TestSuiteImpl(
     }
   }
 
-  private void populateSourceDataTags(Class<?> testClass, SourcePathResolver sourcePathResolver) {
-    if (this.testClass == null) {
+  private void populateSourceDataTags(
+      AgentSpan span,
+      Class<?> testClass,
+      SourcePathResolver sourcePathResolver,
+      Codeowners codeowners) {
+    if (testClass == null) {
       return;
     }
+
+    String sourcePath;
     try {
-      String sourcePath = sourcePathResolver.getSourcePath(testClass);
-      if (sourcePath != null && !sourcePath.isEmpty()) {
-        span.setTag(Tags.TEST_SOURCE_FILE, sourcePath);
+      sourcePath = sourcePathResolver.getSourcePath(testClass);
+      if (sourcePath == null || sourcePath.isEmpty()) {
+        return;
       }
     } catch (SourceResolutionException e) {
       log.debug("Could not populate source path for {}", testClass, e);
+      return;
+    }
+
+    span.setTag(Tags.TEST_SOURCE_FILE, sourcePath);
+
+    Collection<String> testCodeOwners = codeowners.getOwners(sourcePath);
+    if (testCodeOwners != null) {
+      span.setTag(Tags.TEST_CODEOWNERS, toJson(testCodeOwners));
     }
   }
 

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/SpanWriterTest.groovy

@@ -0,0 +1,49 @@
+package datadog.trace.civisibility.domain
+
+import datadog.trace.agent.tooling.TracerInstaller
+import datadog.trace.api.IdGenerationStrategy
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer
+import datadog.trace.common.writer.ListWriter
+import datadog.trace.core.CoreTracer
+import datadog.trace.test.util.DDSpecification
+import spock.lang.Shared
+
+abstract class SpanWriterTest extends DDSpecification {
+  @SuppressWarnings('PropertyName')
+  @Shared
+  ListWriter TEST_WRITER
+
+  @SuppressWarnings('PropertyName')
+  @Shared
+  AgentTracer.TracerAPI TEST_TRACER
+
+  void setupSpec() {
+    TEST_WRITER = new ListWriter()
+    TEST_TRACER =
+      Spy(
+      CoreTracer.builder()
+      .writer(TEST_WRITER)
+      .idGenerationStrategy(IdGenerationStrategy.fromName("SEQUENTIAL"))
+      .build())
+    TracerInstaller.forceInstallGlobalTracer(TEST_TRACER)
+
+    TEST_TRACER.startSpan(*_) >> {
+      def agentSpan = callRealMethod()
+      agentSpan
+    }
+  }
+
+  void cleanupSpec() {
+    TEST_TRACER?.close()
+  }
+
+  void setup() {
+    assert TEST_TRACER.activeSpan() == null: "Span is active before test has started: " + TEST_TRACER.activeSpan()
+    TEST_TRACER.flush()
+    TEST_WRITER.start()
+  }
+
+  void cleanup() {
+    TEST_TRACER.flush()
+  }
+}