google · copybara-service · Mar 20, 2026 · Mar 20, 2026
diff --git a/bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java b/bundle/src/main/java/dev/cel/bundle/CelExperimentalFactory.java
@@ -50,11 +50,7 @@ public static CelBuilder plannerCelBuilder() {
                 CelCheckerLegacyImpl.newBuilder().setStandardEnvironmentEnabled(true)),
             CelRuntimeImpl.newBuilder())
         // CEL-Internal-2
-        .setOptions(
-            CelOptions.current()
-                .enableHeterogeneousNumericComparisons(true)
-                .enableTimestampEpoch(true)
-                .build());
+        .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
   }
 
   private CelExperimentalFactory() {}

diff --git a/bundle/src/test/java/dev/cel/bundle/CelImplTest.java b/bundle/src/test/java/dev/cel/bundle/CelImplTest.java
@@ -2109,7 +2109,6 @@ public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws E
         standardCelBuilderWithMacros()
             .addMessageTypes(descriptors)
             // CEL-Internal-2
-            .setOptions(CelOptions.current().enableTimestampEpoch(true).build())
             .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
             .build();
     CelAbstractSyntaxTree ast =

diff --git a/checker/src/test/java/dev/cel/checker/CelCheckerLegacyImplTest.java b/checker/src/test/java/dev/cel/checker/CelCheckerLegacyImplTest.java
@@ -63,7 +63,7 @@ public void toCheckerBuilder_isImmutable() {
   public void toCheckerBuilder_singularFields_copied() {
     CelStandardDeclarations subsetDecls =
         CelStandardDeclarations.newBuilder().includeFunctions(StandardFunction.BOOL).build();
-    CelOptions celOptions = CelOptions.current().enableTimestampEpoch(true).build();
+    CelOptions celOptions = CelOptions.current().build();
     CelContainer celContainer = CelContainer.ofName("foo");
     CelType expectedResultType = SimpleType.BOOL;
     CelTypeProvider customTypeProvider =

diff --git a/common/src/main/java/dev/cel/common/CelOptions.java b/common/src/main/java/dev/cel/common/CelOptions.java
@@ -293,14 +293,20 @@ public abstract static class Builder {
     public abstract Builder enableHomogeneousLiterals(boolean value);
 
     /**
-     * Enable the {@code int64_to_timestamp} overload which creates a timestamp from Uxix epoch
+     * Enable the {@code int64_to_timestamp} overload which creates a timestamp from Unix epoch
      * seconds.
      *
-     * <p>This option will be automatically enabled after a sufficient period of time has elapsed to
-     * ensure that all runtimes support the implementation.
+     * <p>Historically used to opt-in to this feature, this option is now enabled by default across
+     * all runtimes.
      *
      * <p>TODO: Remove this feature once it has been auto-enabled.
+     *
+     * @deprecated This option is now enabled by default. If you are passing {@code true}, simply
+     *     remove this method call. If you are passing {@code false} to disable this feature, subset
+     *     the environment instead using {@code dev.cel.checker.CelStandardDeclarations} and {@code
+     *     dev.cel.runtime.CelStandardFunctions}.
      */
+    @Deprecated
     public abstract Builder enableTimestampEpoch(boolean value);
 
     /**

diff --git a/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java b/conformance/src/test/java/dev/cel/conformance/ConformanceTest.java
@@ -58,7 +58,6 @@ public final class ConformanceTest extends Statement {
 
   private static final CelOptions OPTIONS =
       CelOptions.current()
-          .enableTimestampEpoch(true)
           .enableHeterogeneousNumericComparisons(true)
           .enableProtoDifferencerEquality(true)
           .enableOptionalSyntax(true)

diff --git a/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java b/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java
@@ -123,11 +123,7 @@ private CelBuilder newCelBuilder(int version) {
     }
 
     return celBuilder
-        .setOptions(
-            CelOptions.current()
-                .enableTimestampEpoch(true)
-                .enableHeterogeneousNumericComparisons(true)
-                .build())
+        .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build())
         .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
         .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
         .addMessageTypes(TestAllTypes.getDescriptor())

diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java
@@ -47,7 +47,7 @@
 @RunWith(TestParameterInjector.class)
 public class ConstantFoldingOptimizerTest {
   private static final CelOptions CEL_OPTIONS =
-      CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build();
+      CelOptions.current().populateMacroCalls(true).build();
   private static final Cel CEL =
       CelFactory.standardCelBuilder()
           .addVar("x", SimpleType.DYN)

diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/InliningOptimizerTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/InliningOptimizerTest.java
@@ -58,8 +58,7 @@ public class InliningOptimizerTest {
               "child",
               StructTypeReference.create(TestAllTypes.NestedMessage.getDescriptor().getFullName()))
           .addVar("shadowed_ident", SimpleType.INT)
-          .setOptions(
-              CelOptions.current().populateMacroCalls(true).enableTimestampEpoch(true).build())
+          .setOptions(CelOptions.current().populateMacroCalls(true).build())
           .build();
 
   @Test

diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerBaselineTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerBaselineTest.java
@@ -265,8 +265,7 @@ private static CelBuilder newCelBuilder() {
         .addMessageTypes(TestAllTypes.getDescriptor())
         .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
         .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
-        .setOptions(
-            CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
+        .setOptions(CelOptions.current().populateMacroCalls(true).build())
         .addCompilerLibraries(
             CelExtensions.optional(), CelExtensions.bindings(), CelExtensions.comprehensions())
         .addRuntimeLibraries(CelExtensions.optional(), CelExtensions.comprehensions())

diff --git a/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java b/optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java
@@ -105,8 +105,7 @@ private static CelBuilder newCelBuilder() {
     return CelFactory.standardCelBuilder()
         .addMessageTypes(TestAllTypes.getDescriptor())
         .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
-        .setOptions(
-            CelOptions.current().enableTimestampEpoch(true).populateMacroCalls(true).build())
+        .setOptions(CelOptions.current().populateMacroCalls(true).build())
         .addCompilerLibraries(CelExtensions.bindings())
         .addFunctionDeclarations(
             CelFunctionDecl.newFunctionDeclaration(

diff --git a/runtime/src/main/java/dev/cel/runtime/CelRuntimeExperimentalFactory.java b/runtime/src/main/java/dev/cel/runtime/CelRuntimeExperimentalFactory.java
@@ -41,11 +41,7 @@ public final class CelRuntimeExperimentalFactory {
   public static CelRuntimeBuilder plannerRuntimeBuilder() {
     return CelRuntimeImpl.newBuilder()
         // CEL-Internal-2
-        .setOptions(
-            CelOptions.current()
-                .enableTimestampEpoch(true)
-                .enableHeterogeneousNumericComparisons(true)
-                .build());
+        .setOptions(CelOptions.current().enableHeterogeneousNumericComparisons(true).build());
   }
 
   private CelRuntimeExperimentalFactory() {}

diff --git a/runtime/src/test/java/dev/cel/runtime/ActivationTest.java b/runtime/src/test/java/dev/cel/runtime/ActivationTest.java
@@ -33,11 +33,10 @@
 public final class ActivationTest {
 
   private static final CelOptions TEST_OPTIONS =
-      CelOptions.current().enableTimestampEpoch(true).enableUnsignedLongs(true).build();
+      CelOptions.current().enableUnsignedLongs(true).build();
 
   private static final CelOptions TEST_OPTIONS_SKIP_UNSET_FIELDS =
       CelOptions.current()
-          .enableTimestampEpoch(true)
           .enableUnsignedLongs(true)
           .fromProtoUnsetFieldOption(CelOptions.ProtoUnsetFieldOptions.SKIP)
           .build();

diff --git a/runtime/src/test/java/dev/cel/runtime/CelStandardFunctionsTest.java b/runtime/src/test/java/dev/cel/runtime/CelStandardFunctionsTest.java
@@ -224,7 +224,7 @@ public void unsignedLongsDisabled_int64Identity_throws() {
   public void timestampEpochDisabled_int64Identity_throws() {
     CelCompiler celCompiler =
         CelCompilerFactory.standardCelCompilerBuilder()
-            .setOptions(CelOptions.current().enableTimestampEpoch(true).build())
+            .setOptions(CelOptions.current().build())
             .build();
     CelRuntime celRuntime =
         CelRuntimeFactory.standardCelRuntimeBuilder()

diff --git a/runtime/src/test/java/dev/cel/runtime/DescriptorTypeResolverTest.java b/runtime/src/test/java/dev/cel/runtime/DescriptorTypeResolverTest.java
@@ -24,7 +24,6 @@
 import dev.cel.bundle.CelFactory;
 import dev.cel.common.CelAbstractSyntaxTree;
 import dev.cel.common.CelContainer;
-import dev.cel.common.CelOptions;
 import dev.cel.common.types.OpaqueType;
 import dev.cel.common.types.OptionalType;
 import dev.cel.common.types.ProtoMessageTypeProvider;
@@ -44,7 +43,6 @@ public class DescriptorTypeResolverTest {
 
   private static final Cel CEL =
       CelFactory.standardCelBuilder()
-          .setOptions(CelOptions.current().enableTimestampEpoch(true).build())
           .setTypeProvider(PROTO_MESSAGE_TYPE_PROVIDER)
           .addCompilerLibraries(CelOptionalLibrary.INSTANCE)
           .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)

diff --git a/runtime/src/test/java/dev/cel/runtime/PlannerInterpreterTest.java b/runtime/src/test/java/dev/cel/runtime/PlannerInterpreterTest.java
@@ -198,7 +198,6 @@ public void planner_unknownResultSet_success() {
     celRuntime =
         newBaseRuntimeBuilder(
                 CelOptions.current()
-                    .enableTimestampEpoch(true)
                     .enableHeterogeneousNumericComparisons(true)
                     .enableOptionalSyntax(true)
                     .comprehensionMaxIterations(1_000)

diff --git a/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java b/testing/src/main/java/dev/cel/testing/BaseInterpreterTest.java
@@ -114,7 +114,6 @@ public abstract class BaseInterpreterTest extends CelBaselineTestCase {
 
   private static final CelOptions BASE_CEL_OPTIONS =
       CelOptions.current()
-          .enableTimestampEpoch(true)
           .enableHeterogeneousNumericComparisons(true)
           .enableOptionalSyntax(true)
           .comprehensionMaxIterations(1_000)

diff --git a/testing/src/main/java/dev/cel/testing/CelBaselineTestCase.java b/testing/src/main/java/dev/cel/testing/CelBaselineTestCase.java
@@ -56,7 +56,6 @@ public abstract class CelBaselineTestCase extends BaselineTestCase {
   protected static final int COMPREHENSION_MAX_ITERATIONS = 1_000;
   protected static final CelOptions TEST_OPTIONS =
       CelOptions.current()
-          .enableTimestampEpoch(true)
           .enableHeterogeneousNumericComparisons(true)
           .enableHiddenAccumulatorVar(true)
           .enableOptionalSyntax(true)

diff --git a/validator/src/test/java/dev/cel/validator/validators/RegexLiteralValidatorTest.java b/validator/src/test/java/dev/cel/validator/validators/RegexLiteralValidatorTest.java
@@ -39,8 +39,7 @@
 
 @RunWith(TestParameterInjector.class)
 public class RegexLiteralValidatorTest {
-  private static final CelOptions CEL_OPTIONS =
-      CelOptions.current().enableTimestampEpoch(true).build();
+  private static final CelOptions CEL_OPTIONS = CelOptions.current().build();
 
   private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();
 

diff --git a/validator/src/test/java/dev/cel/validator/validators/TimestampLiteralValidatorTest.java b/validator/src/test/java/dev/cel/validator/validators/TimestampLiteralValidatorTest.java
@@ -41,8 +41,7 @@
 
 @RunWith(TestParameterInjector.class)
 public class TimestampLiteralValidatorTest {
-  private static final CelOptions CEL_OPTIONS =
-      CelOptions.current().enableTimestampEpoch(true).build();
+  private static final CelOptions CEL_OPTIONS = CelOptions.current().build();
 
   private static final Cel CEL = CelFactory.standardCelBuilder().setOptions(CEL_OPTIONS).build();
 
@@ -205,7 +204,7 @@ public void parentIsNotCallExpr_doesNotThrow(String source) throws Exception {
   public void env_withSetResultType_success() throws Exception {
     Cel cel =
         CelFactory.standardCelBuilder()
-            .setOptions(CelOptions.current().enableTimestampEpoch(true).build())
+            .setOptions(CelOptions.current().build())
             .setResultType(SimpleType.BOOL)
             .build();
     CelValidator validator =