Skip to content

Implement trace for planner #1031

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

Merged
copybara-service merged 1 commit into from
Apr 23, 2026
Merged

Implement trace for planner #1031

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
1 change: 0 additions & 1 deletion extensions/src/main/java/dev/cel/extensions/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ java_library(
":extension_library",
"//checker:checker_builder",
"//common:compiler_common",
"//common:options",
"//common/ast",
"//common/exceptions:numeric_overflow",
"//common/internal:comparison_functions",
Expand Down
4 changes: 2 additions & 2 deletions extensions/src/test/java/dev/cel/extensions/CelExtensionTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
* planner runtime, along with parsed-only and checked expression evaluations for the planner.
*/
abstract class CelExtensionTestBase {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter CelRuntimeFlavor runtimeFlavor;
@TestParameter boolean isParseOnly;

@Before
public void setUpBase() {
Expand Down
4 changes: 2 additions & 2 deletions extensions/src/test/java/dev/cel/extensions/CelMathExtensionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@

@RunWith(TestParameterInjector.class)
public class CelMathExtensionsTest {
@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter public boolean isParseOnly;
@TestParameter private CelRuntimeFlavor runtimeFlavor;
@TestParameter private boolean isParseOnly;

private Cel cel;

Expand Down
2 changes: 1 addition & 1 deletion policy/src/test/java/dev/cel/policy/CelPolicyCompilerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public final class CelPolicyCompilerImplTest {
.enableHeterogeneousNumericComparisons(true)
.build();

@TestParameter public CelRuntimeFlavor runtimeFlavor;
@TestParameter private CelRuntimeFlavor runtimeFlavor;

@Test
public void compileYamlPolicy_success(@TestParameter TestYamlPolicy yamlPolicy) throws Exception {
Expand Down
6 changes: 6 additions & 0 deletions runtime/planner/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ java_library(
name = "program_planner",
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:program_planner"],
)

java_library(
name = "planned_program",
visibility = ["//:internal"],
exports = ["//runtime/src/main/java/dev/cel/runtime/planner:planned_program"],
)
5 changes: 5 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,11 @@ java_library(
"//common/values:cel_value_provider",
"//common/values:combined_cel_value_provider",
"//common/values:proto_message_value_provider",
"//runtime:activation",
"//runtime:interpretable",
"//runtime:proto_message_activation_factory",
"//runtime:resolved_overload",
"//runtime/planner:planned_program",
"//runtime/planner:program_planner",
"//runtime/standard:type",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
56 changes: 49 additions & 7 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.CombinedCelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.planner.PlannedProgram;
import dev.cel.runtime.planner.ProgramPlanner;
import dev.cel.runtime.standard.TypeFunction;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.jspecify.annotations.Nullable;

Expand Down Expand Up @@ -98,6 +100,21 @@ public Program createProgram(CelAbstractSyntaxTree ast) throws CelEvaluationExce
return toRuntimeProgram(planner().plan(ast));
}

private static final CelFunctionResolver EMPTY_FUNCTION_RESOLVER =
new CelFunctionResolver() {
@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Collection<String> overloadIds, Object[] args) {
return Optional.empty();
}

@Override
public Optional<CelResolvedOverload> findOverloadMatchingArgs(
String functionName, Object[] args) {
return Optional.empty();
}
};

public Program toRuntimeProgram(dev.cel.runtime.Program program) {
return new Program() {

Expand All @@ -119,7 +136,13 @@ public Object eval(Map<String, ?> mapValue, CelFunctionResolver lateBoundFunctio

@Override
public Object eval(Message message) throws CelEvaluationException {
throw new UnsupportedOperationException("Not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
/* listener= */ null);
}

@Override
Expand All @@ -141,25 +164,38 @@ public Object eval(PartialVars partialVars) throws CelEvaluationException {

@Override
public Object trace(CelEvaluationListener listener) throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(GlobalResolver.EMPTY, EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Map<String, ?> mapValue, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), EMPTY_FUNCTION_RESOLVER, null, listener);
}

@Override
public Object trace(Message message, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
PlannedProgram plannedProgram = (PlannedProgram) program;
return plannedProgram.evalOrThrow(
plannedProgram.interpretable(),
ProtoMessageActivationFactory.fromProto(message, plannedProgram.options()),
EMPTY_FUNCTION_RESOLVER,
/* partialVars= */ null,
listener);
}

@Override
public Object trace(CelVariableResolver resolver, CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
EMPTY_FUNCTION_RESOLVER,
null,
listener);
}

@Override
Expand All @@ -168,7 +204,12 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(
(name) -> resolver.find(name).orElse(null),
lateBoundFunctionResolver,
null,
listener);
}

@Override
Expand All @@ -177,7 +218,8 @@ public Object trace(
CelFunctionResolver lateBoundFunctionResolver,
CelEvaluationListener listener)
throws CelEvaluationException {
throw new UnsupportedOperationException("Trace is not yet supported.");
return ((PlannedProgram) program)
.trace(Activation.copyOf(mapValue), lateBoundFunctionResolver, null, listener);
}

@Override
Expand Down
30 changes: 28 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/planner/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,21 @@ java_library(
java_library(
name = "planned_program",
srcs = ["PlannedProgram.java"],
tags = [
],
deps = [
":error_metadata",
":localized_evaluation_exception",
":planned_interpretable",
"//:auto_value",
"//common:options",
"//common/annotations",
"//common/exceptions:runtime_exception",
"//common/values",
"//runtime:activation",
"//runtime:evaluation_exception",
"//runtime:evaluation_exception_builder",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:interpreter_util",
Expand All @@ -85,6 +89,7 @@ java_library(
"//runtime:resolved_overload",
"//runtime:variable_resolver",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All @@ -93,6 +98,7 @@ java_library(
srcs = ["EvalConstant.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All @@ -104,6 +110,7 @@ java_library(
deps = [
":planned_interpretable",
":qualifier",
"//common/ast",
"@maven//:com_google_errorprone_error_prone_annotations",
],
)
Expand Down Expand Up @@ -183,6 +190,7 @@ java_library(
":interpretable_attribute",
":planned_interpretable",
":qualifier",
"//common/ast",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
],
Expand All @@ -196,6 +204,7 @@ java_library(
":planned_interpretable",
":presence_test_qualifier",
":qualifier",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand All @@ -208,6 +217,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All @@ -221,6 +231,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All @@ -234,6 +245,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All @@ -248,6 +260,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
Expand All @@ -262,6 +275,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//common/values",
"//runtime:accumulated_unknowns",
Expand All @@ -278,6 +292,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All @@ -291,6 +306,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All @@ -303,6 +319,7 @@ java_library(
srcs = ["EvalConditional.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
Expand All @@ -316,11 +333,11 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/types:type_providers",
"//common/values",
"//common/values:cel_value_provider",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All @@ -333,8 +350,8 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//runtime:accumulated_unknowns",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All @@ -348,6 +365,7 @@ java_library(
":eval_helpers",
":localized_evaluation_exception",
":planned_interpretable",
"//common/ast",
"//common/exceptions:duplicate_key",
"//common/exceptions:invalid_argument",
"//runtime:accumulated_unknowns",
Expand All @@ -364,6 +382,7 @@ java_library(
deps = [
":activation_wrapper",
":planned_interpretable",
"//common/ast",
"//common/exceptions:runtime_exception",
"//common/values:mutable_map_value",
"//runtime:accumulated_unknowns",
Expand Down Expand Up @@ -421,13 +440,16 @@ java_library(
deps = [
":localized_evaluation_exception",
"//common:options",
"//common/ast",
"//common/exceptions:iteration_budget_exceeded",
"//runtime:evaluation_exception",
"//runtime:evaluation_listener",
"//runtime:function_resolver",
"//runtime:interpretable",
"//runtime:partial_vars",
"//runtime:resolved_overload",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:org_jspecify_jspecify",
],
)

Expand All @@ -437,6 +459,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All @@ -451,6 +474,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/exceptions:overload_not_found",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All @@ -465,6 +489,7 @@ java_library(
deps = [
":eval_helpers",
":planned_interpretable",
"//common/ast",
"//common/values",
"//runtime:accumulated_unknowns",
"//runtime:interpretable",
Expand All @@ -478,6 +503,7 @@ java_library(
srcs = ["EvalBlock.java"],
deps = [
":planned_interpretable",
"//common/ast",
"//runtime:evaluation_exception",
"//runtime:interpretable",
"@maven//:com_google_errorprone_error_prone_annotations",
Expand Down
Loading
Loading