Merge branch 'master' into kr-igor/dsm-service-name-override

Author: kr-igor

.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 c87bd359aad64a29f280fc5c70a879f7c7f4846e
+default_system_tests_commit: &default_system_tests_commit 53d9b2c43876a39e5c0426f4df4dd5fd79d062e8
 
 parameters:
   nightly:
@@ -971,19 +971,20 @@ jobs:
             cd system-tests
             set +e
             RUN_ATTEMPTS=1
-            while [ $RUN_ATTEMPTS -le 3 ]; do
+            MAX_ATTEMPTS=1 # Disable retries as the runner is supposed to be stable. Revert to 3 if needed.
+            while [ $RUN_ATTEMPTS -le $MAX_ATTEMPTS ]; do
               echo "Running parametric test attempt $RUN_ATTEMPTS"
-              timeout 20m ./run.sh PARAMETRIC -L java --log-cli-level=DEBUG --durations=30 -vv
+              timeout 20m ./run.sh PARAMETRIC --library java --durations=30 -vv
               status=$?
-              #timneout returns 124 if it times out
-              #if the return code is not 124, then we exit with the status
+              # timeout returns 124 if it times out
+              # if the return code is not 124, then we exit with the status
               if [ $status -ne 124 ]; then
                 exit $status
                 break
               fi
               RUN_ATTEMPTS=$((RUN_ATTEMPTS+1))
-              if [ $RUN_ATTEMPTS -eq 4 ]; then
-                #Max attempts reached, exit with 124
+              if [ $RUN_ATTEMPTS -gt $MAX_ATTEMPTS ]; then
+                # Max attempts reached, exit with 124
                 exit 124
               fi
             done
@@ -994,9 +995,11 @@ jobs:
       - run:
           name: Collect artifacts
           command: tar -cvzf logs_java_parametric_dev.tar.gz -C system-tests logs_parametric
+          when: always
 
       - store_artifacts:
           path: logs_java_parametric_dev.tar.gz
+          when: always
 
 
 build_test_jobs: &build_test_jobs

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Bug Report
+    url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:java
+    about: This option creates an expedited Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private.
+  - name: Feature Request
+    url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:java&tf_1260825272270=pt_apm_category_feature_request
+    about: This option creates an expedited Feature Request via the helpdesk (no login required). This helps with prioritization and allows you to provide additional information in private.

.github/workflows/analyze-changes.yaml

@@ -132,7 +132,7 @@ jobs:
           ls -laR "./workspace/.trivy"
 
       - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
+        uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2 # v0.28.0
         with:
           scan-type: rootfs
           scan-ref: './workspace/.trivy/'

.github/workflows/update-gradle-dependencies.yaml

@@ -77,5 +77,5 @@ jobs:
             --base master \
             --head $BRANCH_NAME \
             --label "tag: dependencies" \
-            --label "tag: no release notes"
+            --label "tag: no release notes" \
             --body-file -

BUILDING.md

@@ -54,7 +54,7 @@ Requirements to build the full project:
 `brew install --cask zulu@8 zulu@11 zulu@17 zulu@21 graalvm/tap/graalvm-ce-java17`
 * 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>`
-* Add the required environment variables to your shell using the `export` command.
+* 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  
 export JAVA_11_HOME=/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home
@@ -63,6 +63,7 @@ export JAVA_21_HOME=/Library/Java/JavaVirtualMachines/zulu-21.jdk/Contents/Home
 export JAVA_GRAALVM17_HOME=/Library/Java/JavaVirtualMachines/graalvm-<current version of graalvm>/Contents/Home
 export JAVA_HOME=$JAVA_8_HOME
 ```
+* Restart your shell after applying the changes if you appended the commands to your shell configuration file.
 
 > [!NOTE] 
 > ARM users: there is no Oracle JDK v8 for ARM. 
@@ -72,15 +73,11 @@ export JAVA_HOME=$JAVA_8_HOME
 > [!NOTE]
 > MacOS users: remember that `/usr/libexec/java_home` may control which JDK is in your path.
 
-> [!NOTE]
-> You can permanently install the environment variables by appending the `export` commands into your shell configuration file `~/.zshrc` or `.bashrc` or other.
-> You will need to restart your shell after applying the changes.
-
 **On Linux:**
 
 * Download and extract JDK 8, 11, 17 and 21 from [Eclipse Temurin releases](https://adoptium.net/temurin/releases/) and GraalVM from [Oracle downloads](https://www.graalvm.org/downloads/).
 * Install the GraalVM native image requirements for native builds by following [the GraalVM official documentation](https://www.graalvm.org/latest/reference-manual/native-image/#prerequisites).
-* Add the required environment variables to your shell using the `export` command.
+* 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=/<path to extracted archive>/jdk8u<current version of JDK 8>
 export JAVA_11_HOME=/<path to extracted archive>/jdk-11.<current version of JDK 11>
@@ -89,10 +86,7 @@ export JAVA_21_HOME=/<path to extracted archive>/jdk-21.<current version of JDK
 export JAVA_GRAALVM17_HOME=/<path to extracted archive>/graalvm-jdk-17.<current version of graalvm>/Contents/Home
 export JAVA_HOME=$JAVA_8_HOME
 ```
-
-> [!NOTE]
-> You can permanently install the environment variables by appending the `export` commands into your shell configuration file `~/.zshrc` or `.bashrc` or other.
-> You will need to restart your shell after applying the changes.
+* Restart your shell after applying the changes if you appended the commands to your shell configuration file.
 
 **On Windows:**
 

CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 Pull requests for bug fixes are welcome, but before submitting new features or changes to current
 functionality, please [open an issue](https://github.com/DataDog/dd-trace-java/issues/new)
-and discuss your ideas or propose the changes you wish to make first. After a resolution is reached a [PR can be
+and discuss your ideas or propose the changes you wish to make first. After a resolution is reached, a [PR can be
 submitted](#pull-request-guidelines) for review.
 
 ## Adding instrumentations
@@ -18,7 +18,7 @@ Check [How Instrumentations Work](docs/how_instrumentations_work.md) for a deep
 ### Development environment quick check
 
 Prior to contributing to the project, you can quickly check your development environment using the `./setup.sh` command
-line, and fix any issue found using the [Building documentation](BUILDING.md).
+line and fix any issue found using the [Building documentation](BUILDING.md).
 
 ### Automatic code formatting
 
@@ -27,73 +27,73 @@ This file is supported by most common text editors.
 
 We have automatic code formatting enabled in Gradle configuration using [Spotless](https://github.com/diffplug/spotless)
 [Gradle plugin](https://github.com/diffplug/spotless/tree/master/plugin-gradle).
-Main goal is to avoid extensive reformatting caused by different IDEs having different opinion about how things should
-be formatted by establishing single _point of truth_.
+Our main goal is to avoid extensive reformatting caused by different IDEs with different opinions about how things should
+be formatted by establishing a single _point of truth_.
 
 To reformat all the files that need reformatting:
 
 ```bash
 ./gradlew spotlessApply
 ```
 
-To run formatting verify task only:
+To run the formatting verify task only:
 
 ```bash
 ./gradlew spotlessCheck
 ```
 
 #### IntelliJ IDEA
 
-For IntelliJ IDEA, we suggest the following settings and plugin:
+For IntelliJ IDEA, we suggest the following settings and plugin.
 
-In contrast to the [IntelliJ IDEA set up](CONTRIBUTING.md#intellij-idea) the default JVM to build and run tests from the
-command line should be Java 8.
+The default JVM to build and run tests from the command line should be Java 8.
 
-* Use Java 8 to build and run tests:  
-  `Project Structure` > `Project` > `SDK` > Use a JDK 1.8
-* Configure import formatting:  
-  `Editor` > `Code Style` > `Java/Groovy` > `Imports`
+* Use Java 8 to build and run tests:
+  * `Project Structure` -> `Project` -> `SDK` -> `Download JDK...` -> `Version: 1.8` -> `Download`
+* Configure Java and Groovy import formatting:  
+  * `Settings...` ->`Editor` > `Code Style` > `Java` > `Imports`
     * `Class count to use import with '*'`: `9999` (some number sufficiently large that is unlikely to matter)
     * `Names count to use static import with '*'`: `9999`
-    * With java use the following import layout (groovy should still use the default) to ensure consistency with
-      google-java-format:
+    * Use the following import layout to ensure consistency with google-java-format:
       ![import layout](https://user-images.githubusercontent.com/734411/43430811-28442636-94ae-11e8-86f1-f270ddcba023.png)
-* [Google Java Format](https://plugins.jetbrains.com/plugin/8527-google-java-format) plugin
+  * top right Settings icon -> `Settings...` ->`Editor` > `Code Style` > `Groovy` > `Imports`
+    * `Class count to use import with '*'`: `9999` (some number sufficiently large that is unlikely to matter)
+    * `Names count to use static import with '*'`: `9999`
+* Install the [Google Java Format](https://plugins.jetbrains.com/plugin/8527-google-java-format) plugin
 
 ### Troubleshooting
 
 * Gradle fails with a "too many open files" error.
-    * You can check the `ulimit` for open files in your current shell by doing `ulimit -n` and raise it by
-      calling `ulimit -n <new number>`
+    * You can check the `ulimit` for open files in your current shell by running `ulimit -n`.
+    * You can raise the `ulimit` by running `ulimit -n <new number>`
 
 <details>
-  <summary>More past issues</summary>
+  <summary>Past issues</summary>
 
 * When Gradle is building the project, the
   error `Could not find netty-transport-native-epoll-4.1.43.Final-linux-x86_64.jar` is shown.
-    * Execute `rm -rf  ~/.m2/repository/io/netty/netty-transport*` in a Terminal and re-build again.
+    * Execute `rm -rf  ~/.m2/repository/io/netty/netty-transport*` in a Terminal and re-build.
 
 * IntelliJ 2021.3
-  complains `Failed to find KotlinGradleProjectData for GradleSourceSetData` https://youtrack.jetbrains.com/issue/KTIJ-20173
-    * Switch to `IntelliJ IDEA CE 2021.2.3`
-
-* IntelliJ Gradle fails to import the project with `JAVA_11_HOME must be set to build Java 11 code`
-    * A workaround is to run IntelliJ from terminal with `JAVA_11_HOME`
-    * In order to verify what's visible from IntelliJ use `Add Configuration` bar and go
-      to `Add New` -> `Gradle` -> `Environmental Variables`
+  complains `Failed to find KotlinGradleProjectData for GradleSourceSetData` https://youtrack.jetbrains.com/issue/KTIJ-20173.
+    * Switch to `IntelliJ IDEA CE 2021.2.3`.
 
+* IntelliJ Gradle fails to import the project with `JAVA_11_HOME must be set to build Java 11 code`.
+    * A workaround is to run IntelliJ from your terminal with `JAVA_11_HOME`.
+    * In order to verify what's visible from IntelliJ, use the `Add Configuration` bar and go
+      to `Add New` -> `Gradle` -> `Environmental Variables`.
 </details>
 
-## Pull Request Guidelines
+## Pull request guidelines
 
 ### Draft first
 
-When opening a pull request, please open it as a [draft](https://github.blog/2019-02-14-introducing-draft-pull-requests/) to not auto assign reviewers before you feel the pull request is in a reviewable state.
+When opening a pull request, please open it as a [draft](https://github.blog/2019-02-14-introducing-draft-pull-requests/) to not auto-assign reviewers before the pull request is in a reviewable state.
 
-### Title Format
+### Title format
 
 Pull request titles should briefly describe the proposed changes in a way that makes sense for the users.
-They should be a sentence starting with an infinitive verb, and avoid using prefixes like `[PROD]` or `PROD - ` in favor of [labels](#labels).
+They should be a sentence starting with an infinitive verb and avoid using prefixes like `[PROD]` or `PROD - ` in favor of [labels](#labels).
 
 >[!CAUTION]
 > Don't title:
@@ -119,7 +119,7 @@ Both pull requests and issues should be labelled with at least a component or an
 >[!TIP]
 > Always add a `comp:` or `inst:` label, and a `type:` label. 
 
-Labels are not only used to categorize but also alter the continuous integration behavior:
+Labels are used to not only categorize but also alter the continuous integration behavior:
 
 * `tag: no release note` to exclude a pull request from the next release changelog. Use it when changes are not relevant to the users like:
   * Internal features changes
@@ -133,16 +133,16 @@ Labels are not only used to categorize but also alter the continuous integration
 > For reference, the [full list of all labels available](https://github.com/DataDog/dd-trace-java/labels).
 > If you feel one is missing, let [the maintainer team](https://github.com/orgs/DataDog/teams/apm-java) know!
 
-## Pull Request Reviews
+## Pull request reviews
 
-### Review Expectations
+### Review expectations
 
-After making you pull request ready for review by converting it from draft, you can expect getting an initial review comment within two working days, and a full review within a week of work.
+After making your pull request ready for review by converting it from a draft, you can expect to get an initial review comment within two working days and a full review within a week of work.
 If you don't receive any update, feel free to send a nice reminder to the assigned reviewers using pull request comments or our internal Slack channel.
 
-### Stale Pull Requests
+### Stale pull requests
 
 A pull request is considered "stale" if it has had no activity (comments, updates) for the last quarter.
-Stale PRs will be commented and labelled as such (using the `tag: stale` label), then closed if they still receive no update for a week after.
+Stale PRs will be commented and labeled as such (using the `tag: stale` label), and then closed if they receive no update after a week.
 
-Closed PRs can be reopened at any time, but may be closed again if they ever meet the same stale conditions.
+Closed PRs can be reopened at any time, but they may be closed again if they meet the same stale conditions.

communication/gradle.lockfile

@@ -73,7 +73,7 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
 org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
 org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
 org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-compat-qual:2.5.5=testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.13.0=testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath

communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java

@@ -9,7 +9,6 @@
 import datadog.communication.monitor.Recording;
 import datadog.trace.api.telemetry.LogCollector;
 import datadog.trace.util.Strings;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
@@ -200,7 +199,7 @@ private String probeTracesEndpoint(String[] endpoints) {
           state = response.header(DATADOG_AGENT_STATE);
           return candidate;
         }
-      } catch (IOException e) {
+      } catch (Throwable e) {
         errorQueryingEndpoint(candidate, e);
       }
     }
@@ -310,7 +309,7 @@ private static void discoverStatsDPort(final Map<String, Object> info) {
       }
       int statsdPort = ((Number) statsdPortObj).intValue();
       DDAgentStatsDClientManager.setDefaultStatsDPort(statsdPort);
-    } catch (Exception ex) {
+    } catch (Throwable ex) {
       log.debug("statsd_port missing from trace agent /info response", ex);
     }
   }

communication/src/main/java/datadog/communication/serialization/Codec.java

@@ -1,14 +1,28 @@
 package datadog.communication.serialization;
 
+import datadog.communication.serialization.custom.stacktrace.StackTraceEventFrameWriter;
+import datadog.communication.serialization.custom.stacktrace.StackTraceEventWriter;
+import datadog.trace.util.stacktrace.StackTraceEvent;
+import datadog.trace.util.stacktrace.StackTraceFrame;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public final class Codec extends ClassValue<ValueWriter<?>> {
 
-  public static final Codec INSTANCE = new Codec();
+  private static final Map<Class<?>, ValueWriter<?>> defaultConfig =
+      Stream.of(
+              new Object[][] {
+                {StackTraceEvent.class, new StackTraceEventWriter()},
+                {StackTraceFrame.class, new StackTraceEventFrameWriter()},
+              })
+          .collect(Collectors.toMap(data -> (Class<?>) data[0], data -> (ValueWriter<?>) data[1]));
+
+  public static final Codec INSTANCE = new Codec(defaultConfig);
 
   private final Map<Class<?>, ValueWriter<?>> config;
 

communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventFrameWriter.java

@@ -0,0 +1,58 @@
+package datadog.communication.serialization.custom.stacktrace;
+
+import datadog.communication.serialization.EncodingCache;
+import datadog.communication.serialization.ValueWriter;
+import datadog.communication.serialization.Writable;
+import datadog.trace.util.Strings;
+import datadog.trace.util.stacktrace.StackTraceFrame;
+
+public class StackTraceEventFrameWriter implements ValueWriter<StackTraceFrame> {
+
+  @Override
+  public void write(StackTraceFrame value, Writable writable, EncodingCache encodingCache) {
+    int mapSize = 1; // id always present
+    boolean hasText = Strings.isNotBlank(value.getText());
+    boolean hasFile = Strings.isNotBlank(value.getFile());
+    boolean hasLine = value.getLine() != null;
+    boolean hasClass = Strings.isNotBlank(value.getClass_name());
+    boolean hasFunction = Strings.isNotBlank(value.getFunction());
+    if (hasText) {
+      mapSize++;
+    }
+    if (hasFile) {
+      mapSize++;
+    }
+    if (hasLine) {
+      mapSize++;
+    }
+    if (hasClass) {
+      mapSize++;
+    }
+    if (hasFunction) {
+      mapSize++;
+    }
+    writable.startMap(mapSize);
+    writable.writeString("id", encodingCache);
+    writable.writeInt(value.getId());
+    if (hasText) {
+      writable.writeString("text", encodingCache);
+      writable.writeString(value.getText(), encodingCache);
+    }
+    if (hasFile) {
+      writable.writeString("file", encodingCache);
+      writable.writeString(value.getFile(), encodingCache);
+    }
+    if (hasLine) {
+      writable.writeString("line", encodingCache);
+      writable.writeInt(value.getLine());
+    }
+    if (hasClass) {
+      writable.writeString("class_name", encodingCache);
+      writable.writeString(value.getClass_name(), encodingCache);
+    }
+    if (hasFunction) {
+      writable.writeString("function", encodingCache);
+      writable.writeString(value.getFunction(), encodingCache);
+    }
+  }
+}