Skip to content

feat(parametric/java): enable FFE span-enrichment scenario for Java #7150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
leoromanovsky wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(parametric/java): enable FFE span-enrichment scenario for Java #7150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3703,7 +3703,7 @@ manifest:
tests/parametric/test_dynamic_configuration.py::TestDynamicConfigV1_ServiceTargets::test_not_match_service_target: irrelevant (APMAPI-1003)
tests/parametric/test_dynamic_configuration.py::TestDynamicConfigV2: v1.31.0
tests/parametric/test_ffe/test_dynamic_evaluation.py::Test_Feature_Flag_Dynamic_Evaluation: v1.56.0
tests/parametric/test_ffe/test_span_enrichment.py: missing_feature
tests/parametric/test_ffe/test_span_enrichment.py: v1.64.0
tests/parametric/test_headers_b3.py::Test_Headers_B3::test_headers_b3_migrated_extract_invalid: # Modified by easy win activation script
- declaration: missing_feature (Need to remove b3=b3multi alias)
component_version: <1.58.2+06122213c8
Expand Down
79 changes: 61 additions & 18 deletions ...rametric/src/main/java/com/datadoghq/trace/controller/FeatureFlagEvaluatorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;

import com.datadoghq.trace.opentracing.controller.OpenTracingController;
import com.fasterxml.jackson.annotation.JsonAlias;
import datadog.trace.api.DDSpanId;
import datadog.trace.api.openfeature.Provider;
import dev.openfeature.sdk.Client;
import dev.openfeature.sdk.EvaluationContext;
Expand All @@ -13,6 +15,9 @@
import dev.openfeature.sdk.ProviderState;
import dev.openfeature.sdk.Structure;
import dev.openfeature.sdk.Value;
import io.opentracing.Scope;
import io.opentracing.Span;
import io.opentracing.util.GlobalTracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -78,26 +83,19 @@ public ResponseEntity<Map<String, Object>> evaluate(@RequestBody final EvaluateR
Object value;
String reason;
final EvaluationContext context = context(request);
// Re-activate the caller-supplied root span around the eval so the ffe_* tags (Phase 2) land
// on the test's span. The client sends span_id as a decimal STRING (see
// _test_client_parametric.py:814-815); the OT registry is keyed by DDSpanId.from(...).
// An unknown/missing/unparsable span_id leaves target null -> skip activation, never throw (T-01-DOS).
final Span target = resolveSpan(request.getSpanId());
try {
value = switch (request.getVariationType()) {
case "BOOLEAN" ->
client.getBooleanValue(request.getFlag(), (Boolean) request.getDefaultValue(), context);
case "STRING" -> client.getStringValue(request.getFlag(), (String) request.getDefaultValue(), context);
case "INTEGER" -> {
final Number integerEval = (Number) request.getDefaultValue();
yield client.getIntegerValue(request.getFlag(), integerEval.intValue(), context);
if (target != null) {
try (Scope scope = GlobalTracer.get().scopeManager().activate(target)) {
value = evaluate(request, context);
}
case "NUMERIC" -> {
final Number doubleEval = (Number) request.getDefaultValue();
yield client.getDoubleValue(request.getFlag(), doubleEval.doubleValue(), context);
}
case "JSON" -> {
final Value objectValue = client.getObjectValue(request.getFlag(), Value.objectToValue(request.getDefaultValue()), context);
yield context.convertValue(objectValue);
}
default -> request.getDefaultValue();
};

} else {
value = evaluate(request, context);
}
reason = "DEFAULT";
} catch (Throwable e) {
LOGGER.error("Error on resolution", e);
Expand All @@ -110,6 +108,40 @@ public ResponseEntity<Map<String, Object>> evaluate(@RequestBody final EvaluateR
return ResponseEntity.ok(result);
}

/** Look up a span by the (string) span_id the test client sends; null when missing/unparsable. */
private static Span resolveSpan(final String spanId) {
if (spanId == null || spanId.isEmpty()) {
return null;
}
try {
return OpenTracingController.getSpan(DDSpanId.from(spanId));
} catch (Throwable e) {
LOGGER.warn("Could not resolve span for span_id {}", spanId, e);
return null;
}
}

private Object evaluate(final EvaluateRequest request, final EvaluationContext context) {
return switch (request.getVariationType()) {
case "BOOLEAN" ->
client.getBooleanValue(request.getFlag(), (Boolean) request.getDefaultValue(), context);
case "STRING" -> client.getStringValue(request.getFlag(), (String) request.getDefaultValue(), context);
case "INTEGER" -> {
final Number integerEval = (Number) request.getDefaultValue();
yield client.getIntegerValue(request.getFlag(), integerEval.intValue(), context);
}
case "NUMERIC" -> {
final Number doubleEval = (Number) request.getDefaultValue();
yield client.getDoubleValue(request.getFlag(), doubleEval.doubleValue(), context);
}
case "JSON" -> {
final Value objectValue = client.getObjectValue(request.getFlag(), Value.objectToValue(request.getDefaultValue()), context);
yield context.convertValue(objectValue);
}
default -> request.getDefaultValue();
};
}

private static EvaluationContext context(final EvaluateRequest request) {
final MutableContext context = new MutableContext();
context.setTargetingKey(request.getTargetingKey());
Expand Down Expand Up @@ -141,12 +173,23 @@ public static class EvaluateRequest {
private Object defaultValue;
@JsonAlias("targeting_key")
private String targetingKey;
// The test client sends span_id as a STRING (see _test_client_parametric.py:814-815).
@JsonAlias("span_id")
private String spanId;
private Map<String, Object> attributes;

public Map<String, Object> getAttributes() {
return attributes;
}

public String getSpanId() {
return spanId;
}

public void setSpanId(String spanId) {
this.spanId = spanId;
}

public void setAttributes(Map<String, Object> attributes) {
this.attributes = attributes;
}
Expand Down
Loading