udpate generated proto code

Author: c-cube

src/proto/common.ml

@@ -33,6 +33,15 @@ type instrumentation_scope = {
   mutable dropped_attributes_count : int32;
 }
 
+type entity_ref = {
+  mutable _presence: Pbrt.Bitfield.t;
+  (** tracking presence for 2 fields *)
+  mutable schema_url : string;
+  mutable type_ : string;
+  mutable id_keys : string list;
+  mutable description_keys : string list;
+}
+
 let default_any_value (): any_value = String_value ("")
 
 let default_array_value (): array_value = 
@@ -61,6 +70,15 @@ let default_instrumentation_scope (): instrumentation_scope =
   dropped_attributes_count=0l;
 }
 
+let default_entity_ref (): entity_ref = 
+{
+  _presence=Pbrt.Bitfield.empty;
+  schema_url="";
+  type_="";
+  id_keys=[];
+  description_keys=[];
+}
+
 
 (** {2 Make functions} *)
 
@@ -151,6 +169,38 @@ let make_instrumentation_scope
   | Some v -> set_instrumentation_scope_dropped_attributes_count _res v);
   _res
 
+let[@inline] has_entity_ref_schema_url (self:entity_ref) : bool = (Pbrt.Bitfield.get self._presence 0)
+let[@inline] has_entity_ref_type_ (self:entity_ref) : bool = (Pbrt.Bitfield.get self._presence 1)
+
+let[@inline] set_entity_ref_schema_url (self:entity_ref) (x:string) : unit =
+  self._presence <- (Pbrt.Bitfield.set self._presence 0); self.schema_url <- x
+let[@inline] set_entity_ref_type_ (self:entity_ref) (x:string) : unit =
+  self._presence <- (Pbrt.Bitfield.set self._presence 1); self.type_ <- x
+let[@inline] set_entity_ref_id_keys (self:entity_ref) (x:string list) : unit =
+  self.id_keys <- x
+let[@inline] set_entity_ref_description_keys (self:entity_ref) (x:string list) : unit =
+  self.description_keys <- x
+
+let copy_entity_ref (self:entity_ref) : entity_ref =
+  { self with schema_url = self.schema_url }
+
+let make_entity_ref 
+  ?(schema_url:string option)
+  ?(type_:string option)
+  ~(id_keys:string list) 
+  ~(description_keys:string list) 
+  () : entity_ref  =
+  let _res = default_entity_ref () in
+  (match schema_url with
+  | None -> ()
+  | Some v -> set_entity_ref_schema_url _res v);
+  (match type_ with
+  | None -> ()
+  | Some v -> set_entity_ref_type_ _res v);
+  set_entity_ref_id_keys _res id_keys;
+  set_entity_ref_description_keys _res description_keys;
+  _res
+
 [@@@ocaml.warning "-23-27-30-39"]
 
 (** {2 Formatters} *)
@@ -197,6 +247,17 @@ let rec pp_instrumentation_scope fmt (v:instrumentation_scope) =
   in
   Pbrt.Pp.pp_brk pp_i fmt ()
 
+let rec pp_entity_ref fmt (v:entity_ref) = 
+  let pp_i fmt () =
+    Pbrt.Pp.pp_record_field ~first:true "schema_url" Pbrt.Pp.pp_string fmt v.schema_url;
+    if not (Pbrt.Bitfield.get v._presence 0) then Format.pp_print_string fmt "(* absent *)";
+    Pbrt.Pp.pp_record_field ~first:false "type_" Pbrt.Pp.pp_string fmt v.type_;
+    if not (Pbrt.Bitfield.get v._presence 1) then Format.pp_print_string fmt "(* absent *)";
+    Pbrt.Pp.pp_record_field ~first:false "id_keys" (Pbrt.Pp.pp_list Pbrt.Pp.pp_string) fmt v.id_keys;
+    Pbrt.Pp.pp_record_field ~first:false "description_keys" (Pbrt.Pp.pp_list Pbrt.Pp.pp_string) fmt v.description_keys;
+  in
+  Pbrt.Pp.pp_brk pp_i fmt ()
+
 [@@@ocaml.warning "-23-27-30-39"]
 
 (** {2 Protobuf Encoding} *)
@@ -272,6 +333,25 @@ let rec encode_pb_instrumentation_scope (v:instrumentation_scope) encoder =
   );
   ()
 
+let rec encode_pb_entity_ref (v:entity_ref) encoder = 
+  if (Pbrt.Bitfield.get v._presence 0) then (
+    Pbrt.Encoder.string v.schema_url encoder;
+    Pbrt.Encoder.key 1 Pbrt.Bytes encoder; 
+  );
+  if (Pbrt.Bitfield.get v._presence 1) then (
+    Pbrt.Encoder.string v.type_ encoder;
+    Pbrt.Encoder.key 2 Pbrt.Bytes encoder; 
+  );
+  Pbrt.List_util.rev_iter_with (fun x encoder ->
+    Pbrt.Encoder.string x encoder;
+    Pbrt.Encoder.key 3 Pbrt.Bytes encoder; 
+  ) v.id_keys encoder;
+  Pbrt.List_util.rev_iter_with (fun x encoder ->
+    Pbrt.Encoder.string x encoder;
+    Pbrt.Encoder.key 4 Pbrt.Bytes encoder; 
+  ) v.description_keys encoder;
+  ()
+
 [@@@ocaml.warning "-23-27-30-39"]
 
 (** {2 Protobuf Decoding} *)
@@ -385,3 +465,37 @@ let rec decode_pb_instrumentation_scope d =
     | Some (_, payload_kind) -> Pbrt.Decoder.skip d payload_kind
   done;
   (v : instrumentation_scope)
+
+let rec decode_pb_entity_ref d =
+  let v = default_entity_ref () in
+  let continue__= ref true in
+  while !continue__ do
+    match Pbrt.Decoder.key d with
+    | None -> (
+      (* put lists in the correct order *)
+      set_entity_ref_description_keys v (List.rev v.description_keys);
+      set_entity_ref_id_keys v (List.rev v.id_keys);
+    ); continue__ := false
+    | Some (1, Pbrt.Bytes) -> begin
+      set_entity_ref_schema_url v (Pbrt.Decoder.string d);
+    end
+    | Some (1, pk) -> 
+      Pbrt.Decoder.unexpected_payload "Message(entity_ref), field(1)" pk
+    | Some (2, Pbrt.Bytes) -> begin
+      set_entity_ref_type_ v (Pbrt.Decoder.string d);
+    end
+    | Some (2, pk) -> 
+      Pbrt.Decoder.unexpected_payload "Message(entity_ref), field(2)" pk
+    | Some (3, Pbrt.Bytes) -> begin
+      set_entity_ref_id_keys v ((Pbrt.Decoder.string d) :: v.id_keys);
+    end
+    | Some (3, pk) -> 
+      Pbrt.Decoder.unexpected_payload "Message(entity_ref), field(3)" pk
+    | Some (4, Pbrt.Bytes) -> begin
+      set_entity_ref_description_keys v ((Pbrt.Decoder.string d) :: v.description_keys);
+    end
+    | Some (4, pk) -> 
+      Pbrt.Decoder.unexpected_payload "Message(entity_ref), field(4)" pk
+    | Some (_, payload_kind) -> Pbrt.Decoder.skip d payload_kind
+  done;
+  (v : entity_ref)

src/proto/common.mli

@@ -40,6 +40,15 @@ type instrumentation_scope = private {
   mutable dropped_attributes_count : int32;
 }
 
+type entity_ref = private {
+  mutable _presence: Pbrt.Bitfield.t;
+  (** tracking presence for 2 fields *)
+  mutable schema_url : string;
+  mutable type_ : string;
+  mutable id_keys : string list;
+  mutable description_keys : string list;
+}
+
 
 (** {2 Basic values} *)
 
@@ -58,6 +67,9 @@ val default_key_value : unit -> key_value
 val default_instrumentation_scope : unit -> instrumentation_scope 
 (** [default_instrumentation_scope ()] is a new empty value for type [instrumentation_scope] *)
 
+val default_entity_ref : unit -> entity_ref 
+(** [default_entity_ref ()] is a new empty value for type [entity_ref] *)
+
 
 (** {2 Make functions} *)
 
@@ -134,6 +146,35 @@ val has_instrumentation_scope_dropped_attributes_count : instrumentation_scope -
 val set_instrumentation_scope_dropped_attributes_count : instrumentation_scope -> int32 -> unit
   (** set field dropped_attributes_count in instrumentation_scope *)
 
+val make_entity_ref : 
+  ?schema_url:string ->
+  ?type_:string ->
+  id_keys:string list ->
+  description_keys:string list ->
+  unit ->
+  entity_ref
+(** [make_entity_ref … ()] is a builder for type [entity_ref] *)
+
+val copy_entity_ref : entity_ref -> entity_ref
+
+val has_entity_ref_schema_url : entity_ref -> bool
+  (** presence of field "schema_url" in [entity_ref] *)
+
+val set_entity_ref_schema_url : entity_ref -> string -> unit
+  (** set field schema_url in entity_ref *)
+
+val has_entity_ref_type_ : entity_ref -> bool
+  (** presence of field "type_" in [entity_ref] *)
+
+val set_entity_ref_type_ : entity_ref -> string -> unit
+  (** set field type_ in entity_ref *)
+
+val set_entity_ref_id_keys : entity_ref -> string list -> unit
+  (** set field id_keys in entity_ref *)
+
+val set_entity_ref_description_keys : entity_ref -> string list -> unit
+  (** set field description_keys in entity_ref *)
+
 
 (** {2 Formatters} *)
 
@@ -152,6 +193,9 @@ val pp_key_value : Format.formatter -> key_value -> unit
 val pp_instrumentation_scope : Format.formatter -> instrumentation_scope -> unit 
 (** [pp_instrumentation_scope v] formats v *)
 
+val pp_entity_ref : Format.formatter -> entity_ref -> unit 
+(** [pp_entity_ref v] formats v *)
+
 
 (** {2 Protobuf Encoding} *)
 
@@ -170,6 +214,9 @@ val encode_pb_key_value : key_value -> Pbrt.Encoder.t -> unit
 val encode_pb_instrumentation_scope : instrumentation_scope -> Pbrt.Encoder.t -> unit
 (** [encode_pb_instrumentation_scope v encoder] encodes [v] with the given [encoder] *)
 
+val encode_pb_entity_ref : entity_ref -> Pbrt.Encoder.t -> unit
+(** [encode_pb_entity_ref v encoder] encodes [v] with the given [encoder] *)
+
 
 (** {2 Protobuf Decoding} *)
 
@@ -187,3 +234,6 @@ val decode_pb_key_value : Pbrt.Decoder.t -> key_value
 
 val decode_pb_instrumentation_scope : Pbrt.Decoder.t -> instrumentation_scope
 (** [decode_pb_instrumentation_scope decoder] decodes a [instrumentation_scope] binary value from [decoder] *)
+
+val decode_pb_entity_ref : Pbrt.Decoder.t -> entity_ref
+(** [decode_pb_entity_ref decoder] decodes a [entity_ref] binary value from [decoder] *)

src/proto/logs.ml

@@ -29,7 +29,7 @@ type severity_number =
 
 type log_record = {
   mutable _presence: Pbrt.Bitfield.t;
-  (** tracking presence for 8 fields *)
+  (** tracking presence for 9 fields *)
   mutable time_unix_nano : int64;
   mutable observed_time_unix_nano : int64;
   mutable severity_number : severity_number;
@@ -40,6 +40,7 @@ type log_record = {
   mutable flags : int32;
   mutable trace_id : bytes;
   mutable span_id : bytes;
+  mutable event_name : string;
 }
 
 type scope_logs = {
@@ -81,6 +82,7 @@ let default_log_record (): log_record =
   flags=0l;
   trace_id=Bytes.create 0;
   span_id=Bytes.create 0;
+  event_name="";
 }
 
 let default_scope_logs (): scope_logs = 
@@ -118,6 +120,7 @@ let[@inline] has_log_record_dropped_attributes_count (self:log_record) : bool =
 let[@inline] has_log_record_flags (self:log_record) : bool = (Pbrt.Bitfield.get self._presence 5)
 let[@inline] has_log_record_trace_id (self:log_record) : bool = (Pbrt.Bitfield.get self._presence 6)
 let[@inline] has_log_record_span_id (self:log_record) : bool = (Pbrt.Bitfield.get self._presence 7)
+let[@inline] has_log_record_event_name (self:log_record) : bool = (Pbrt.Bitfield.get self._presence 8)
 
 let[@inline] set_log_record_time_unix_nano (self:log_record) (x:int64) : unit =
   self._presence <- (Pbrt.Bitfield.set self._presence 0); self.time_unix_nano <- x
@@ -139,6 +142,8 @@ let[@inline] set_log_record_trace_id (self:log_record) (x:bytes) : unit =
   self._presence <- (Pbrt.Bitfield.set self._presence 6); self.trace_id <- x
 let[@inline] set_log_record_span_id (self:log_record) (x:bytes) : unit =
   self._presence <- (Pbrt.Bitfield.set self._presence 7); self.span_id <- x
+let[@inline] set_log_record_event_name (self:log_record) (x:string) : unit =
+  self._presence <- (Pbrt.Bitfield.set self._presence 8); self.event_name <- x
 
 let copy_log_record (self:log_record) : log_record =
   { self with time_unix_nano = self.time_unix_nano }
@@ -154,6 +159,7 @@ let make_log_record
   ?(flags:int32 option)
   ?(trace_id:bytes option)
   ?(span_id:bytes option)
+  ?(event_name:string option)
   () : log_record  =
   let _res = default_log_record () in
   (match time_unix_nano with
@@ -184,6 +190,9 @@ let make_log_record
   (match span_id with
   | None -> ()
   | Some v -> set_log_record_span_id _res v);
+  (match event_name with
+  | None -> ()
+  | Some v -> set_log_record_event_name _res v);
   _res
 
 let[@inline] has_scope_logs_schema_url (self:scope_logs) : bool = (Pbrt.Bitfield.get self._presence 0)
@@ -307,6 +316,8 @@ let rec pp_log_record fmt (v:log_record) =
     if not (Pbrt.Bitfield.get v._presence 6) then Format.pp_print_string fmt "(* absent *)";
     Pbrt.Pp.pp_record_field ~first:false "span_id" Pbrt.Pp.pp_bytes fmt v.span_id;
     if not (Pbrt.Bitfield.get v._presence 7) then Format.pp_print_string fmt "(* absent *)";
+    Pbrt.Pp.pp_record_field ~first:false "event_name" Pbrt.Pp.pp_string fmt v.event_name;
+    if not (Pbrt.Bitfield.get v._presence 8) then Format.pp_print_string fmt "(* absent *)";
   in
   Pbrt.Pp.pp_brk pp_i fmt ()
 
@@ -414,6 +425,10 @@ let rec encode_pb_log_record (v:log_record) encoder =
     Pbrt.Encoder.bytes v.span_id encoder;
     Pbrt.Encoder.key 10 Pbrt.Bytes encoder; 
   );
+  if (Pbrt.Bitfield.get v._presence 8) then (
+    Pbrt.Encoder.string v.event_name encoder;
+    Pbrt.Encoder.key 12 Pbrt.Bytes encoder; 
+  );
   ()
 
 let rec encode_pb_scope_logs (v:scope_logs) encoder = 
@@ -554,6 +569,11 @@ let rec decode_pb_log_record d =
     end
     | Some (10, pk) -> 
       Pbrt.Decoder.unexpected_payload "Message(log_record), field(10)" pk
+    | Some (12, Pbrt.Bytes) -> begin
+      set_log_record_event_name v (Pbrt.Decoder.string d);
+    end
+    | Some (12, pk) -> 
+      Pbrt.Decoder.unexpected_payload "Message(log_record), field(12)" pk
     | Some (_, payload_kind) -> Pbrt.Decoder.skip d payload_kind
   done;
   (v : log_record)

src/proto/logs.mli

@@ -36,7 +36,7 @@ type severity_number =
 
 type log_record = private {
   mutable _presence: Pbrt.Bitfield.t;
-  (** tracking presence for 8 fields *)
+  (** tracking presence for 9 fields *)
   mutable time_unix_nano : int64;
   mutable observed_time_unix_nano : int64;
   mutable severity_number : severity_number;
@@ -47,6 +47,7 @@ type log_record = private {
   mutable flags : int32;
   mutable trace_id : bytes;
   mutable span_id : bytes;
+  mutable event_name : string;
 }
 
 type scope_logs = private {
@@ -109,6 +110,7 @@ val make_log_record :
   ?flags:int32 ->
   ?trace_id:bytes ->
   ?span_id:bytes ->
+  ?event_name:string ->
   unit ->
   log_record
 (** [make_log_record … ()] is a builder for type [log_record] *)
@@ -169,6 +171,12 @@ val has_log_record_span_id : log_record -> bool
 val set_log_record_span_id : log_record -> bytes -> unit
   (** set field span_id in log_record *)
 
+val has_log_record_event_name : log_record -> bool
+  (** presence of field "event_name" in [log_record] *)
+
+val set_log_record_event_name : log_record -> string -> unit
+  (** set field event_name in log_record *)
+
 val make_scope_logs : 
   ?scope:Common.instrumentation_scope ->
   log_records:log_record list ->