update generated code again, repeated fields are optional again

Author: c-cube

src/core/opentelemetry.ml

@@ -692,8 +692,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
@@ -1219,9 +1218,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.
@@ -1371,7 +1368,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)
@@ -1380,12 +1377,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
@@ -1399,7 +1396,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)
@@ -1422,7 +1419,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 *)
@@ -1435,9 +1432,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
@@ -1542,7 +1537,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 ()
 
@@ -1568,9 +1563,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

src/proto/common.ml

@@ -18,24 +18,21 @@ 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;
   mutable dropped_attributes_count : int32;
 }
 
 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

src/proto/common.mli

@@ -25,24 +25,21 @@ 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;
   mutable dropped_attributes_count : int32;
 }
 
 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] *)

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,23 +82,23 @@ 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;
   log_records=[];
   schema_url="";
 }
 
-let default_resource_logs (): resource_logs = 
+let default_resource_logs (): resource_logs =
 {
   _presence=Pbrt.Bitfield.empty;
   resource=None;
   scope_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;