cel-expr · copybara-service · Oct 14, 2025 · Oct 14, 2025
diff --git a/bundle/src/test/java/dev/cel/bundle/CelImplTest.java b/bundle/src/test/java/dev/cel/bundle/CelImplTest.java
@@ -77,7 +77,6 @@
 import dev.cel.common.CelVarDecl;
 import dev.cel.common.ast.CelExpr;
 import dev.cel.common.ast.CelExpr.CelList;
-import dev.cel.common.internal.ProtoTimeUtils;
 import dev.cel.common.testing.RepeatedTestProvider;
 import dev.cel.common.types.CelKind;
 import dev.cel.common.types.CelProtoMessageTypes;
@@ -114,6 +113,7 @@
 import dev.cel.runtime.CelVariableResolver;
 import dev.cel.runtime.UnknownContext;
 import dev.cel.testing.testdata.proto3.StandaloneGlobalEnum;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -817,27 +817,30 @@ public void program_messageConstruction() throws Exception {
  public void program_duplicateTypeDescriptor() throws Exception {
    Cel cel =
        standardCelBuilderWithMacros()
+            .setOptions(CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build())
            .addMessageTypes(Timestamp.getDescriptor())
            .addMessageTypes(ImmutableList.of(Timestamp.getDescriptor()))
            .setContainer(CelContainer.ofName("google"))
            .setResultType(SimpleType.TIMESTAMP)
            .build();
    CelRuntime.Program program =
        cel.createProgram(cel.compile("protobuf.Timestamp{seconds: 12}").getAst());
-    assertThat(program.eval()).isEqualTo(ProtoTimeUtils.fromSecondsToTimestamp(12));
+
+    assertThat(program.eval()).isEqualTo(Instant.ofEpochSecond(12));
  }

  @Test
  public void program_hermeticDescriptors_wellKnownProtobuf() throws Exception {
    Cel cel =
        standardCelBuilderWithMacros()
+            .setOptions(CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build())
            .addMessageTypes(Timestamp.getDescriptor())
            .setContainer(CelContainer.ofName("google"))
            .setResultType(SimpleType.TIMESTAMP)
            .build();
    CelRuntime.Program program =
        cel.createProgram(cel.compile("protobuf.Timestamp{seconds: 12}").getAst());
-    assertThat(program.eval()).isEqualTo(ProtoTimeUtils.fromSecondsToTimestamp(12));
+    assertThat(program.eval()).isEqualTo(Instant.ofEpochSecond(12));
  }

  @Test
@@ -959,14 +962,15 @@ public void program_deepTypeResolutionDisabledForRuntime_fails() throws Exceptio
  public void program_typeProvider() throws Exception {
    Cel cel =
        standardCelBuilderWithMacros()
+            .setOptions(CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build())
            .setTypeProvider(
                new DescriptorTypeProvider(ImmutableList.of(Timestamp.getDescriptor())))
            .setContainer(CelContainer.ofName("google"))
            .setResultType(SimpleType.TIMESTAMP)
            .build();
    CelRuntime.Program program =
        cel.createProgram(cel.compile("protobuf.Timestamp{seconds: 12}").getAst());
-    assertThat(program.eval()).isEqualTo(ProtoTimeUtils.fromSecondsToTimestamp(12));
+    assertThat(program.eval()).isEqualTo(Instant.ofEpochSecond(12));
  }

  @Test

diff --git a/common/src/main/java/dev/cel/common/CelOptions.java b/common/src/main/java/dev/cel/common/CelOptions.java
@@ -462,6 +462,8 @@ public abstract static class Builder {
     *       com.google.protobuf.ByteString}.
     *   <li>CEL null: {@code dev.cel.common.values.NullValue} instead of {@code
     *       com.google.protobuf.NullValue}.
+     *   <li>Timestamp: {@code java.time.Instant} instead of {@code com.google.protobuf.Timestamp}.
+     *   <li>Duration: {@code java.time.Duration} instead of {@code com.google.protobuf.Duration}.
     * </ul>
     */
    public abstract Builder evaluateCanonicalTypesToNativeValues(boolean value);

diff --git a/common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java b/common/src/test/java/dev/cel/common/internal/ProtoAdapterTest.java
@@ -41,6 +41,7 @@
 import com.google.type.Expr;
 import dev.cel.common.CelOptions;
 import dev.cel.common.values.CelByteString;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -88,11 +89,10 @@ public static List<Object[]> data() {
            {1.5D, Any.pack(DoubleValue.of(1.5D))},
            {1.5D, Value.newBuilder().setNumberValue(1.5D).build()},
            {
-              Duration.newBuilder().setSeconds(123).build(),
-              Duration.newBuilder().setSeconds(123).build(),
+              java.time.Duration.ofSeconds(123), Duration.newBuilder().setSeconds(123).build(),
            },
            {
-              Duration.newBuilder().setSeconds(123).build(),
+              java.time.Duration.ofSeconds(123),
              Any.pack(Duration.newBuilder().setSeconds(123).build()),
            },
            {1L, Int64Value.of(1L)},
@@ -132,12 +132,10 @@ public static List<Object[]> data() {
                  .build(),
            },
            {
-              Timestamp.newBuilder().setSeconds(123).build(),
-              Timestamp.newBuilder().setSeconds(123).build(),
+              Instant.ofEpochSecond(123), Timestamp.newBuilder().setSeconds(123).build(),
            },
            {
-              Timestamp.newBuilder().setSeconds(123).build(),
-              Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
+              Instant.ofEpochSecond(123), Any.pack(Timestamp.newBuilder().setSeconds(123).build()),
            },
            {UnsignedLong.valueOf(1L), UInt64Value.of(1L)},
            {UnsignedLong.valueOf(1L), Any.pack(UInt64Value.of(1L))},
@@ -152,7 +150,10 @@ public static List<Object[]> data() {
    @Test
    public void adaptValueToProto_bidirectionalConversion() {
      DynamicProto dynamicProto = DynamicProto.create(DefaultMessageFactory.INSTANCE);
-      ProtoAdapter protoAdapter = new ProtoAdapter(dynamicProto, CelOptions.DEFAULT);
+      ProtoAdapter protoAdapter =
+          new ProtoAdapter(
+              dynamicProto,
+              CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build());
      assertThat(protoAdapter.adaptValueToProto(value, proto.getDescriptorForType().getFullName()))
          .isEqualTo(proto);
      assertThat(protoAdapter.adaptProtoToValue(proto)).isEqualTo(value);

diff --git a/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java b/common/src/test/java/dev/cel/common/values/ProtoMessageValueProviderTest.java
@@ -28,7 +28,6 @@
 import dev.cel.common.internal.DefaultMessageFactory;
 import dev.cel.common.internal.DynamicProto;
 import dev.cel.common.internal.ProtoMessageFactory;
-import dev.cel.common.internal.ProtoTimeUtils;
 import dev.cel.expr.conformance.proto2.TestAllTypes;
 import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
 import java.time.Duration;
@@ -66,7 +65,8 @@ public void newValue_createEmptyProtoMessage() {
  @Test
  public void newValue_createProtoMessage_fieldsPopulated() {
    ProtoMessageValueProvider protoMessageValueProvider =
-        ProtoMessageValueProvider.newInstance(CelOptions.DEFAULT, DYNAMIC_PROTO);
+        ProtoMessageValueProvider.newInstance(
+            CelOptions.current().evaluateCanonicalTypesToNativeValues(true).build(), DYNAMIC_PROTO);

    ProtoMessageValue protoMessageValue =
        (ProtoMessageValue)
@@ -89,9 +89,9 @@ public void newValue_createProtoMessage_fieldsPopulated() {
                        "single_string",
                        "hello",
                        "single_timestamp",
-                        ProtoTimeUtils.fromSecondsToTimestamp(50),
+                        Instant.ofEpochSecond(50),
                        "single_duration",
-                        ProtoTimeUtils.fromSecondsToDuration(100)))
+                        Duration.ofSeconds(100)))
                .get();

    assertThat(protoMessageValue.isZeroValue()).isFalse();