gh-worker-dd-mergequeue-cf854d · Oct 23, 2026 · Oct 21, 2026 · Oct 22, 2026 · Oct 22, 2026 · Oct 23, 2026
@@ -399,9 +399,10 @@
 **/kafka*/**/*Iast*                                                                          @DataDog/asm-java @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 
 # @DataDog/feature-flagging-and-experimentation-sdk
-/dd-openfeature/              @DataDog/feature-flagging-and-experimentation-sdk
-/dd-smoke-tests/openfeature/  @DataDog/feature-flagging-and-experimentation-sdk
-/products/feature-flagging/   @DataDog/feature-flagging-and-experimentation-sdk
+/dd-java-agent/instrumentation/datadog/openfeature/  @DataDog/feature-flagging-and-experimentation-sdk
+/dd-openfeature/                                     @DataDog/feature-flagging-and-experimentation-sdk
+/dd-smoke-tests/openfeature/                         @DataDog/feature-flagging-and-experimentation-sdk
+/products/feature-flagging/                          @DataDog/feature-flagging-and-experimentation-sdk
 
 # @DataDog/profiling-java
 /dd-java-agent/ddprof-lib/                                                                              @DataDog/profiling-java

@@ -0,0 +1,31 @@
+plugins {
+  id 'dd-trace-java.module.instrumentation'
+}
+
+// TODO Add a muzzle pass directive on com.datadoghq:dd-openfeature once the SDK is published.
+
+tracerJava {
+  addSourceSetFor(JavaVersion.VERSION_11)
+}
+
+testJvmConstraints {
+  minJavaVersion = JavaVersion.VERSION_11
+}
+
+dependencies {
+  main_java11CompileOnly project(':dd-openfeature')
+  main_java11CompileOnly project(':products:feature-flagging:feature-flagging-bootstrap')
+  main_java11CompileOnly libs.spotbugs.annotations
+
+  testImplementation project(':dd-openfeature')
+  testImplementation project(':products:feature-flagging:feature-flagging-bootstrap')
+  testImplementation libs.bundles.mockito
+}
+
+tasks.named("compileMain_java11Java", JavaCompile) {
+  configureCompiler(it, JavaVersion.VERSION_11)
+}
+
+tasks.named("compileTestJava", JavaCompile) {
+  configureCompiler(it, JavaVersion.VERSION_11)
+}
@@ -0,0 +1,132 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:datadog:openfeature:dd-openfeature-1.69:dependencies --write-locks
+cafe.cryptography:curve25519-elisabeth:0.1.0=testRuntimeClasspath
+cafe.cryptography:ed25519-elisabeth:0.1.0=testRuntimeClasspath
+ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath
+com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath
+com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath
+com.datadoghq:dd-instrument-java:0.0.6=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.datadoghq:dd-openfeature:1.67.0=legacySdk
+com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath
+com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.20.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.20.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.javaparser:javaparser-core:3.25.6=codenarc
+com.github.jnr:jffi:1.3.15=testRuntimeClasspath
+com.github.jnr:jnr-a64asm:1.0.0=testRuntimeClasspath
+com.github.jnr:jnr-constants:0.10.4=testRuntimeClasspath
+com.github.jnr:jnr-enxio:0.32.20=testRuntimeClasspath
+com.github.jnr:jnr-ffi:2.2.19=testRuntimeClasspath
+com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath
+com.github.jnr:jnr-unixsocket:0.38.25=testRuntimeClasspath
+com.github.jnr:jnr-x86asm:1.0.2=testRuntimeClasspath
+com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,main_java11CompileClasspath,spotbugs
+com.github.spotbugs:spotbugs:4.10.4=spotbugs
+com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
+com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
+com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor
+com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor
+com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,main_java11CompileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.code.gson:gson:2.14.0=spotbugs
+com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor
+com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.48.0=spotbugs
+com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
+com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor
+com.google.guava:guava:33.6.0-jre=testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor
+com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath
+com.google.re2j:re2j:1.8=testRuntimeClasspath
+com.squareup.moshi:moshi:1.11.0=testCompileClasspath,testRuntimeClasspath
+com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
+com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
+com.squareup.okio:okio:1.17.5=testCompileClasspath,testRuntimeClasspath
+com.thoughtworks.qdox:qdox:1.12.1=codenarc
+commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
+commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
+commons-io:commons-io:2.21.0=spotbugs
+de.thetaphi:forbiddenapis:3.11=compileClasspath,testCompileClasspath,testRuntimeClasspath
+dev.openfeature:sdk:1.23.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
+io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
+io.opentelemetry:opentelemetry-api:1.66.0=testRuntimeClasspath
+io.opentelemetry:opentelemetry-common:1.66.0=testRuntimeClasspath
+io.opentelemetry:opentelemetry-context:1.66.0=testRuntimeClasspath
+io.sqreen:libsqreen:17.5.0=testRuntimeClasspath
+javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
+jaxen:jaxen:2.0.6=spotbugs
+junit:junit:4.13.2=testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath
+net.java.dev.jna:jna:5.8.0=testRuntimeClasspath
+net.sf.saxon:Saxon-HE:12.10=spotbugs
+org.apache.ant:ant-antlr:1.10.14=codenarc
+org.apache.ant:ant-junit:1.10.14=codenarc
+org.apache.bcel:bcel:6.12.0=spotbugs
+org.apache.commons:commons-lang3:3.20.0=spotbugs
+org.apache.commons:commons-text:1.15.0=spotbugs
+org.apache.logging.log4j:log4j-api:2.26.1=spotbugs
+org.apache.logging.log4j:log4j-core:2.26.1=spotbugs
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testRuntimeClasspath
+org.checkerframework:checker-qual:3.33.0=annotationProcessor,testAnnotationProcessor
+org.codehaus.groovy:groovy-ant:3.0.23=codenarc
+org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
+org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
+org.codehaus.groovy:groovy-json:3.0.23=codenarc
+org.codehaus.groovy:groovy-json:3.0.25=testCompileClasspath,testRuntimeClasspath
+org.codehaus.groovy:groovy-templates:3.0.23=codenarc
+org.codehaus.groovy:groovy-xml:3.0.23=codenarc
+org.codehaus.groovy:groovy:3.0.23=codenarc
+org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath
+org.codenarc:CodeNarc:3.7.0=codenarc
+org.dom4j:dom4j:2.2.0=spotbugs
+org.gmetrics:GMetrics:2.1.0=codenarc
+org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath
+org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
+org.jctools:jctools-core-jdk11:4.0.6=testRuntimeClasspath
+org.jctools:jctools-core:4.0.6=testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
+org.junit.platform:junit-platform-runner:1.14.1=testRuntimeClasspath
+org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath
+org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath
+org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath
+org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
+org.ow2.asm:asm-analysis:9.10.1=spotbugs
+org.ow2.asm:asm-analysis:9.7.1=testRuntimeClasspath
+org.ow2.asm:asm-commons:9.10.1=spotbugs,testRuntimeClasspath
+org.ow2.asm:asm-tree:9.10.1=spotbugs,testRuntimeClasspath
+org.ow2.asm:asm-util:9.10.1=spotbugs
+org.ow2.asm:asm-util:9.7.1=testRuntimeClasspath
+org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
+org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
+org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
+org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath
+org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
+org.slf4j:slf4j-api:2.0.18=spotbugs
+org.slf4j:slf4j-api:2.0.19=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
+org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
+org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
+org.tabletest:tabletest-junit:1.2.2=testCompileClasspath,testRuntimeClasspath
+org.tabletest:tabletest-parser:1.2.1=testCompileClasspath,testRuntimeClasspath
+org.xmlresolver:xmlresolver:5.3.3=spotbugs
+empty=main_java11AnnotationProcessor,spotbugsPlugins
@@ -0,0 +1,55 @@
+package datadog.trace.instrumentation.openfeature;
+
+import static datadog.trace.agent.tooling.InstrumenterModule.TargetSystem.FEATURE_FLAGS;
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isStatic;
+import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.InstrumenterModule;
+import java.util.Set;
+
+/**
+ * Connects the {@code dd-openfeature} SDK to the agent: Remote Configuration, the event platform
+ * proxy, health metrics and span enrichment.
+ */
+@SuppressWarnings("unused")
+@AutoService(InstrumenterModule.class)
+public class DDOpenFeatureInstrumentation extends InstrumenterModule
+    implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+
+  public DDOpenFeatureInstrumentation() {
+    super("openfeature");
+  }
+
+  @Override
+  public boolean isApplicable(final Set<TargetSystem> enabledSystems) {
+    return enabledSystems.contains(FEATURE_FLAGS);
+  }
+
+  @Override
+  public String instrumentedType() {
+    return "com.datadog.openfeature.internal.bridge.v1.AgentBridges";
+  }
+
+  @Override
+  public String[] helperClassNames() {
+    // Helpers are compiled in the java11 source set, out of reach of helper discovery.
+    return new String[] {
+      packageName + ".AgentConfigurationSource",
+      packageName + ".AgentEventProxy",
+      packageName + ".AgentHealthMetrics",
+      packageName + ".AgentSpanEnricher",
+      packageName + ".JavaAgentBridge",
+    };
+  }
+
+  @Override
+  public void methodAdvice(final MethodTransformer transformer) {
+    transformer.applyAdvice(
+        isMethod().and(isStatic()).and(named("detect")).and(takesNoArguments()),
+        packageName + ".DetectBridgeAdvice");
+  }
+}
@@ -0,0 +1,19 @@
+package datadog.trace.instrumentation.openfeature;
+
+import com.datadog.openfeature.internal.bridge.v1.ConfigurationSource;
+import datadog.trace.api.featureflag.FeatureFlaggingGateway;
+import java.util.function.Consumer;
+
+/** Receives the flag configuration from the agent Remote Configuration client. */
+public final class AgentConfigurationSource implements ConfigurationSource {
+  private final FeatureFlaggingGateway.Backend backend;
+
+  AgentConfigurationSource(final FeatureFlaggingGateway.Backend backend) {
+    this.backend = backend;
+  }
+
+  @Override
+  public AutoCloseable subscribe(final Consumer<byte[]> listener) {
+    return this.backend.subscribeRemoteConfig(listener);
+  }
+}
@@ -0,0 +1,22 @@
+package datadog.trace.instrumentation.openfeature;
+
+import com.datadog.openfeature.internal.bridge.v1.EventProxyUnavailableException;
+import com.datadog.openfeature.internal.bridge.v1.EventTransport;
+import datadog.trace.api.featureflag.FeatureFlaggingGateway;
+import java.io.IOException;
+
+/** Posts events through the Datadog Agent event platform proxy. */
+public final class AgentEventProxy implements EventTransport {
+  private final FeatureFlaggingGateway.Backend backend;
+
+  AgentEventProxy(final FeatureFlaggingGateway.Backend backend) {
+    this.backend = backend;
+  }
+
+  @Override
+  public void post(final String route, final byte[] json) throws IOException {
+    if (!this.backend.postEvent(route, json)) {
+      throw new EventProxyUnavailableException("Datadog Agent event platform proxy unavailable");
+    }
+  }
+}
@@ -0,0 +1,19 @@
+package datadog.trace.instrumentation.openfeature;
+
+import com.datadog.openfeature.internal.bridge.v1.HealthMetrics;
+import datadog.trace.api.featureflag.FeatureFlaggingGateway;
+import javax.annotation.Nullable;
+
+/** Reports the SDK health counters through the agent telemetry. */
+public final class AgentHealthMetrics implements HealthMetrics {
+  private final FeatureFlaggingGateway.Backend backend;
+
+  AgentHealthMetrics(final FeatureFlaggingGateway.Backend backend) {
+    this.backend = backend;
+  }
+
+  @Override
+  public void count(final String metric, final long value, @Nullable final String reason) {
+    this.backend.count(metric, value, reason);
+  }
+}
@@ -0,0 +1,25 @@
+package datadog.trace.instrumentation.openfeature;
+
+import com.datadog.openfeature.internal.bridge.v1.SpanEnricher;
+import datadog.trace.api.featureflag.FeatureFlaggingGateway;
+import javax.annotation.Nullable;
+
+/** Reflects flag evaluations onto the agent local root span. */
+public final class AgentSpanEnricher implements SpanEnricher {
+  private final FeatureFlaggingGateway.Backend backend;
+
+  AgentSpanEnricher(final FeatureFlaggingGateway.Backend backend) {
+    this.backend = backend;
+  }
+
+  @Override
+  public void serialId(
+      final int serialId, final boolean doLog, @Nullable final String targetingKey) {
+    this.backend.enrichSerialId(serialId, doLog, targetingKey);
+  }
+
+  @Override
+  public void runtimeDefault(final String flagKey, @Nullable final Object defaultValue) {
+    this.backend.enrichRuntimeDefault(flagKey, defaultValue);
+  }
+}
@@ -0,0 +1,14 @@
+package datadog.trace.instrumentation.openfeature;
+
+import static net.bytebuddy.asm.Advice.OnMethodExit;
+import static net.bytebuddy.asm.Advice.Return;
+
+import com.datadog.openfeature.internal.bridge.v1.AgentBridge;
+
+@SuppressWarnings("unused")
+public class DetectBridgeAdvice {
+  @OnMethodExit(suppress = Throwable.class)
+  public static void detect(@Return(readOnly = false) AgentBridge bridge) {
+    bridge = JavaAgentBridge.connect(bridge);
+  }
+}