Revert "Bug 1991427 - Apply mozilla patches for opentelemetry-proto r=jari" for causing build bustages @casts.h.

This reverts commit dfb89a0.

Revert "Bug 1991427 - Update opentelemetry-proto to new version v1.8.0 r=jari"

This reverts commit 2bdb19e.

Revert "Bug 1991427 - Switch otel-proto definitions to use `LITE_RUNTIME` r=jari"

This reverts commit 01b021c.

Revert "Bug 1991427 - Add support for `post-patch-actions` to `moz.yaml` files r=tjr"

This reverts commit 9f238f9.

Author: agoloman

python/mozbuild/mozbuild/vendor/docs/index.rst

@@ -64,37 +64,3 @@ In the presence of patches, two steps are needed:
 
 In the absence of patches, a single step is needed, and no extra argument is
 required.
-
-
-Vendoring Actions
-=================
-
-Vendoring actions in the ``moz.yaml`` file can be configured to run either before
-or after patches are applied using separate sections:
-
-* Actions in ``update-actions`` run **before** patches are applied
-* Actions in ``post-patch-actions`` run **after** patches are applied
-
-This separation is useful when you need to run scripts that depend on Mozilla-specific
-patches being applied first, such as:
-
-* Code generation scripts that need patched configuration files
-* Build system updates that depend on patched build definitions
-* Processing steps that require Mozilla-specific modifications to be in place
-
-Example:
-
-.. code-block:: yaml
-
-   # Actions that run before patches are applied
-   update-actions:
-     - action: run-script
-       script: '{yaml_dir}/pre_patch_script.sh'
-       cwd: '{yaml_dir}'
-
-   # Actions that run after patches are applied
-   post-patch-actions:
-     - action: run-script
-       script: '{yaml_dir}/post_patch_script.sh'
-       cwd: '{yaml_dir}'
-       args: ['{revision}']

python/mozbuild/mozbuild/vendor/docs/template.yaml

@@ -158,7 +158,7 @@ vendoring:
   # All three file/path parameters ("keep", "exclude", and "include") support
   # filenames, directory names, and globs/wildcards.
 
-  # Actions to take after updating but before applying patches. Applied in order.
+  # Actions to take after updating. Applied in order.
   # The action subfield is required. It must be one of:
   #   - copy-file
   #   - move-file
@@ -231,15 +231,6 @@ vendoring:
       script: '{cwd}/generate_sources.sh'
       cwd: '{yaml_dir}'
 
-  # Actions to take after patches have been applied. Applied in order.
-  # Uses the same action types as update-actions.
-  # optional
-  post-patch-actions:
-    - action: run-script
-      script: '{yaml_dir}/post_patch_script.py'
-      cwd: '{yaml_dir}'
-      args: ['{revision}']
-
 
 # Configuration for automatic updating system.
 # optional

python/mozbuild/mozbuild/vendor/moz_yaml.py

@@ -119,39 +119,6 @@ def load_moz_yaml(filename, verify=True, require_license_file=True):
 
 def _schema_1():
     """Returns Voluptuous Schema object."""
-
-    actions_schema = All(
-        VendoringActions(),
-        [
-            {
-                Required("action"): In(
-                    [
-                        "copy-file",
-                        "move-file",
-                        "move-dir",
-                        "replace-in-file",
-                        "replace-in-file-regex",
-                        "run-script",
-                        "run-command",
-                        "delete-path",
-                        "vcs-add-remove-files",
-                    ],
-                    msg="Invalid action specified in vendoring-actions",
-                ),
-                "from": All(str, Length(min=1)),
-                "to": All(str, Length(min=1)),
-                "pattern": All(str, Length(min=1)),
-                "with": All(str, Length(min=1)),
-                "file": All(str, Length(min=1)),
-                "script": All(str, Length(min=1)),
-                "command": All(str, Length(min=1)),
-                "args": All([All(str, Length(min=1))]),
-                "cwd": All(str, Length(min=1)),
-                "path": All(str, Length(min=1)),
-            }
-        ],
-    )
-
     return Schema(
         {
             Required("schema"): "1",
@@ -234,8 +201,37 @@ def _schema_1():
                 "individual-files-default-upstream": str,
                 "individual-files-default-destination": All(str, Length(min=1)),
                 "individual-files-list": Unique([str]),
-                "update-actions": actions_schema,
-                "post-patch-actions": actions_schema,
+                "update-actions": All(
+                    UpdateActions(),
+                    [
+                        {
+                            Required("action"): In(
+                                [
+                                    "copy-file",
+                                    "move-file",
+                                    "move-dir",
+                                    "replace-in-file",
+                                    "replace-in-file-regex",
+                                    "run-script",
+                                    "run-command",
+                                    "delete-path",
+                                    "vcs-add-remove-files",
+                                ],
+                                msg="Invalid action specified in update-actions",
+                            ),
+                            "from": All(str, Length(min=1)),
+                            "to": All(str, Length(min=1)),
+                            "pattern": All(str, Length(min=1)),
+                            "with": All(str, Length(min=1)),
+                            "file": All(str, Length(min=1)),
+                            "script": All(str, Length(min=1)),
+                            "command": All(str, Length(min=1)),
+                            "args": All([All(str, Length(min=1))]),
+                            "cwd": All(str, Length(min=1)),
+                            "path": All(str, Length(min=1)),
+                        }
+                    ],
+                ),
             },
         }
     )
@@ -442,8 +438,8 @@ def _schema_1_transform(manifest):
     return manifest
 
 
-class VendoringActions:
-    """Voluptuous validator which verifies the vendoring actions(s) are valid."""
+class UpdateActions:
+    """Voluptuous validator which verifies the update actions(s) are valid."""
 
     def __call__(self, values):
         for v in values:
@@ -501,7 +497,7 @@ def __call__(self, values):
         return values
 
     def __repr__(self):
-        return "VendoringActions"
+        return "UpdateActions"
 
 
 class UpdatebotTasks:

python/mozbuild/mozbuild/vendor/vendor_manifest.py

@@ -137,7 +137,6 @@ def vendor(
                 os.path.dirname(self.yaml_file),
                 self.manifest["vendoring"]["vendor-directory"],
             )
-            self.run_vendoring_actions(revision, "post-patch-actions")
             return
 
         # ==========================================================
@@ -273,7 +272,7 @@ def process_regular_or_individual(
             self.logInfo({}, "Skipping fetching upstream source.")
 
         self.logInfo({}, "Checking for update actions")
-        self.run_vendoring_actions(new_revision, "update-actions")
+        self.update_files(new_revision)
 
         if self.patch_mode == "check":
             self.import_local_patches(
@@ -699,14 +698,14 @@ def spurious_check(self, revision, ignore_modified):
             "Version '{rev}' has changed {num} files.",
         )
 
-    def run_vendoring_actions(self, revision, actions_type="update-actions"):
-        if actions_type not in self.manifest["vendoring"]:
+    def update_files(self, revision):
+        if "update-actions" not in self.manifest["vendoring"]:
             return
 
-        for action in self.manifest["vendoring"][actions_type]:
-            if action["action"] == "copy-file":
-                src = self.get_full_path(action["from"])
-                dst = self.get_full_path(action["to"])
+        for update in self.manifest["vendoring"]["update-actions"]:
+            if update["action"] == "copy-file":
+                src = self.get_full_path(update["from"])
+                dst = self.get_full_path(update["to"])
 
                 self.logInfo(
                     {"s": src, "d": dst}, "action: copy-file src: {s} dst: {d}"
@@ -716,24 +715,24 @@ def run_vendoring_actions(self, revision, actions_type="update-actions"):
                     contents = f.read()
                 with open(dst, "w") as f:
                     f.write(contents)
-            elif action["action"] == "vcs-add-remove-files":
-                directory = self.get_full_path(action["path"])
+            elif update["action"] == "vcs-add-remove-files":
+                directory = self.get_full_path(update["path"])
 
                 self.logInfo({"d": directory}, "action: vcs-add-remove-files dir: {d}")
 
                 self.repository.add_remove_files(directory)
-            elif action["action"] == "move-file":
-                src = self.get_full_path(action["from"])
-                dst = self.get_full_path(action["to"])
+            elif update["action"] == "move-file":
+                src = self.get_full_path(update["from"])
+                dst = self.get_full_path(update["to"])
 
                 self.logInfo(
                     {"s": src, "d": dst}, "action: move-file src: {s} dst: {d}"
                 )
 
                 shutil.move(src, dst)
-            elif action["action"] == "move-dir":
-                src = self.get_full_path(action["from"])
-                dst = self.get_full_path(action["to"])
+            elif update["action"] == "move-dir":
+                src = self.get_full_path(update["from"])
+                dst = self.get_full_path(update["to"])
 
                 self.logInfo(
                     {"src": src, "dst": dst}, "action: move-dir src: {src} dst: {dst}"
@@ -762,32 +761,32 @@ def copy_tree(src, dst):
                 copy_tree(src, dst)
                 shutil.rmtree(src)
 
-            elif action["action"] in ["replace-in-file", "replace-in-file-regex"]:
-                file = self.get_full_path(action["file"])
+            elif update["action"] in ["replace-in-file", "replace-in-file-regex"]:
+                file = self.get_full_path(update["file"])
 
                 self.logInfo({"file": file}, "action: replace-in-file file: {file}")
 
-                replacement = action["with"].replace("{revision}", revision)
+                replacement = update["with"].replace("{revision}", revision)
                 _replace_in_file(
                     file,
-                    action["pattern"],
+                    update["pattern"],
                     replacement,
-                    regex=action["action"] == "replace-in-file-regex",
+                    regex=update["action"] == "replace-in-file-regex",
                 )
-            elif action["action"] == "delete-path":
-                path = self.get_full_path(action["path"])
+            elif update["action"] == "delete-path":
+                path = self.get_full_path(update["path"])
                 self.logInfo({"path": path}, "action: delete-path path: {path}")
                 mozfile.remove(path)
-            elif action["action"] in ["run-script", "run-command"]:
-                if action["action"] == "run-script":
-                    command = self.get_full_path(action["script"], support_cwd=True)
+            elif update["action"] in ["run-script", "run-command"]:
+                if update["action"] == "run-script":
+                    command = self.get_full_path(update["script"], support_cwd=True)
                 else:
-                    command = action["command"]
+                    command = update["command"]
 
-                run_dir = self.get_full_path(action["cwd"], support_cwd=True)
+                run_dir = self.get_full_path(update["cwd"], support_cwd=True)
 
                 args = []
-                for a in action.get("args", []):
+                for a in update.get("args", []):
                     if a == "{revision}":
                         args.append(revision)
                     elif any(
@@ -809,7 +808,7 @@ def copy_tree(src, dst):
                         "command": command,
                         "run_dir": run_dir,
                         "args": args,
-                        "type": action["action"],
+                        "type": update["action"],
                     },
                     "action: {type} command: {command} working dir: {run_dir} args: {args}",
                 )

third_party/opentelemetry-cpp/moz.build

@@ -9,6 +9,7 @@ DIRS += [
     "sdk/src",
 ]
 
+
 TEST_DIRS += ["exporters/memory"]
 
 with Files("**"):

third_party/opentelemetry-cpp/third_party/opentelemetry-proto/CHANGELOG.md

@@ -4,32 +4,6 @@
 
 The full list of changes can be found in the compare view for the respective release at <https://github.com/open-telemetry/opentelemetry-proto/releases>.
 
-## 1.8.0 - 2025-09-02
-
-### Changed
-
-- profiles: drop gzip requirement. [#661](https://github.com/open-telemetry/opentelemetry-proto/pull/661)
-- profiles: avoid `optional` keyword usage. [#659](https://github.com/open-telemetry/opentelemetry-proto/pull/659)
-- profiles: make `profile_id` optional. [#665](https://github.com/open-telemetry/opentelemetry-proto/pull/665)
-- profiles: use single `Profile.sample_type` and clarify use of timestamps. [#649](https://github.com/open-telemetry/opentelemetry-proto/pull/649)
-- all: add notes about the attribute values restrictions. [#683](https://github.com/open-telemetry/opentelemetry-proto/pull/683)<br>
-  ⚠️ **IMPORTANT**: These restrictions can be dropped in a future minor release.
-- profiles: clarify usage of the zero value as the first element of tables in `ProfilesDictionary`. [#688](https://github.com/open-telemetry/opentelemetry-proto/pull/688), [#698](https://github.com/open-telemetry/opentelemetry-proto/pull/698)
-- profiles: unsigned `time_nanos` and `duration_nanos` in `Profile`. [#692](https://github.com/open-telemetry/opentelemetry-proto/pull/692)
-- profiles: improve attribute encoding in `ProfilesDictionary`. [#672](https://github.com/open-telemetry/opentelemetry-proto/pull/672)
-- profiles: simplify profile stack trace representation. [#708](https://github.com/open-telemetry/opentelemetry-proto/pull/708)
-
-### Fixed
-
-- examples: fix OTLP JSON Event example body. [#666](https://github.com/open-telemetry/opentelemetry-proto/pull/666)
-- docs: minor specification fixes around `UNAVAILABLE` and `RetryInfo`. [#669](https://github.com/open-telemetry/opentelemetry-proto/pull/669)
-
-### Removed
-
-- profiles: remove `default_sample_type`. [#679](https://github.com/open-telemetry/opentelemetry-proto/pull/679)
-- profiles: remove `has_*` debug info fields, they are moving to attributes. [#595](https://github.com/open-telemetry/opentelemetry-proto/pull/595)
-- profiles: remove `Location.is_folded`. [#690](https://github.com/open-telemetry/opentelemetry-proto/pull/690)
-
 ## 1.7.0 - 2025-05-19
 
 ### Added

third_party/opentelemetry-cpp/third_party/opentelemetry-proto/README.md

@@ -127,15 +127,3 @@ Experiments which succeed, require a review before the field or the message is m
 
 No guarantees are provided whatsoever about the stability of the code that
 is generated from the .proto files by any particular code generator.
-
-## Maintainers
-
-- [OpenTelemetry Technical Committee](https://github.com/open-telemetry/community/blob/main/community-members.md#technical-committee)
-
-For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
-
-## Approvers
-
-- [OpenTelemetry Specification Sponsors](https://github.com/open-telemetry/community/blob/main/community-members.md#specifications-and-proto)
-
-For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).

third_party/opentelemetry-cpp/third_party/opentelemetry-proto/moz.yaml

@@ -9,8 +9,8 @@ origin:
   description: OpenTelemetry protocol (OTLP) specification and Protobuf definitions
   url: https://opentelemetry.io/docs/specs/otlp/
 
-  release: v1.8.0 (2025-09-02T11:03:39-04:00).
-  revision: v1.8.0
+  release: identifier
+  revision: sha
 
   license: Apache-2.0
   license-file: LICENSE
@@ -46,10 +46,7 @@ vendoring:
    - opentelemetry/proto/trace/v1/trace.pb.cc
    - opentelemetry/proto/trace/v1/trace.pb.h
 
-  patches:
-    - patches/add-lite_runtime-optimization-to-protos.patch
-
-  post-patch-actions:
+  update-actions:
     - action: run-script
       script: "{topsrcdir}/toolkit/components/protobuf/scripts/protoc_wrapper.py"
       cwd: "{topsrcdir}"

third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry.proto.resource.v1.rs

@@ -6,16 +6,6 @@ pub struct Resource {
     /// Set of attributes that describe the resource.
     /// Attribute keys MUST be unique (it is not allowed to have more than one
     /// attribute with the same key).
-    ///
-    /// The attribute values SHOULD NOT contain empty values.
-    /// The attribute values SHOULD NOT contain bytes values.
-    /// The attribute values SHOULD NOT contain array values different than array of string values, bool values, int values,
-    /// double values.
-    /// The attribute values SHOULD NOT contain kvlist values.
-    /// The behavior of software that receives attributes containing such values can be unpredictable.
-    /// These restrictions can change in a minor release.
-    /// The restrictions take origin from the OpenTelemetry specification:
-    /// <https://github.com/open-telemetry/opentelemetry-specification/blob/v1.47.0/specification/common/README.md#attribute.>
     #[prost(message, repeated, tag = "1")]
     pub attributes: ::prost::alloc::vec::Vec<super::super::common::v1::KeyValue>,
     /// dropped_attributes_count is the number of dropped attributes. If the value is 0, then