Merge branch 'master' into mcculls/move-inferred-proxy-code-out-of-components

Author: mcculls

.github/dependabot.yml

@@ -8,7 +8,13 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
+    labels:
+      - "comp: tooling"
+      - "tag: dependencies"
+      - "tag: no release notes"
+    commit-message:
+      prefix: "chore(ci): "
     groups:
       gh-actions-packages:
         patterns:

.github/workflows/README.md

@@ -115,6 +115,16 @@ _Action:_
 
 _Notes:_ Results are sent on both production and staging environments.
 
+### check-ci-pipelines [🔗](check-ci-pipelines.yaml)
+
+_Trigger:_ When opening or updating a PR.
+
+_Action:_ This action will check all other continuous integration jobs (Github action, Gitlab, CircleCi), and will fail if any of them fails.
+The purpose of this job is to be required for PR merges, achieving Green CI Policy.
+It got an `ignored` parameters to exclude some jobs if they are temprorary failing.
+
+_Recovery:_ Manually trigger the action on the desired branch.
+
 ### comment-on-submodule-update [🔗](comment-on-submodule-update.yaml)
 
 _Trigger:_ When creating a PR commits to `master` or a `release/*` branch with a Git Submodule update.
@@ -137,14 +147,6 @@ _Action:_ Build the Java Client Library and runs [the system tests](https://gith
 
 _Recovery:_ Manually trigger the action on the desired branch.
 
-### all-green [🔗](all-green.yaml)
-
-_Trigger:_ Any pull request.
-
-_Action:_ This action will check all other jobs (Github action, Gitlab, CircleCi), and will fail if any of them fails. This action got an `ignored` paraemters to exclude some jobs if they are temprorary failing. The purpose of this job is to be required for merges, achieving Green CI Policy.
-
-_Recovery:_ Manually trigger the action on the desired branch.
-
 ## Maintenance
 
 GitHub actions should be part of the [repository allowed actions to run](https://github.com/DataDog/dd-trace-java/settings/actions).

.github/workflows/all-green.yml renamed to .github/workflows/check-ci-pipelines.yml

@@ -16,7 +16,8 @@ permissions:
   statuses: read
 
 jobs:
-  all-jobs-are-green:
+  check-ci-pipelines:
+    name: Check CI Pipelines
     runs-on: ubuntu-latest
     steps:
       - name: Run Ensure CI Success

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelContext.java

@@ -89,6 +89,15 @@ public String toString() {
     return "OtelContext{" + "delegate=" + delegate + '}';
   }
 
+  /**
+   * Returns the underlying context.
+   *
+   * @return The underlying context.
+   */
+  public datadog.context.Context asContext() {
+    return this.delegate;
+  }
+
   private static datadog.context.ContextKey delegateKey(ContextKey key) {
     return DELEGATE_KEYS.computeIfAbsent(key, OtelContext::mapByKeyName);
   }

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/AgentTextMapPropagator.java

@@ -1,9 +1,7 @@
 package datadog.opentelemetry.shim.context.propagation;
 
 import static datadog.context.propagation.Propagators.defaultPropagator;
-import static datadog.opentelemetry.shim.trace.OtelSpanContext.fromRemote;
 import static datadog.trace.api.TracePropagationStyle.TRACECONTEXT;
-import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
 
 import datadog.opentelemetry.shim.context.OtelContext;
 import datadog.opentelemetry.shim.trace.OtelExtractedContext;
@@ -13,8 +11,6 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext.Extracted;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
 import datadog.trace.util.PropagationUtils;
-import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.TraceState;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapGetter;
@@ -45,27 +41,25 @@ public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C
     if (carrier == null) {
       return context;
     }
-    Extracted extracted =
-        extractContextAndGetSpanContext(
-            carrier,
-            (carrier1, classifier) -> {
-              for (String key : getter.keys(carrier1)) {
-                classifier.accept(key, getter.get(carrier1, key));
-              }
-            });
-    if (extracted == null) {
-      return context;
-    } else {
-      TraceState traceState = extractTraceState(extracted, carrier, getter);
-      SpanContext spanContext = fromRemote(extracted, traceState);
-      return Span.wrap(spanContext).storeInContext(OtelContext.ROOT);
-    }
+    datadog.context.Context extracted =
+        defaultPropagator()
+            .extract(
+                convertContext(context),
+                carrier,
+                (carrier1, classifier) -> {
+                  for (String key : getter.keys(carrier1)) {
+                    classifier.accept(key, getter.get(carrier1, key));
+                  }
+                });
+    return new OtelContext(extracted);
   }
 
   private static datadog.context.Context convertContext(Context context) {
-    // TODO Extract baggage too
-    // TODO Create fast path from OtelSpan --> AgentSpan delegate --> with() to inflate as full
-    // context if baggage
+    // Try to get the underlying context when injecting a Datadog context
+    if (context instanceof OtelContext) {
+      return ((OtelContext) context).asContext();
+    }
+    // Otherwise, fallback to extracting limited tracing context and recreating an OTel context from
     AgentSpanContext extract = OtelExtractedContext.extract(context);
     return AgentSpan.fromSpanContext(extract);
   }

dd-java-agent/instrumentation/java-security/src/test/groovy/test/WeakCipherTest.groovy

@@ -63,7 +63,7 @@ class WeakCipherTest extends AgentTestRunner {
   }
 
   // Key Generator
-  def "test weak cipher instrumentation"() {
+  def "test weak keygen instrumentation"() {
     setup:
     WeakCipherModule module = Mock(WeakCipherModule)
     InstrumentationBridge.registerIastModule(module)
@@ -75,7 +75,7 @@ class WeakCipherTest extends AgentTestRunner {
     1 * module.onCipherAlgorithm(_)
   }
 
-  def "test weak cipher instrumentation with provider"() {
+  def "test weak keygen instrumentation with provider"() {
     setup:
     WeakCipherModule module = Mock(WeakCipherModule)
     InstrumentationBridge.registerIastModule(module)
@@ -88,7 +88,7 @@ class WeakCipherTest extends AgentTestRunner {
     1 * module.onCipherAlgorithm(_)
   }
 
-  def "test weak cipher instrumentation with provider string"() {
+  def "test weak keygen instrumentation with provider string"() {
     setup:
     WeakCipherModule module = Mock(WeakCipherModule)
     InstrumentationBridge.registerIastModule(module)

dd-java-agent/instrumentation/kotlin-coroutines/build.gradle

@@ -2,13 +2,42 @@ plugins {
   id 'java-test-fixtures'
 }
 
+muzzle {
+  pass {
+    group = 'org.jetbrains.kotlin'
+    module = 'kotlin-stdlib'
+    versions = "[1.3.0,)"
+    extraDependency "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0"
+  }
+  pass {
+    group = 'org.jetbrains.kotlinx'
+    module = 'kotlinx-coroutines-core'
+    versions = "[1.3.0,)"
+  }
+  pass {
+    group = 'org.jetbrains.kotlinx'
+    module = 'kotlinx-coroutines-core-jvm'
+    versions = "[1.5.0,)"
+  }
+}
+
 apply from: "$rootDir/gradle/java.gradle"
 apply from: "$rootDir/gradle/test-with-kotlin.gradle"
 
+addTestSuite('latestDepTest')
+
 tasks.named("compileTestFixturesGroovy").configure {
   classpath += files(compileTestFixturesKotlin.destinationDirectory)
 }
 
+tasks.named("compileTestGroovy").configure {
+  classpath += files(compileTestKotlin.destinationDirectory)
+}
+
+tasks.named("compileLatestDepTestGroovy").configure {
+  classpath += files(compileLatestDepTestKotlin.destinationDirectory)
+}
+
 dependencies {
   api project(':dd-java-agent:instrumentation:java-concurrent')
   compileOnly libs.kotlin
@@ -20,4 +49,12 @@ dependencies {
   testFixturesApi project(':dd-java-agent:instrumentation:trace-annotation')
   testFixturesApi project(':dd-java-agent:testing')
   testFixturesApi 'com.github.spotbugs:spotbugs-annotations:4.2.0'
+
+  testImplementation libs.kotlin
+  testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0"
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:kotlin-coroutines'))
+
+  latestDepTestImplementation libs.kotlin
+  latestDepTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.+"
+  latestDepTestImplementation testFixtures(project(':dd-java-agent:instrumentation:kotlin-coroutines'))
 }