Merge branch 'master' into zgu/ddprof-release_1.29.0

Author: jbachorik

.gitlab-ci.yml

@@ -601,11 +601,12 @@ agent_integration_tests:
     GRADLE_TARGET: "traceAgentTest"
     CACHE_TYPE: "base"
   services:
-    - name: datadog/agent:7.34.0
+    - name: registry.ddbuild.io/images/mirror/datadog/agent:7.40.1
       alias: local-agent
       variables:
         DD_APM_ENABLED: "true"
         DD_BIND_HOST: "0.0.0.0"
+        DD_HOSTNAME: "local-agent"
         DD_API_KEY: "invalid_key_but_this_is_fine"
 
 test_base:

BUILDING.md

@@ -69,10 +69,16 @@ Download and install JDK versions 8, 11, 17, 21 and 24, and GraalVM 17 for your
   ```shell
   brew install --cask zulu@8 zulu@11 zulu@17 zulu@21 zulu graalvm/tap/graalvm-ce-java17
   ```
-* Fix the GraalVM installation by [removing the quarantine flag](https://www.graalvm.org/latest/docs/getting-started/macos/):
+* Identify your local version of GraalVM:
+  ```
+  ls /Library/Java/JavaVirtualMachines | grep graalvm
+  ```
+  Example: `graalvm-ce-java17-22.3.1`
+* Use this version in the following command to fix the GraalVM installation by [removing the quarantine flag](https://www.graalvm.org/latest/docs/getting-started/macos/):
   ```
   sudo xattr -r -d com.apple.quarantine /Library/Java/JavaVirtualMachines/graalvm-<current version of graalvm>
   ```
+  Example: `/Library/Java/JavaVirtualMachines/graalvm-ce-java17-22.3.1`
 * Add the required environment variables to your shell using the `export` command. You can permanently install the environment variables by appending the `export` commands into your shell configuration file `~/.zshrc` or `.bashrc` or other.
   ```shell
   export JAVA_8_HOME=/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Home

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCache.java

@@ -62,6 +62,11 @@ static class AnnotatedRegion {
     this.smapsPath = smapsPath;
   }
 
+  // @VisibleForTesting
+  void invalidate() {
+    UPDATER.getAndSet(this, System.nanoTime() - (2 * ttl));
+  }
+
   @SuppressWarnings("unchecked")
   public List<SmapEntryEvent> getEvents() {
     long prevTimestamp = lastTimestamp;
@@ -296,9 +301,9 @@ private static Map<Long, String> getAnnotatedRegions() {
     return Collections.emptyMap();
   }
 
-  private static void collectEvents(List<SmapEntryEvent> events) {
+  private void collectEvents(List<SmapEntryEvent> events) {
     try (BufferedReader br =
-        new BufferedReader(new InputStreamReader(Files.newInputStream(SMAPS_PATH)), 64 * 1024)) {
+        new BufferedReader(new InputStreamReader(Files.newInputStream(smapsPath)), 64 * 1024)) {
       readEvents(br, events);
       Map<Long, String> regions = getAnnotatedRegions();
       for (SmapEntryEvent e : events) {

dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/events/SmapEntryCacheTest.java

@@ -18,16 +18,14 @@ void getEvents() throws Exception {
     assumeTrue(OperatingSystem.isLinux());
     // We need at least Java 22 for the annotated regions
     assumeTrue(JavaVirtualMachine.isJavaVersionAtLeast(22));
-    SmapEntryCache smapEntryCache = new SmapEntryCache(Duration.ofMillis(100));
+    SmapEntryCache smapEntryCache =
+        new SmapEntryCache(Duration.ofHours(1)); // set up a really long expiration duration
     List<SmapEntryEvent> events1 = smapEntryCache.getEvents();
     List<SmapEntryEvent> events2 = smapEntryCache.getEvents();
     // the cache is using double buffered event list so we can use identity comparison
     assertSame(events1, events2);
 
-    long ts = System.nanoTime();
-    while (System.nanoTime() - ts < 150_000_000L) { // make sure the cache is expired
-      Thread.sleep(200);
-    }
+    smapEntryCache.invalidate(); // pretend expiring the cache
     events1 = smapEntryCache.getEvents();
     assertNotSame(events1, events2);
   }

dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy

@@ -18,10 +18,11 @@ abstract class AbstractTraceAgentTest extends DDSpecification {
      and we use 'testcontainers' for this.
      */
     if ("true" != System.getenv("CI")) {
-      agentContainer = new GenericContainer("datadog/agent:7.34.0")
+      agentContainer = new GenericContainer("datadog/agent:7.40.1")
         .withEnv(["DD_APM_ENABLED": "true",
           "DD_BIND_HOST"  : "0.0.0.0",
           "DD_API_KEY"    : "invalid_key_but_this_is_fine",
+          "DD_HOSTNAME"   : "doesnotexist",
           "DD_LOGS_STDOUT": "yes"])
         .withExposedPorts(datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_PORT)
         .withStartupTimeout(Duration.ofSeconds(120))

gradle/forbiddenapis.gradle

@@ -1,9 +1,22 @@
 buildscript {
   repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
+    mavenLocal()
+    if (project.rootProject.hasProperty("gradlePluginProxy")) {
+      maven {
+        url project.rootProject.property("gradlePluginProxy")
+        allowInsecureProtocol true
+      }
     }
+    if (project.rootProject.hasProperty("mavenRepositoryProxy")) {
+      maven {
+        url project.rootProject.property("mavenRepositoryProxy")
+        allowInsecureProtocol true
+      }
+    }
+    gradlePluginPortal()
+    mavenCentral()
   }
+
   dependencies {
     classpath "de.thetaphi:forbiddenapis:3.8"
   }