Merge branch 'master' into kr-igor/kafka-lag-spark-streaming

Author: kr-igor

.circleci/config.continue.yml.j2

@@ -500,6 +500,9 @@ jobs:
       - image: << pipeline.parameters.docker_image >>:{{ docker_image_prefix }}<< parameters.testJvm >>
 
     parameters:
+      environment:
+        type: string
+        default: ""
       testJvm:
         type: string
         default: ""
@@ -562,6 +565,7 @@ jobs:
               PROFILER_COMMAND="-XX:StartFlightRecording=settings=profile,filename=/tmp/<< parameters.stage >>-<< parameters.testJvm >>.jfr,dumponexit=true"
             fi
 
+            << parameters.environment >>
             MAVEN_OPTS="-Xms64M -Xmx512M"
             GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms<< parameters.maxDaemonHeapSize >> -Xmx<< parameters.maxDaemonHeapSize >> $PROFILER_COMMAND -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp' -Ddatadog.forkedMaxHeapSize=768M -Ddatadog.forkedMinHeapSize=128M"
             ./gradlew
@@ -1244,6 +1248,20 @@ build_test_jobs: &build_test_jobs
       matrix:
         <<: *test_matrix
 
+  - tests:
+      requires:
+        - ok_to_test
+      name: z_test_<< matrix.testJvm >>_ssi_smoke
+      environment: "DD_INJECT_FORCE=true DD_INJECTION_ENABLED=tracer"
+      gradleTarget: "stageMainDist :smokeTest"
+      gradleParameters: "-PskipFlakyTests"
+      stage: smoke
+      cacheType: smoke
+      parallelism: 4
+      maxWorkers: 3
+      matrix:
+        <<: *test_matrix
+
   - tests:
       requires:
         - ok_to_test
@@ -1286,11 +1304,23 @@ build_test_jobs: &build_test_jobs
       maxWorkers: 3
       testJvm: "8"
 
+  - tests:
+      requires:
+        - ok_to_test
+      name: z_test_8_ssi_smoke
+      environment: "DD_INJECT_FORCE=true DD_INJECTION_ENABLED=tracer"
+      gradleTarget: "stageMainDist :smokeTest"
+      gradleParameters: "-PskipFlakyTests"
+      stage: smoke
+      cacheType: smoke
+      testJvm: "8"
+
   - fan_in:
       requires:
         - z_test_<< matrix.testJvm >>_base
         - z_test_<< matrix.testJvm >>_inst
         - z_test_<< matrix.testJvm >>_smoke
+        - z_test_<< matrix.testJvm >>_ssi_smoke
       name: test_<< matrix.testJvm >>
       stage: tracing
       matrix:
@@ -1301,6 +1331,7 @@ build_test_jobs: &build_test_jobs
         - z_test_8_base
         - z_test_8_inst
         - z_test_8_smoke
+        - z_test_8_ssi_smoke
       name: test_8
       stage: tracing
       testJvm: "8"

.github/workflows/add-assets-to-release.yaml.disabled

@@ -10,4 +10,4 @@ jobs:
     steps:
       - name: Update download releases
         if: ${{ github.event_name == 'workflow_dispatch' || ( !github.event.release.draft && !github.event.release.prerelease && !startsWith(github.event.release.name, 'download-latest') ) }}
-        uses: DataDog/download-release-action@ea1f13c0cad08eafeebec8b7d9b2d6ee74efb92a # 0.0.2
+        uses: DataDog/download-release-action@eeefd56e9d1f0102ad1e6f6c8a170c7bfbc5b613 # 0.0.3

.github/workflows/update-download-releases.yaml

@@ -55,8 +55,8 @@ jaxen:jaxen:1.2.0=spotbugs
 jline:jline:2.14.6=testRuntimeClasspath
 junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.14.16=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.16=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.18=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testRuntimeClasspath
 net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 net.sf.saxon:Saxon-HE:11.4=spotbugs
 org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath

communication/gradle.lockfile

@@ -45,8 +45,8 @@ jaxen:jaxen:1.2.0=spotbugs
 jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath
 junit:junit-dep:4.11=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 junit:junit:4.13.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.14.16=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.14.16=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.18=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.18=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.java.dev.jna:jna-platform:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
 net.jcip:jcip-annotations:1.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath

dd-java-agent/agent-bootstrap/gradle.lockfile

@@ -151,7 +151,19 @@ public boolean isEnabledByDefault() {
   private static boolean debuggerEnabled = false;
   private static boolean agentlessLogSubmissionEnabled = false;
 
-  public static void start(final Instrumentation inst, final URL agentJarURL, String agentArgs) {
+  /**
+   * Starts the agent; returns a boolean indicating if Agent started successfully
+   *
+   * <p>The Agent is considered to start successfully if Instrumentation can be activated. All other
+   * pieces are considered optional.
+   */
+  public static void start(
+      final Object bootstrapInitTelemetry,
+      final Instrumentation inst,
+      final URL agentJarURL,
+      final String agentArgs) {
+    InitializationTelemetry initTelemetry = InitializationTelemetry.proxy(bootstrapInitTelemetry);
+
     StaticEventLogger.begin("Agent");
     StaticEventLogger.begin("Agent.start");
 
@@ -163,8 +175,9 @@ public static void start(final Instrumentation inst, final URL agentJarURL, Stri
       remoteConfigEnabled = false;
       telemetryEnabled = false;
       // apply trace instrumentation, but skip starting other services
-      startDatadogAgent(inst);
+      startDatadogAgent(initTelemetry, inst);
       StaticEventLogger.end("Agent.start");
+
       return;
     }
 
@@ -279,7 +292,7 @@ public void run() {
      * when it will happen after the class transformers were added.
      */
     AgentTaskScheduler.initialize();
-    startDatadogAgent(inst);
+    startDatadogAgent(initTelemetry, inst);
 
     final EnumSet<Library> libraries = detectLibraries(log);
 
@@ -326,7 +339,7 @@ public void run() {
      * logging facility. Likewise on IBM JDKs OkHttp may indirectly load 'IBMSASL' which in turn loads LogManager.
      */
     InstallDatadogTracerCallback installDatadogTracerCallback =
-        new InstallDatadogTracerCallback(inst);
+        new InstallDatadogTracerCallback(initTelemetry, inst);
     if (delayOkHttp) {
       log.debug("Custom logger detected. Delaying Datadog Tracer initialization.");
       registerLogManagerCallback(installDatadogTracerCallback);
@@ -397,10 +410,10 @@ public static synchronized Class<?> installAgentCLI() throws Exception {
   }
 
   /** Used by AgentCLI to send sample traces from the command-line. */
-  public static void startDatadogTracer() throws Exception {
+  public static void startDatadogTracer(InitializationTelemetry initTelemetry) throws Exception {
     Class<?> scoClass =
         AGENT_CLASSLOADER.loadClass("datadog.communication.ddagent.SharedCommunicationObjects");
-    installDatadogTracer(scoClass, scoClass.getConstructor().newInstance());
+    installDatadogTracer(initTelemetry, scoClass, scoClass.getConstructor().newInstance());
     startJmx(); // send runtime metrics along with the traces
   }
 
@@ -475,9 +488,12 @@ public void execute() {
   }
 
   protected static class InstallDatadogTracerCallback extends ClassLoadCallBack {
+    private final InitializationTelemetry initTelemetry;
     private final Instrumentation instrumentation;
 
-    public InstallDatadogTracerCallback(Instrumentation instrumentation) {
+    public InstallDatadogTracerCallback(
+        InitializationTelemetry initTelemetry, Instrumentation instrumentation) {
+      this.initTelemetry = initTelemetry;
       this.instrumentation = instrumentation;
     }
 
@@ -502,7 +518,7 @@ public void execute() {
         throw new UndeclaredThrowableException(e);
       }
 
-      installDatadogTracer(scoClass, sco);
+      installDatadogTracer(initTelemetry, scoClass, sco);
       maybeStartAppSec(scoClass, sco);
       maybeStartIast(scoClass, sco);
       maybeStartCiVisibility(instrumentation, scoClass, sco);
@@ -582,9 +598,9 @@ private static void maybeStartRemoteConfig(Class<?> scoClass, Object sco) {
     StaticEventLogger.end("Remote Config");
   }
 
-  private static synchronized void startDatadogAgent(final Instrumentation inst) {
+  private static synchronized void startDatadogAgent(
+      final InitializationTelemetry initTelemetry, final Instrumentation inst) {
     if (null != inst) {
-
       StaticEventLogger.begin("BytebuddyAgent");
 
       try {
@@ -595,13 +611,15 @@ private static synchronized void startDatadogAgent(final Instrumentation inst) {
         agentInstallerMethod.invoke(null, inst);
       } catch (final Throwable ex) {
         log.error("Throwable thrown while installing the Datadog Agent", ex);
+        initTelemetry.onFatalError(ex);
+      } finally {
+        StaticEventLogger.end("BytebuddyAgent");
       }
-
-      StaticEventLogger.end("BytebuddyAgent");
     }
   }
 
-  private static synchronized void installDatadogTracer(Class<?> scoClass, Object sco) {
+  private static synchronized void installDatadogTracer(
+      InitializationTelemetry initTelemetry, Class<?> scoClass, Object sco) {
     if (AGENT_CLASSLOADER == null) {
       throw new IllegalStateException("Datadog agent should have been started already");
     }
@@ -622,6 +640,8 @@ private static synchronized void installDatadogTracer(Class<?> scoClass, Object
       throw ex;
     } catch (final Throwable ex) {
       log.error("Throwable thrown while installing the Datadog Tracer", ex);
+
+      initTelemetry.onFatalError(ex);
     }
 
     StaticEventLogger.end("GlobalTracer");