commit 2c8e9bccfd6ce951ceda8d46ab619f461b7fd0bc parent 8720d3395e4f5e3d566d2de44eb42ef5f6b95fcd Author: agoloman <agoloman@mozilla.com> Date: Thu, 2 Oct 2025 21:17:28 +0300 Revert "Bug 1991427 - Apply mozilla patches for opentelemetry-proto r=jari" for causing build bustages @casts.h. This reverts commit dfb89a0be73ea286c8da8db7f5d1b1be61062b99. Revert "Bug 1991427 - Update opentelemetry-proto to new version v1.8.0 r=jari" This reverts commit 2bdb19eb2811c41d25ffec715c5d3983c5481933. Revert "Bug 1991427 - Switch otel-proto definitions to use `LITE_RUNTIME` r=jari" This reverts commit 01b021cb7b294cc5fb55bab11cb344cfc09fb278. Revert "Bug 1991427 - Add support for `post-patch-actions` to `moz.yaml` files r=tjr" This reverts commit 9f238f9dc7bf9ab15f5bcd4dd2bf8e5c16124e10. Diffstat:
24 files changed, 1391 insertions(+), 988 deletions(-)
diff --git a/python/mozbuild/mozbuild/vendor/docs/index.rst b/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}'] diff --git a/python/mozbuild/mozbuild/vendor/docs/template.yaml b/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 diff --git a/python/mozbuild/mozbuild/vendor/moz_yaml.py b/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 @@ class VendoringActions: return values def __repr__(self): - return "VendoringActions" + return "UpdateActions" class UpdatebotTasks: diff --git a/python/mozbuild/mozbuild/vendor/vendor_manifest.py b/python/mozbuild/mozbuild/vendor/vendor_manifest.py @@ -137,7 +137,6 @@ class VendorManifest(MozbuildObject): os.path.dirname(self.yaml_file), self.manifest["vendoring"]["vendor-directory"], ) - self.run_vendoring_actions(revision, "post-patch-actions") return # ========================================================== @@ -273,7 +272,7 @@ class VendorManifest(MozbuildObject): 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 @@ class VendorManifest(MozbuildObject): "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 @@ class VendorManifest(MozbuildObject): 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 @@ class VendorManifest(MozbuildObject): 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 @@ class VendorManifest(MozbuildObject): "command": command, "run_dir": run_dir, "args": args, - "type": action["action"], + "type": update["action"], }, "action: {type} command: {command} working dir: {run_dir} args: {args}", ) diff --git a/third_party/opentelemetry-cpp/moz.build b/third_party/opentelemetry-cpp/moz.build @@ -9,6 +9,7 @@ DIRS += [ "sdk/src", ] + TEST_DIRS += ["exporters/memory"] with Files("**"): diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/CHANGELOG.md b/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 diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/README.md b/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). diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/moz.yaml b/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}" diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry.proto.resource.v1.rs b/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 diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry.proto.trace.v1.rs b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry.proto.trace.v1.rs @@ -156,18 +156,10 @@ pub struct Span { /// "example.com/myattribute": true /// "example.com/score": 10.239 /// + /// The OpenTelemetry API specification further restricts the allowed value types: + /// <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/README.md#attribute> /// 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 = "9")] pub attributes: ::prost::alloc::vec::Vec<super::super::common::v1::KeyValue>, /// dropped_attributes_count is the number of attributes that were discarded. Attributes @@ -212,16 +204,6 @@ pub mod span { /// attributes is a collection of attribute key/value pairs on the event. /// 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 = "3")] pub attributes: ::prost::alloc::vec::Vec< super::super::super::common::v1::KeyValue, @@ -251,16 +233,6 @@ pub mod span { /// attributes is a collection of attribute key/value pairs on the link. /// 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 = "4")] pub attributes: ::prost::alloc::vec::Vec< super::super::super::common::v1::KeyValue, diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.pb.cc b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.pb.cc @@ -8,7 +8,10 @@ #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/extension_set.h> #include <google/protobuf/wire_format_lite.h> -#include <google/protobuf/io/zero_copy_stream_impl_lite.h> +#include <google/protobuf/descriptor.h> +#include <google/protobuf/generated_message_reflection.h> +#include <google/protobuf/reflection_ops.h> +#include <google/protobuf/wire_format.h> // @@protoc_insertion_point(includes) #include <google/protobuf/port_def.inc> @@ -67,6 +70,86 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT } // namespace collector } // namespace proto } // namespace opentelemetry +static ::_pb::Metadata file_level_metadata_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto[3]; +static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto = nullptr; +static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto = nullptr; + +const uint32_t TableStruct_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest, _impl_.resource_spans_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse, _impl_.partial_success_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::collector::trace::v1::ExportTracePartialSuccess, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::collector::trace::v1::ExportTracePartialSuccess, _impl_.rejected_spans_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::collector::trace::v1::ExportTracePartialSuccess, _impl_.error_message_), +}; +static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + { 0, -1, -1, sizeof(::opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest)}, + { 7, -1, -1, sizeof(::opentelemetry::proto::collector::trace::v1::ExportTraceServiceResponse)}, + { 14, -1, -1, sizeof(::opentelemetry::proto::collector::trace::v1::ExportTracePartialSuccess)}, +}; + +static const ::_pb::Message* const file_default_instances[] = { + &::opentelemetry::proto::collector::trace::v1::_ExportTraceServiceRequest_default_instance_._instance, + &::opentelemetry::proto::collector::trace::v1::_ExportTraceServiceResponse_default_instance_._instance, + &::opentelemetry::proto::collector::trace::v1::_ExportTracePartialSuccess_default_instance_._instance, +}; + +const char descriptor_table_protodef_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = + "\n:opentelemetry/proto/collector/trace/v1" + "/trace_service.proto\022&opentelemetry.prot" + "o.collector.trace.v1\032(opentelemetry/prot" + "o/trace/v1/trace.proto\"`\n\031ExportTraceSer" + "viceRequest\022C\n\016resource_spans\030\001 \003(\0132+.op" + "entelemetry.proto.trace.v1.ResourceSpans" + "\"x\n\032ExportTraceServiceResponse\022Z\n\017partia" + "l_success\030\001 \001(\0132A.opentelemetry.proto.co" + "llector.trace.v1.ExportTracePartialSucce" + "ss\"J\n\031ExportTracePartialSuccess\022\026\n\016rejec" + "ted_spans\030\001 \001(\003\022\025\n\rerror_message\030\002 \001(\t2\242" + "\001\n\014TraceService\022\221\001\n\006Export\022A.opentelemet" + "ry.proto.collector.trace.v1.ExportTraceS" + "erviceRequest\032B.opentelemetry.proto.coll" + "ector.trace.v1.ExportTraceServiceRespons" + "e\"\000B\234\001\n)io.opentelemetry.proto.collector" + ".trace.v1B\021TraceServiceProtoP\001Z1go.opent" + "elemetry.io/proto/otlp/collector/trace/v" + "1\252\002&OpenTelemetry.Proto.Collector.Trace." + "V1b\006proto3" + ; +static const ::_pbi::DescriptorTable* const descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_deps[1] = { + &::descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto, +}; +static ::_pbi::once_flag descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_once; +const ::_pbi::DescriptorTable descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto = { + false, false, 770, descriptor_table_protodef_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto, + "opentelemetry/proto/collector/trace/v1/trace_service.proto", + &descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_once, descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_deps, 1, 3, + schemas, file_default_instances, TableStruct_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto::offsets, + file_level_metadata_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto, file_level_enum_descriptors_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto, + file_level_service_descriptors_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto, +}; +PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_getter() { + return &descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto; +} + +// Force running AddDescriptors() at dynamic initialization time. +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto(&descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto); namespace opentelemetry { namespace proto { namespace collector { @@ -84,18 +167,18 @@ void ExportTraceServiceRequest::clear_resource_spans() { } ExportTraceServiceRequest::ExportTraceServiceRequest(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest) } ExportTraceServiceRequest::ExportTraceServiceRequest(const ExportTraceServiceRequest& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { ExportTraceServiceRequest* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.resource_spans_){from._impl_.resource_spans_} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest) } @@ -111,7 +194,7 @@ inline void ExportTraceServiceRequest::SharedCtor( ExportTraceServiceRequest::~ExportTraceServiceRequest() { // @@protoc_insertion_point(destructor:opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -134,7 +217,7 @@ void ExportTraceServiceRequest::Clear() { (void) cached_has_bits; _impl_.resource_spans_.Clear(); - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* ExportTraceServiceRequest::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -167,7 +250,7 @@ const char* ExportTraceServiceRequest::_InternalParse(const char* ptr, ::_pbi::P } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -194,8 +277,8 @@ uint8_t* ExportTraceServiceRequest::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest) return target; @@ -216,29 +299,26 @@ size_t ExportTraceServiceRequest::ByteSizeLong() const { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void ExportTraceServiceRequest::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const ExportTraceServiceRequest*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ExportTraceServiceRequest::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + ExportTraceServiceRequest::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ExportTraceServiceRequest::GetClassData() const { return &_class_data_; } + -void ExportTraceServiceRequest::MergeFrom(const ExportTraceServiceRequest& from) { - ExportTraceServiceRequest* const _this = this; +void ExportTraceServiceRequest::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<ExportTraceServiceRequest*>(&to_msg); + auto& from = static_cast<const ExportTraceServiceRequest&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; _this->_impl_.resource_spans_.MergeFrom(from._impl_.resource_spans_); - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void ExportTraceServiceRequest::CopyFrom(const ExportTraceServiceRequest& from) { @@ -258,11 +338,12 @@ void ExportTraceServiceRequest::InternalSwap(ExportTraceServiceRequest* other) { _impl_.resource_spans_.InternalSwap(&other->_impl_.resource_spans_); } -std::string ExportTraceServiceRequest::GetTypeName() const { - return "opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest"; +::PROTOBUF_NAMESPACE_ID::Metadata ExportTraceServiceRequest::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto[0]); } - // =================================================================== class ExportTraceServiceResponse::_Internal { @@ -276,18 +357,18 @@ ExportTraceServiceResponse::_Internal::partial_success(const ExportTraceServiceR } ExportTraceServiceResponse::ExportTraceServiceResponse(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse) } ExportTraceServiceResponse::ExportTraceServiceResponse(const ExportTraceServiceResponse& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { ExportTraceServiceResponse* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.partial_success_){nullptr} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); if (from._internal_has_partial_success()) { _this->_impl_.partial_success_ = new ::opentelemetry::proto::collector::trace::v1::ExportTracePartialSuccess(*from._impl_.partial_success_); } @@ -306,7 +387,7 @@ inline void ExportTraceServiceResponse::SharedCtor( ExportTraceServiceResponse::~ExportTraceServiceResponse() { // @@protoc_insertion_point(destructor:opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -332,7 +413,7 @@ void ExportTraceServiceResponse::Clear() { delete _impl_.partial_success_; } _impl_.partial_success_ = nullptr; - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* ExportTraceServiceResponse::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -360,7 +441,7 @@ const char* ExportTraceServiceResponse::_InternalParse(const char* ptr, ::_pbi:: } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -386,8 +467,8 @@ uint8_t* ExportTraceServiceResponse::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse) return target; @@ -408,22 +489,19 @@ size_t ExportTraceServiceResponse::ByteSizeLong() const { *_impl_.partial_success_); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void ExportTraceServiceResponse::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const ExportTraceServiceResponse*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ExportTraceServiceResponse::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + ExportTraceServiceResponse::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ExportTraceServiceResponse::GetClassData() const { return &_class_data_; } + -void ExportTraceServiceResponse::MergeFrom(const ExportTraceServiceResponse& from) { - ExportTraceServiceResponse* const _this = this; +void ExportTraceServiceResponse::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<ExportTraceServiceResponse*>(&to_msg); + auto& from = static_cast<const ExportTraceServiceResponse&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -433,7 +511,7 @@ void ExportTraceServiceResponse::MergeFrom(const ExportTraceServiceResponse& fro _this->_internal_mutable_partial_success()->::opentelemetry::proto::collector::trace::v1::ExportTracePartialSuccess::MergeFrom( from._internal_partial_success()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void ExportTraceServiceResponse::CopyFrom(const ExportTraceServiceResponse& from) { @@ -453,11 +531,12 @@ void ExportTraceServiceResponse::InternalSwap(ExportTraceServiceResponse* other) swap(_impl_.partial_success_, other->_impl_.partial_success_); } -std::string ExportTraceServiceResponse::GetTypeName() const { - return "opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse"; +::PROTOBUF_NAMESPACE_ID::Metadata ExportTraceServiceResponse::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto[1]); } - // =================================================================== class ExportTracePartialSuccess::_Internal { @@ -466,19 +545,19 @@ class ExportTracePartialSuccess::_Internal { ExportTracePartialSuccess::ExportTracePartialSuccess(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.collector.trace.v1.ExportTracePartialSuccess) } ExportTracePartialSuccess::ExportTracePartialSuccess(const ExportTracePartialSuccess& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { ExportTracePartialSuccess* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.error_message_){} , decltype(_impl_.rejected_spans_){} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.error_message_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.error_message_.Set("", GetArenaForAllocation()); @@ -508,7 +587,7 @@ inline void ExportTracePartialSuccess::SharedCtor( ExportTracePartialSuccess::~ExportTracePartialSuccess() { // @@protoc_insertion_point(destructor:opentelemetry.proto.collector.trace.v1.ExportTracePartialSuccess) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -532,7 +611,7 @@ void ExportTracePartialSuccess::Clear() { _impl_.error_message_.ClearToEmpty(); _impl_.rejected_spans_ = int64_t{0}; - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* ExportTracePartialSuccess::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -555,7 +634,7 @@ const char* ExportTracePartialSuccess::_InternalParse(const char* ptr, ::_pbi::P auto str = _internal_mutable_error_message(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.collector.trace.v1.ExportTracePartialSuccess.error_message")); } else goto handle_unusual; continue; @@ -570,7 +649,7 @@ const char* ExportTracePartialSuccess::_InternalParse(const char* ptr, ::_pbi::P } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -605,8 +684,8 @@ uint8_t* ExportTracePartialSuccess::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.collector.trace.v1.ExportTracePartialSuccess) return target; @@ -632,22 +711,19 @@ size_t ExportTracePartialSuccess::ByteSizeLong() const { total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_rejected_spans()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void ExportTracePartialSuccess::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const ExportTracePartialSuccess*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ExportTracePartialSuccess::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + ExportTracePartialSuccess::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ExportTracePartialSuccess::GetClassData() const { return &_class_data_; } + -void ExportTracePartialSuccess::MergeFrom(const ExportTracePartialSuccess& from) { - ExportTracePartialSuccess* const _this = this; +void ExportTracePartialSuccess::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<ExportTracePartialSuccess*>(&to_msg); + auto& from = static_cast<const ExportTracePartialSuccess&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.collector.trace.v1.ExportTracePartialSuccess) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -659,7 +735,7 @@ void ExportTracePartialSuccess::MergeFrom(const ExportTracePartialSuccess& from) if (from._internal_rejected_spans() != 0) { _this->_internal_set_rejected_spans(from._internal_rejected_spans()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void ExportTracePartialSuccess::CopyFrom(const ExportTracePartialSuccess& from) { @@ -685,11 +761,12 @@ void ExportTracePartialSuccess::InternalSwap(ExportTracePartialSuccess* other) { swap(_impl_.rejected_spans_, other->_impl_.rejected_spans_); } -std::string ExportTracePartialSuccess::GetTypeName() const { - return "opentelemetry.proto.collector.trace.v1.ExportTracePartialSuccess"; +::PROTOBUF_NAMESPACE_ID::Metadata ExportTracePartialSuccess::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto[2]); } - // @@protoc_insertion_point(namespace_scope) } // namespace v1 } // namespace trace diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.pb.h b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.pb.h @@ -25,9 +25,11 @@ #include <google/protobuf/arenastring.h> #include <google/protobuf/generated_message_util.h> #include <google/protobuf/metadata_lite.h> -#include <google/protobuf/message_lite.h> +#include <google/protobuf/generated_message_reflection.h> +#include <google/protobuf/message.h> #include <google/protobuf/repeated_field.h> // IWYU pragma: export #include <google/protobuf/extension_set.h> // IWYU pragma: export +#include <google/protobuf/unknown_field_set.h> #include "opentelemetry/proto/trace/v1/trace.pb.h" // @@protoc_insertion_point(includes) #include <google/protobuf/port_def.inc> @@ -42,6 +44,7 @@ PROTOBUF_NAMESPACE_CLOSE struct TableStruct_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto { static const uint32_t offsets[]; }; +extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_opentelemetry_2fproto_2fcollector_2ftrace_2fv1_2ftrace_5fservice_2eproto; namespace opentelemetry { namespace proto { namespace collector { @@ -75,7 +78,7 @@ namespace v1 { // =================================================================== class ExportTraceServiceRequest final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest) */ { public: inline ExportTraceServiceRequest() : ExportTraceServiceRequest(nullptr) {} ~ExportTraceServiceRequest() override; @@ -105,6 +108,15 @@ class ExportTraceServiceRequest final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const ExportTraceServiceRequest& default_instance() { return *internal_default_instance(); } @@ -142,9 +154,15 @@ class ExportTraceServiceRequest final : ExportTraceServiceRequest* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<ExportTraceServiceRequest>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const ExportTraceServiceRequest& from); - void MergeFrom(const ExportTraceServiceRequest& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const ExportTraceServiceRequest& from) { + ExportTraceServiceRequest::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -157,7 +175,7 @@ class ExportTraceServiceRequest final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(ExportTraceServiceRequest* other); private: @@ -170,7 +188,10 @@ class ExportTraceServiceRequest final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -214,7 +235,7 @@ class ExportTraceServiceRequest final : // ------------------------------------------------------------------- class ExportTraceServiceResponse final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse) */ { public: inline ExportTraceServiceResponse() : ExportTraceServiceResponse(nullptr) {} ~ExportTraceServiceResponse() override; @@ -244,6 +265,15 @@ class ExportTraceServiceResponse final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const ExportTraceServiceResponse& default_instance() { return *internal_default_instance(); } @@ -281,9 +311,15 @@ class ExportTraceServiceResponse final : ExportTraceServiceResponse* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<ExportTraceServiceResponse>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const ExportTraceServiceResponse& from); - void MergeFrom(const ExportTraceServiceResponse& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const ExportTraceServiceResponse& from) { + ExportTraceServiceResponse::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -296,7 +332,7 @@ class ExportTraceServiceResponse final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(ExportTraceServiceResponse* other); private: @@ -309,7 +345,10 @@ class ExportTraceServiceResponse final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -353,7 +392,7 @@ class ExportTraceServiceResponse final : // ------------------------------------------------------------------- class ExportTracePartialSuccess final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.collector.trace.v1.ExportTracePartialSuccess) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.collector.trace.v1.ExportTracePartialSuccess) */ { public: inline ExportTracePartialSuccess() : ExportTracePartialSuccess(nullptr) {} ~ExportTracePartialSuccess() override; @@ -383,6 +422,15 @@ class ExportTracePartialSuccess final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const ExportTracePartialSuccess& default_instance() { return *internal_default_instance(); } @@ -420,9 +468,15 @@ class ExportTracePartialSuccess final : ExportTracePartialSuccess* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<ExportTracePartialSuccess>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const ExportTracePartialSuccess& from); - void MergeFrom(const ExportTracePartialSuccess& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const ExportTracePartialSuccess& from) { + ExportTracePartialSuccess::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -435,7 +489,7 @@ class ExportTracePartialSuccess final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(ExportTracePartialSuccess* other); private: @@ -448,7 +502,10 @@ class ExportTracePartialSuccess final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto @@ -14,8 +14,6 @@ syntax = "proto3"; -option optimize_for = LITE_RUNTIME; - package opentelemetry.proto.collector.trace.v1; import "opentelemetry/proto/trace/v1/trace.proto"; diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/common/v1/common.pb.cc b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/common/v1/common.pb.cc @@ -8,7 +8,10 @@ #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/extension_set.h> #include <google/protobuf/wire_format_lite.h> -#include <google/protobuf/io/zero_copy_stream_impl_lite.h> +#include <google/protobuf/descriptor.h> +#include <google/protobuf/generated_message_reflection.h> +#include <google/protobuf/reflection_ops.h> +#include <google/protobuf/wire_format.h> // @@protoc_insertion_point(includes) #include <google/protobuf/port_def.inc> @@ -111,6 +114,127 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT } // namespace common } // namespace proto } // namespace opentelemetry +static ::_pb::Metadata file_level_metadata_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto[6]; +static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto = nullptr; +static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto = nullptr; + +const uint32_t TableStruct_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::AnyValue, _internal_metadata_), + ~0u, // no _extensions_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::AnyValue, _impl_._oneof_case_[0]), + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + ::_pbi::kInvalidFieldOffsetTag, + ::_pbi::kInvalidFieldOffsetTag, + ::_pbi::kInvalidFieldOffsetTag, + ::_pbi::kInvalidFieldOffsetTag, + ::_pbi::kInvalidFieldOffsetTag, + ::_pbi::kInvalidFieldOffsetTag, + ::_pbi::kInvalidFieldOffsetTag, + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::AnyValue, _impl_.value_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::ArrayValue, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::ArrayValue, _impl_.values_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::KeyValueList, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::KeyValueList, _impl_.values_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::KeyValue, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::KeyValue, _impl_.key_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::KeyValue, _impl_.value_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::InstrumentationScope, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::InstrumentationScope, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::InstrumentationScope, _impl_.version_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::InstrumentationScope, _impl_.attributes_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::InstrumentationScope, _impl_.dropped_attributes_count_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::EntityRef, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::EntityRef, _impl_.schema_url_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::EntityRef, _impl_.type_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::EntityRef, _impl_.id_keys_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::common::v1::EntityRef, _impl_.description_keys_), +}; +static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + { 0, -1, -1, sizeof(::opentelemetry::proto::common::v1::AnyValue)}, + { 14, -1, -1, sizeof(::opentelemetry::proto::common::v1::ArrayValue)}, + { 21, -1, -1, sizeof(::opentelemetry::proto::common::v1::KeyValueList)}, + { 28, -1, -1, sizeof(::opentelemetry::proto::common::v1::KeyValue)}, + { 36, -1, -1, sizeof(::opentelemetry::proto::common::v1::InstrumentationScope)}, + { 46, -1, -1, sizeof(::opentelemetry::proto::common::v1::EntityRef)}, +}; + +static const ::_pb::Message* const file_default_instances[] = { + &::opentelemetry::proto::common::v1::_AnyValue_default_instance_._instance, + &::opentelemetry::proto::common::v1::_ArrayValue_default_instance_._instance, + &::opentelemetry::proto::common::v1::_KeyValueList_default_instance_._instance, + &::opentelemetry::proto::common::v1::_KeyValue_default_instance_._instance, + &::opentelemetry::proto::common::v1::_InstrumentationScope_default_instance_._instance, + &::opentelemetry::proto::common::v1::_EntityRef_default_instance_._instance, +}; + +const char descriptor_table_protodef_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = + "\n*opentelemetry/proto/common/v1/common.p" + "roto\022\035opentelemetry.proto.common.v1\"\214\002\n\010" + "AnyValue\022\026\n\014string_value\030\001 \001(\tH\000\022\024\n\nbool" + "_value\030\002 \001(\010H\000\022\023\n\tint_value\030\003 \001(\003H\000\022\026\n\014d" + "ouble_value\030\004 \001(\001H\000\022@\n\013array_value\030\005 \001(\013" + "2).opentelemetry.proto.common.v1.ArrayVa" + "lueH\000\022C\n\014kvlist_value\030\006 \001(\0132+.openteleme" + "try.proto.common.v1.KeyValueListH\000\022\025\n\013by" + "tes_value\030\007 \001(\014H\000B\007\n\005value\"E\n\nArrayValue" + "\0227\n\006values\030\001 \003(\0132\'.opentelemetry.proto.c" + "ommon.v1.AnyValue\"G\n\014KeyValueList\0227\n\006val" + "ues\030\001 \003(\0132\'.opentelemetry.proto.common.v" + "1.KeyValue\"O\n\010KeyValue\022\013\n\003key\030\001 \001(\t\0226\n\005v" + "alue\030\002 \001(\0132\'.opentelemetry.proto.common." + "v1.AnyValue\"\224\001\n\024InstrumentationScope\022\014\n\004" + "name\030\001 \001(\t\022\017\n\007version\030\002 \001(\t\022;\n\nattribute" + "s\030\003 \003(\0132\'.opentelemetry.proto.common.v1." + "KeyValue\022 \n\030dropped_attributes_count\030\004 \001" + "(\r\"X\n\tEntityRef\022\022\n\nschema_url\030\001 \001(\t\022\014\n\004t" + "ype\030\002 \001(\t\022\017\n\007id_keys\030\003 \003(\t\022\030\n\020descriptio" + "n_keys\030\004 \003(\tB{\n io.opentelemetry.proto.c" + "ommon.v1B\013CommonProtoP\001Z(go.opentelemetr" + "y.io/proto/otlp/common/v1\252\002\035OpenTelemetr" + "y.Proto.Common.V1b\006proto3" + ; +static ::_pbi::once_flag descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_once; +const ::_pbi::DescriptorTable descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto = { + false, false, 945, descriptor_table_protodef_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto, + "opentelemetry/proto/common/v1/common.proto", + &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_once, nullptr, 0, 6, + schemas, file_default_instances, TableStruct_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto::offsets, + file_level_metadata_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto, file_level_enum_descriptors_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto, + file_level_service_descriptors_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto, +}; +PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_getter() { + return &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto; +} + +// Force running AddDescriptors() at dynamic initialization time. +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto(&descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto); namespace opentelemetry { namespace proto { namespace common { @@ -164,19 +288,19 @@ void AnyValue::set_allocated_kvlist_value(::opentelemetry::proto::common::v1::Ke } AnyValue::AnyValue(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.common.v1.AnyValue) } AnyValue::AnyValue(const AnyValue& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { AnyValue* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.value_){} , /*decltype(_impl_._cached_size_)*/{} , /*decltype(_impl_._oneof_case_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); clear_has_value(); switch (from.value_case()) { case kStringValue: { @@ -230,7 +354,7 @@ inline void AnyValue::SharedCtor( AnyValue::~AnyValue() { // @@protoc_insertion_point(destructor:opentelemetry.proto.common.v1.AnyValue) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -298,7 +422,7 @@ void AnyValue::Clear() { (void) cached_has_bits; clear_value(); - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* AnyValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -313,7 +437,7 @@ const char* AnyValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) auto str = _internal_mutable_string_value(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.common.v1.AnyValue.string_value")); } else goto handle_unusual; continue; @@ -377,7 +501,7 @@ const char* AnyValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -444,8 +568,8 @@ uint8_t* AnyValue::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.common.v1.AnyValue) return target; @@ -507,22 +631,19 @@ size_t AnyValue::ByteSizeLong() const { break; } } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void AnyValue::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const AnyValue*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData AnyValue::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + AnyValue::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*AnyValue::GetClassData() const { return &_class_data_; } + -void AnyValue::MergeFrom(const AnyValue& from) { - AnyValue* const _this = this; +void AnyValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<AnyValue*>(&to_msg); + auto& from = static_cast<const AnyValue&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.common.v1.AnyValue) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -563,7 +684,7 @@ void AnyValue::MergeFrom(const AnyValue& from) { break; } } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void AnyValue::CopyFrom(const AnyValue& from) { @@ -584,11 +705,12 @@ void AnyValue::InternalSwap(AnyValue* other) { swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]); } -std::string AnyValue::GetTypeName() const { - return "opentelemetry.proto.common.v1.AnyValue"; +::PROTOBUF_NAMESPACE_ID::Metadata AnyValue::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto[0]); } - // =================================================================== class ArrayValue::_Internal { @@ -597,18 +719,18 @@ class ArrayValue::_Internal { ArrayValue::ArrayValue(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.common.v1.ArrayValue) } ArrayValue::ArrayValue(const ArrayValue& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { ArrayValue* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.values_){from._impl_.values_} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:opentelemetry.proto.common.v1.ArrayValue) } @@ -624,7 +746,7 @@ inline void ArrayValue::SharedCtor( ArrayValue::~ArrayValue() { // @@protoc_insertion_point(destructor:opentelemetry.proto.common.v1.ArrayValue) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -647,7 +769,7 @@ void ArrayValue::Clear() { (void) cached_has_bits; _impl_.values_.Clear(); - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* ArrayValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -680,7 +802,7 @@ const char* ArrayValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ct } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -707,8 +829,8 @@ uint8_t* ArrayValue::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.common.v1.ArrayValue) return target; @@ -729,29 +851,26 @@ size_t ArrayValue::ByteSizeLong() const { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void ArrayValue::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const ArrayValue*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ArrayValue::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + ArrayValue::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ArrayValue::GetClassData() const { return &_class_data_; } + -void ArrayValue::MergeFrom(const ArrayValue& from) { - ArrayValue* const _this = this; +void ArrayValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<ArrayValue*>(&to_msg); + auto& from = static_cast<const ArrayValue&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.common.v1.ArrayValue) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; _this->_impl_.values_.MergeFrom(from._impl_.values_); - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void ArrayValue::CopyFrom(const ArrayValue& from) { @@ -771,11 +890,12 @@ void ArrayValue::InternalSwap(ArrayValue* other) { _impl_.values_.InternalSwap(&other->_impl_.values_); } -std::string ArrayValue::GetTypeName() const { - return "opentelemetry.proto.common.v1.ArrayValue"; +::PROTOBUF_NAMESPACE_ID::Metadata ArrayValue::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto[1]); } - // =================================================================== class KeyValueList::_Internal { @@ -784,18 +904,18 @@ class KeyValueList::_Internal { KeyValueList::KeyValueList(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.common.v1.KeyValueList) } KeyValueList::KeyValueList(const KeyValueList& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { KeyValueList* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.values_){from._impl_.values_} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:opentelemetry.proto.common.v1.KeyValueList) } @@ -811,7 +931,7 @@ inline void KeyValueList::SharedCtor( KeyValueList::~KeyValueList() { // @@protoc_insertion_point(destructor:opentelemetry.proto.common.v1.KeyValueList) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -834,7 +954,7 @@ void KeyValueList::Clear() { (void) cached_has_bits; _impl_.values_.Clear(); - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* KeyValueList::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -867,7 +987,7 @@ const char* KeyValueList::_InternalParse(const char* ptr, ::_pbi::ParseContext* } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -894,8 +1014,8 @@ uint8_t* KeyValueList::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.common.v1.KeyValueList) return target; @@ -916,29 +1036,26 @@ size_t KeyValueList::ByteSizeLong() const { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void KeyValueList::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const KeyValueList*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData KeyValueList::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + KeyValueList::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*KeyValueList::GetClassData() const { return &_class_data_; } + -void KeyValueList::MergeFrom(const KeyValueList& from) { - KeyValueList* const _this = this; +void KeyValueList::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<KeyValueList*>(&to_msg); + auto& from = static_cast<const KeyValueList&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.common.v1.KeyValueList) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; _this->_impl_.values_.MergeFrom(from._impl_.values_); - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void KeyValueList::CopyFrom(const KeyValueList& from) { @@ -958,11 +1075,12 @@ void KeyValueList::InternalSwap(KeyValueList* other) { _impl_.values_.InternalSwap(&other->_impl_.values_); } -std::string KeyValueList::GetTypeName() const { - return "opentelemetry.proto.common.v1.KeyValueList"; +::PROTOBUF_NAMESPACE_ID::Metadata KeyValueList::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto[2]); } - // =================================================================== class KeyValue::_Internal { @@ -976,19 +1094,19 @@ KeyValue::_Internal::value(const KeyValue* msg) { } KeyValue::KeyValue(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.common.v1.KeyValue) } KeyValue::KeyValue(const KeyValue& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { KeyValue* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.key_){} , decltype(_impl_.value_){nullptr} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.key_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.key_.Set("", GetArenaForAllocation()); @@ -1020,7 +1138,7 @@ inline void KeyValue::SharedCtor( KeyValue::~KeyValue() { // @@protoc_insertion_point(destructor:opentelemetry.proto.common.v1.KeyValue) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -1048,7 +1166,7 @@ void KeyValue::Clear() { delete _impl_.value_; } _impl_.value_ = nullptr; - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* KeyValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -1063,7 +1181,7 @@ const char* KeyValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) auto str = _internal_mutable_key(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.common.v1.KeyValue.key")); } else goto handle_unusual; continue; @@ -1086,7 +1204,7 @@ const char* KeyValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1122,8 +1240,8 @@ uint8_t* KeyValue::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.common.v1.KeyValue) return target; @@ -1151,22 +1269,19 @@ size_t KeyValue::ByteSizeLong() const { *_impl_.value_); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void KeyValue::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const KeyValue*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData KeyValue::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + KeyValue::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*KeyValue::GetClassData() const { return &_class_data_; } + -void KeyValue::MergeFrom(const KeyValue& from) { - KeyValue* const _this = this; +void KeyValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<KeyValue*>(&to_msg); + auto& from = static_cast<const KeyValue&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.common.v1.KeyValue) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -1179,7 +1294,7 @@ void KeyValue::MergeFrom(const KeyValue& from) { _this->_internal_mutable_value()->::opentelemetry::proto::common::v1::AnyValue::MergeFrom( from._internal_value()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void KeyValue::CopyFrom(const KeyValue& from) { @@ -1205,11 +1320,12 @@ void KeyValue::InternalSwap(KeyValue* other) { swap(_impl_.value_, other->_impl_.value_); } -std::string KeyValue::GetTypeName() const { - return "opentelemetry.proto.common.v1.KeyValue"; +::PROTOBUF_NAMESPACE_ID::Metadata KeyValue::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto[3]); } - // =================================================================== class InstrumentationScope::_Internal { @@ -1218,12 +1334,12 @@ class InstrumentationScope::_Internal { InstrumentationScope::InstrumentationScope(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.common.v1.InstrumentationScope) } InstrumentationScope::InstrumentationScope(const InstrumentationScope& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { InstrumentationScope* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.attributes_){from._impl_.attributes_} @@ -1232,7 +1348,7 @@ InstrumentationScope::InstrumentationScope(const InstrumentationScope& from) , decltype(_impl_.dropped_attributes_count_){} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.name_.Set("", GetArenaForAllocation()); @@ -1276,7 +1392,7 @@ inline void InstrumentationScope::SharedCtor( InstrumentationScope::~InstrumentationScope() { // @@protoc_insertion_point(destructor:opentelemetry.proto.common.v1.InstrumentationScope) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -1304,7 +1420,7 @@ void InstrumentationScope::Clear() { _impl_.name_.ClearToEmpty(); _impl_.version_.ClearToEmpty(); _impl_.dropped_attributes_count_ = 0u; - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* InstrumentationScope::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -1319,7 +1435,7 @@ const char* InstrumentationScope::_InternalParse(const char* ptr, ::_pbi::ParseC auto str = _internal_mutable_name(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.common.v1.InstrumentationScope.name")); } else goto handle_unusual; continue; @@ -1329,7 +1445,7 @@ const char* InstrumentationScope::_InternalParse(const char* ptr, ::_pbi::ParseC auto str = _internal_mutable_version(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.common.v1.InstrumentationScope.version")); } else goto handle_unusual; continue; @@ -1365,7 +1481,7 @@ const char* InstrumentationScope::_InternalParse(const char* ptr, ::_pbi::ParseC } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1418,8 +1534,8 @@ uint8_t* InstrumentationScope::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.common.v1.InstrumentationScope) return target; @@ -1459,22 +1575,19 @@ size_t InstrumentationScope::ByteSizeLong() const { total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_dropped_attributes_count()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void InstrumentationScope::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const InstrumentationScope*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData InstrumentationScope::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + InstrumentationScope::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*InstrumentationScope::GetClassData() const { return &_class_data_; } -void InstrumentationScope::MergeFrom(const InstrumentationScope& from) { - InstrumentationScope* const _this = this; + +void InstrumentationScope::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<InstrumentationScope*>(&to_msg); + auto& from = static_cast<const InstrumentationScope&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.common.v1.InstrumentationScope) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -1490,7 +1603,7 @@ void InstrumentationScope::MergeFrom(const InstrumentationScope& from) { if (from._internal_dropped_attributes_count() != 0) { _this->_internal_set_dropped_attributes_count(from._internal_dropped_attributes_count()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void InstrumentationScope::CopyFrom(const InstrumentationScope& from) { @@ -1521,11 +1634,12 @@ void InstrumentationScope::InternalSwap(InstrumentationScope* other) { swap(_impl_.dropped_attributes_count_, other->_impl_.dropped_attributes_count_); } -std::string InstrumentationScope::GetTypeName() const { - return "opentelemetry.proto.common.v1.InstrumentationScope"; +::PROTOBUF_NAMESPACE_ID::Metadata InstrumentationScope::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto[4]); } - // =================================================================== class EntityRef::_Internal { @@ -1534,12 +1648,12 @@ class EntityRef::_Internal { EntityRef::EntityRef(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.common.v1.EntityRef) } EntityRef::EntityRef(const EntityRef& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { EntityRef* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.id_keys_){from._impl_.id_keys_} @@ -1548,7 +1662,7 @@ EntityRef::EntityRef(const EntityRef& from) , decltype(_impl_.type_){} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.schema_url_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.schema_url_.Set("", GetArenaForAllocation()); @@ -1591,7 +1705,7 @@ inline void EntityRef::SharedCtor( EntityRef::~EntityRef() { // @@protoc_insertion_point(destructor:opentelemetry.proto.common.v1.EntityRef) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -1620,7 +1734,7 @@ void EntityRef::Clear() { _impl_.description_keys_.Clear(); _impl_.schema_url_.ClearToEmpty(); _impl_.type_.ClearToEmpty(); - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* EntityRef::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -1635,7 +1749,7 @@ const char* EntityRef::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx auto str = _internal_mutable_schema_url(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.common.v1.EntityRef.schema_url")); } else goto handle_unusual; continue; @@ -1645,7 +1759,7 @@ const char* EntityRef::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx auto str = _internal_mutable_type(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.common.v1.EntityRef.type")); } else goto handle_unusual; continue; @@ -1658,7 +1772,7 @@ const char* EntityRef::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx auto str = _internal_add_id_keys(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.common.v1.EntityRef.id_keys")); if (!ctx->DataAvailable(ptr)) break; } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr)); } else @@ -1673,7 +1787,7 @@ const char* EntityRef::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx auto str = _internal_add_description_keys(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.common.v1.EntityRef.description_keys")); if (!ctx->DataAvailable(ptr)) break; } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr)); } else @@ -1690,7 +1804,7 @@ const char* EntityRef::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1749,8 +1863,8 @@ uint8_t* EntityRef::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.common.v1.EntityRef) return target; @@ -1794,22 +1908,19 @@ size_t EntityRef::ByteSizeLong() const { this->_internal_type()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void EntityRef::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const EntityRef*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData EntityRef::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + EntityRef::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EntityRef::GetClassData() const { return &_class_data_; } -void EntityRef::MergeFrom(const EntityRef& from) { - EntityRef* const _this = this; + +void EntityRef::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<EntityRef*>(&to_msg); + auto& from = static_cast<const EntityRef&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.common.v1.EntityRef) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -1823,7 +1934,7 @@ void EntityRef::MergeFrom(const EntityRef& from) { if (!from._internal_type().empty()) { _this->_internal_set_type(from._internal_type()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void EntityRef::CopyFrom(const EntityRef& from) { @@ -1854,11 +1965,12 @@ void EntityRef::InternalSwap(EntityRef* other) { ); } -std::string EntityRef::GetTypeName() const { - return "opentelemetry.proto.common.v1.EntityRef"; +::PROTOBUF_NAMESPACE_ID::Metadata EntityRef::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto[5]); } - // @@protoc_insertion_point(namespace_scope) } // namespace v1 } // namespace common diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/common/v1/common.pb.h b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/common/v1/common.pb.h @@ -25,9 +25,11 @@ #include <google/protobuf/arenastring.h> #include <google/protobuf/generated_message_util.h> #include <google/protobuf/metadata_lite.h> -#include <google/protobuf/message_lite.h> +#include <google/protobuf/generated_message_reflection.h> +#include <google/protobuf/message.h> #include <google/protobuf/repeated_field.h> // IWYU pragma: export #include <google/protobuf/extension_set.h> // IWYU pragma: export +#include <google/protobuf/unknown_field_set.h> // @@protoc_insertion_point(includes) #include <google/protobuf/port_def.inc> #define PROTOBUF_INTERNAL_EXPORT_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto @@ -41,6 +43,7 @@ PROTOBUF_NAMESPACE_CLOSE struct TableStruct_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto { static const uint32_t offsets[]; }; +extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto; namespace opentelemetry { namespace proto { namespace common { @@ -83,7 +86,7 @@ namespace v1 { // =================================================================== class AnyValue final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.AnyValue) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.AnyValue) */ { public: inline AnyValue() : AnyValue(nullptr) {} ~AnyValue() override; @@ -113,6 +116,15 @@ class AnyValue final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const AnyValue& default_instance() { return *internal_default_instance(); } @@ -161,9 +173,15 @@ class AnyValue final : AnyValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<AnyValue>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const AnyValue& from); - void MergeFrom(const AnyValue& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const AnyValue& from) { + AnyValue::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -176,7 +194,7 @@ class AnyValue final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(AnyValue* other); private: @@ -189,7 +207,10 @@ class AnyValue final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -356,7 +377,7 @@ class AnyValue final : // ------------------------------------------------------------------- class ArrayValue final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.ArrayValue) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.ArrayValue) */ { public: inline ArrayValue() : ArrayValue(nullptr) {} ~ArrayValue() override; @@ -386,6 +407,15 @@ class ArrayValue final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const ArrayValue& default_instance() { return *internal_default_instance(); } @@ -423,9 +453,15 @@ class ArrayValue final : ArrayValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<ArrayValue>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const ArrayValue& from); - void MergeFrom(const ArrayValue& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const ArrayValue& from) { + ArrayValue::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -438,7 +474,7 @@ class ArrayValue final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(ArrayValue* other); private: @@ -451,7 +487,10 @@ class ArrayValue final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -495,7 +534,7 @@ class ArrayValue final : // ------------------------------------------------------------------- class KeyValueList final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.KeyValueList) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.KeyValueList) */ { public: inline KeyValueList() : KeyValueList(nullptr) {} ~KeyValueList() override; @@ -525,6 +564,15 @@ class KeyValueList final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const KeyValueList& default_instance() { return *internal_default_instance(); } @@ -562,9 +610,15 @@ class KeyValueList final : KeyValueList* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<KeyValueList>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const KeyValueList& from); - void MergeFrom(const KeyValueList& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const KeyValueList& from) { + KeyValueList::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -577,7 +631,7 @@ class KeyValueList final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(KeyValueList* other); private: @@ -590,7 +644,10 @@ class KeyValueList final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -634,7 +691,7 @@ class KeyValueList final : // ------------------------------------------------------------------- class KeyValue final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.KeyValue) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.KeyValue) */ { public: inline KeyValue() : KeyValue(nullptr) {} ~KeyValue() override; @@ -664,6 +721,15 @@ class KeyValue final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const KeyValue& default_instance() { return *internal_default_instance(); } @@ -701,9 +767,15 @@ class KeyValue final : KeyValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<KeyValue>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const KeyValue& from); - void MergeFrom(const KeyValue& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const KeyValue& from) { + KeyValue::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -716,7 +788,7 @@ class KeyValue final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(KeyValue* other); private: @@ -729,7 +801,10 @@ class KeyValue final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -789,7 +864,7 @@ class KeyValue final : // ------------------------------------------------------------------- class InstrumentationScope final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.InstrumentationScope) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.InstrumentationScope) */ { public: inline InstrumentationScope() : InstrumentationScope(nullptr) {} ~InstrumentationScope() override; @@ -819,6 +894,15 @@ class InstrumentationScope final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const InstrumentationScope& default_instance() { return *internal_default_instance(); } @@ -856,9 +940,15 @@ class InstrumentationScope final : InstrumentationScope* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<InstrumentationScope>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const InstrumentationScope& from); - void MergeFrom(const InstrumentationScope& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const InstrumentationScope& from) { + InstrumentationScope::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -871,7 +961,7 @@ class InstrumentationScope final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(InstrumentationScope* other); private: @@ -884,7 +974,10 @@ class InstrumentationScope final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -971,7 +1064,7 @@ class InstrumentationScope final : // ------------------------------------------------------------------- class EntityRef final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.EntityRef) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.common.v1.EntityRef) */ { public: inline EntityRef() : EntityRef(nullptr) {} ~EntityRef() override; @@ -1001,6 +1094,15 @@ class EntityRef final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const EntityRef& default_instance() { return *internal_default_instance(); } @@ -1038,9 +1140,15 @@ class EntityRef final : EntityRef* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<EntityRef>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const EntityRef& from); - void MergeFrom(const EntityRef& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const EntityRef& from) { + EntityRef::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -1053,7 +1161,7 @@ class EntityRef final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(EntityRef* other); private: @@ -1066,7 +1174,10 @@ class EntityRef final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto @@ -14,8 +14,6 @@ syntax = "proto3"; -option optimize_for = LITE_RUNTIME; - package opentelemetry.proto.common.v1; option csharp_namespace = "OpenTelemetry.Proto.Common.V1"; diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.pb.cc b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.pb.cc @@ -8,7 +8,10 @@ #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/extension_set.h> #include <google/protobuf/wire_format_lite.h> -#include <google/protobuf/io/zero_copy_stream_impl_lite.h> +#include <google/protobuf/descriptor.h> +#include <google/protobuf/generated_message_reflection.h> +#include <google/protobuf/reflection_ops.h> +#include <google/protobuf/wire_format.h> // @@protoc_insertion_point(includes) #include <google/protobuf/port_def.inc> @@ -40,6 +43,60 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT } // namespace resource } // namespace proto } // namespace opentelemetry +static ::_pb::Metadata file_level_metadata_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto[1]; +static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto = nullptr; +static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto = nullptr; + +const uint32_t TableStruct_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::resource::v1::Resource, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::resource::v1::Resource, _impl_.attributes_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::resource::v1::Resource, _impl_.dropped_attributes_count_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::resource::v1::Resource, _impl_.entity_refs_), +}; +static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + { 0, -1, -1, sizeof(::opentelemetry::proto::resource::v1::Resource)}, +}; + +static const ::_pb::Message* const file_default_instances[] = { + &::opentelemetry::proto::resource::v1::_Resource_default_instance_._instance, +}; + +const char descriptor_table_protodef_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = + "\n.opentelemetry/proto/resource/v1/resour" + "ce.proto\022\037opentelemetry.proto.resource.v" + "1\032*opentelemetry/proto/common/v1/common." + "proto\"\250\001\n\010Resource\022;\n\nattributes\030\001 \003(\0132\'" + ".opentelemetry.proto.common.v1.KeyValue\022" + " \n\030dropped_attributes_count\030\002 \001(\r\022=\n\013ent" + "ity_refs\030\003 \003(\0132(.opentelemetry.proto.com" + "mon.v1.EntityRefB\203\001\n\"io.opentelemetry.pr" + "oto.resource.v1B\rResourceProtoP\001Z*go.ope" + "ntelemetry.io/proto/otlp/resource/v1\252\002\037O" + "penTelemetry.Proto.Resource.V1b\006proto3" + ; +static const ::_pbi::DescriptorTable* const descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto_deps[1] = { + &::descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto, +}; +static ::_pbi::once_flag descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto_once; +const ::_pbi::DescriptorTable descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto = { + false, false, 438, descriptor_table_protodef_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto, + "opentelemetry/proto/resource/v1/resource.proto", + &descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto_once, descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto_deps, 1, 1, + schemas, file_default_instances, TableStruct_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto::offsets, + file_level_metadata_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto, file_level_enum_descriptors_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto, + file_level_service_descriptors_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto, +}; +PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto_getter() { + return &descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto; +} + +// Force running AddDescriptors() at dynamic initialization time. +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto(&descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto); namespace opentelemetry { namespace proto { namespace resource { @@ -59,12 +116,12 @@ void Resource::clear_entity_refs() { } Resource::Resource(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.resource.v1.Resource) } Resource::Resource(const Resource& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { Resource* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.attributes_){from._impl_.attributes_} @@ -72,7 +129,7 @@ Resource::Resource(const Resource& from) , decltype(_impl_.dropped_attributes_count_){} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _this->_impl_.dropped_attributes_count_ = from._impl_.dropped_attributes_count_; // @@protoc_insertion_point(copy_constructor:opentelemetry.proto.resource.v1.Resource) } @@ -91,7 +148,7 @@ inline void Resource::SharedCtor( Resource::~Resource() { // @@protoc_insertion_point(destructor:opentelemetry.proto.resource.v1.Resource) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -117,7 +174,7 @@ void Resource::Clear() { _impl_.attributes_.Clear(); _impl_.entity_refs_.Clear(); _impl_.dropped_attributes_count_ = 0u; - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* Resource::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -171,7 +228,7 @@ const char* Resource::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -212,8 +269,8 @@ uint8_t* Resource::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.resource.v1.Resource) return target; @@ -246,22 +303,19 @@ size_t Resource::ByteSizeLong() const { total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_dropped_attributes_count()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void Resource::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const Resource*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Resource::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + Resource::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Resource::GetClassData() const { return &_class_data_; } + -void Resource::MergeFrom(const Resource& from) { - Resource* const _this = this; +void Resource::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<Resource*>(&to_msg); + auto& from = static_cast<const Resource&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.resource.v1.Resource) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -272,7 +326,7 @@ void Resource::MergeFrom(const Resource& from) { if (from._internal_dropped_attributes_count() != 0) { _this->_internal_set_dropped_attributes_count(from._internal_dropped_attributes_count()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void Resource::CopyFrom(const Resource& from) { @@ -294,11 +348,12 @@ void Resource::InternalSwap(Resource* other) { swap(_impl_.dropped_attributes_count_, other->_impl_.dropped_attributes_count_); } -std::string Resource::GetTypeName() const { - return "opentelemetry.proto.resource.v1.Resource"; +::PROTOBUF_NAMESPACE_ID::Metadata Resource::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto[0]); } - // @@protoc_insertion_point(namespace_scope) } // namespace v1 } // namespace resource diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.pb.h b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.pb.h @@ -25,9 +25,11 @@ #include <google/protobuf/arenastring.h> #include <google/protobuf/generated_message_util.h> #include <google/protobuf/metadata_lite.h> -#include <google/protobuf/message_lite.h> +#include <google/protobuf/generated_message_reflection.h> +#include <google/protobuf/message.h> #include <google/protobuf/repeated_field.h> // IWYU pragma: export #include <google/protobuf/extension_set.h> // IWYU pragma: export +#include <google/protobuf/unknown_field_set.h> #include "opentelemetry/proto/common/v1/common.pb.h" // @@protoc_insertion_point(includes) #include <google/protobuf/port_def.inc> @@ -42,6 +44,7 @@ PROTOBUF_NAMESPACE_CLOSE struct TableStruct_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto { static const uint32_t offsets[]; }; +extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto; namespace opentelemetry { namespace proto { namespace resource { @@ -64,7 +67,7 @@ namespace v1 { // =================================================================== class Resource final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.resource.v1.Resource) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.resource.v1.Resource) */ { public: inline Resource() : Resource(nullptr) {} ~Resource() override; @@ -94,6 +97,15 @@ class Resource final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const Resource& default_instance() { return *internal_default_instance(); } @@ -131,9 +143,15 @@ class Resource final : Resource* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<Resource>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const Resource& from); - void MergeFrom(const Resource& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const Resource& from) { + Resource::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -146,7 +164,7 @@ class Resource final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(Resource* other); private: @@ -159,7 +177,10 @@ class Resource final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto @@ -14,8 +14,6 @@ syntax = "proto3"; -option optimize_for = LITE_RUNTIME; - package opentelemetry.proto.resource.v1; import "opentelemetry/proto/common/v1/common.proto"; @@ -31,16 +29,6 @@ message 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. repeated opentelemetry.proto.common.v1.KeyValue attributes = 1; // dropped_attributes_count is the number of dropped attributes. If the value is 0, then diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.pb.cc b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.pb.cc @@ -8,7 +8,10 @@ #include <google/protobuf/io/coded_stream.h> #include <google/protobuf/extension_set.h> #include <google/protobuf/wire_format_lite.h> -#include <google/protobuf/io/zero_copy_stream_impl_lite.h> +#include <google/protobuf/descriptor.h> +#include <google/protobuf/generated_message_reflection.h> +#include <google/protobuf/reflection_ops.h> +#include <google/protobuf/wire_format.h> // @@protoc_insertion_point(includes) #include <google/protobuf/port_def.inc> @@ -144,10 +147,190 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT } // namespace trace } // namespace proto } // namespace opentelemetry +static ::_pb::Metadata file_level_metadata_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[7]; +static const ::_pb::EnumDescriptor* file_level_enum_descriptors_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[3]; +static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto = nullptr; + +const uint32_t TableStruct_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::TracesData, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::TracesData, _impl_.resource_spans_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::ResourceSpans, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::ResourceSpans, _impl_.resource_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::ResourceSpans, _impl_.scope_spans_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::ResourceSpans, _impl_.schema_url_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::ScopeSpans, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::ScopeSpans, _impl_.scope_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::ScopeSpans, _impl_.spans_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::ScopeSpans, _impl_.schema_url_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Event, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Event, _impl_.time_unix_nano_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Event, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Event, _impl_.attributes_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Event, _impl_.dropped_attributes_count_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Link, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Link, _impl_.trace_id_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Link, _impl_.span_id_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Link, _impl_.trace_state_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Link, _impl_.attributes_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Link, _impl_.dropped_attributes_count_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span_Link, _impl_.flags_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.trace_id_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.span_id_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.trace_state_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.parent_span_id_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.flags_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.name_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.kind_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.start_time_unix_nano_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.end_time_unix_nano_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.attributes_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.dropped_attributes_count_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.events_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.dropped_events_count_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.links_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.dropped_links_count_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Span, _impl_.status_), + ~0u, // no _has_bits_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Status, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + ~0u, // no _inlined_string_donated_ + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Status, _impl_.message_), + PROTOBUF_FIELD_OFFSET(::opentelemetry::proto::trace::v1::Status, _impl_.code_), +}; +static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + { 0, -1, -1, sizeof(::opentelemetry::proto::trace::v1::TracesData)}, + { 7, -1, -1, sizeof(::opentelemetry::proto::trace::v1::ResourceSpans)}, + { 16, -1, -1, sizeof(::opentelemetry::proto::trace::v1::ScopeSpans)}, + { 25, -1, -1, sizeof(::opentelemetry::proto::trace::v1::Span_Event)}, + { 35, -1, -1, sizeof(::opentelemetry::proto::trace::v1::Span_Link)}, + { 47, -1, -1, sizeof(::opentelemetry::proto::trace::v1::Span)}, + { 69, -1, -1, sizeof(::opentelemetry::proto::trace::v1::Status)}, +}; + +static const ::_pb::Message* const file_default_instances[] = { + &::opentelemetry::proto::trace::v1::_TracesData_default_instance_._instance, + &::opentelemetry::proto::trace::v1::_ResourceSpans_default_instance_._instance, + &::opentelemetry::proto::trace::v1::_ScopeSpans_default_instance_._instance, + &::opentelemetry::proto::trace::v1::_Span_Event_default_instance_._instance, + &::opentelemetry::proto::trace::v1::_Span_Link_default_instance_._instance, + &::opentelemetry::proto::trace::v1::_Span_default_instance_._instance, + &::opentelemetry::proto::trace::v1::_Status_default_instance_._instance, +}; + +const char descriptor_table_protodef_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = + "\n(opentelemetry/proto/trace/v1/trace.pro" + "to\022\034opentelemetry.proto.trace.v1\032*opente" + "lemetry/proto/common/v1/common.proto\032.op" + "entelemetry/proto/resource/v1/resource.p" + "roto\"Q\n\nTracesData\022C\n\016resource_spans\030\001 \003" + "(\0132+.opentelemetry.proto.trace.v1.Resour" + "ceSpans\"\247\001\n\rResourceSpans\022;\n\010resource\030\001 " + "\001(\0132).opentelemetry.proto.resource.v1.Re" + "source\022=\n\013scope_spans\030\002 \003(\0132(.openteleme" + "try.proto.trace.v1.ScopeSpans\022\022\n\nschema_" + "url\030\003 \001(\tJ\006\010\350\007\020\351\007\"\227\001\n\nScopeSpans\022B\n\005scop" + "e\030\001 \001(\01323.opentelemetry.proto.common.v1." + "InstrumentationScope\0221\n\005spans\030\002 \003(\0132\".op" + "entelemetry.proto.trace.v1.Span\022\022\n\nschem" + "a_url\030\003 \001(\t\"\204\010\n\004Span\022\020\n\010trace_id\030\001 \001(\014\022\017" + "\n\007span_id\030\002 \001(\014\022\023\n\013trace_state\030\003 \001(\t\022\026\n\016" + "parent_span_id\030\004 \001(\014\022\r\n\005flags\030\020 \001(\007\022\014\n\004n" + "ame\030\005 \001(\t\0229\n\004kind\030\006 \001(\0162+.opentelemetry." + "proto.trace.v1.Span.SpanKind\022\034\n\024start_ti" + "me_unix_nano\030\007 \001(\006\022\032\n\022end_time_unix_nano" + "\030\010 \001(\006\022;\n\nattributes\030\t \003(\0132\'.opentelemet" + "ry.proto.common.v1.KeyValue\022 \n\030dropped_a" + "ttributes_count\030\n \001(\r\0228\n\006events\030\013 \003(\0132(." + "opentelemetry.proto.trace.v1.Span.Event\022" + "\034\n\024dropped_events_count\030\014 \001(\r\0226\n\005links\030\r" + " \003(\0132\'.opentelemetry.proto.trace.v1.Span" + ".Link\022\033\n\023dropped_links_count\030\016 \001(\r\0224\n\006st" + "atus\030\017 \001(\0132$.opentelemetry.proto.trace.v" + "1.Status\032\214\001\n\005Event\022\026\n\016time_unix_nano\030\001 \001" + "(\006\022\014\n\004name\030\002 \001(\t\022;\n\nattributes\030\003 \003(\0132\'.o" + "pentelemetry.proto.common.v1.KeyValue\022 \n" + "\030dropped_attributes_count\030\004 \001(\r\032\254\001\n\004Link" + "\022\020\n\010trace_id\030\001 \001(\014\022\017\n\007span_id\030\002 \001(\014\022\023\n\013t" + "race_state\030\003 \001(\t\022;\n\nattributes\030\004 \003(\0132\'.o" + "pentelemetry.proto.common.v1.KeyValue\022 \n" + "\030dropped_attributes_count\030\005 \001(\r\022\r\n\005flags" + "\030\006 \001(\007\"\231\001\n\010SpanKind\022\031\n\025SPAN_KIND_UNSPECI" + "FIED\020\000\022\026\n\022SPAN_KIND_INTERNAL\020\001\022\024\n\020SPAN_K" + "IND_SERVER\020\002\022\024\n\020SPAN_KIND_CLIENT\020\003\022\026\n\022SP" + "AN_KIND_PRODUCER\020\004\022\026\n\022SPAN_KIND_CONSUMER" + "\020\005\"\256\001\n\006Status\022\017\n\007message\030\002 \001(\t\022=\n\004code\030\003" + " \001(\0162/.opentelemetry.proto.trace.v1.Stat" + "us.StatusCode\"N\n\nStatusCode\022\025\n\021STATUS_CO" + "DE_UNSET\020\000\022\022\n\016STATUS_CODE_OK\020\001\022\025\n\021STATUS" + "_CODE_ERROR\020\002J\004\010\001\020\002*\234\001\n\tSpanFlags\022\031\n\025SPA" + "N_FLAGS_DO_NOT_USE\020\000\022 \n\033SPAN_FLAGS_TRACE" + "_FLAGS_MASK\020\377\001\022*\n%SPAN_FLAGS_CONTEXT_HAS" + "_IS_REMOTE_MASK\020\200\002\022&\n!SPAN_FLAGS_CONTEXT" + "_IS_REMOTE_MASK\020\200\004Bw\n\037io.opentelemetry.p" + "roto.trace.v1B\nTraceProtoP\001Z\'go.opentele" + "metry.io/proto/otlp/trace/v1\252\002\034OpenTelem" + "etry.Proto.Trace.V1b\006proto3" + ; +static const ::_pbi::DescriptorTable* const descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_deps[2] = { + &::descriptor_table_opentelemetry_2fproto_2fcommon_2fv1_2fcommon_2eproto, + &::descriptor_table_opentelemetry_2fproto_2fresource_2fv1_2fresource_2eproto, +}; +static ::_pbi::once_flag descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_once; +const ::_pbi::DescriptorTable descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto = { + false, false, 2067, descriptor_table_protodef_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto, + "opentelemetry/proto/trace/v1/trace.proto", + &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_once, descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_deps, 2, 7, + schemas, file_default_instances, TableStruct_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto::offsets, + file_level_metadata_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto, file_level_enum_descriptors_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto, + file_level_service_descriptors_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto, +}; +PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_getter() { + return &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto; +} + +// Force running AddDescriptors() at dynamic initialization time. +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto(&descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto); namespace opentelemetry { namespace proto { namespace trace { namespace v1 { +const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Span_SpanKind_descriptor() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto); + return file_level_enum_descriptors_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[0]; +} bool Span_SpanKind_IsValid(int value) { switch (value) { case 0: @@ -162,59 +345,6 @@ bool Span_SpanKind_IsValid(int value) { } } -static ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<std::string> Span_SpanKind_strings[6] = {}; - -static const char Span_SpanKind_names[] = - "SPAN_KIND_CLIENT" - "SPAN_KIND_CONSUMER" - "SPAN_KIND_INTERNAL" - "SPAN_KIND_PRODUCER" - "SPAN_KIND_SERVER" - "SPAN_KIND_UNSPECIFIED"; - -static const ::PROTOBUF_NAMESPACE_ID::internal::EnumEntry Span_SpanKind_entries[] = { - { {Span_SpanKind_names + 0, 16}, 3 }, - { {Span_SpanKind_names + 16, 18}, 5 }, - { {Span_SpanKind_names + 34, 18}, 1 }, - { {Span_SpanKind_names + 52, 18}, 4 }, - { {Span_SpanKind_names + 70, 16}, 2 }, - { {Span_SpanKind_names + 86, 21}, 0 }, -}; - -static const int Span_SpanKind_entries_by_number[] = { - 5, // 0 -> SPAN_KIND_UNSPECIFIED - 2, // 1 -> SPAN_KIND_INTERNAL - 4, // 2 -> SPAN_KIND_SERVER - 0, // 3 -> SPAN_KIND_CLIENT - 3, // 4 -> SPAN_KIND_PRODUCER - 1, // 5 -> SPAN_KIND_CONSUMER -}; - -const std::string& Span_SpanKind_Name( - Span_SpanKind value) { - static const bool dummy = - ::PROTOBUF_NAMESPACE_ID::internal::InitializeEnumStrings( - Span_SpanKind_entries, - Span_SpanKind_entries_by_number, - 6, Span_SpanKind_strings); - (void) dummy; - int idx = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumName( - Span_SpanKind_entries, - Span_SpanKind_entries_by_number, - 6, value); - return idx == -1 ? ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString() : - Span_SpanKind_strings[idx].get(); -} -bool Span_SpanKind_Parse( - ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Span_SpanKind* value) { - int int_value; - bool success = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumValue( - Span_SpanKind_entries, 6, name, &int_value); - if (success) { - *value = static_cast<Span_SpanKind>(int_value); - } - return success; -} #if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) constexpr Span_SpanKind Span::SPAN_KIND_UNSPECIFIED; constexpr Span_SpanKind Span::SPAN_KIND_INTERNAL; @@ -226,6 +356,10 @@ constexpr Span_SpanKind Span::SpanKind_MIN; constexpr Span_SpanKind Span::SpanKind_MAX; constexpr int Span::SpanKind_ARRAYSIZE; #endif // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) +const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Status_StatusCode_descriptor() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto); + return file_level_enum_descriptors_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[1]; +} bool Status_StatusCode_IsValid(int value) { switch (value) { case 0: @@ -237,50 +371,6 @@ bool Status_StatusCode_IsValid(int value) { } } -static ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<std::string> Status_StatusCode_strings[3] = {}; - -static const char Status_StatusCode_names[] = - "STATUS_CODE_ERROR" - "STATUS_CODE_OK" - "STATUS_CODE_UNSET"; - -static const ::PROTOBUF_NAMESPACE_ID::internal::EnumEntry Status_StatusCode_entries[] = { - { {Status_StatusCode_names + 0, 17}, 2 }, - { {Status_StatusCode_names + 17, 14}, 1 }, - { {Status_StatusCode_names + 31, 17}, 0 }, -}; - -static const int Status_StatusCode_entries_by_number[] = { - 2, // 0 -> STATUS_CODE_UNSET - 1, // 1 -> STATUS_CODE_OK - 0, // 2 -> STATUS_CODE_ERROR -}; - -const std::string& Status_StatusCode_Name( - Status_StatusCode value) { - static const bool dummy = - ::PROTOBUF_NAMESPACE_ID::internal::InitializeEnumStrings( - Status_StatusCode_entries, - Status_StatusCode_entries_by_number, - 3, Status_StatusCode_strings); - (void) dummy; - int idx = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumName( - Status_StatusCode_entries, - Status_StatusCode_entries_by_number, - 3, value); - return idx == -1 ? ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString() : - Status_StatusCode_strings[idx].get(); -} -bool Status_StatusCode_Parse( - ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Status_StatusCode* value) { - int int_value; - bool success = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumValue( - Status_StatusCode_entries, 3, name, &int_value); - if (success) { - *value = static_cast<Status_StatusCode>(int_value); - } - return success; -} #if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) constexpr Status_StatusCode Status::STATUS_CODE_UNSET; constexpr Status_StatusCode Status::STATUS_CODE_OK; @@ -289,6 +379,10 @@ constexpr Status_StatusCode Status::StatusCode_MIN; constexpr Status_StatusCode Status::StatusCode_MAX; constexpr int Status::StatusCode_ARRAYSIZE; #endif // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) +const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* SpanFlags_descriptor() { + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto); + return file_level_enum_descriptors_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[2]; +} bool SpanFlags_IsValid(int value) { switch (value) { case 0: @@ -301,53 +395,6 @@ bool SpanFlags_IsValid(int value) { } } -static ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<std::string> SpanFlags_strings[4] = {}; - -static const char SpanFlags_names[] = - "SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK" - "SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK" - "SPAN_FLAGS_DO_NOT_USE" - "SPAN_FLAGS_TRACE_FLAGS_MASK"; - -static const ::PROTOBUF_NAMESPACE_ID::internal::EnumEntry SpanFlags_entries[] = { - { {SpanFlags_names + 0, 37}, 256 }, - { {SpanFlags_names + 37, 33}, 512 }, - { {SpanFlags_names + 70, 21}, 0 }, - { {SpanFlags_names + 91, 27}, 255 }, -}; - -static const int SpanFlags_entries_by_number[] = { - 2, // 0 -> SPAN_FLAGS_DO_NOT_USE - 3, // 255 -> SPAN_FLAGS_TRACE_FLAGS_MASK - 0, // 256 -> SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK - 1, // 512 -> SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK -}; - -const std::string& SpanFlags_Name( - SpanFlags value) { - static const bool dummy = - ::PROTOBUF_NAMESPACE_ID::internal::InitializeEnumStrings( - SpanFlags_entries, - SpanFlags_entries_by_number, - 4, SpanFlags_strings); - (void) dummy; - int idx = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumName( - SpanFlags_entries, - SpanFlags_entries_by_number, - 4, value); - return idx == -1 ? ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString() : - SpanFlags_strings[idx].get(); -} -bool SpanFlags_Parse( - ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, SpanFlags* value) { - int int_value; - bool success = ::PROTOBUF_NAMESPACE_ID::internal::LookUpEnumValue( - SpanFlags_entries, 4, name, &int_value); - if (success) { - *value = static_cast<SpanFlags>(int_value); - } - return success; -} // =================================================================== @@ -357,18 +404,18 @@ class TracesData::_Internal { TracesData::TracesData(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.trace.v1.TracesData) } TracesData::TracesData(const TracesData& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { TracesData* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.resource_spans_){from._impl_.resource_spans_} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:opentelemetry.proto.trace.v1.TracesData) } @@ -384,7 +431,7 @@ inline void TracesData::SharedCtor( TracesData::~TracesData() { // @@protoc_insertion_point(destructor:opentelemetry.proto.trace.v1.TracesData) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -407,7 +454,7 @@ void TracesData::Clear() { (void) cached_has_bits; _impl_.resource_spans_.Clear(); - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* TracesData::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -440,7 +487,7 @@ const char* TracesData::_InternalParse(const char* ptr, ::_pbi::ParseContext* ct } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -467,8 +514,8 @@ uint8_t* TracesData::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.trace.v1.TracesData) return target; @@ -489,29 +536,26 @@ size_t TracesData::ByteSizeLong() const { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void TracesData::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const TracesData*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData TracesData::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + TracesData::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*TracesData::GetClassData() const { return &_class_data_; } + -void TracesData::MergeFrom(const TracesData& from) { - TracesData* const _this = this; +void TracesData::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<TracesData*>(&to_msg); + auto& from = static_cast<const TracesData&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.trace.v1.TracesData) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; (void) cached_has_bits; _this->_impl_.resource_spans_.MergeFrom(from._impl_.resource_spans_); - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void TracesData::CopyFrom(const TracesData& from) { @@ -531,11 +575,12 @@ void TracesData::InternalSwap(TracesData* other) { _impl_.resource_spans_.InternalSwap(&other->_impl_.resource_spans_); } -std::string TracesData::GetTypeName() const { - return "opentelemetry.proto.trace.v1.TracesData"; +::PROTOBUF_NAMESPACE_ID::Metadata TracesData::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[0]); } - // =================================================================== class ResourceSpans::_Internal { @@ -555,12 +600,12 @@ void ResourceSpans::clear_resource() { } ResourceSpans::ResourceSpans(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.trace.v1.ResourceSpans) } ResourceSpans::ResourceSpans(const ResourceSpans& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { ResourceSpans* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.scope_spans_){from._impl_.scope_spans_} @@ -568,7 +613,7 @@ ResourceSpans::ResourceSpans(const ResourceSpans& from) , decltype(_impl_.resource_){nullptr} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.schema_url_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.schema_url_.Set("", GetArenaForAllocation()); @@ -601,7 +646,7 @@ inline void ResourceSpans::SharedCtor( ResourceSpans::~ResourceSpans() { // @@protoc_insertion_point(destructor:opentelemetry.proto.trace.v1.ResourceSpans) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -631,7 +676,7 @@ void ResourceSpans::Clear() { delete _impl_.resource_; } _impl_.resource_ = nullptr; - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* ResourceSpans::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -667,7 +712,7 @@ const char* ResourceSpans::_InternalParse(const char* ptr, ::_pbi::ParseContext* auto str = _internal_mutable_schema_url(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.trace.v1.ResourceSpans.schema_url")); } else goto handle_unusual; continue; @@ -682,7 +727,7 @@ const char* ResourceSpans::_InternalParse(const char* ptr, ::_pbi::ParseContext* } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -726,8 +771,8 @@ uint8_t* ResourceSpans::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.trace.v1.ResourceSpans) return target; @@ -762,22 +807,19 @@ size_t ResourceSpans::ByteSizeLong() const { *_impl_.resource_); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void ResourceSpans::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const ResourceSpans*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ResourceSpans::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + ResourceSpans::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ResourceSpans::GetClassData() const { return &_class_data_; } -void ResourceSpans::MergeFrom(const ResourceSpans& from) { - ResourceSpans* const _this = this; + +void ResourceSpans::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<ResourceSpans*>(&to_msg); + auto& from = static_cast<const ResourceSpans&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.trace.v1.ResourceSpans) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -791,7 +833,7 @@ void ResourceSpans::MergeFrom(const ResourceSpans& from) { _this->_internal_mutable_resource()->::opentelemetry::proto::resource::v1::Resource::MergeFrom( from._internal_resource()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void ResourceSpans::CopyFrom(const ResourceSpans& from) { @@ -818,11 +860,12 @@ void ResourceSpans::InternalSwap(ResourceSpans* other) { swap(_impl_.resource_, other->_impl_.resource_); } -std::string ResourceSpans::GetTypeName() const { - return "opentelemetry.proto.trace.v1.ResourceSpans"; +::PROTOBUF_NAMESPACE_ID::Metadata ResourceSpans::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[1]); } - // =================================================================== class ScopeSpans::_Internal { @@ -842,12 +885,12 @@ void ScopeSpans::clear_scope() { } ScopeSpans::ScopeSpans(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.trace.v1.ScopeSpans) } ScopeSpans::ScopeSpans(const ScopeSpans& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { ScopeSpans* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.spans_){from._impl_.spans_} @@ -855,7 +898,7 @@ ScopeSpans::ScopeSpans(const ScopeSpans& from) , decltype(_impl_.scope_){nullptr} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.schema_url_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.schema_url_.Set("", GetArenaForAllocation()); @@ -888,7 +931,7 @@ inline void ScopeSpans::SharedCtor( ScopeSpans::~ScopeSpans() { // @@protoc_insertion_point(destructor:opentelemetry.proto.trace.v1.ScopeSpans) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -918,7 +961,7 @@ void ScopeSpans::Clear() { delete _impl_.scope_; } _impl_.scope_ = nullptr; - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* ScopeSpans::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -954,7 +997,7 @@ const char* ScopeSpans::_InternalParse(const char* ptr, ::_pbi::ParseContext* ct auto str = _internal_mutable_schema_url(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.trace.v1.ScopeSpans.schema_url")); } else goto handle_unusual; continue; @@ -969,7 +1012,7 @@ const char* ScopeSpans::_InternalParse(const char* ptr, ::_pbi::ParseContext* ct } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1013,8 +1056,8 @@ uint8_t* ScopeSpans::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.trace.v1.ScopeSpans) return target; @@ -1049,22 +1092,19 @@ size_t ScopeSpans::ByteSizeLong() const { *_impl_.scope_); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void ScopeSpans::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const ScopeSpans*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ScopeSpans::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + ScopeSpans::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ScopeSpans::GetClassData() const { return &_class_data_; } + -void ScopeSpans::MergeFrom(const ScopeSpans& from) { - ScopeSpans* const _this = this; +void ScopeSpans::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<ScopeSpans*>(&to_msg); + auto& from = static_cast<const ScopeSpans&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.trace.v1.ScopeSpans) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -1078,7 +1118,7 @@ void ScopeSpans::MergeFrom(const ScopeSpans& from) { _this->_internal_mutable_scope()->::opentelemetry::proto::common::v1::InstrumentationScope::MergeFrom( from._internal_scope()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void ScopeSpans::CopyFrom(const ScopeSpans& from) { @@ -1105,11 +1145,12 @@ void ScopeSpans::InternalSwap(ScopeSpans* other) { swap(_impl_.scope_, other->_impl_.scope_); } -std::string ScopeSpans::GetTypeName() const { - return "opentelemetry.proto.trace.v1.ScopeSpans"; +::PROTOBUF_NAMESPACE_ID::Metadata ScopeSpans::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[2]); } - // =================================================================== class Span_Event::_Internal { @@ -1121,12 +1162,12 @@ void Span_Event::clear_attributes() { } Span_Event::Span_Event(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.trace.v1.Span.Event) } Span_Event::Span_Event(const Span_Event& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { Span_Event* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.attributes_){from._impl_.attributes_} @@ -1135,7 +1176,7 @@ Span_Event::Span_Event(const Span_Event& from) , decltype(_impl_.dropped_attributes_count_){} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.name_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.name_.Set("", GetArenaForAllocation()); @@ -1169,7 +1210,7 @@ inline void Span_Event::SharedCtor( Span_Event::~Span_Event() { // @@protoc_insertion_point(destructor:opentelemetry.proto.trace.v1.Span.Event) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -1197,7 +1238,7 @@ void Span_Event::Clear() { ::memset(&_impl_.time_unix_nano_, 0, static_cast<size_t>( reinterpret_cast<char*>(&_impl_.dropped_attributes_count_) - reinterpret_cast<char*>(&_impl_.time_unix_nano_)) + sizeof(_impl_.dropped_attributes_count_)); - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* Span_Event::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -1220,7 +1261,7 @@ const char* Span_Event::_InternalParse(const char* ptr, ::_pbi::ParseContext* ct auto str = _internal_mutable_name(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.trace.v1.Span.Event.name")); } else goto handle_unusual; continue; @@ -1256,7 +1297,7 @@ const char* Span_Event::_InternalParse(const char* ptr, ::_pbi::ParseContext* ct } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1305,8 +1346,8 @@ uint8_t* Span_Event::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.trace.v1.Span.Event) return target; @@ -1344,22 +1385,19 @@ size_t Span_Event::ByteSizeLong() const { total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_dropped_attributes_count()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void Span_Event::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const Span_Event*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Span_Event::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + Span_Event::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Span_Event::GetClassData() const { return &_class_data_; } -void Span_Event::MergeFrom(const Span_Event& from) { - Span_Event* const _this = this; + +void Span_Event::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<Span_Event*>(&to_msg); + auto& from = static_cast<const Span_Event&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.trace.v1.Span.Event) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -1375,7 +1413,7 @@ void Span_Event::MergeFrom(const Span_Event& from) { if (from._internal_dropped_attributes_count() != 0) { _this->_internal_set_dropped_attributes_count(from._internal_dropped_attributes_count()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void Span_Event::CopyFrom(const Span_Event& from) { @@ -1407,11 +1445,12 @@ void Span_Event::InternalSwap(Span_Event* other) { reinterpret_cast<char*>(&other->_impl_.time_unix_nano_)); } -std::string Span_Event::GetTypeName() const { - return "opentelemetry.proto.trace.v1.Span.Event"; +::PROTOBUF_NAMESPACE_ID::Metadata Span_Event::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[3]); } - // =================================================================== class Span_Link::_Internal { @@ -1423,12 +1462,12 @@ void Span_Link::clear_attributes() { } Span_Link::Span_Link(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.trace.v1.Span.Link) } Span_Link::Span_Link(const Span_Link& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { Span_Link* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.attributes_){from._impl_.attributes_} @@ -1439,7 +1478,7 @@ Span_Link::Span_Link(const Span_Link& from) , decltype(_impl_.flags_){} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.trace_id_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.trace_id_.Set("", GetArenaForAllocation()); @@ -1499,7 +1538,7 @@ inline void Span_Link::SharedCtor( Span_Link::~Span_Link() { // @@protoc_insertion_point(destructor:opentelemetry.proto.trace.v1.Span.Link) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -1531,7 +1570,7 @@ void Span_Link::Clear() { ::memset(&_impl_.dropped_attributes_count_, 0, static_cast<size_t>( reinterpret_cast<char*>(&_impl_.flags_) - reinterpret_cast<char*>(&_impl_.dropped_attributes_count_)) + sizeof(_impl_.flags_)); - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* Span_Link::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -1564,7 +1603,7 @@ const char* Span_Link::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx auto str = _internal_mutable_trace_state(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.trace.v1.Span.Link.trace_state")); } else goto handle_unusual; continue; @@ -1608,7 +1647,7 @@ const char* Span_Link::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -1669,8 +1708,8 @@ uint8_t* Span_Link::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.trace.v1.Span.Link) return target; @@ -1722,22 +1761,19 @@ size_t Span_Link::ByteSizeLong() const { total_size += 1 + 4; } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void Span_Link::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const Span_Link*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Span_Link::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + Span_Link::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Span_Link::GetClassData() const { return &_class_data_; } + -void Span_Link::MergeFrom(const Span_Link& from) { - Span_Link* const _this = this; +void Span_Link::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<Span_Link*>(&to_msg); + auto& from = static_cast<const Span_Link&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.trace.v1.Span.Link) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -1759,7 +1795,7 @@ void Span_Link::MergeFrom(const Span_Link& from) { if (from._internal_flags() != 0) { _this->_internal_set_flags(from._internal_flags()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void Span_Link::CopyFrom(const Span_Link& from) { @@ -1799,11 +1835,12 @@ void Span_Link::InternalSwap(Span_Link* other) { reinterpret_cast<char*>(&other->_impl_.dropped_attributes_count_)); } -std::string Span_Link::GetTypeName() const { - return "opentelemetry.proto.trace.v1.Span.Link"; +::PROTOBUF_NAMESPACE_ID::Metadata Span_Link::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[4]); } - // =================================================================== class Span::_Internal { @@ -1820,12 +1857,12 @@ void Span::clear_attributes() { } Span::Span(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.trace.v1.Span) } Span::Span(const Span& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { Span* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.attributes_){from._impl_.attributes_} @@ -1846,7 +1883,7 @@ Span::Span(const Span& from) , decltype(_impl_.flags_){} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.trace_id_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.trace_id_.Set("", GetArenaForAllocation()); @@ -1943,7 +1980,7 @@ inline void Span::SharedCtor( Span::~Span() { // @@protoc_insertion_point(destructor:opentelemetry.proto.trace.v1.Span) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -1988,7 +2025,7 @@ void Span::Clear() { ::memset(&_impl_.start_time_unix_nano_, 0, static_cast<size_t>( reinterpret_cast<char*>(&_impl_.flags_) - reinterpret_cast<char*>(&_impl_.start_time_unix_nano_)) + sizeof(_impl_.flags_)); - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* Span::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -2021,7 +2058,7 @@ const char* Span::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { auto str = _internal_mutable_trace_state(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.trace.v1.Span.trace_state")); } else goto handle_unusual; continue; @@ -2040,7 +2077,7 @@ const char* Span::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { auto str = _internal_mutable_name(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.trace.v1.Span.name")); } else goto handle_unusual; continue; @@ -2159,7 +2196,7 @@ const char* Span::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -2290,8 +2327,8 @@ uint8_t* Span::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.trace.v1.Span) return target; @@ -2404,22 +2441,19 @@ size_t Span::ByteSizeLong() const { total_size += 2 + 4; } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void Span::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const Span*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Span::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + Span::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Span::GetClassData() const { return &_class_data_; } + -void Span::MergeFrom(const Span& from) { - Span* const _this = this; +void Span::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<Span*>(&to_msg); + auto& from = static_cast<const Span&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.trace.v1.Span) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -2468,7 +2502,7 @@ void Span::MergeFrom(const Span& from) { if (from._internal_flags() != 0) { _this->_internal_set_flags(from._internal_flags()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void Span::CopyFrom(const Span& from) { @@ -2518,11 +2552,12 @@ void Span::InternalSwap(Span* other) { reinterpret_cast<char*>(&other->_impl_.status_)); } -std::string Span::GetTypeName() const { - return "opentelemetry.proto.trace.v1.Span"; +::PROTOBUF_NAMESPACE_ID::Metadata Span::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[5]); } - // =================================================================== class Status::_Internal { @@ -2531,19 +2566,19 @@ class Status::_Internal { Status::Status(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned) - : ::PROTOBUF_NAMESPACE_ID::MessageLite(arena, is_message_owned) { + : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) { SharedCtor(arena, is_message_owned); // @@protoc_insertion_point(arena_constructor:opentelemetry.proto.trace.v1.Status) } Status::Status(const Status& from) - : ::PROTOBUF_NAMESPACE_ID::MessageLite() { + : ::PROTOBUF_NAMESPACE_ID::Message() { Status* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.message_){} , decltype(_impl_.code_){} , /*decltype(_impl_._cached_size_)*/{}}; - _internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _impl_.message_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.message_.Set("", GetArenaForAllocation()); @@ -2573,7 +2608,7 @@ inline void Status::SharedCtor( Status::~Status() { // @@protoc_insertion_point(destructor:opentelemetry.proto.trace.v1.Status) - if (auto *arena = _internal_metadata_.DeleteReturnArena<std::string>()) { + if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) { (void)arena; return; } @@ -2597,7 +2632,7 @@ void Status::Clear() { _impl_.message_.ClearToEmpty(); _impl_.code_ = 0; - _internal_metadata_.Clear<std::string>(); + _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } const char* Status::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { @@ -2612,7 +2647,7 @@ const char* Status::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { auto str = _internal_mutable_message(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, nullptr)); + CHK_(::_pbi::VerifyUTF8(str, "opentelemetry.proto.trace.v1.Status.message")); } else goto handle_unusual; continue; @@ -2636,7 +2671,7 @@ const char* Status::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) { } ptr = UnknownFieldParse( tag, - _internal_metadata_.mutable_unknown_fields<std::string>(), + _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(), ptr, ctx); CHK_(ptr != nullptr); } // while @@ -2672,8 +2707,8 @@ uint8_t* Status::_InternalSerialize( } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - target = stream->WriteRaw(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).data(), - static_cast<int>(_internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size()), target); + target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( + _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); } // @@protoc_insertion_point(serialize_to_array_end:opentelemetry.proto.trace.v1.Status) return target; @@ -2700,22 +2735,19 @@ size_t Status::ByteSizeLong() const { ::_pbi::WireFormatLite::EnumSize(this->_internal_code()); } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { - total_size += _internal_metadata_.unknown_fields<std::string>(::PROTOBUF_NAMESPACE_ID::internal::GetEmptyString).size(); - } - int cached_size = ::_pbi::ToCachedSize(total_size); - SetCachedSize(cached_size); - return total_size; + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } -void Status::CheckTypeAndMergeFrom( - const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) { - MergeFrom(*::_pbi::DownCast<const Status*>( - &from)); -} +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Status::_class_data_ = { + ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck, + Status::MergeImpl +}; +const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Status::GetClassData() const { return &_class_data_; } -void Status::MergeFrom(const Status& from) { - Status* const _this = this; + +void Status::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) { + auto* const _this = static_cast<Status*>(&to_msg); + auto& from = static_cast<const Status&>(from_msg); // @@protoc_insertion_point(class_specific_merge_from_start:opentelemetry.proto.trace.v1.Status) GOOGLE_DCHECK_NE(&from, _this); uint32_t cached_has_bits = 0; @@ -2727,7 +2759,7 @@ void Status::MergeFrom(const Status& from) { if (from._internal_code() != 0) { _this->_internal_set_code(from._internal_code()); } - _this->_internal_metadata_.MergeFrom<std::string>(from._internal_metadata_); + _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } void Status::CopyFrom(const Status& from) { @@ -2753,11 +2785,12 @@ void Status::InternalSwap(Status* other) { swap(_impl_.code_, other->_impl_.code_); } -std::string Status::GetTypeName() const { - return "opentelemetry.proto.trace.v1.Status"; +::PROTOBUF_NAMESPACE_ID::Metadata Status::GetMetadata() const { + return ::_pbi::AssignDescriptors( + &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_getter, &descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto_once, + file_level_metadata_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto[6]); } - // @@protoc_insertion_point(namespace_scope) } // namespace v1 } // namespace trace diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.pb.h b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.pb.h @@ -25,10 +25,12 @@ #include <google/protobuf/arenastring.h> #include <google/protobuf/generated_message_util.h> #include <google/protobuf/metadata_lite.h> -#include <google/protobuf/message_lite.h> +#include <google/protobuf/generated_message_reflection.h> +#include <google/protobuf/message.h> #include <google/protobuf/repeated_field.h> // IWYU pragma: export #include <google/protobuf/extension_set.h> // IWYU pragma: export -#include <google/protobuf/generated_enum_util.h> +#include <google/protobuf/generated_enum_reflection.h> +#include <google/protobuf/unknown_field_set.h> #include "opentelemetry/proto/common/v1/common.pb.h" #include "opentelemetry/proto/resource/v1/resource.pb.h" // @@protoc_insertion_point(includes) @@ -44,6 +46,7 @@ PROTOBUF_NAMESPACE_CLOSE struct TableStruct_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto { static const uint32_t offsets[]; }; +extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_opentelemetry_2fproto_2ftrace_2fv1_2ftrace_2eproto; namespace opentelemetry { namespace proto { namespace trace { @@ -102,16 +105,20 @@ constexpr Span_SpanKind Span_SpanKind_SpanKind_MIN = Span_SpanKind_SPAN_KIND_UNS constexpr Span_SpanKind Span_SpanKind_SpanKind_MAX = Span_SpanKind_SPAN_KIND_CONSUMER; constexpr int Span_SpanKind_SpanKind_ARRAYSIZE = Span_SpanKind_SpanKind_MAX + 1; -const std::string& Span_SpanKind_Name(Span_SpanKind value); +const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Span_SpanKind_descriptor(); template<typename T> inline const std::string& Span_SpanKind_Name(T enum_t_value) { static_assert(::std::is_same<T, Span_SpanKind>::value || ::std::is_integral<T>::value, "Incorrect type passed to function Span_SpanKind_Name."); - return Span_SpanKind_Name(static_cast<Span_SpanKind>(enum_t_value)); + return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum( + Span_SpanKind_descriptor(), enum_t_value); +} +inline bool Span_SpanKind_Parse( + ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Span_SpanKind* value) { + return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<Span_SpanKind>( + Span_SpanKind_descriptor(), name, value); } -bool Span_SpanKind_Parse( - ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Span_SpanKind* value); enum Status_StatusCode : int { Status_StatusCode_STATUS_CODE_UNSET = 0, Status_StatusCode_STATUS_CODE_OK = 1, @@ -124,16 +131,20 @@ constexpr Status_StatusCode Status_StatusCode_StatusCode_MIN = Status_StatusCode constexpr Status_StatusCode Status_StatusCode_StatusCode_MAX = Status_StatusCode_STATUS_CODE_ERROR; constexpr int Status_StatusCode_StatusCode_ARRAYSIZE = Status_StatusCode_StatusCode_MAX + 1; -const std::string& Status_StatusCode_Name(Status_StatusCode value); +const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Status_StatusCode_descriptor(); template<typename T> inline const std::string& Status_StatusCode_Name(T enum_t_value) { static_assert(::std::is_same<T, Status_StatusCode>::value || ::std::is_integral<T>::value, "Incorrect type passed to function Status_StatusCode_Name."); - return Status_StatusCode_Name(static_cast<Status_StatusCode>(enum_t_value)); + return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum( + Status_StatusCode_descriptor(), enum_t_value); +} +inline bool Status_StatusCode_Parse( + ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Status_StatusCode* value) { + return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<Status_StatusCode>( + Status_StatusCode_descriptor(), name, value); } -bool Status_StatusCode_Parse( - ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Status_StatusCode* value); enum SpanFlags : int { SPAN_FLAGS_DO_NOT_USE = 0, SPAN_FLAGS_TRACE_FLAGS_MASK = 255, @@ -147,20 +158,24 @@ constexpr SpanFlags SpanFlags_MIN = SPAN_FLAGS_DO_NOT_USE; constexpr SpanFlags SpanFlags_MAX = SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK; constexpr int SpanFlags_ARRAYSIZE = SpanFlags_MAX + 1; -const std::string& SpanFlags_Name(SpanFlags value); +const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* SpanFlags_descriptor(); template<typename T> inline const std::string& SpanFlags_Name(T enum_t_value) { static_assert(::std::is_same<T, SpanFlags>::value || ::std::is_integral<T>::value, "Incorrect type passed to function SpanFlags_Name."); - return SpanFlags_Name(static_cast<SpanFlags>(enum_t_value)); + return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum( + SpanFlags_descriptor(), enum_t_value); +} +inline bool SpanFlags_Parse( + ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, SpanFlags* value) { + return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<SpanFlags>( + SpanFlags_descriptor(), name, value); } -bool SpanFlags_Parse( - ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, SpanFlags* value); // =================================================================== class TracesData final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.TracesData) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.TracesData) */ { public: inline TracesData() : TracesData(nullptr) {} ~TracesData() override; @@ -190,6 +205,15 @@ class TracesData final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const TracesData& default_instance() { return *internal_default_instance(); } @@ -227,9 +251,15 @@ class TracesData final : TracesData* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<TracesData>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const TracesData& from); - void MergeFrom(const TracesData& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const TracesData& from) { + TracesData::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -242,7 +272,7 @@ class TracesData final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(TracesData* other); private: @@ -255,7 +285,10 @@ class TracesData final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -299,7 +332,7 @@ class TracesData final : // ------------------------------------------------------------------- class ResourceSpans final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.ResourceSpans) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.ResourceSpans) */ { public: inline ResourceSpans() : ResourceSpans(nullptr) {} ~ResourceSpans() override; @@ -329,6 +362,15 @@ class ResourceSpans final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const ResourceSpans& default_instance() { return *internal_default_instance(); } @@ -366,9 +408,15 @@ class ResourceSpans final : ResourceSpans* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<ResourceSpans>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const ResourceSpans& from); - void MergeFrom(const ResourceSpans& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const ResourceSpans& from) { + ResourceSpans::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -381,7 +429,7 @@ class ResourceSpans final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(ResourceSpans* other); private: @@ -394,7 +442,10 @@ class ResourceSpans final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -474,7 +525,7 @@ class ResourceSpans final : // ------------------------------------------------------------------- class ScopeSpans final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.ScopeSpans) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.ScopeSpans) */ { public: inline ScopeSpans() : ScopeSpans(nullptr) {} ~ScopeSpans() override; @@ -504,6 +555,15 @@ class ScopeSpans final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const ScopeSpans& default_instance() { return *internal_default_instance(); } @@ -541,9 +601,15 @@ class ScopeSpans final : ScopeSpans* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<ScopeSpans>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const ScopeSpans& from); - void MergeFrom(const ScopeSpans& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const ScopeSpans& from) { + ScopeSpans::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -556,7 +622,7 @@ class ScopeSpans final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(ScopeSpans* other); private: @@ -569,7 +635,10 @@ class ScopeSpans final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -649,7 +718,7 @@ class ScopeSpans final : // ------------------------------------------------------------------- class Span_Event final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.Span.Event) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.Span.Event) */ { public: inline Span_Event() : Span_Event(nullptr) {} ~Span_Event() override; @@ -679,6 +748,15 @@ class Span_Event final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const Span_Event& default_instance() { return *internal_default_instance(); } @@ -716,9 +794,15 @@ class Span_Event final : Span_Event* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<Span_Event>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const Span_Event& from); - void MergeFrom(const Span_Event& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const Span_Event& from) { + Span_Event::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -731,7 +815,7 @@ class Span_Event final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(Span_Event* other); private: @@ -744,7 +828,10 @@ class Span_Event final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -826,7 +913,7 @@ class Span_Event final : // ------------------------------------------------------------------- class Span_Link final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.Span.Link) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.Span.Link) */ { public: inline Span_Link() : Span_Link(nullptr) {} ~Span_Link() override; @@ -856,6 +943,15 @@ class Span_Link final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const Span_Link& default_instance() { return *internal_default_instance(); } @@ -893,9 +989,15 @@ class Span_Link final : Span_Link* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<Span_Link>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const Span_Link& from); - void MergeFrom(const Span_Link& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const Span_Link& from) { + Span_Link::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -908,7 +1010,7 @@ class Span_Link final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(Span_Link* other); private: @@ -921,7 +1023,10 @@ class Span_Link final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -1035,7 +1140,7 @@ class Span_Link final : // ------------------------------------------------------------------- class Span final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.Span) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.Span) */ { public: inline Span() : Span(nullptr) {} ~Span() override; @@ -1065,6 +1170,15 @@ class Span final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const Span& default_instance() { return *internal_default_instance(); } @@ -1102,9 +1216,15 @@ class Span final : Span* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<Span>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const Span& from); - void MergeFrom(const Span& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const Span& from) { + Span::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -1117,7 +1237,7 @@ class Span final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(Span* other); private: @@ -1130,7 +1250,10 @@ class Span final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -1159,6 +1282,10 @@ class Span final : Span_SpanKind_SpanKind_MAX; static constexpr int SpanKind_ARRAYSIZE = Span_SpanKind_SpanKind_ARRAYSIZE; + static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* + SpanKind_descriptor() { + return Span_SpanKind_descriptor(); + } template<typename T> static inline const std::string& SpanKind_Name(T enum_t_value) { static_assert(::std::is_same<T, SpanKind>::value || @@ -1428,7 +1555,7 @@ class Span final : // ------------------------------------------------------------------- class Status final : - public ::PROTOBUF_NAMESPACE_ID::MessageLite /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.Status) */ { + public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:opentelemetry.proto.trace.v1.Status) */ { public: inline Status() : Status(nullptr) {} ~Status() override; @@ -1458,6 +1585,15 @@ class Status final : return *this; } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() { + return GetDescriptor(); + } + static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() { + return default_instance().GetMetadata().descriptor; + } + static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() { + return default_instance().GetMetadata().reflection; + } static const Status& default_instance() { return *internal_default_instance(); } @@ -1495,9 +1631,15 @@ class Status final : Status* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final { return CreateMaybeMessage<Status>(arena); } - void CheckTypeAndMergeFrom(const ::PROTOBUF_NAMESPACE_ID::MessageLite& from) final; + using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom; void CopyFrom(const Status& from); - void MergeFrom(const Status& from); + using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom; + void MergeFrom( const Status& from) { + Status::MergeImpl(*this, from); + } + private: + static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg); + public: PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final; bool IsInitialized() const final; @@ -1510,7 +1652,7 @@ class Status final : private: void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned); void SharedDtor(); - void SetCachedSize(int size) const; + void SetCachedSize(int size) const final; void InternalSwap(Status* other); private: @@ -1523,7 +1665,10 @@ class Status final : bool is_message_owned = false); public: - std::string GetTypeName() const final; + static const ClassData _class_data_; + const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final; + + ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final; // nested types ---------------------------------------------------- @@ -1543,6 +1688,10 @@ class Status final : Status_StatusCode_StatusCode_MAX; static constexpr int StatusCode_ARRAYSIZE = Status_StatusCode_StatusCode_ARRAYSIZE; + static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* + StatusCode_descriptor() { + return Status_StatusCode_descriptor(); + } template<typename T> static inline const std::string& StatusCode_Name(T enum_t_value) { static_assert(::std::is_same<T, StatusCode>::value || @@ -3071,8 +3220,20 @@ inline void Status::set_code(::opentelemetry::proto::trace::v1::Status_StatusCod PROTOBUF_NAMESPACE_OPEN template <> struct is_proto_enum< ::opentelemetry::proto::trace::v1::Span_SpanKind> : ::std::true_type {}; +template <> +inline const EnumDescriptor* GetEnumDescriptor< ::opentelemetry::proto::trace::v1::Span_SpanKind>() { + return ::opentelemetry::proto::trace::v1::Span_SpanKind_descriptor(); +} template <> struct is_proto_enum< ::opentelemetry::proto::trace::v1::Status_StatusCode> : ::std::true_type {}; +template <> +inline const EnumDescriptor* GetEnumDescriptor< ::opentelemetry::proto::trace::v1::Status_StatusCode>() { + return ::opentelemetry::proto::trace::v1::Status_StatusCode_descriptor(); +} template <> struct is_proto_enum< ::opentelemetry::proto::trace::v1::SpanFlags> : ::std::true_type {}; +template <> +inline const EnumDescriptor* GetEnumDescriptor< ::opentelemetry::proto::trace::v1::SpanFlags>() { + return ::opentelemetry::proto::trace::v1::SpanFlags_descriptor(); +} PROTOBUF_NAMESPACE_CLOSE diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto @@ -14,8 +14,6 @@ syntax = "proto3"; -option optimize_for = LITE_RUNTIME; - package opentelemetry.proto.trace.v1; import "opentelemetry/proto/common/v1/common.proto"; @@ -208,18 +206,10 @@ message Span { // "example.com/myattribute": true // "example.com/score": 10.239 // + // The OpenTelemetry API specification further restricts the allowed value types: + // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/README.md#attribute // 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. repeated opentelemetry.proto.common.v1.KeyValue attributes = 9; // dropped_attributes_count is the number of attributes that were discarded. Attributes @@ -240,16 +230,6 @@ message Span { // attributes is a collection of attribute key/value pairs on the event. // 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. repeated opentelemetry.proto.common.v1.KeyValue attributes = 3; // dropped_attributes_count is the number of dropped attributes. If the value is 0, @@ -282,16 +262,6 @@ message Span { // attributes is a collection of attribute key/value pairs on the link. // 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. repeated opentelemetry.proto.common.v1.KeyValue attributes = 4; // dropped_attributes_count is the number of dropped attributes. If the value is 0, diff --git a/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/patches/add-lite_runtime-optimization-to-protos.patch b/third_party/opentelemetry-cpp/third_party/opentelemetry-proto/patches/add-lite_runtime-optimization-to-protos.patch @@ -1,52 +0,0 @@ -diff --git a/opentelemetry/proto/collector/trace/v1/trace_service.proto b/opentelemetry/proto/collector/trace/v1/trace_service.proto -index efbbedbe4545..6a439642915c 100644 ---- a/opentelemetry/proto/collector/trace/v1/trace_service.proto -+++ b/opentelemetry/proto/collector/trace/v1/trace_service.proto -@@ -14,6 +14,8 @@ - - syntax = "proto3"; - -+option optimize_for = LITE_RUNTIME; -+ - package opentelemetry.proto.collector.trace.v1; - - import "opentelemetry/proto/trace/v1/trace.proto"; -diff --git a/opentelemetry/proto/common/v1/common.proto b/opentelemetry/proto/common/v1/common.proto -index 57c9f86e0067..452f27edca95 100644 ---- a/opentelemetry/proto/common/v1/common.proto -+++ b/opentelemetry/proto/common/v1/common.proto -@@ -14,6 +14,8 @@ - - syntax = "proto3"; - -+option optimize_for = LITE_RUNTIME; -+ - package opentelemetry.proto.common.v1; - - option csharp_namespace = "OpenTelemetry.Proto.Common.V1"; -diff --git a/opentelemetry/proto/resource/v1/resource.proto b/opentelemetry/proto/resource/v1/resource.proto -index 05d4456840f4..54c9471466f2 100644 ---- a/opentelemetry/proto/resource/v1/resource.proto -+++ b/opentelemetry/proto/resource/v1/resource.proto -@@ -14,6 +14,8 @@ - - syntax = "proto3"; - -+option optimize_for = LITE_RUNTIME; -+ - package opentelemetry.proto.resource.v1; - - import "opentelemetry/proto/common/v1/common.proto"; -diff --git a/opentelemetry/proto/trace/v1/trace.proto b/opentelemetry/proto/trace/v1/trace.proto -index 24442853edcf..c6470638a97a 100644 ---- a/opentelemetry/proto/trace/v1/trace.proto -+++ b/opentelemetry/proto/trace/v1/trace.proto -@@ -14,6 +14,8 @@ - - syntax = "proto3"; - -+option optimize_for = LITE_RUNTIME; -+ - package opentelemetry.proto.trace.v1; - - import "opentelemetry/proto/common/v1/common.proto"; diff --git a/toolkit/components/protobuf/scripts/protoc_wrapper.py b/toolkit/components/protobuf/scripts/protoc_wrapper.py @@ -64,7 +64,7 @@ def _download_protoc_binary(revision): if not isinstance(member, ZipInfo): member = self.getinfo(member) - targetpath = ZipFile._extract_member(self, member, targetpath, pwd) + targetpath = super(ZipFile, self)._extract_member(member, targetpath, pwd) attr = member.external_attr >> 16 if attr != 0: