Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones#833

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
Oct 9, 2025
Merged

Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones #833

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: 1 addition & 0 deletions bundle/src/test/java/dev/cel/bundle/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ java_library(
"//checker:checker_legacy_environment",
"//checker:proto_type_mask",
"//common:cel_ast",
"//common:cel_descriptor_util",
"//common:cel_source",
"//common:compiler_common",
"//common:container",
Expand Down
64 changes: 60 additions & 4 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,18 @@
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Duration;
import com.google.protobuf.DynamicMessage;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import com.google.protobuf.Struct;
import com.google.protobuf.TextFormat;
import com.google.protobuf.Timestamp;
import com.google.protobuf.TypeRegistry;
import com.google.protobuf.WrappersProto;
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
Expand All@@ -62,6 +66,7 @@
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -91,6 +96,7 @@
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
Expand DownExpand Up@@ -196,13 +202,11 @@ public void build_badFileDescriptorSet() {
IllegalArgumentException.class,
() ->
standardCelBuilderWithMacros()
.setContainer(CelContainer.ofName("google.rpc.context.AttributeContext"))
.setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
.addFileTypes(
FileDescriptorSet.newBuilder()
.addFile(AttributeContext.getDescriptor().getFile().toProto())
.addFile(TestAllTypesExtensions.getDescriptor().getFile().toProto())
.build())
.setProtoResultType(
CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
.build());
assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
}
Expand DownExpand Up@@ -2124,6 +2128,58 @@ public void program_evaluateCanonicalTypesToNativeTypesDisabled_producesBytesPro
assertThat(result).isEqualTo(ByteString.copyFromUtf8("abc"));
}

@Test
public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws Exception {
// Force serialization of the descriptor to get a unique instance
FileDescriptorProto proto = TestAllTypes.getDescriptor().getFile().toProto();
FileDescriptorSet fds = FileDescriptorSet.newBuilder().addFile(proto).build();
ImmutableSet<FileDescriptor> fileDescriptors =
CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fds);
ImmutableSet<Descriptor> descriptors =
CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptors)
.messageTypeDescriptors();
Descriptor testAllTypesDescriptor =
descriptors.stream()
.filter(x -> x.getFullName().equals(TestAllTypes.getDescriptor().getFullName()))
.findAny()
.get();

// Parse text proto using this fds
TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(descriptors).build();
TestAllTypes.Builder testAllTypesBuilder = TestAllTypes.newBuilder();
TextFormat.Parser textFormatParser =
TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
String textProto =
"single_timestamp {\n" //
+ " seconds: 100\n" //
+ "}";
textFormatParser.merge(textProto, testAllTypesBuilder);
TestAllTypes testAllTypesFromTextProto = testAllTypesBuilder.build();
DynamicMessage dynamicMessage =
DynamicMessage.parseFrom(
testAllTypesDescriptor,
testAllTypesFromTextProto.toByteArray(),
ExtensionRegistry.getEmptyRegistry());
// Setup CEL environment with the same descriptors obtained from FDS
Cel cel =
standardCelBuilderWithMacros()
.addMessageTypes(descriptors)
.setOptions(
CelOptions.current()
.evaluateCanonicalTypesToNativeValues(true)
.enableTimestampEpoch(true)
.build())
.setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
.build();
CelAbstractSyntaxTree ast =
cel.compile("TestAllTypes{single_timestamp: timestamp(100)}").getAst();

DynamicMessage evalResult = (DynamicMessage) cel.createProgram(ast).eval();

// This should strictly equal regardless of where the descriptors came from for WKTs
assertThat(evalResult).isEqualTo(dynamicMessage);
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
2 changes: 1 addition & 1 deletion checker/src/main/java/dev/cel/checker/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ java_library(
":type_provider_legacy_impl",
"//:auto_value",
"//common:cel_ast",
"//common:cel_descriptors",
"//common:cel_descriptor_util",
"//common:cel_source",
"//common:compiler_common",
"//common:container",
Expand Down
13 changes: 13 additions & 0 deletions common/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -106,5 +106,18 @@ java_library(

java_library(
name = "cel_descriptors",
visibility = ["//:internal"],
exports = ["//common/src/main/java/dev/cel/common:cel_descriptors"],
)

java_library(
name = "cel_descriptor_util",
visibility = [
"//:internal",
# TODO: Remove references to the following clients
"//java/com/google/abuse/admin/notebook/compiler/checkedtypes:__pkg__",
"//java/com/google/paymentfraud/v2/util/featurereplay/common/risklogrecordio:__pkg__",
"//java/com/google/payments/consumer/growth/treatmentconfig/management/backend/service/config/utils:__pkg__",
],
exports = ["//common/src/main/java/dev/cel/common:cel_descriptor_util"],
)
19 changes: 16 additions & 3 deletions common/src/main/java/dev/cel/common/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,31 @@ PROTO_V1ALPHA1_AST_SOURCE = [
]

java_library(
name = "cel_descriptors",
name = "cel_descriptor_util",
srcs = [
"CelDescriptorUtil.java",
"CelDescriptors.java",
],
tags = [
],
deps = [
"//:auto_value",
":cel_descriptors",
"//common/annotations",
"//common/internal:file_descriptor_converter",
"//common/types:cel_types",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
],
)

java_library(
name = "cel_descriptors",
srcs = [
"CelDescriptors.java",
],
tags = [
],
deps = [
"//:auto_value",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
Expand Down
3 changes: 3 additions & 0 deletions common/src/main/java/dev/cel/common/CelDescriptorUtil.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,10 +166,12 @@ private static void collectMessageTypeDescriptors(
if (visited.contains(messageName)) {
return;
}

if (!descriptor.getOptions().getMapEntry()) {
visited.add(messageName);
celDescriptors.addMessageTypeDescriptors(descriptor);
}

if (CelTypes.getWellKnownCelType(messageName).isPresent()) {
return;
}
Expand DownExpand Up@@ -234,6 +236,7 @@ private static void copyToFileDescriptorSet(
if (visited.contains(fd.getFullName())) {
return;
}

visited.add(fd.getFullName());
for (FileDescriptor dep : fd.getDependencies()) {
copyToFileDescriptorSet(visited, dep, files);
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,9 @@ java_library(
tags = [
],
deps = [
":cel_descriptor_pools",
"//:auto_value",
"//common/internal:well_known_proto",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
Expand Down
4 changes: 4 additions & 0 deletions common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,10 @@ public static DefaultDescriptorPool create(
extensionRegistry);
}

public static Descriptor getWellKnownProtoDescriptor(WellKnownProto wellKnownProto) {
return WELL_KNOWN_PROTO_TO_DESCRIPTORS.get(wellKnownProto);
}

@Override
public Optional<Descriptor> findDescriptor(String name) {
return Optional.ofNullable(descriptorMap.get(name));
Expand Down
11 changes: 10 additions & 1 deletion common/src/main/java/dev/cel/common/internal/FileDescriptorSetConverter.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
package dev.cel.common.internal;

import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -76,7 +77,15 @@ private static FileDescriptor readDescriptor(
// Read dependencies first, they are needed to create the logical descriptor from the proto.
List<FileDescriptor> deps = new ArrayList<>();
for (String dep : fileProto.getDependencyList()) {
deps.add(readDescriptor(dep, descriptorProtos, descriptors));
ImmutableCollection<WellKnownProto> wktProtos = WellKnownProto.getByPathName(dep);
if (wktProtos.isEmpty()) {
deps.add(readDescriptor(dep, descriptorProtos, descriptors));
} else {
// Ensure the generated message's descriptor is used as a dependency for WKTs to avoid
// issues with descriptor instance mismatch.
WellKnownProto wellKnownProto = wktProtos.iterator().next();
deps.add(DefaultDescriptorPool.getWellKnownProtoDescriptor(wellKnownProto).getFile());
}
}
// Create the file descriptor, cache, and return.
try {
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones#833

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

Oct 9, 2025
 Merged


Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones
#833
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: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ java_library(
 "//checker:checker_legacy_environment",
 "//checker:proto_type_mask",
 "//common:cel_ast",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

64 changes: 60 additions & 4 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,18 @@
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Duration;
import com.google.protobuf.DynamicMessage;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import com.google.protobuf.Struct;
import com.google.protobuf.TextFormat;
import com.google.protobuf.Timestamp;
import com.google.protobuf.TypeRegistry;
import com.google.protobuf.WrappersProto;
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
Expand All@@ -62,6 +66,7 @@
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -91,6 +96,7 @@
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
Expand DownExpand Up@@ -196,13 +202,11 @@ public void build_badFileDescriptorSet() {
 IllegalArgumentException.class,
 () ->
 standardCelBuilderWithMacros()
 .setContainer(CelContainer.ofName("google.rpc.context.AttributeContext"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .addFileTypes(
 FileDescriptorSet.newBuilder()
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .addFile(TestAllTypesExtensions.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
 CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand DownExpand Up@@ -2124,6 +2128,58 @@ public void program_evaluateCanonicalTypesToNativeTypesDisabled_producesBytesPro
 assertThat(result).isEqualTo(ByteString.copyFromUtf8("abc"));
 }

 @Test
 public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws Exception {
 // Force serialization of the descriptor to get a unique instance
 FileDescriptorProto proto = TestAllTypes.getDescriptor().getFile().toProto();
 FileDescriptorSet fds = FileDescriptorSet.newBuilder().addFile(proto).build();
 ImmutableSet<FileDescriptor> fileDescriptors =
 CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fds);
 ImmutableSet<Descriptor> descriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptors)
 .messageTypeDescriptors();
 Descriptor testAllTypesDescriptor =
 descriptors.stream()
 .filter(x -> x.getFullName().equals(TestAllTypes.getDescriptor().getFullName()))
 .findAny()
 .get();

 // Parse text proto using this fds
 TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(descriptors).build();
 TestAllTypes.Builder testAllTypesBuilder = TestAllTypes.newBuilder();
 TextFormat.Parser textFormatParser =
 TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
 String textProto =
 "single_timestamp {\n" //
 + " seconds: 100\n" //
 + "}";
 textFormatParser.merge(textProto, testAllTypesBuilder);
 TestAllTypes testAllTypesFromTextProto = testAllTypesBuilder.build();
 DynamicMessage dynamicMessage =
 DynamicMessage.parseFrom(
 testAllTypesDescriptor,
 testAllTypesFromTextProto.toByteArray(),
 ExtensionRegistry.getEmptyRegistry());
 // Setup CEL environment with the same descriptors obtained from FDS
 Cel cel =
 standardCelBuilderWithMacros()
 .addMessageTypes(descriptors)
 .setOptions(
 CelOptions.current()
 .evaluateCanonicalTypesToNativeValues(true)
 .enableTimestampEpoch(true)
 .build())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("TestAllTypes{single_timestamp: timestamp(100)}").getAst();

 DynamicMessage evalResult = (DynamicMessage) cel.createProgram(ast).eval();

 // This should strictly equal regardless of where the descriptors came from for WKTs
 assertThat(evalResult).isEqualTo(dynamicMessage);
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ java_library(
 ":type_provider_legacy_impl",
 "//:auto_value",
 "//common:cel_ast",
 "//common:cel_descriptors",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

13 changes: 13 additions & 0 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,5 +106,18 @@ java_library(

java_library(
 name = "cel_descriptors",
 visibility = ["//:internal"],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptors"],
)

java_library(
 name = "cel_descriptor_util",
 visibility = [
 "//:internal",
 # TODO: Remove references to the following clients
 "//java/com/google/abuse/admin/notebook/compiler/checkedtypes:__pkg__",
 "//java/com/google/paymentfraud/v2/util/featurereplay/common/risklogrecordio:__pkg__",
 "//java/com/google/payments/consumer/growth/treatmentconfig/management/backend/service/config/utils:__pkg__",
 ],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptor_util"],
)

19 changes: 16 additions & 3 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,31 @@ PROTO_V1ALPHA1_AST_SOURCE = [
]

java_library(
 name = "cel_descriptors",
 name = "cel_descriptor_util",
 srcs = [
 "CelDescriptorUtil.java",
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 ":cel_descriptors",
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "cel_descriptors",
 srcs = [
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

3 changes: 3 additions & 0 deletions
common/src/main/java/dev/cel/common/CelDescriptorUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,10 +166,12 @@ private static void collectMessageTypeDescriptors(
 if (visited.contains(messageName)) {
 return;
 }

 if (!descriptor.getOptions().getMapEntry()) {
 visited.add(messageName);
 celDescriptors.addMessageTypeDescriptors(descriptor);
 }

 if (CelTypes.getWellKnownCelType(messageName).isPresent()) {
 return;
 }
Expand DownExpand Up@@ -234,6 +236,7 @@ private static void copyToFileDescriptorSet(
 if (visited.contains(fd.getFullName())) {
 return;
 }

 visited.add(fd.getFullName());
 for (FileDescriptor dep : fd.getDependencies()) {
 copyToFileDescriptorSet(visited, dep, files);
Expand Down

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,9 @@ java_library(
 tags = [
 ],
 deps = [
 ":cel_descriptor_pools",
 "//:auto_value",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

4 changes: 4 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,10 @@ public static DefaultDescriptorPool create(
 extensionRegistry);
 }

 public static Descriptor getWellKnownProtoDescriptor(WellKnownProto wellKnownProto) {
 return WELL_KNOWN_PROTO_TO_DESCRIPTORS.get(wellKnownProto);
 }

 @Override
 public Optional<Descriptor> findDescriptor(String name) {
 return Optional.ofNullable(descriptorMap.get(name));
Expand Down

11 changes: 10 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/FileDescriptorSetConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
package dev.cel.common.internal;

import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -76,7 +77,15 @@ private static FileDescriptor readDescriptor(
 // Read dependencies first, they are needed to create the logical descriptor from the proto.
 List<FileDescriptor> deps = new ArrayList<>();
 for (String dep : fileProto.getDependencyList()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 ImmutableCollection<WellKnownProto> wktProtos = WellKnownProto.getByPathName(dep);
 if (wktProtos.isEmpty()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 } else {
 // Ensure the generated message's descriptor is used as a dependency for WKTs to avoid
 // issues with descriptor instance mismatch.
 WellKnownProto wellKnownProto = wktProtos.iterator().next();
 deps.add(DefaultDescriptorPool.getWellKnownProtoDescriptor(wellKnownProto).getFile());
 }
 }
 // Create the file descriptor, cache, and return.
 try {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones#833

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

Oct 9, 2025
 Merged


Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones
#833
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: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ java_library(
 "//checker:checker_legacy_environment",
 "//checker:proto_type_mask",
 "//common:cel_ast",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

64 changes: 60 additions & 4 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,18 @@
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Duration;
import com.google.protobuf.DynamicMessage;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import com.google.protobuf.Struct;
import com.google.protobuf.TextFormat;
import com.google.protobuf.Timestamp;
import com.google.protobuf.TypeRegistry;
import com.google.protobuf.WrappersProto;
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
Expand All@@ -62,6 +66,7 @@
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -91,6 +96,7 @@
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
Expand DownExpand Up@@ -196,13 +202,11 @@ public void build_badFileDescriptorSet() {
 IllegalArgumentException.class,
 () ->
 standardCelBuilderWithMacros()
 .setContainer(CelContainer.ofName("google.rpc.context.AttributeContext"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .addFileTypes(
 FileDescriptorSet.newBuilder()
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .addFile(TestAllTypesExtensions.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
 CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand DownExpand Up@@ -2124,6 +2128,58 @@ public void program_evaluateCanonicalTypesToNativeTypesDisabled_producesBytesPro
 assertThat(result).isEqualTo(ByteString.copyFromUtf8("abc"));
 }

 @Test
 public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws Exception {
 // Force serialization of the descriptor to get a unique instance
 FileDescriptorProto proto = TestAllTypes.getDescriptor().getFile().toProto();
 FileDescriptorSet fds = FileDescriptorSet.newBuilder().addFile(proto).build();
 ImmutableSet<FileDescriptor> fileDescriptors =
 CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fds);
 ImmutableSet<Descriptor> descriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptors)
 .messageTypeDescriptors();
 Descriptor testAllTypesDescriptor =
 descriptors.stream()
 .filter(x -> x.getFullName().equals(TestAllTypes.getDescriptor().getFullName()))
 .findAny()
 .get();

 // Parse text proto using this fds
 TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(descriptors).build();
 TestAllTypes.Builder testAllTypesBuilder = TestAllTypes.newBuilder();
 TextFormat.Parser textFormatParser =
 TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
 String textProto =
 "single_timestamp {\n" //
 + " seconds: 100\n" //
 + "}";
 textFormatParser.merge(textProto, testAllTypesBuilder);
 TestAllTypes testAllTypesFromTextProto = testAllTypesBuilder.build();
 DynamicMessage dynamicMessage =
 DynamicMessage.parseFrom(
 testAllTypesDescriptor,
 testAllTypesFromTextProto.toByteArray(),
 ExtensionRegistry.getEmptyRegistry());
 // Setup CEL environment with the same descriptors obtained from FDS
 Cel cel =
 standardCelBuilderWithMacros()
 .addMessageTypes(descriptors)
 .setOptions(
 CelOptions.current()
 .evaluateCanonicalTypesToNativeValues(true)
 .enableTimestampEpoch(true)
 .build())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("TestAllTypes{single_timestamp: timestamp(100)}").getAst();

 DynamicMessage evalResult = (DynamicMessage) cel.createProgram(ast).eval();

 // This should strictly equal regardless of where the descriptors came from for WKTs
 assertThat(evalResult).isEqualTo(dynamicMessage);
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ java_library(
 ":type_provider_legacy_impl",
 "//:auto_value",
 "//common:cel_ast",
 "//common:cel_descriptors",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

13 changes: 13 additions & 0 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,5 +106,18 @@ java_library(

java_library(
 name = "cel_descriptors",
 visibility = ["//:internal"],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptors"],
)

java_library(
 name = "cel_descriptor_util",
 visibility = [
 "//:internal",
 # TODO: Remove references to the following clients
 "//java/com/google/abuse/admin/notebook/compiler/checkedtypes:__pkg__",
 "//java/com/google/paymentfraud/v2/util/featurereplay/common/risklogrecordio:__pkg__",
 "//java/com/google/payments/consumer/growth/treatmentconfig/management/backend/service/config/utils:__pkg__",
 ],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptor_util"],
)

19 changes: 16 additions & 3 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,31 @@ PROTO_V1ALPHA1_AST_SOURCE = [
]

java_library(
 name = "cel_descriptors",
 name = "cel_descriptor_util",
 srcs = [
 "CelDescriptorUtil.java",
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 ":cel_descriptors",
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "cel_descriptors",
 srcs = [
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

3 changes: 3 additions & 0 deletions
common/src/main/java/dev/cel/common/CelDescriptorUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,10 +166,12 @@ private static void collectMessageTypeDescriptors(
 if (visited.contains(messageName)) {
 return;
 }

 if (!descriptor.getOptions().getMapEntry()) {
 visited.add(messageName);
 celDescriptors.addMessageTypeDescriptors(descriptor);
 }

 if (CelTypes.getWellKnownCelType(messageName).isPresent()) {
 return;
 }
Expand DownExpand Up@@ -234,6 +236,7 @@ private static void copyToFileDescriptorSet(
 if (visited.contains(fd.getFullName())) {
 return;
 }

 visited.add(fd.getFullName());
 for (FileDescriptor dep : fd.getDependencies()) {
 copyToFileDescriptorSet(visited, dep, files);
Expand Down

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,9 @@ java_library(
 tags = [
 ],
 deps = [
 ":cel_descriptor_pools",
 "//:auto_value",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

4 changes: 4 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,10 @@ public static DefaultDescriptorPool create(
 extensionRegistry);
 }

 public static Descriptor getWellKnownProtoDescriptor(WellKnownProto wellKnownProto) {
 return WELL_KNOWN_PROTO_TO_DESCRIPTORS.get(wellKnownProto);
 }

 @Override
 public Optional<Descriptor> findDescriptor(String name) {
 return Optional.ofNullable(descriptorMap.get(name));
Expand Down

11 changes: 10 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/FileDescriptorSetConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
package dev.cel.common.internal;

import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -76,7 +77,15 @@ private static FileDescriptor readDescriptor(
 // Read dependencies first, they are needed to create the logical descriptor from the proto.
 List<FileDescriptor> deps = new ArrayList<>();
 for (String dep : fileProto.getDependencyList()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 ImmutableCollection<WellKnownProto> wktProtos = WellKnownProto.getByPathName(dep);
 if (wktProtos.isEmpty()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 } else {
 // Ensure the generated message's descriptor is used as a dependency for WKTs to avoid
 // issues with descriptor instance mismatch.
 WellKnownProto wellKnownProto = wktProtos.iterator().next();
 deps.add(DefaultDescriptorPool.getWellKnownProtoDescriptor(wellKnownProto).getFile());
 }
 }
 // Create the file descriptor, cache, and return.
 try {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones#833

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

Oct 9, 2025
 Merged


Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones
#833
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: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ java_library(
 "//checker:checker_legacy_environment",
 "//checker:proto_type_mask",
 "//common:cel_ast",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

64 changes: 60 additions & 4 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,18 @@
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Duration;
import com.google.protobuf.DynamicMessage;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import com.google.protobuf.Struct;
import com.google.protobuf.TextFormat;
import com.google.protobuf.Timestamp;
import com.google.protobuf.TypeRegistry;
import com.google.protobuf.WrappersProto;
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
Expand All@@ -62,6 +66,7 @@
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -91,6 +96,7 @@
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
Expand DownExpand Up@@ -196,13 +202,11 @@ public void build_badFileDescriptorSet() {
 IllegalArgumentException.class,
 () ->
 standardCelBuilderWithMacros()
 .setContainer(CelContainer.ofName("google.rpc.context.AttributeContext"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .addFileTypes(
 FileDescriptorSet.newBuilder()
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .addFile(TestAllTypesExtensions.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
 CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand DownExpand Up@@ -2124,6 +2128,58 @@ public void program_evaluateCanonicalTypesToNativeTypesDisabled_producesBytesPro
 assertThat(result).isEqualTo(ByteString.copyFromUtf8("abc"));
 }

 @Test
 public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws Exception {
 // Force serialization of the descriptor to get a unique instance
 FileDescriptorProto proto = TestAllTypes.getDescriptor().getFile().toProto();
 FileDescriptorSet fds = FileDescriptorSet.newBuilder().addFile(proto).build();
 ImmutableSet<FileDescriptor> fileDescriptors =
 CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fds);
 ImmutableSet<Descriptor> descriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptors)
 .messageTypeDescriptors();
 Descriptor testAllTypesDescriptor =
 descriptors.stream()
 .filter(x -> x.getFullName().equals(TestAllTypes.getDescriptor().getFullName()))
 .findAny()
 .get();

 // Parse text proto using this fds
 TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(descriptors).build();
 TestAllTypes.Builder testAllTypesBuilder = TestAllTypes.newBuilder();
 TextFormat.Parser textFormatParser =
 TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
 String textProto =
 "single_timestamp {\n" //
 + " seconds: 100\n" //
 + "}";
 textFormatParser.merge(textProto, testAllTypesBuilder);
 TestAllTypes testAllTypesFromTextProto = testAllTypesBuilder.build();
 DynamicMessage dynamicMessage =
 DynamicMessage.parseFrom(
 testAllTypesDescriptor,
 testAllTypesFromTextProto.toByteArray(),
 ExtensionRegistry.getEmptyRegistry());
 // Setup CEL environment with the same descriptors obtained from FDS
 Cel cel =
 standardCelBuilderWithMacros()
 .addMessageTypes(descriptors)
 .setOptions(
 CelOptions.current()
 .evaluateCanonicalTypesToNativeValues(true)
 .enableTimestampEpoch(true)
 .build())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("TestAllTypes{single_timestamp: timestamp(100)}").getAst();

 DynamicMessage evalResult = (DynamicMessage) cel.createProgram(ast).eval();

 // This should strictly equal regardless of where the descriptors came from for WKTs
 assertThat(evalResult).isEqualTo(dynamicMessage);
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ java_library(
 ":type_provider_legacy_impl",
 "//:auto_value",
 "//common:cel_ast",
 "//common:cel_descriptors",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

13 changes: 13 additions & 0 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,5 +106,18 @@ java_library(

java_library(
 name = "cel_descriptors",
 visibility = ["//:internal"],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptors"],
)

java_library(
 name = "cel_descriptor_util",
 visibility = [
 "//:internal",
 # TODO: Remove references to the following clients
 "//java/com/google/abuse/admin/notebook/compiler/checkedtypes:__pkg__",
 "//java/com/google/paymentfraud/v2/util/featurereplay/common/risklogrecordio:__pkg__",
 "//java/com/google/payments/consumer/growth/treatmentconfig/management/backend/service/config/utils:__pkg__",
 ],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptor_util"],
)

19 changes: 16 additions & 3 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,31 @@ PROTO_V1ALPHA1_AST_SOURCE = [
]

java_library(
 name = "cel_descriptors",
 name = "cel_descriptor_util",
 srcs = [
 "CelDescriptorUtil.java",
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 ":cel_descriptors",
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "cel_descriptors",
 srcs = [
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

3 changes: 3 additions & 0 deletions
common/src/main/java/dev/cel/common/CelDescriptorUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,10 +166,12 @@ private static void collectMessageTypeDescriptors(
 if (visited.contains(messageName)) {
 return;
 }

 if (!descriptor.getOptions().getMapEntry()) {
 visited.add(messageName);
 celDescriptors.addMessageTypeDescriptors(descriptor);
 }

 if (CelTypes.getWellKnownCelType(messageName).isPresent()) {
 return;
 }
Expand DownExpand Up@@ -234,6 +236,7 @@ private static void copyToFileDescriptorSet(
 if (visited.contains(fd.getFullName())) {
 return;
 }

 visited.add(fd.getFullName());
 for (FileDescriptor dep : fd.getDependencies()) {
 copyToFileDescriptorSet(visited, dep, files);
Expand Down

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,9 @@ java_library(
 tags = [
 ],
 deps = [
 ":cel_descriptor_pools",
 "//:auto_value",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

4 changes: 4 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,10 @@ public static DefaultDescriptorPool create(
 extensionRegistry);
 }

 public static Descriptor getWellKnownProtoDescriptor(WellKnownProto wellKnownProto) {
 return WELL_KNOWN_PROTO_TO_DESCRIPTORS.get(wellKnownProto);
 }

 @Override
 public Optional<Descriptor> findDescriptor(String name) {
 return Optional.ofNullable(descriptorMap.get(name));
Expand Down

11 changes: 10 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/FileDescriptorSetConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
package dev.cel.common.internal;

import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -76,7 +77,15 @@ private static FileDescriptor readDescriptor(
 // Read dependencies first, they are needed to create the logical descriptor from the proto.
 List<FileDescriptor> deps = new ArrayList<>();
 for (String dep : fileProto.getDependencyList()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 ImmutableCollection<WellKnownProto> wktProtos = WellKnownProto.getByPathName(dep);
 if (wktProtos.isEmpty()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 } else {
 // Ensure the generated message's descriptor is used as a dependency for WKTs to avoid
 // issues with descriptor instance mismatch.
 WellKnownProto wellKnownProto = wktProtos.iterator().next();
 deps.add(DefaultDescriptorPool.getWellKnownProtoDescriptor(wellKnownProto).getFile());
 }
 }
 // Create the file descriptor, cache, and return.
 try {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones#833

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

Oct 9, 2025
 Merged


Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones
#833
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: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ java_library(
 "//checker:checker_legacy_environment",
 "//checker:proto_type_mask",
 "//common:cel_ast",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

64 changes: 60 additions & 4 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,18 @@
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Duration;
import com.google.protobuf.DynamicMessage;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import com.google.protobuf.Struct;
import com.google.protobuf.TextFormat;
import com.google.protobuf.Timestamp;
import com.google.protobuf.TypeRegistry;
import com.google.protobuf.WrappersProto;
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
Expand All@@ -62,6 +66,7 @@
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -91,6 +96,7 @@
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
Expand DownExpand Up@@ -196,13 +202,11 @@ public void build_badFileDescriptorSet() {
 IllegalArgumentException.class,
 () ->
 standardCelBuilderWithMacros()
 .setContainer(CelContainer.ofName("google.rpc.context.AttributeContext"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .addFileTypes(
 FileDescriptorSet.newBuilder()
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .addFile(TestAllTypesExtensions.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
 CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand DownExpand Up@@ -2124,6 +2128,58 @@ public void program_evaluateCanonicalTypesToNativeTypesDisabled_producesBytesPro
 assertThat(result).isEqualTo(ByteString.copyFromUtf8("abc"));
 }

 @Test
 public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws Exception {
 // Force serialization of the descriptor to get a unique instance
 FileDescriptorProto proto = TestAllTypes.getDescriptor().getFile().toProto();
 FileDescriptorSet fds = FileDescriptorSet.newBuilder().addFile(proto).build();
 ImmutableSet<FileDescriptor> fileDescriptors =
 CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fds);
 ImmutableSet<Descriptor> descriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptors)
 .messageTypeDescriptors();
 Descriptor testAllTypesDescriptor =
 descriptors.stream()
 .filter(x -> x.getFullName().equals(TestAllTypes.getDescriptor().getFullName()))
 .findAny()
 .get();

 // Parse text proto using this fds
 TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(descriptors).build();
 TestAllTypes.Builder testAllTypesBuilder = TestAllTypes.newBuilder();
 TextFormat.Parser textFormatParser =
 TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
 String textProto =
 "single_timestamp {\n" //
 + " seconds: 100\n" //
 + "}";
 textFormatParser.merge(textProto, testAllTypesBuilder);
 TestAllTypes testAllTypesFromTextProto = testAllTypesBuilder.build();
 DynamicMessage dynamicMessage =
 DynamicMessage.parseFrom(
 testAllTypesDescriptor,
 testAllTypesFromTextProto.toByteArray(),
 ExtensionRegistry.getEmptyRegistry());
 // Setup CEL environment with the same descriptors obtained from FDS
 Cel cel =
 standardCelBuilderWithMacros()
 .addMessageTypes(descriptors)
 .setOptions(
 CelOptions.current()
 .evaluateCanonicalTypesToNativeValues(true)
 .enableTimestampEpoch(true)
 .build())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("TestAllTypes{single_timestamp: timestamp(100)}").getAst();

 DynamicMessage evalResult = (DynamicMessage) cel.createProgram(ast).eval();

 // This should strictly equal regardless of where the descriptors came from for WKTs
 assertThat(evalResult).isEqualTo(dynamicMessage);
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ java_library(
 ":type_provider_legacy_impl",
 "//:auto_value",
 "//common:cel_ast",
 "//common:cel_descriptors",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

13 changes: 13 additions & 0 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,5 +106,18 @@ java_library(

java_library(
 name = "cel_descriptors",
 visibility = ["//:internal"],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptors"],
)

java_library(
 name = "cel_descriptor_util",
 visibility = [
 "//:internal",
 # TODO: Remove references to the following clients
 "//java/com/google/abuse/admin/notebook/compiler/checkedtypes:__pkg__",
 "//java/com/google/paymentfraud/v2/util/featurereplay/common/risklogrecordio:__pkg__",
 "//java/com/google/payments/consumer/growth/treatmentconfig/management/backend/service/config/utils:__pkg__",
 ],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptor_util"],
)

19 changes: 16 additions & 3 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,31 @@ PROTO_V1ALPHA1_AST_SOURCE = [
]

java_library(
 name = "cel_descriptors",
 name = "cel_descriptor_util",
 srcs = [
 "CelDescriptorUtil.java",
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 ":cel_descriptors",
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "cel_descriptors",
 srcs = [
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

3 changes: 3 additions & 0 deletions
common/src/main/java/dev/cel/common/CelDescriptorUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,10 +166,12 @@ private static void collectMessageTypeDescriptors(
 if (visited.contains(messageName)) {
 return;
 }

 if (!descriptor.getOptions().getMapEntry()) {
 visited.add(messageName);
 celDescriptors.addMessageTypeDescriptors(descriptor);
 }

 if (CelTypes.getWellKnownCelType(messageName).isPresent()) {
 return;
 }
Expand DownExpand Up@@ -234,6 +236,7 @@ private static void copyToFileDescriptorSet(
 if (visited.contains(fd.getFullName())) {
 return;
 }

 visited.add(fd.getFullName());
 for (FileDescriptor dep : fd.getDependencies()) {
 copyToFileDescriptorSet(visited, dep, files);
Expand Down

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,9 @@ java_library(
 tags = [
 ],
 deps = [
 ":cel_descriptor_pools",
 "//:auto_value",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

4 changes: 4 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,10 @@ public static DefaultDescriptorPool create(
 extensionRegistry);
 }

 public static Descriptor getWellKnownProtoDescriptor(WellKnownProto wellKnownProto) {
 return WELL_KNOWN_PROTO_TO_DESCRIPTORS.get(wellKnownProto);
 }

 @Override
 public Optional<Descriptor> findDescriptor(String name) {
 return Optional.ofNullable(descriptorMap.get(name));
Expand Down

11 changes: 10 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/FileDescriptorSetConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
package dev.cel.common.internal;

import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -76,7 +77,15 @@ private static FileDescriptor readDescriptor(
 // Read dependencies first, they are needed to create the logical descriptor from the proto.
 List<FileDescriptor> deps = new ArrayList<>();
 for (String dep : fileProto.getDependencyList()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 ImmutableCollection<WellKnownProto> wktProtos = WellKnownProto.getByPathName(dep);
 if (wktProtos.isEmpty()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 } else {
 // Ensure the generated message's descriptor is used as a dependency for WKTs to avoid
 // issues with descriptor instance mismatch.
 WellKnownProto wellKnownProto = wktProtos.iterator().next();
 deps.add(DefaultDescriptorPool.getWellKnownProtoDescriptor(wellKnownProto).getFile());
 }
 }
 // Create the file descriptor, cache, and return.
 try {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones#833

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

Oct 9, 2025
 Merged


Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones
#833
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: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ java_library(
 "//checker:checker_legacy_environment",
 "//checker:proto_type_mask",
 "//common:cel_ast",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

64 changes: 60 additions & 4 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,18 @@
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Duration;
import com.google.protobuf.DynamicMessage;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import com.google.protobuf.Struct;
import com.google.protobuf.TextFormat;
import com.google.protobuf.Timestamp;
import com.google.protobuf.TypeRegistry;
import com.google.protobuf.WrappersProto;
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
Expand All@@ -62,6 +66,7 @@
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -91,6 +96,7 @@
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
Expand DownExpand Up@@ -196,13 +202,11 @@ public void build_badFileDescriptorSet() {
 IllegalArgumentException.class,
 () ->
 standardCelBuilderWithMacros()
 .setContainer(CelContainer.ofName("google.rpc.context.AttributeContext"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .addFileTypes(
 FileDescriptorSet.newBuilder()
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .addFile(TestAllTypesExtensions.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
 CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand DownExpand Up@@ -2124,6 +2128,58 @@ public void program_evaluateCanonicalTypesToNativeTypesDisabled_producesBytesPro
 assertThat(result).isEqualTo(ByteString.copyFromUtf8("abc"));
 }

 @Test
 public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws Exception {
 // Force serialization of the descriptor to get a unique instance
 FileDescriptorProto proto = TestAllTypes.getDescriptor().getFile().toProto();
 FileDescriptorSet fds = FileDescriptorSet.newBuilder().addFile(proto).build();
 ImmutableSet<FileDescriptor> fileDescriptors =
 CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fds);
 ImmutableSet<Descriptor> descriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptors)
 .messageTypeDescriptors();
 Descriptor testAllTypesDescriptor =
 descriptors.stream()
 .filter(x -> x.getFullName().equals(TestAllTypes.getDescriptor().getFullName()))
 .findAny()
 .get();

 // Parse text proto using this fds
 TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(descriptors).build();
 TestAllTypes.Builder testAllTypesBuilder = TestAllTypes.newBuilder();
 TextFormat.Parser textFormatParser =
 TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
 String textProto =
 "single_timestamp {\n" //
 + " seconds: 100\n" //
 + "}";
 textFormatParser.merge(textProto, testAllTypesBuilder);
 TestAllTypes testAllTypesFromTextProto = testAllTypesBuilder.build();
 DynamicMessage dynamicMessage =
 DynamicMessage.parseFrom(
 testAllTypesDescriptor,
 testAllTypesFromTextProto.toByteArray(),
 ExtensionRegistry.getEmptyRegistry());
 // Setup CEL environment with the same descriptors obtained from FDS
 Cel cel =
 standardCelBuilderWithMacros()
 .addMessageTypes(descriptors)
 .setOptions(
 CelOptions.current()
 .evaluateCanonicalTypesToNativeValues(true)
 .enableTimestampEpoch(true)
 .build())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("TestAllTypes{single_timestamp: timestamp(100)}").getAst();

 DynamicMessage evalResult = (DynamicMessage) cel.createProgram(ast).eval();

 // This should strictly equal regardless of where the descriptors came from for WKTs
 assertThat(evalResult).isEqualTo(dynamicMessage);
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ java_library(
 ":type_provider_legacy_impl",
 "//:auto_value",
 "//common:cel_ast",
 "//common:cel_descriptors",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

13 changes: 13 additions & 0 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,5 +106,18 @@ java_library(

java_library(
 name = "cel_descriptors",
 visibility = ["//:internal"],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptors"],
)

java_library(
 name = "cel_descriptor_util",
 visibility = [
 "//:internal",
 # TODO: Remove references to the following clients
 "//java/com/google/abuse/admin/notebook/compiler/checkedtypes:__pkg__",
 "//java/com/google/paymentfraud/v2/util/featurereplay/common/risklogrecordio:__pkg__",
 "//java/com/google/payments/consumer/growth/treatmentconfig/management/backend/service/config/utils:__pkg__",
 ],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptor_util"],
)

19 changes: 16 additions & 3 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,31 @@ PROTO_V1ALPHA1_AST_SOURCE = [
]

java_library(
 name = "cel_descriptors",
 name = "cel_descriptor_util",
 srcs = [
 "CelDescriptorUtil.java",
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 ":cel_descriptors",
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "cel_descriptors",
 srcs = [
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

3 changes: 3 additions & 0 deletions
common/src/main/java/dev/cel/common/CelDescriptorUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,10 +166,12 @@ private static void collectMessageTypeDescriptors(
 if (visited.contains(messageName)) {
 return;
 }

 if (!descriptor.getOptions().getMapEntry()) {
 visited.add(messageName);
 celDescriptors.addMessageTypeDescriptors(descriptor);
 }

 if (CelTypes.getWellKnownCelType(messageName).isPresent()) {
 return;
 }
Expand DownExpand Up@@ -234,6 +236,7 @@ private static void copyToFileDescriptorSet(
 if (visited.contains(fd.getFullName())) {
 return;
 }

 visited.add(fd.getFullName());
 for (FileDescriptor dep : fd.getDependencies()) {
 copyToFileDescriptorSet(visited, dep, files);
Expand Down

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,9 @@ java_library(
 tags = [
 ],
 deps = [
 ":cel_descriptor_pools",
 "//:auto_value",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

4 changes: 4 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,10 @@ public static DefaultDescriptorPool create(
 extensionRegistry);
 }

 public static Descriptor getWellKnownProtoDescriptor(WellKnownProto wellKnownProto) {
 return WELL_KNOWN_PROTO_TO_DESCRIPTORS.get(wellKnownProto);
 }

 @Override
 public Optional<Descriptor> findDescriptor(String name) {
 return Optional.ofNullable(descriptorMap.get(name));
Expand Down

11 changes: 10 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/FileDescriptorSetConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
package dev.cel.common.internal;

import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -76,7 +77,15 @@ private static FileDescriptor readDescriptor(
 // Read dependencies first, they are needed to create the logical descriptor from the proto.
 List<FileDescriptor> deps = new ArrayList<>();
 for (String dep : fileProto.getDependencyList()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 ImmutableCollection<WellKnownProto> wktProtos = WellKnownProto.getByPathName(dep);
 if (wktProtos.isEmpty()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 } else {
 // Ensure the generated message's descriptor is used as a dependency for WKTs to avoid
 // issues with descriptor instance mismatch.
 WellKnownProto wellKnownProto = wktProtos.iterator().next();
 deps.add(DefaultDescriptorPool.getWellKnownProtoDescriptor(wellKnownProto).getFile());
 }
 }
 // Create the file descriptor, cache, and return.
 try {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones#833

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

Oct 9, 2025
 Merged


Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones
#833
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: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ java_library(
 "//checker:checker_legacy_environment",
 "//checker:proto_type_mask",
 "//common:cel_ast",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

64 changes: 60 additions & 4 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,18 @@
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Duration;
import com.google.protobuf.DynamicMessage;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import com.google.protobuf.Struct;
import com.google.protobuf.TextFormat;
import com.google.protobuf.Timestamp;
import com.google.protobuf.TypeRegistry;
import com.google.protobuf.WrappersProto;
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
Expand All@@ -62,6 +66,7 @@
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -91,6 +96,7 @@
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
Expand DownExpand Up@@ -196,13 +202,11 @@ public void build_badFileDescriptorSet() {
 IllegalArgumentException.class,
 () ->
 standardCelBuilderWithMacros()
 .setContainer(CelContainer.ofName("google.rpc.context.AttributeContext"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .addFileTypes(
 FileDescriptorSet.newBuilder()
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .addFile(TestAllTypesExtensions.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
 CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand DownExpand Up@@ -2124,6 +2128,58 @@ public void program_evaluateCanonicalTypesToNativeTypesDisabled_producesBytesPro
 assertThat(result).isEqualTo(ByteString.copyFromUtf8("abc"));
 }

 @Test
 public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws Exception {
 // Force serialization of the descriptor to get a unique instance
 FileDescriptorProto proto = TestAllTypes.getDescriptor().getFile().toProto();
 FileDescriptorSet fds = FileDescriptorSet.newBuilder().addFile(proto).build();
 ImmutableSet<FileDescriptor> fileDescriptors =
 CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fds);
 ImmutableSet<Descriptor> descriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptors)
 .messageTypeDescriptors();
 Descriptor testAllTypesDescriptor =
 descriptors.stream()
 .filter(x -> x.getFullName().equals(TestAllTypes.getDescriptor().getFullName()))
 .findAny()
 .get();

 // Parse text proto using this fds
 TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(descriptors).build();
 TestAllTypes.Builder testAllTypesBuilder = TestAllTypes.newBuilder();
 TextFormat.Parser textFormatParser =
 TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
 String textProto =
 "single_timestamp {\n" //
 + " seconds: 100\n" //
 + "}";
 textFormatParser.merge(textProto, testAllTypesBuilder);
 TestAllTypes testAllTypesFromTextProto = testAllTypesBuilder.build();
 DynamicMessage dynamicMessage =
 DynamicMessage.parseFrom(
 testAllTypesDescriptor,
 testAllTypesFromTextProto.toByteArray(),
 ExtensionRegistry.getEmptyRegistry());
 // Setup CEL environment with the same descriptors obtained from FDS
 Cel cel =
 standardCelBuilderWithMacros()
 .addMessageTypes(descriptors)
 .setOptions(
 CelOptions.current()
 .evaluateCanonicalTypesToNativeValues(true)
 .enableTimestampEpoch(true)
 .build())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("TestAllTypes{single_timestamp: timestamp(100)}").getAst();

 DynamicMessage evalResult = (DynamicMessage) cel.createProgram(ast).eval();

 // This should strictly equal regardless of where the descriptors came from for WKTs
 assertThat(evalResult).isEqualTo(dynamicMessage);
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ java_library(
 ":type_provider_legacy_impl",
 "//:auto_value",
 "//common:cel_ast",
 "//common:cel_descriptors",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

13 changes: 13 additions & 0 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,5 +106,18 @@ java_library(

java_library(
 name = "cel_descriptors",
 visibility = ["//:internal"],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptors"],
)

java_library(
 name = "cel_descriptor_util",
 visibility = [
 "//:internal",
 # TODO: Remove references to the following clients
 "//java/com/google/abuse/admin/notebook/compiler/checkedtypes:__pkg__",
 "//java/com/google/paymentfraud/v2/util/featurereplay/common/risklogrecordio:__pkg__",
 "//java/com/google/payments/consumer/growth/treatmentconfig/management/backend/service/config/utils:__pkg__",
 ],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptor_util"],
)

19 changes: 16 additions & 3 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,31 @@ PROTO_V1ALPHA1_AST_SOURCE = [
]

java_library(
 name = "cel_descriptors",
 name = "cel_descriptor_util",
 srcs = [
 "CelDescriptorUtil.java",
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 ":cel_descriptors",
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "cel_descriptors",
 srcs = [
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

3 changes: 3 additions & 0 deletions
common/src/main/java/dev/cel/common/CelDescriptorUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,10 +166,12 @@ private static void collectMessageTypeDescriptors(
 if (visited.contains(messageName)) {
 return;
 }

 if (!descriptor.getOptions().getMapEntry()) {
 visited.add(messageName);
 celDescriptors.addMessageTypeDescriptors(descriptor);
 }

 if (CelTypes.getWellKnownCelType(messageName).isPresent()) {
 return;
 }
Expand DownExpand Up@@ -234,6 +236,7 @@ private static void copyToFileDescriptorSet(
 if (visited.contains(fd.getFullName())) {
 return;
 }

 visited.add(fd.getFullName());
 for (FileDescriptor dep : fd.getDependencies()) {
 copyToFileDescriptorSet(visited, dep, files);
Expand Down

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,9 @@ java_library(
 tags = [
 ],
 deps = [
 ":cel_descriptor_pools",
 "//:auto_value",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

4 changes: 4 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,10 @@ public static DefaultDescriptorPool create(
 extensionRegistry);
 }

 public static Descriptor getWellKnownProtoDescriptor(WellKnownProto wellKnownProto) {
 return WELL_KNOWN_PROTO_TO_DESCRIPTORS.get(wellKnownProto);
 }

 @Override
 public Optional<Descriptor> findDescriptor(String name) {
 return Optional.ofNullable(descriptorMap.get(name));
Expand Down

11 changes: 10 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/FileDescriptorSetConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
package dev.cel.common.internal;

import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -76,7 +77,15 @@ private static FileDescriptor readDescriptor(
 // Read dependencies first, they are needed to create the logical descriptor from the proto.
 List<FileDescriptor> deps = new ArrayList<>();
 for (String dep : fileProto.getDependencyList()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 ImmutableCollection<WellKnownProto> wktProtos = WellKnownProto.getByPathName(dep);
 if (wktProtos.isEmpty()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 } else {
 // Ensure the generated message's descriptor is used as a dependency for WKTs to avoid
 // issues with descriptor instance mismatch.
 WellKnownProto wellKnownProto = wktProtos.iterator().next();
 deps.add(DefaultDescriptorPool.getWellKnownProtoDescriptor(wellKnownProto).getFile());
 }
 }
 // Create the file descriptor, cache, and return.
 try {
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones#833

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

Oct 9, 2025
 Merged


Fix FileDescriptorSetConverter to always reference WellKnownTypes descriptors from generated ones
#833
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: 1 addition & 0 deletions
bundle/src/test/java/dev/cel/bundle/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ java_library(
 "//checker:checker_legacy_environment",
 "//checker:proto_type_mask",
 "//common:cel_ast",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

64 changes: 60 additions & 4 deletions
bundle/src/test/java/dev/cel/bundle/CelImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,14 +43,18 @@
import com.google.protobuf.ByteString;
import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
import com.google.protobuf.Descriptors.Descriptor;
import com.google.protobuf.Descriptors.FileDescriptor;
import com.google.protobuf.Duration;
import com.google.protobuf.DynamicMessage;
import com.google.protobuf.Empty;
import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.FieldMask;
import com.google.protobuf.Message;
import com.google.protobuf.Struct;
import com.google.protobuf.TextFormat;
import com.google.protobuf.Timestamp;
import com.google.protobuf.TypeRegistry;
import com.google.protobuf.WrappersProto;
import com.google.rpc.context.AttributeContext;
import com.google.testing.junit.testparameterinjector.TestParameter;
Expand All@@ -62,6 +66,7 @@
import dev.cel.checker.TypeProvider;
import dev.cel.common.CelAbstractSyntaxTree;
import dev.cel.common.CelContainer;
import dev.cel.common.CelDescriptorUtil;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelIssue;
import dev.cel.common.CelOptions;
Expand DownExpand Up@@ -91,6 +96,7 @@
import dev.cel.compiler.CelCompilerFactory;
import dev.cel.compiler.CelCompilerImpl;
import dev.cel.expr.conformance.proto2.Proto2ExtensionScopedMessage;
import dev.cel.expr.conformance.proto2.TestAllTypesExtensions;
import dev.cel.expr.conformance.proto3.TestAllTypes;
import dev.cel.parser.CelParserImpl;
import dev.cel.parser.CelStandardMacro;
Expand DownExpand Up@@ -196,13 +202,11 @@ public void build_badFileDescriptorSet() {
 IllegalArgumentException.class,
 () ->
 standardCelBuilderWithMacros()
 .setContainer(CelContainer.ofName("google.rpc.context.AttributeContext"))
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto2"))
 .addFileTypes(
 FileDescriptorSet.newBuilder()
 .addFile(AttributeContext.getDescriptor().getFile().toProto())
 .addFile(TestAllTypesExtensions.getDescriptor().getFile().toProto())
 .build())
 .setProtoResultType(
 CelProtoTypes.createMessage("google.rpc.context.AttributeContext.Resource"))
 .build());
 assertThat(e).hasMessageThat().contains("file descriptor set with unresolved proto file");
 }
Expand DownExpand Up@@ -2124,6 +2128,58 @@ public void program_evaluateCanonicalTypesToNativeTypesDisabled_producesBytesPro
 assertThat(result).isEqualTo(ByteString.copyFromUtf8("abc"));
 }

 @Test
 public void program_fdsContainsWktDependency_descriptorInstancesMatch() throws Exception {
 // Force serialization of the descriptor to get a unique instance
 FileDescriptorProto proto = TestAllTypes.getDescriptor().getFile().toProto();
 FileDescriptorSet fds = FileDescriptorSet.newBuilder().addFile(proto).build();
 ImmutableSet<FileDescriptor> fileDescriptors =
 CelDescriptorUtil.getFileDescriptorsFromFileDescriptorSet(fds);
 ImmutableSet<Descriptor> descriptors =
 CelDescriptorUtil.getAllDescriptorsFromFileDescriptor(fileDescriptors)
 .messageTypeDescriptors();
 Descriptor testAllTypesDescriptor =
 descriptors.stream()
 .filter(x -> x.getFullName().equals(TestAllTypes.getDescriptor().getFullName()))
 .findAny()
 .get();

 // Parse text proto using this fds
 TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(descriptors).build();
 TestAllTypes.Builder testAllTypesBuilder = TestAllTypes.newBuilder();
 TextFormat.Parser textFormatParser =
 TextFormat.Parser.newBuilder().setTypeRegistry(typeRegistry).build();
 String textProto =
 "single_timestamp {\n" //
 + " seconds: 100\n" //
 + "}";
 textFormatParser.merge(textProto, testAllTypesBuilder);
 TestAllTypes testAllTypesFromTextProto = testAllTypesBuilder.build();
 DynamicMessage dynamicMessage =
 DynamicMessage.parseFrom(
 testAllTypesDescriptor,
 testAllTypesFromTextProto.toByteArray(),
 ExtensionRegistry.getEmptyRegistry());
 // Setup CEL environment with the same descriptors obtained from FDS
 Cel cel =
 standardCelBuilderWithMacros()
 .addMessageTypes(descriptors)
 .setOptions(
 CelOptions.current()
 .evaluateCanonicalTypesToNativeValues(true)
 .enableTimestampEpoch(true)
 .build())
 .setContainer(CelContainer.ofName("cel.expr.conformance.proto3"))
 .build();
 CelAbstractSyntaxTree ast =
 cel.compile("TestAllTypes{single_timestamp: timestamp(100)}").getAst();

 DynamicMessage evalResult = (DynamicMessage) cel.createProgram(ast).eval();

 // This should strictly equal regardless of where the descriptors came from for WKTs
 assertThat(evalResult).isEqualTo(dynamicMessage);
 }

 @Test
 public void toBuilder_isImmutable() {
 CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down

2 changes: 1 addition & 1 deletion
checker/src/main/java/dev/cel/checker/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,7 +73,7 @@ java_library(
 ":type_provider_legacy_impl",
 "//:auto_value",
 "//common:cel_ast",
 "//common:cel_descriptors",
 "//common:cel_descriptor_util",
 "//common:cel_source",
 "//common:compiler_common",
 "//common:container",
Expand Down

13 changes: 13 additions & 0 deletions
common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,5 +106,18 @@ java_library(

java_library(
 name = "cel_descriptors",
 visibility = ["//:internal"],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptors"],
)

java_library(
 name = "cel_descriptor_util",
 visibility = [
 "//:internal",
 # TODO: Remove references to the following clients
 "//java/com/google/abuse/admin/notebook/compiler/checkedtypes:__pkg__",
 "//java/com/google/paymentfraud/v2/util/featurereplay/common/risklogrecordio:__pkg__",
 "//java/com/google/payments/consumer/growth/treatmentconfig/management/backend/service/config/utils:__pkg__",
 ],
 exports = ["//common/src/main/java/dev/cel/common:cel_descriptor_util"],
)

19 changes: 16 additions & 3 deletions
common/src/main/java/dev/cel/common/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,31 @@ PROTO_V1ALPHA1_AST_SOURCE = [
]

java_library(
 name = "cel_descriptors",
 name = "cel_descriptor_util",
 srcs = [
 "CelDescriptorUtil.java",
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 ":cel_descriptors",
 "//common/annotations",
 "//common/internal:file_descriptor_converter",
 "//common/types:cel_types",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 ],
)

java_library(
 name = "cel_descriptors",
 srcs = [
 "CelDescriptors.java",
 ],
 tags = [
 ],
 deps = [
 "//:auto_value",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

3 changes: 3 additions & 0 deletions
common/src/main/java/dev/cel/common/CelDescriptorUtil.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,10 +166,12 @@ private static void collectMessageTypeDescriptors(
 if (visited.contains(messageName)) {
 return;
 }

 if (!descriptor.getOptions().getMapEntry()) {
 visited.add(messageName);
 celDescriptors.addMessageTypeDescriptors(descriptor);
 }

 if (CelTypes.getWellKnownCelType(messageName).isPresent()) {
 return;
 }
Expand DownExpand Up@@ -234,6 +236,7 @@ private static void copyToFileDescriptorSet(
 if (visited.contains(fd.getFullName())) {
 return;
 }

 visited.add(fd.getFullName());
 for (FileDescriptor dep : fd.getDependencies()) {
 copyToFileDescriptorSet(visited, dep, files);
Expand Down

2 changes: 2 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -232,7 +232,9 @@ java_library(
 tags = [
 ],
 deps = [
 ":cel_descriptor_pools",
 "//:auto_value",
 "//common/internal:well_known_proto",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
Expand Down

4 changes: 4 additions & 0 deletions
common/src/main/java/dev/cel/common/internal/DefaultDescriptorPool.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,10 @@ public static DefaultDescriptorPool create(
 extensionRegistry);
 }

 public static Descriptor getWellKnownProtoDescriptor(WellKnownProto wellKnownProto) {
 return WELL_KNOWN_PROTO_TO_DESCRIPTORS.get(wellKnownProto);
 }

 @Override
 public Optional<Descriptor> findDescriptor(String name) {
 return Optional.ofNullable(descriptorMap.get(name));
Expand Down

11 changes: 10 additions & 1 deletion
common/src/main/java/dev/cel/common/internal/FileDescriptorSetConverter.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@
package dev.cel.common.internal;

import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableSet;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.errorprone.annotations.CheckReturnValue;
Expand DownExpand Up@@ -76,7 +77,15 @@ private static FileDescriptor readDescriptor(
 // Read dependencies first, they are needed to create the logical descriptor from the proto.
 List<FileDescriptor> deps = new ArrayList<>();
 for (String dep : fileProto.getDependencyList()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 ImmutableCollection<WellKnownProto> wktProtos = WellKnownProto.getByPathName(dep);
 if (wktProtos.isEmpty()) {
 deps.add(readDescriptor(dep, descriptorProtos, descriptors));
 } else {
 // Ensure the generated message's descriptor is used as a dependency for WKTs to avoid
 // issues with descriptor instance mismatch.
 WellKnownProto wellKnownProto = wktProtos.iterator().next();
 deps.add(DefaultDescriptorPool.getWellKnownProtoDescriptor(wellKnownProto).getFile());
 }
 }
 // Create the file descriptor, cache, and return.
 try {
Expand Down
Loading
Loading