Fix the opt-transitions we use to get fully optimized builds + stable test artifacts (#694)

### Changes are visible to end-users: no

### Test plan

existing tests

---------

Co-authored-by: aspect-marvin[bot] <[email protected]>

Author: dzbarsky

.bazelrc

@@ -32,6 +32,7 @@ common:release --build_tag_filters=release
 common:release --stamp
 common:release --compilation_mode=opt
 common:release --@rules_rust//rust/settings:lto=fat
+common:release --@rules_rust//:extra_rustc_flags=-Cpanic=abort
 
 # Speed up local development by using the non-hermetic CPP toolchain.
 common:nollvm --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=0

bazel/rust/defs.bzl

@@ -2,13 +2,27 @@
 
 load("@aspect_bazel_lib//lib:expand_template.bzl", _expand_template = "expand_template")
 load("@rules_rust//rust:defs.bzl", _rust_binary = "rust_binary", _rust_library = "rust_library", _rust_proc_macro = "rust_proc_macro", _rust_test = "rust_test")
+load("@with_cfg.bzl", "with_cfg")
 
 _default_platform = select({
     # Non-Linux binaries should just build with their default platforms
     "//conditions:default": None,
 })
 
-def rust_binary(name, rustc_env_files = [], version_key = "", crate_features = [], **kwargs):
+rust_opt_binary, _rust_opt_binary_internal = with_cfg(_rust_binary).set(
+    "compilation_mode",
+    "opt",
+).set(
+    Label("@rules_rust//:extra_rustc_flags"),
+    [
+        "-Cstrip=symbols",
+        "-Ccodegen-units=1",
+        "-Cpanic=abort",
+    ],
+    # Avoid rules_rust trying to instrument this binary
+).set("collect_code_coverage", "false").build()
+
+def rust_binary(name, rustc_env_files = [], version_key = "", crate_features = [], platform = _default_platform, **kwargs):
     """
     Macro for rust_binary defaults.
 
@@ -32,46 +46,22 @@ def rust_binary(name, rustc_env_files = [], version_key = "", crate_features = [
         )
         rustc_env_files = rustc_env_files + [rustc_env_file]
 
-    platform = kwargs.pop("platform", _default_platform)
-
-    _rust_binary(
+    # Note that we use symbol stripping to
+    # try and make these artifacts reproducibly sized for the
+    # container_structure tests.
+    rust_opt_binary(
         name = name,
         rustc_env_files = rustc_env_files,
-        rustc_flags = select({
-            "//bazel/release:is_opt": [
-                "-Ccodegen-units=1",
-                "-Copt-level=3",
-                "-Cpanic=abort",
-                "-Cstrip=symbols",
-            ],
-            # Default/test configuration. Note that we use symbol stripping to
-            # try and make these artifacts reproducibly sized for the
-            # container_structure tests.
-            #
-            # TODO: Can we have a CI config condition here?
-            "//conditions:default": [
-                "-Ccodegen-units=1",
-                "-Copt-level=3",
-                "-Cstrip=symbols",
-            ],
-        }),
         crate_features = crate_features + ["bazel"],
         platform = platform,
         **kwargs
     )
 
-def rust_test(name, crate_features = [], **kwargs):
-    platform = kwargs.pop("platform", _default_platform)
-
+def rust_test(name, crate_features = [], platform = _default_platform, **kwargs):
     _rust_test(
         name = name,
         crate_features = crate_features + ["bazel"],
         platform = platform,
-        rustc_flags = select({
-            "//conditions:default": [
-                "-Copt-level=0",
-            ],
-        }),
         **kwargs
     )
 
@@ -99,22 +89,10 @@ def rust_library(name, rustc_env_files = [], version_key = "", crate_features =
         )
         stamp = -1  # workaround https://github.com/bazelbuild/rules_rust/pull/3503
         rustc_env_files = rustc_env_files + [rustc_env_file]
+
     _rust_library(
         name = name,
         rustc_env_files = rustc_env_files,
-        rustc_flags = select({
-            "//bazel/release:is_opt": [
-                "-Ccodegen-units=1",
-                "-Copt-level=3",
-                "-Cpanic=abort",
-                "-Cstrip=symbols",
-            ],
-            "//conditions:default": [
-                "-Ccodegen-units=1",
-                "-Copt-level=3",
-                "-Cstrip=symbols",
-            ],
-        }),
         crate_features = crate_features + ["bazel"],
         stamp = stamp,
         **kwargs
@@ -131,19 +109,6 @@ def rust_proc_macro(name, crate_features = [], **kwargs):
     """
     _rust_proc_macro(
         name = name,
-        rustc_flags = select({
-            "//bazel/release:is_opt": [
-                "-Ccodegen-units=1",
-                "-Copt-level=3",
-                "-Cpanic=abort",
-                "--release",
-            ],
-            "//conditions:default": [
-                "-Ccodegen-units=1",
-                "-Copt-level=3",
-                "-Cstrip=debuginfo",
-            ],
-        }),
         crate_features = crate_features + ["bazel"],
         **kwargs
     )

bazel/rust/multi_platform_rust_binaries.bzl

@@ -4,11 +4,8 @@ load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_files")
 load("@rules_pkg//pkg:pkg.bzl", "pkg_tar", "pkg_zip")
-load("@with_cfg.bzl", "with_cfg")
 load("//bazel/release:hashes.bzl", "hashes")
 
-opt_filegroup, _opt_filegroup_internal = with_cfg(native.filegroup).set("compilation_mode", "opt").build()
-
 TARGET_TRIPLES = [
     ("x86_64_unknown_linux_gnu", "linux_x86_64"),
     ("aarch64_unknown_linux_gnu", "linux_aarch64"),
@@ -106,14 +103,14 @@ def multi_platform_rust_binaries(name, target, name_scheme = TARGET_NAMING_SCHEM
             mac_bins.extend(bin_outs)
             mac_pkged.extend(pkged_outs)
 
-    opt_filegroup(
+    native.filegroup(
         name = name,
         srcs = linux_bins + mac_bins,
         tags = kwargs.get("tags", []) + ["release"],
         visibility = kwargs.get("visibility", []),
     )
 
-    opt_filegroup(
+    native.filegroup(
         name = "{}.packaged".format(name),
         srcs = linux_pkged + mac_pkged,
         tags = kwargs.get("tags", []) + ["release"],

py/tests/py_venv_image_layer/my_app_amd64_layers_listing.yaml

@@ -2514,9 +2514,9 @@ files:
   - drwxr-xr-x  0 0      0           0 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/
   - drwxr-xr-x  0 0      0           0 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/
   - -rwxr-xr-x  0 0      0        2801 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/activate
-  - -rwxr-xr-x  0 0      0     1372152 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python
-  - -rwxr-xr-x  0 0      0     1372152 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
-  - -rwxr-xr-x  0 0      0     1372152 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
+  - -rwxr-xr-x  0 0      0      734360 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python
+  - -rwxr-xr-x  0 0      0      734360 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
+  - -rwxr-xr-x  0 0      0      734360 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
   - drwxr-xr-x  0 0      0           0 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/lib/
   - drwxr-xr-x  0 0      0           0 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/lib/python3.9/
   - -rwxr-xr-x  0 0      0         348 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/pyvenv.cfg

py/tests/py_venv_image_layer/my_app_arm64_layers_listing.yaml

@@ -2495,9 +2495,9 @@ files:
   - drwxr-xr-x  0 0      0           0 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/
   - drwxr-xr-x  0 0      0           0 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/
   - -rwxr-xr-x  0 0      0        2801 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/activate
-  - -rwxr-xr-x  0 0      0     1231448 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python
-  - -rwxr-xr-x  0 0      0     1231448 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
-  - -rwxr-xr-x  0 0      0     1231448 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
+  - -rwxr-xr-x  0 0      0      701600 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python
+  - -rwxr-xr-x  0 0      0      701600 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3
+  - -rwxr-xr-x  0 0      0      701600 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/bin/python3.9
   - drwxr-xr-x  0 0      0           0 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/lib/
   - drwxr-xr-x  0 0      0           0 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/lib/python3.9/
   - -rwxr-xr-x  0 0      0         349 Jan  1  2023 ./py/tests/py_venv_image_layer/my_app_bin.runfiles/_main/py/tests/py_venv_image_layer/.my_app_bin/pyvenv.cfg

py/tools/venv_bin/BUILD.bazel

@@ -2,7 +2,6 @@ load("//bazel/release:release.bzl", "release")
 load("//bazel/rust:defs.bzl", "rust_binary")
 load("//bazel/rust:multi_platform_rust_binaries.bzl", "multi_platform_rust_binaries")
 
-# TODO(#497): transition to --nocollect_code_coverage to avoid rules_rust trying to instrument this binary
 rust_binary(
     name = "venv",
     srcs = [