From d4b44244d77c86a05a27b6400854d3487a943a39 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Mon, 3 Nov 2025 13:45:46 -0500 Subject: [PATCH] update generated code again, repeated fields are optional again --- src/core/opentelemetry.ml | 27 +++----- src/proto/common.ml | 29 ++++----- src/proto/common.mli | 19 +++--- src/proto/logs.ml | 25 ++++---- src/proto/logs.mli | 17 +++-- src/proto/logs_service.ml | 11 ++-- src/proto/logs_service.mli | 5 +- src/proto/metrics.ml | 113 +++++++++++++++------------------- src/proto/metrics.mli | 81 ++++++++++-------------- src/proto/metrics_service.ml | 11 ++-- src/proto/metrics_service.mli | 5 +- src/proto/resource.ml | 9 ++- src/proto/resource.mli | 7 +-- src/proto/status.ml | 7 +-- src/proto/status.mli | 5 +- src/proto/trace.ml | 48 +++++++-------- src/proto/trace.mli | 34 +++++----- src/proto/trace_service.ml | 11 ++-- src/proto/trace_service.mli | 5 +- 19 files changed, 201 insertions(+), 268 deletions(-) diff --git a/src/core/opentelemetry.ml b/src/core/opentelemetry.ml index 7f1d3a68..4b189819 100644 --- a/src/core/opentelemetry.ml +++ b/src/core/opentelemetry.ml @@ -696,8 +696,7 @@ module Globals = struct let service_version = ref None let instrumentation_library : instrumentation_scope = - make_instrumentation_scope ~version:"%%VERSION_NUM%%" ~name:"ocaml-otel" - ~attributes:[] () + make_instrumentation_scope ~version:"%%VERSION_NUM%%" ~name:"ocaml-otel" () (** Global attributes, initially set via OTEL_RESOURCE_ATTRIBUTES and modifiable by the user code. They will be attached to each outgoing @@ -1223,9 +1222,7 @@ module Trace = struct make_scope_spans ~scope:Globals.instrumentation_library ~spans () in let attributes = Globals.mk_attributes ?service_name ?attrs () in - let resource = - Proto.Resource.make_resource ~entity_refs:[] ~attributes () - in + let resource = Proto.Resource.make_resource ~attributes () in make_resource_spans ~resource ~scope_spans:[ ils ] () (** Sync emitter. @@ -1375,7 +1372,7 @@ module Metrics = struct number_data_point = let attributes = attrs |> List.map _conv_key_value in make_number_data_point ~start_time_unix_nano ~time_unix_nano:now ~attributes - ~value:(As_double d) ~exemplars:[] () + ~value:(As_double d) () (** Number data point, as an int *) let int ?(start_time_unix_nano = _program_start) @@ -1384,12 +1381,12 @@ module Metrics = struct let attributes = attrs |> List.map _conv_key_value in make_number_data_point ~start_time_unix_nano ~time_unix_nano:now ~attributes ~value:(As_int (Int64.of_int i)) - ~exemplars:[] () + () (** Aggregation of a scalar metric, always with the current value *) let gauge ~name ?description ?unit_ (l : number_data_point list) : t = let data = Gauge (make_gauge ~data_points:l ()) in - make_metric ~metadata:[] ~name ?description ?unit_ ~data () + make_metric ~name ?description ?unit_ ~data () type aggregation_temporality = Metrics.aggregation_temporality = | Aggregation_temporality_unspecified @@ -1403,7 +1400,7 @@ module Metrics = struct let data = Sum (make_sum ~data_points:l ?is_monotonic ~aggregation_temporality ()) in - make_metric ~metadata:[] ~name ?description ?unit_ ~data () + make_metric ~name ?description ?unit_ ~data () (** Histogram data @param count number of values in population (non negative) @@ -1426,7 +1423,7 @@ module Metrics = struct let data = Histogram (make_histogram ~data_points:l ?aggregation_temporality ()) in - make_metric ~metadata:[] ~name ?description ?unit_ ~data () + make_metric ~name ?description ?unit_ ~data () (* TODO: exponential history *) (* TODO: summary *) @@ -1439,9 +1436,7 @@ module Metrics = struct make_scope_metrics ~scope:Globals.instrumentation_library ~metrics:l () in let attributes = Globals.mk_attributes ?service_name ?attrs () in - let resource = - Proto.Resource.make_resource ~entity_refs:[] ~attributes () - in + let resource = Proto.Resource.make_resource ~attributes () in make_resource_metrics ~scope_metrics:[ lm ] ~resource () (** Emit some metrics to the collector (sync). This blocks until the backend @@ -1546,7 +1541,7 @@ module Logs = struct let trace_id = Option.map Trace_id.to_bytes trace_id in let span_id = Option.map Span_id.to_bytes span_id in let body = _conv_value body in - make_log_record ~time_unix_nano ~observed_time_unix_nano ~attributes:[] + make_log_record ~time_unix_nano ~observed_time_unix_nano ?severity_number:severity ?severity_text:log_level ?flags ?trace_id ?span_id ?body () @@ -1572,9 +1567,7 @@ module Logs = struct cause deadlocks. *) let emit ?service_name ?attrs (l : t list) : unit = let attributes = Globals.mk_attributes ?service_name ?attrs () in - let resource = - Proto.Resource.make_resource ~entity_refs:[] ~attributes () - in + let resource = Proto.Resource.make_resource ~attributes () in let ll = make_scope_logs ~scope:Globals.instrumentation_library ~log_records:l () in diff --git a/src/proto/common.ml b/src/proto/common.ml index c403f65a..bf0646d8 100644 --- a/src/proto/common.ml +++ b/src/proto/common.ml @@ -18,15 +18,13 @@ and key_value_list = { } and key_value = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable key : string; mutable value : any_value option; } type instrumentation_scope = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable name : string; mutable version : string; mutable attributes : key_value list; @@ -34,8 +32,7 @@ type instrumentation_scope = { } type entity_ref = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable schema_url : string; mutable type_ : string; mutable id_keys : string list; @@ -44,24 +41,24 @@ type entity_ref = { let default_any_value (): any_value = String_value ("") -let default_array_value (): array_value = +let default_array_value (): array_value = { values=[]; } -let default_key_value_list (): key_value_list = +let default_key_value_list (): key_value_list = { values=[]; } -let default_key_value (): key_value = +let default_key_value (): key_value = { _presence=Pbrt.Bitfield.empty; key=""; value=None; } -let default_instrumentation_scope (): instrumentation_scope = +let default_instrumentation_scope (): instrumentation_scope = { _presence=Pbrt.Bitfield.empty; name=""; @@ -70,7 +67,7 @@ let default_instrumentation_scope (): instrumentation_scope = dropped_attributes_count=0l; } -let default_entity_ref (): entity_ref = +let default_entity_ref (): entity_ref = { _presence=Pbrt.Bitfield.empty; schema_url=""; @@ -91,7 +88,7 @@ let copy_array_value (self:array_value) : array_value = { self with values = self.values } let make_array_value - ~(values:any_value list) + ?(values=[]) () : array_value = let _res = default_array_value () in set_array_value_values _res values; @@ -105,7 +102,7 @@ let copy_key_value_list (self:key_value_list) : key_value_list = { self with values = self.values } let make_key_value_list - ~(values:key_value list) + ?(values=[]) () : key_value_list = let _res = default_key_value_list () in set_key_value_list_values _res values; @@ -153,7 +150,7 @@ let copy_instrumentation_scope (self:instrumentation_scope) : instrumentation_sc let make_instrumentation_scope ?(name:string option) ?(version:string option) - ~(attributes:key_value list) + ?(attributes=[]) ?(dropped_attributes_count:int32 option) () : instrumentation_scope = let _res = default_instrumentation_scope () in @@ -187,8 +184,8 @@ let copy_entity_ref (self:entity_ref) : entity_ref = let make_entity_ref ?(schema_url:string option) ?(type_:string option) - ~(id_keys:string list) - ~(description_keys:string list) + ?(id_keys=[]) + ?(description_keys=[]) () : entity_ref = let _res = default_entity_ref () in (match schema_url with diff --git a/src/proto/common.mli b/src/proto/common.mli index e74eedd5..2e655701 100644 --- a/src/proto/common.mli +++ b/src/proto/common.mli @@ -25,15 +25,13 @@ and key_value_list = private { } and key_value = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable key : string; mutable value : any_value option; } type instrumentation_scope = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable name : string; mutable version : string; mutable attributes : key_value list; @@ -41,8 +39,7 @@ type instrumentation_scope = private { } type entity_ref = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable schema_url : string; mutable type_ : string; mutable id_keys : string list; @@ -75,7 +72,7 @@ val default_entity_ref : unit -> entity_ref val make_array_value : - values:any_value list -> + ?values:any_value list -> unit -> array_value (** [make_array_value … ()] is a builder for type [array_value] *) @@ -86,7 +83,7 @@ val set_array_value_values : array_value -> any_value list -> unit (** set field values in array_value *) val make_key_value_list : - values:key_value list -> + ?values:key_value list -> unit -> key_value_list (** [make_key_value_list … ()] is a builder for type [key_value_list] *) @@ -117,7 +114,7 @@ val set_key_value_value : key_value -> any_value -> unit val make_instrumentation_scope : ?name:string -> ?version:string -> - attributes:key_value list -> + ?attributes:key_value list -> ?dropped_attributes_count:int32 -> unit -> instrumentation_scope @@ -149,8 +146,8 @@ val set_instrumentation_scope_dropped_attributes_count : instrumentation_scope - val make_entity_ref : ?schema_url:string -> ?type_:string -> - id_keys:string list -> - description_keys:string list -> + ?id_keys:string list -> + ?description_keys:string list -> unit -> entity_ref (** [make_entity_ref … ()] is a builder for type [entity_ref] *) diff --git a/src/proto/logs.ml b/src/proto/logs.ml index bd8857be..37ec423c 100644 --- a/src/proto/logs.ml +++ b/src/proto/logs.ml @@ -28,8 +28,7 @@ type severity_number = | Severity_number_fatal4 type log_record = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 9 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 9 fields *) mutable time_unix_nano : int64; mutable observed_time_unix_nano : int64; mutable severity_number : severity_number; @@ -44,16 +43,14 @@ type log_record = { } type scope_logs = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable scope : Common.instrumentation_scope option; mutable log_records : log_record list; mutable schema_url : string; } type resource_logs = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable resource : Resource.resource option; mutable scope_logs : scope_logs list; mutable schema_url : string; @@ -69,7 +66,7 @@ type log_record_flags = let default_severity_number () = (Severity_number_unspecified:severity_number) -let default_log_record (): log_record = +let default_log_record (): log_record = { _presence=Pbrt.Bitfield.empty; time_unix_nano=0L; @@ -85,7 +82,7 @@ let default_log_record (): log_record = event_name=""; } -let default_scope_logs (): scope_logs = +let default_scope_logs (): scope_logs = { _presence=Pbrt.Bitfield.empty; scope=None; @@ -93,7 +90,7 @@ let default_scope_logs (): scope_logs = schema_url=""; } -let default_resource_logs (): resource_logs = +let default_resource_logs (): resource_logs = { _presence=Pbrt.Bitfield.empty; resource=None; @@ -101,7 +98,7 @@ let default_resource_logs (): resource_logs = schema_url=""; } -let default_logs_data (): logs_data = +let default_logs_data (): logs_data = { resource_logs=[]; } @@ -154,7 +151,7 @@ let make_log_record ?(severity_number:severity_number option) ?(severity_text:string option) ?(body:Common.any_value option) - ~(attributes:Common.key_value list) + ?(attributes=[]) ?(dropped_attributes_count:int32 option) ?(flags:int32 option) ?(trace_id:bytes option) @@ -209,7 +206,7 @@ let copy_scope_logs (self:scope_logs) : scope_logs = let make_scope_logs ?(scope:Common.instrumentation_scope option) - ~(log_records:log_record list) + ?(log_records=[]) ?(schema_url:string option) () : scope_logs = let _res = default_scope_logs () in @@ -236,7 +233,7 @@ let copy_resource_logs (self:resource_logs) : resource_logs = let make_resource_logs ?(resource:Resource.resource option) - ~(scope_logs:scope_logs list) + ?(scope_logs=[]) ?(schema_url:string option) () : resource_logs = let _res = default_resource_logs () in @@ -257,7 +254,7 @@ let copy_logs_data (self:logs_data) : logs_data = { self with resource_logs = self.resource_logs } let make_logs_data - ~(resource_logs:resource_logs list) + ?(resource_logs=[]) () : logs_data = let _res = default_logs_data () in set_logs_data_resource_logs _res resource_logs; diff --git a/src/proto/logs.mli b/src/proto/logs.mli index 4cc12a49..4d018c04 100644 --- a/src/proto/logs.mli +++ b/src/proto/logs.mli @@ -35,8 +35,7 @@ type severity_number = | Severity_number_fatal4 type log_record = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 9 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 9 fields *) mutable time_unix_nano : int64; mutable observed_time_unix_nano : int64; mutable severity_number : severity_number; @@ -51,16 +50,14 @@ type log_record = private { } type scope_logs = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable scope : Common.instrumentation_scope option; mutable log_records : log_record list; mutable schema_url : string; } type resource_logs = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable resource : Resource.resource option; mutable scope_logs : scope_logs list; mutable schema_url : string; @@ -105,7 +102,7 @@ val make_log_record : ?severity_number:severity_number -> ?severity_text:string -> ?body:Common.any_value -> - attributes:Common.key_value list -> + ?attributes:Common.key_value list -> ?dropped_attributes_count:int32 -> ?flags:int32 -> ?trace_id:bytes -> @@ -179,7 +176,7 @@ val set_log_record_event_name : log_record -> string -> unit val make_scope_logs : ?scope:Common.instrumentation_scope -> - log_records:log_record list -> + ?log_records:log_record list -> ?schema_url:string -> unit -> scope_logs @@ -201,7 +198,7 @@ val set_scope_logs_schema_url : scope_logs -> string -> unit val make_resource_logs : ?resource:Resource.resource -> - scope_logs:scope_logs list -> + ?scope_logs:scope_logs list -> ?schema_url:string -> unit -> resource_logs @@ -222,7 +219,7 @@ val set_resource_logs_schema_url : resource_logs -> string -> unit (** set field schema_url in resource_logs *) val make_logs_data : - resource_logs:resource_logs list -> + ?resource_logs:resource_logs list -> unit -> logs_data (** [make_logs_data … ()] is a builder for type [logs_data] *) diff --git a/src/proto/logs_service.ml b/src/proto/logs_service.ml index 7d72da7c..f6a59251 100644 --- a/src/proto/logs_service.ml +++ b/src/proto/logs_service.ml @@ -5,8 +5,7 @@ type export_logs_service_request = { } type export_logs_partial_success = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable rejected_log_records : int64; mutable error_message : string; } @@ -15,19 +14,19 @@ type export_logs_service_response = { mutable partial_success : export_logs_partial_success option; } -let default_export_logs_service_request (): export_logs_service_request = +let default_export_logs_service_request (): export_logs_service_request = { resource_logs=[]; } -let default_export_logs_partial_success (): export_logs_partial_success = +let default_export_logs_partial_success (): export_logs_partial_success = { _presence=Pbrt.Bitfield.empty; rejected_log_records=0L; error_message=""; } -let default_export_logs_service_response (): export_logs_service_response = +let default_export_logs_service_response (): export_logs_service_response = { partial_success=None; } @@ -43,7 +42,7 @@ let copy_export_logs_service_request (self:export_logs_service_request) : export { self with resource_logs = self.resource_logs } let make_export_logs_service_request - ~(resource_logs:Logs.resource_logs list) + ?(resource_logs=[]) () : export_logs_service_request = let _res = default_export_logs_service_request () in set_export_logs_service_request_resource_logs _res resource_logs; diff --git a/src/proto/logs_service.mli b/src/proto/logs_service.mli index 834653f4..7791a1e5 100644 --- a/src/proto/logs_service.mli +++ b/src/proto/logs_service.mli @@ -12,8 +12,7 @@ type export_logs_service_request = private { } type export_logs_partial_success = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable rejected_log_records : int64; mutable error_message : string; } @@ -38,7 +37,7 @@ val default_export_logs_service_response : unit -> export_logs_service_response (** {2 Make functions} *) val make_export_logs_service_request : - resource_logs:Logs.resource_logs list -> + ?resource_logs:Logs.resource_logs list -> unit -> export_logs_service_request (** [make_export_logs_service_request … ()] is a builder for type [export_logs_service_request] *) diff --git a/src/proto/metrics.ml b/src/proto/metrics.ml index 8e81d221..85ecbfe9 100644 --- a/src/proto/metrics.ml +++ b/src/proto/metrics.ml @@ -5,8 +5,7 @@ type exemplar_value = | As_int of int64 and exemplar = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable filtered_attributes : Common.key_value list; mutable time_unix_nano : int64; mutable value : exemplar_value option; @@ -19,8 +18,7 @@ type number_data_point_value = | As_int of int64 and number_data_point = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable attributes : Common.key_value list; mutable start_time_unix_nano : int64; mutable time_unix_nano : int64; @@ -39,16 +37,14 @@ type aggregation_temporality = | Aggregation_temporality_cumulative type sum = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable data_points : number_data_point list; mutable aggregation_temporality : aggregation_temporality; mutable is_monotonic : bool; } type histogram_data_point = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 4 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 4 fields *) mutable attributes : Common.key_value list; mutable start_time_unix_nano : int64; mutable time_unix_nano : int64; @@ -63,22 +59,19 @@ type histogram_data_point = { } type histogram = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable data_points : histogram_data_point list; mutable aggregation_temporality : aggregation_temporality; } type exponential_histogram_data_point_buckets = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable offset : int32; mutable bucket_counts : int64 list; } type exponential_histogram_data_point = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 7 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 7 fields *) mutable attributes : Common.key_value list; mutable start_time_unix_nano : int64; mutable time_unix_nano : int64; @@ -96,22 +89,19 @@ type exponential_histogram_data_point = { } type exponential_histogram = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable data_points : exponential_histogram_data_point list; mutable aggregation_temporality : aggregation_temporality; } type summary_data_point_value_at_quantile = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable quantile : float; mutable value : float; } type summary_data_point = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 5 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 5 fields *) mutable attributes : Common.key_value list; mutable start_time_unix_nano : int64; mutable time_unix_nano : int64; @@ -133,8 +123,7 @@ type metric_data = | Summary of summary and metric = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable name : string; mutable description : string; mutable unit_ : string; @@ -143,16 +132,14 @@ and metric = { } type scope_metrics = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable scope : Common.instrumentation_scope option; mutable metrics : metric list; mutable schema_url : string; } type resource_metrics = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable resource : Resource.resource option; mutable scope_metrics : scope_metrics list; mutable schema_url : string; @@ -168,7 +155,7 @@ type data_point_flags = let default_exemplar_value (): exemplar_value = As_double (0.) -let default_exemplar (): exemplar = +let default_exemplar (): exemplar = { _presence=Pbrt.Bitfield.empty; filtered_attributes=[]; @@ -180,7 +167,7 @@ let default_exemplar (): exemplar = let default_number_data_point_value (): number_data_point_value = As_double (0.) -let default_number_data_point (): number_data_point = +let default_number_data_point (): number_data_point = { _presence=Pbrt.Bitfield.empty; attributes=[]; @@ -191,14 +178,14 @@ let default_number_data_point (): number_data_point = flags=0l; } -let default_gauge (): gauge = +let default_gauge (): gauge = { data_points=[]; } let default_aggregation_temporality () = (Aggregation_temporality_unspecified:aggregation_temporality) -let default_sum (): sum = +let default_sum (): sum = { _presence=Pbrt.Bitfield.empty; data_points=[]; @@ -206,7 +193,7 @@ let default_sum (): sum = is_monotonic=false; } -let default_histogram_data_point (): histogram_data_point = +let default_histogram_data_point (): histogram_data_point = { _presence=Pbrt.Bitfield.empty; attributes=[]; @@ -222,21 +209,21 @@ let default_histogram_data_point (): histogram_data_point = max=None; } -let default_histogram (): histogram = +let default_histogram (): histogram = { _presence=Pbrt.Bitfield.empty; data_points=[]; aggregation_temporality=default_aggregation_temporality (); } -let default_exponential_histogram_data_point_buckets (): exponential_histogram_data_point_buckets = +let default_exponential_histogram_data_point_buckets (): exponential_histogram_data_point_buckets = { _presence=Pbrt.Bitfield.empty; offset=0l; bucket_counts=[]; } -let default_exponential_histogram_data_point (): exponential_histogram_data_point = +let default_exponential_histogram_data_point (): exponential_histogram_data_point = { _presence=Pbrt.Bitfield.empty; attributes=[]; @@ -255,21 +242,21 @@ let default_exponential_histogram_data_point (): exponential_histogram_data_poin zero_threshold=0.; } -let default_exponential_histogram (): exponential_histogram = +let default_exponential_histogram (): exponential_histogram = { _presence=Pbrt.Bitfield.empty; data_points=[]; aggregation_temporality=default_aggregation_temporality (); } -let default_summary_data_point_value_at_quantile (): summary_data_point_value_at_quantile = +let default_summary_data_point_value_at_quantile (): summary_data_point_value_at_quantile = { _presence=Pbrt.Bitfield.empty; quantile=0.; value=0.; } -let default_summary_data_point (): summary_data_point = +let default_summary_data_point (): summary_data_point = { _presence=Pbrt.Bitfield.empty; attributes=[]; @@ -281,14 +268,14 @@ let default_summary_data_point (): summary_data_point = flags=0l; } -let default_summary (): summary = +let default_summary (): summary = { data_points=[]; } let default_metric_data (): metric_data = Gauge (default_gauge ()) -let default_metric (): metric = +let default_metric (): metric = { _presence=Pbrt.Bitfield.empty; name=""; @@ -298,7 +285,7 @@ let default_metric (): metric = metadata=[]; } -let default_scope_metrics (): scope_metrics = +let default_scope_metrics (): scope_metrics = { _presence=Pbrt.Bitfield.empty; scope=None; @@ -306,7 +293,7 @@ let default_scope_metrics (): scope_metrics = schema_url=""; } -let default_resource_metrics (): resource_metrics = +let default_resource_metrics (): resource_metrics = { _presence=Pbrt.Bitfield.empty; resource=None; @@ -314,7 +301,7 @@ let default_resource_metrics (): resource_metrics = schema_url=""; } -let default_metrics_data (): metrics_data = +let default_metrics_data (): metrics_data = { resource_metrics=[]; } @@ -344,7 +331,7 @@ let copy_exemplar (self:exemplar) : exemplar = { self with filtered_attributes = self.filtered_attributes } let make_exemplar - ~(filtered_attributes:Common.key_value list) + ?(filtered_attributes=[]) ?(time_unix_nano:int64 option) ?(value:exemplar_value option) ?(span_id:bytes option) @@ -388,11 +375,11 @@ let copy_number_data_point (self:number_data_point) : number_data_point = { self with attributes = self.attributes } let make_number_data_point - ~(attributes:Common.key_value list) + ?(attributes=[]) ?(start_time_unix_nano:int64 option) ?(time_unix_nano:int64 option) ?(value:number_data_point_value option) - ~(exemplars:exemplar list) + ?(exemplars=[]) ?(flags:int32 option) () : number_data_point = let _res = default_number_data_point () in @@ -420,7 +407,7 @@ let copy_gauge (self:gauge) : gauge = { self with data_points = self.data_points } let make_gauge - ~(data_points:number_data_point list) + ?(data_points=[]) () : gauge = let _res = default_gauge () in set_gauge_data_points _res data_points; @@ -441,7 +428,7 @@ let copy_sum (self:sum) : sum = { self with data_points = self.data_points } let make_sum - ~(data_points:number_data_point list) + ?(data_points=[]) ?(aggregation_temporality:aggregation_temporality option) ?(is_monotonic:bool option) () : sum = @@ -487,14 +474,14 @@ let copy_histogram_data_point (self:histogram_data_point) : histogram_data_point { self with attributes = self.attributes } let make_histogram_data_point - ~(attributes:Common.key_value list) + ?(attributes=[]) ?(start_time_unix_nano:int64 option) ?(time_unix_nano:int64 option) ?(count:int64 option) ?(sum:float option) - ~(bucket_counts:int64 list) - ~(explicit_bounds:float list) - ~(exemplars:exemplar list) + ?(bucket_counts=[]) + ?(explicit_bounds=[]) + ?(exemplars=[]) ?(flags:int32 option) ?(min:float option) ?(max:float option) @@ -538,7 +525,7 @@ let copy_histogram (self:histogram) : histogram = { self with data_points = self.data_points } let make_histogram - ~(data_points:histogram_data_point list) + ?(data_points=[]) ?(aggregation_temporality:aggregation_temporality option) () : histogram = let _res = default_histogram () in @@ -560,7 +547,7 @@ let copy_exponential_histogram_data_point_buckets (self:exponential_histogram_da let make_exponential_histogram_data_point_buckets ?(offset:int32 option) - ~(bucket_counts:int64 list) + ?(bucket_counts=[]) () : exponential_histogram_data_point_buckets = let _res = default_exponential_histogram_data_point_buckets () in (match offset with @@ -610,7 +597,7 @@ let copy_exponential_histogram_data_point (self:exponential_histogram_data_point { self with attributes = self.attributes } let make_exponential_histogram_data_point - ~(attributes:Common.key_value list) + ?(attributes=[]) ?(start_time_unix_nano:int64 option) ?(time_unix_nano:int64 option) ?(count:int64 option) @@ -620,7 +607,7 @@ let make_exponential_histogram_data_point ?(positive:exponential_histogram_data_point_buckets option) ?(negative:exponential_histogram_data_point_buckets option) ?(flags:int32 option) - ~(exemplars:exemplar list) + ?(exemplars=[]) ?(min:float option) ?(max:float option) ?(zero_threshold:float option) @@ -677,7 +664,7 @@ let copy_exponential_histogram (self:exponential_histogram) : exponential_histog { self with data_points = self.data_points } let make_exponential_histogram - ~(data_points:exponential_histogram_data_point list) + ?(data_points=[]) ?(aggregation_temporality:aggregation_temporality option) () : exponential_histogram = let _res = default_exponential_histogram () in @@ -736,12 +723,12 @@ let copy_summary_data_point (self:summary_data_point) : summary_data_point = { self with attributes = self.attributes } let make_summary_data_point - ~(attributes:Common.key_value list) + ?(attributes=[]) ?(start_time_unix_nano:int64 option) ?(time_unix_nano:int64 option) ?(count:int64 option) ?(sum:float option) - ~(quantile_values:summary_data_point_value_at_quantile list) + ?(quantile_values=[]) ?(flags:int32 option) () : summary_data_point = let _res = default_summary_data_point () in @@ -772,7 +759,7 @@ let copy_summary (self:summary) : summary = { self with data_points = self.data_points } let make_summary - ~(data_points:summary_data_point list) + ?(data_points=[]) () : summary = let _res = default_summary () in set_summary_data_points _res data_points; @@ -802,7 +789,7 @@ let make_metric ?(description:string option) ?(unit_:string option) ?(data:metric_data option) - ~(metadata:Common.key_value list) + ?(metadata=[]) () : metric = let _res = default_metric () in (match name with @@ -834,7 +821,7 @@ let copy_scope_metrics (self:scope_metrics) : scope_metrics = let make_scope_metrics ?(scope:Common.instrumentation_scope option) - ~(metrics:metric list) + ?(metrics=[]) ?(schema_url:string option) () : scope_metrics = let _res = default_scope_metrics () in @@ -861,7 +848,7 @@ let copy_resource_metrics (self:resource_metrics) : resource_metrics = let make_resource_metrics ?(resource:Resource.resource option) - ~(scope_metrics:scope_metrics list) + ?(scope_metrics=[]) ?(schema_url:string option) () : resource_metrics = let _res = default_resource_metrics () in @@ -882,7 +869,7 @@ let copy_metrics_data (self:metrics_data) : metrics_data = { self with resource_metrics = self.resource_metrics } let make_metrics_data - ~(resource_metrics:resource_metrics list) + ?(resource_metrics=[]) () : metrics_data = let _res = default_metrics_data () in set_metrics_data_resource_metrics _res resource_metrics; diff --git a/src/proto/metrics.mli b/src/proto/metrics.mli index 5e8b1543..2b96e9f2 100644 --- a/src/proto/metrics.mli +++ b/src/proto/metrics.mli @@ -12,8 +12,7 @@ type exemplar_value = | As_int of int64 and exemplar = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable filtered_attributes : Common.key_value list; mutable time_unix_nano : int64; mutable value : exemplar_value option; @@ -26,8 +25,7 @@ type number_data_point_value = | As_int of int64 and number_data_point = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable attributes : Common.key_value list; mutable start_time_unix_nano : int64; mutable time_unix_nano : int64; @@ -46,16 +44,14 @@ type aggregation_temporality = | Aggregation_temporality_cumulative type sum = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable data_points : number_data_point list; mutable aggregation_temporality : aggregation_temporality; mutable is_monotonic : bool; } type histogram_data_point = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 4 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 4 fields *) mutable attributes : Common.key_value list; mutable start_time_unix_nano : int64; mutable time_unix_nano : int64; @@ -70,22 +66,19 @@ type histogram_data_point = private { } type histogram = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable data_points : histogram_data_point list; mutable aggregation_temporality : aggregation_temporality; } type exponential_histogram_data_point_buckets = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable offset : int32; mutable bucket_counts : int64 list; } type exponential_histogram_data_point = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 7 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 7 fields *) mutable attributes : Common.key_value list; mutable start_time_unix_nano : int64; mutable time_unix_nano : int64; @@ -103,22 +96,19 @@ type exponential_histogram_data_point = private { } type exponential_histogram = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable data_points : exponential_histogram_data_point list; mutable aggregation_temporality : aggregation_temporality; } type summary_data_point_value_at_quantile = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable quantile : float; mutable value : float; } type summary_data_point = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 5 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 5 fields *) mutable attributes : Common.key_value list; mutable start_time_unix_nano : int64; mutable time_unix_nano : int64; @@ -140,8 +130,7 @@ type metric_data = | Summary of summary and metric = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable name : string; mutable description : string; mutable unit_ : string; @@ -150,16 +139,14 @@ and metric = private { } type scope_metrics = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable scope : Common.instrumentation_scope option; mutable metrics : metric list; mutable schema_url : string; } type resource_metrics = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable resource : Resource.resource option; mutable scope_metrics : scope_metrics list; mutable schema_url : string; @@ -244,7 +231,7 @@ val default_data_point_flags : unit -> data_point_flags val make_exemplar : - filtered_attributes:Common.key_value list -> + ?filtered_attributes:Common.key_value list -> ?time_unix_nano:int64 -> ?value:exemplar_value -> ?span_id:bytes -> @@ -281,11 +268,11 @@ val set_exemplar_trace_id : exemplar -> bytes -> unit val make_number_data_point : - attributes:Common.key_value list -> + ?attributes:Common.key_value list -> ?start_time_unix_nano:int64 -> ?time_unix_nano:int64 -> ?value:number_data_point_value -> - exemplars:exemplar list -> + ?exemplars:exemplar list -> ?flags:int32 -> unit -> number_data_point @@ -321,7 +308,7 @@ val set_number_data_point_flags : number_data_point -> int32 -> unit (** set field flags in number_data_point *) val make_gauge : - data_points:number_data_point list -> + ?data_points:number_data_point list -> unit -> gauge (** [make_gauge … ()] is a builder for type [gauge] *) @@ -333,7 +320,7 @@ val set_gauge_data_points : gauge -> number_data_point list -> unit val make_sum : - data_points:number_data_point list -> + ?data_points:number_data_point list -> ?aggregation_temporality:aggregation_temporality -> ?is_monotonic:bool -> unit -> @@ -358,14 +345,14 @@ val set_sum_is_monotonic : sum -> bool -> unit (** set field is_monotonic in sum *) val make_histogram_data_point : - attributes:Common.key_value list -> + ?attributes:Common.key_value list -> ?start_time_unix_nano:int64 -> ?time_unix_nano:int64 -> ?count:int64 -> ?sum:float -> - bucket_counts:int64 list -> - explicit_bounds:float list -> - exemplars:exemplar list -> + ?bucket_counts:int64 list -> + ?explicit_bounds:float list -> + ?exemplars:exemplar list -> ?flags:int32 -> ?min:float -> ?max:float -> @@ -421,7 +408,7 @@ val set_histogram_data_point_max : histogram_data_point -> float -> unit (** set field max in histogram_data_point *) val make_histogram : - data_points:histogram_data_point list -> + ?data_points:histogram_data_point list -> ?aggregation_temporality:aggregation_temporality -> unit -> histogram @@ -440,7 +427,7 @@ val set_histogram_aggregation_temporality : histogram -> aggregation_temporality val make_exponential_histogram_data_point_buckets : ?offset:int32 -> - bucket_counts:int64 list -> + ?bucket_counts:int64 list -> unit -> exponential_histogram_data_point_buckets (** [make_exponential_histogram_data_point_buckets … ()] is a builder for type [exponential_histogram_data_point_buckets] *) @@ -457,7 +444,7 @@ val set_exponential_histogram_data_point_buckets_bucket_counts : exponential_his (** set field bucket_counts in exponential_histogram_data_point_buckets *) val make_exponential_histogram_data_point : - attributes:Common.key_value list -> + ?attributes:Common.key_value list -> ?start_time_unix_nano:int64 -> ?time_unix_nano:int64 -> ?count:int64 -> @@ -467,7 +454,7 @@ val make_exponential_histogram_data_point : ?positive:exponential_histogram_data_point_buckets -> ?negative:exponential_histogram_data_point_buckets -> ?flags:int32 -> - exemplars:exemplar list -> + ?exemplars:exemplar list -> ?min:float -> ?max:float -> ?zero_threshold:float -> @@ -541,7 +528,7 @@ val set_exponential_histogram_data_point_zero_threshold : exponential_histogram_ (** set field zero_threshold in exponential_histogram_data_point *) val make_exponential_histogram : - data_points:exponential_histogram_data_point list -> + ?data_points:exponential_histogram_data_point list -> ?aggregation_temporality:aggregation_temporality -> unit -> exponential_histogram @@ -580,12 +567,12 @@ val set_summary_data_point_value_at_quantile_value : summary_data_point_value_at (** set field value in summary_data_point_value_at_quantile *) val make_summary_data_point : - attributes:Common.key_value list -> + ?attributes:Common.key_value list -> ?start_time_unix_nano:int64 -> ?time_unix_nano:int64 -> ?count:int64 -> ?sum:float -> - quantile_values:summary_data_point_value_at_quantile list -> + ?quantile_values:summary_data_point_value_at_quantile list -> ?flags:int32 -> unit -> summary_data_point @@ -630,7 +617,7 @@ val set_summary_data_point_flags : summary_data_point -> int32 -> unit (** set field flags in summary_data_point *) val make_summary : - data_points:summary_data_point list -> + ?data_points:summary_data_point list -> unit -> summary (** [make_summary … ()] is a builder for type [summary] *) @@ -646,7 +633,7 @@ val make_metric : ?description:string -> ?unit_:string -> ?data:metric_data -> - metadata:Common.key_value list -> + ?metadata:Common.key_value list -> unit -> metric (** [make_metric … ()] is a builder for type [metric] *) @@ -679,7 +666,7 @@ val set_metric_metadata : metric -> Common.key_value list -> unit val make_scope_metrics : ?scope:Common.instrumentation_scope -> - metrics:metric list -> + ?metrics:metric list -> ?schema_url:string -> unit -> scope_metrics @@ -701,7 +688,7 @@ val set_scope_metrics_schema_url : scope_metrics -> string -> unit val make_resource_metrics : ?resource:Resource.resource -> - scope_metrics:scope_metrics list -> + ?scope_metrics:scope_metrics list -> ?schema_url:string -> unit -> resource_metrics @@ -722,7 +709,7 @@ val set_resource_metrics_schema_url : resource_metrics -> string -> unit (** set field schema_url in resource_metrics *) val make_metrics_data : - resource_metrics:resource_metrics list -> + ?resource_metrics:resource_metrics list -> unit -> metrics_data (** [make_metrics_data … ()] is a builder for type [metrics_data] *) diff --git a/src/proto/metrics_service.ml b/src/proto/metrics_service.ml index 48e719f7..fbfaeec5 100644 --- a/src/proto/metrics_service.ml +++ b/src/proto/metrics_service.ml @@ -5,8 +5,7 @@ type export_metrics_service_request = { } type export_metrics_partial_success = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable rejected_data_points : int64; mutable error_message : string; } @@ -15,19 +14,19 @@ type export_metrics_service_response = { mutable partial_success : export_metrics_partial_success option; } -let default_export_metrics_service_request (): export_metrics_service_request = +let default_export_metrics_service_request (): export_metrics_service_request = { resource_metrics=[]; } -let default_export_metrics_partial_success (): export_metrics_partial_success = +let default_export_metrics_partial_success (): export_metrics_partial_success = { _presence=Pbrt.Bitfield.empty; rejected_data_points=0L; error_message=""; } -let default_export_metrics_service_response (): export_metrics_service_response = +let default_export_metrics_service_response (): export_metrics_service_response = { partial_success=None; } @@ -43,7 +42,7 @@ let copy_export_metrics_service_request (self:export_metrics_service_request) : { self with resource_metrics = self.resource_metrics } let make_export_metrics_service_request - ~(resource_metrics:Metrics.resource_metrics list) + ?(resource_metrics=[]) () : export_metrics_service_request = let _res = default_export_metrics_service_request () in set_export_metrics_service_request_resource_metrics _res resource_metrics; diff --git a/src/proto/metrics_service.mli b/src/proto/metrics_service.mli index e7f14ac7..5dec4ea8 100644 --- a/src/proto/metrics_service.mli +++ b/src/proto/metrics_service.mli @@ -12,8 +12,7 @@ type export_metrics_service_request = private { } type export_metrics_partial_success = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable rejected_data_points : int64; mutable error_message : string; } @@ -38,7 +37,7 @@ val default_export_metrics_service_response : unit -> export_metrics_service_res (** {2 Make functions} *) val make_export_metrics_service_request : - resource_metrics:Metrics.resource_metrics list -> + ?resource_metrics:Metrics.resource_metrics list -> unit -> export_metrics_service_request (** [make_export_metrics_service_request … ()] is a builder for type [export_metrics_service_request] *) diff --git a/src/proto/resource.ml b/src/proto/resource.ml index b8667170..9e59160a 100644 --- a/src/proto/resource.ml +++ b/src/proto/resource.ml @@ -1,14 +1,13 @@ [@@@ocaml.warning "-23-27-30-39-44"] type resource = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable attributes : Common.key_value list; mutable dropped_attributes_count : int32; mutable entity_refs : Common.entity_ref list; } -let default_resource (): resource = +let default_resource (): resource = { _presence=Pbrt.Bitfield.empty; attributes=[]; @@ -32,9 +31,9 @@ let copy_resource (self:resource) : resource = { self with attributes = self.attributes } let make_resource - ~(attributes:Common.key_value list) + ?(attributes=[]) ?(dropped_attributes_count:int32 option) - ~(entity_refs:Common.entity_ref list) + ?(entity_refs=[]) () : resource = let _res = default_resource () in set_resource_attributes _res attributes; diff --git a/src/proto/resource.mli b/src/proto/resource.mli index 8090808a..e2d800c8 100644 --- a/src/proto/resource.mli +++ b/src/proto/resource.mli @@ -8,8 +8,7 @@ (** {2 Types} *) type resource = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable attributes : Common.key_value list; mutable dropped_attributes_count : int32; mutable entity_refs : Common.entity_ref list; @@ -25,9 +24,9 @@ val default_resource : unit -> resource (** {2 Make functions} *) val make_resource : - attributes:Common.key_value list -> + ?attributes:Common.key_value list -> ?dropped_attributes_count:int32 -> - entity_refs:Common.entity_ref list -> + ?entity_refs:Common.entity_ref list -> unit -> resource (** [make_resource … ()] is a builder for type [resource] *) diff --git a/src/proto/status.ml b/src/proto/status.ml index 6654f327..f70d8e3e 100644 --- a/src/proto/status.ml +++ b/src/proto/status.ml @@ -1,14 +1,13 @@ [@@@ocaml.warning "-23-27-30-39-44"] type status = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable code : int32; mutable message : bytes; mutable details : bytes list; } -let default_status (): status = +let default_status (): status = { _presence=Pbrt.Bitfield.empty; code=0l; @@ -35,7 +34,7 @@ let copy_status (self:status) : status = let make_status ?(code:int32 option) ?(message:bytes option) - ~(details:bytes list) + ?(details=[]) () : status = let _res = default_status () in (match code with diff --git a/src/proto/status.mli b/src/proto/status.mli index 9ed1f2b1..bf9e2764 100644 --- a/src/proto/status.mli +++ b/src/proto/status.mli @@ -8,8 +8,7 @@ (** {2 Types} *) type status = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable code : int32; mutable message : bytes; mutable details : bytes list; @@ -27,7 +26,7 @@ val default_status : unit -> status val make_status : ?code:int32 -> ?message:bytes -> - details:bytes list -> + ?details:bytes list -> unit -> status (** [make_status … ()] is a builder for type [status] *) diff --git a/src/proto/trace.ml b/src/proto/trace.ml index 12780c8b..6c5ac2e0 100644 --- a/src/proto/trace.ml +++ b/src/proto/trace.ml @@ -9,8 +9,7 @@ type span_span_kind = | Span_kind_consumer type span_event = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable time_unix_nano : int64; mutable name : string; mutable attributes : Common.key_value list; @@ -18,8 +17,7 @@ type span_event = { } type span_link = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 5 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 5 fields *) mutable trace_id : bytes; mutable span_id : bytes; mutable trace_state : string; @@ -34,15 +32,13 @@ type status_status_code = | Status_code_error type status = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable message : string; mutable code : status_status_code; } type span = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 12 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 12 fields *) mutable trace_id : bytes; mutable span_id : bytes; mutable trace_state : string; @@ -62,16 +58,14 @@ type span = { } type scope_spans = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable scope : Common.instrumentation_scope option; mutable spans : span list; mutable schema_url : string; } type resource_spans = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable resource : Resource.resource option; mutable scope_spans : scope_spans list; mutable schema_url : string; @@ -89,7 +83,7 @@ type span_flags = let default_span_span_kind () = (Span_kind_unspecified:span_span_kind) -let default_span_event (): span_event = +let default_span_event (): span_event = { _presence=Pbrt.Bitfield.empty; time_unix_nano=0L; @@ -98,7 +92,7 @@ let default_span_event (): span_event = dropped_attributes_count=0l; } -let default_span_link (): span_link = +let default_span_link (): span_link = { _presence=Pbrt.Bitfield.empty; trace_id=Bytes.create 0; @@ -111,14 +105,14 @@ let default_span_link (): span_link = let default_status_status_code () = (Status_code_unset:status_status_code) -let default_status (): status = +let default_status (): status = { _presence=Pbrt.Bitfield.empty; message=""; code=default_status_status_code (); } -let default_span (): span = +let default_span (): span = { _presence=Pbrt.Bitfield.empty; trace_id=Bytes.create 0; @@ -139,7 +133,7 @@ let default_span (): span = status=None; } -let default_scope_spans (): scope_spans = +let default_scope_spans (): scope_spans = { _presence=Pbrt.Bitfield.empty; scope=None; @@ -147,7 +141,7 @@ let default_scope_spans (): scope_spans = schema_url=""; } -let default_resource_spans (): resource_spans = +let default_resource_spans (): resource_spans = { _presence=Pbrt.Bitfield.empty; resource=None; @@ -155,7 +149,7 @@ let default_resource_spans (): resource_spans = schema_url=""; } -let default_traces_data (): traces_data = +let default_traces_data (): traces_data = { resource_spans=[]; } @@ -185,7 +179,7 @@ let copy_span_event (self:span_event) : span_event = let make_span_event ?(time_unix_nano:int64 option) ?(name:string option) - ~(attributes:Common.key_value list) + ?(attributes=[]) ?(dropped_attributes_count:int32 option) () : span_event = let _res = default_span_event () in @@ -227,7 +221,7 @@ let make_span_link ?(trace_id:bytes option) ?(span_id:bytes option) ?(trace_state:string option) - ~(attributes:Common.key_value list) + ?(attributes=[]) ?(dropped_attributes_count:int32 option) ?(flags:int32 option) () : span_link = @@ -334,11 +328,11 @@ let make_span ?(kind:span_span_kind option) ?(start_time_unix_nano:int64 option) ?(end_time_unix_nano:int64 option) - ~(attributes:Common.key_value list) + ?(attributes=[]) ?(dropped_attributes_count:int32 option) - ~(events:span_event list) + ?(events=[]) ?(dropped_events_count:int32 option) - ~(links:span_link list) + ?(links=[]) ?(dropped_links_count:int32 option) ?(status:status option) () : span = @@ -401,7 +395,7 @@ let copy_scope_spans (self:scope_spans) : scope_spans = let make_scope_spans ?(scope:Common.instrumentation_scope option) - ~(spans:span list) + ?(spans=[]) ?(schema_url:string option) () : scope_spans = let _res = default_scope_spans () in @@ -428,7 +422,7 @@ let copy_resource_spans (self:resource_spans) : resource_spans = let make_resource_spans ?(resource:Resource.resource option) - ~(scope_spans:scope_spans list) + ?(scope_spans=[]) ?(schema_url:string option) () : resource_spans = let _res = default_resource_spans () in @@ -449,7 +443,7 @@ let copy_traces_data (self:traces_data) : traces_data = { self with resource_spans = self.resource_spans } let make_traces_data - ~(resource_spans:resource_spans list) + ?(resource_spans=[]) () : traces_data = let _res = default_traces_data () in set_traces_data_resource_spans _res resource_spans; diff --git a/src/proto/trace.mli b/src/proto/trace.mli index 9f9fa49a..783de4df 100644 --- a/src/proto/trace.mli +++ b/src/proto/trace.mli @@ -16,8 +16,7 @@ type span_span_kind = | Span_kind_consumer type span_event = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 3 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 3 fields *) mutable time_unix_nano : int64; mutable name : string; mutable attributes : Common.key_value list; @@ -25,8 +24,7 @@ type span_event = private { } type span_link = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 5 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 5 fields *) mutable trace_id : bytes; mutable span_id : bytes; mutable trace_state : string; @@ -41,15 +39,13 @@ type status_status_code = | Status_code_error type status = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable message : string; mutable code : status_status_code; } type span = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 12 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 12 fields *) mutable trace_id : bytes; mutable span_id : bytes; mutable trace_state : string; @@ -69,16 +65,14 @@ type span = private { } type scope_spans = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable scope : Common.instrumentation_scope option; mutable spans : span list; mutable schema_url : string; } type resource_spans = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 1 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 1 fields *) mutable resource : Resource.resource option; mutable scope_spans : scope_spans list; mutable schema_url : string; @@ -134,7 +128,7 @@ val default_span_flags : unit -> span_flags val make_span_event : ?time_unix_nano:int64 -> ?name:string -> - attributes:Common.key_value list -> + ?attributes:Common.key_value list -> ?dropped_attributes_count:int32 -> unit -> span_event @@ -167,7 +161,7 @@ val make_span_link : ?trace_id:bytes -> ?span_id:bytes -> ?trace_state:string -> - attributes:Common.key_value list -> + ?attributes:Common.key_value list -> ?dropped_attributes_count:int32 -> ?flags:int32 -> unit -> @@ -241,11 +235,11 @@ val make_span : ?kind:span_span_kind -> ?start_time_unix_nano:int64 -> ?end_time_unix_nano:int64 -> - attributes:Common.key_value list -> + ?attributes:Common.key_value list -> ?dropped_attributes_count:int32 -> - events:span_event list -> + ?events:span_event list -> ?dropped_events_count:int32 -> - links:span_link list -> + ?links:span_link list -> ?dropped_links_count:int32 -> ?status:status -> unit -> @@ -340,7 +334,7 @@ val set_span_status : span -> status -> unit val make_scope_spans : ?scope:Common.instrumentation_scope -> - spans:span list -> + ?spans:span list -> ?schema_url:string -> unit -> scope_spans @@ -362,7 +356,7 @@ val set_scope_spans_schema_url : scope_spans -> string -> unit val make_resource_spans : ?resource:Resource.resource -> - scope_spans:scope_spans list -> + ?scope_spans:scope_spans list -> ?schema_url:string -> unit -> resource_spans @@ -383,7 +377,7 @@ val set_resource_spans_schema_url : resource_spans -> string -> unit (** set field schema_url in resource_spans *) val make_traces_data : - resource_spans:resource_spans list -> + ?resource_spans:resource_spans list -> unit -> traces_data (** [make_traces_data … ()] is a builder for type [traces_data] *) diff --git a/src/proto/trace_service.ml b/src/proto/trace_service.ml index 2f80a2eb..06d0e6d9 100644 --- a/src/proto/trace_service.ml +++ b/src/proto/trace_service.ml @@ -5,8 +5,7 @@ type export_trace_service_request = { } type export_trace_partial_success = { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable rejected_spans : int64; mutable error_message : string; } @@ -15,19 +14,19 @@ type export_trace_service_response = { mutable partial_success : export_trace_partial_success option; } -let default_export_trace_service_request (): export_trace_service_request = +let default_export_trace_service_request (): export_trace_service_request = { resource_spans=[]; } -let default_export_trace_partial_success (): export_trace_partial_success = +let default_export_trace_partial_success (): export_trace_partial_success = { _presence=Pbrt.Bitfield.empty; rejected_spans=0L; error_message=""; } -let default_export_trace_service_response (): export_trace_service_response = +let default_export_trace_service_response (): export_trace_service_response = { partial_success=None; } @@ -43,7 +42,7 @@ let copy_export_trace_service_request (self:export_trace_service_request) : expo { self with resource_spans = self.resource_spans } let make_export_trace_service_request - ~(resource_spans:Trace.resource_spans list) + ?(resource_spans=[]) () : export_trace_service_request = let _res = default_export_trace_service_request () in set_export_trace_service_request_resource_spans _res resource_spans; diff --git a/src/proto/trace_service.mli b/src/proto/trace_service.mli index 3bf58259..fc4173de 100644 --- a/src/proto/trace_service.mli +++ b/src/proto/trace_service.mli @@ -12,8 +12,7 @@ type export_trace_service_request = private { } type export_trace_partial_success = private { - mutable _presence: Pbrt.Bitfield.t; - (** tracking presence for 2 fields *) + mutable _presence: Pbrt.Bitfield.t; (** presence for 2 fields *) mutable rejected_spans : int64; mutable error_message : string; } @@ -38,7 +37,7 @@ val default_export_trace_service_response : unit -> export_trace_service_respons (** {2 Make functions} *) val make_export_trace_service_request : - resource_spans:Trace.resource_spans list -> + ?resource_spans:Trace.resource_spans list -> unit -> export_trace_service_request (** [make_export_trace_service_request … ()] is a builder for type [export_trace_service_request] *)