use protoc with presence

.github/workflows/main.yml

@@ -42,8 +42,7 @@ jobs:
           allow-prerelease-opam: true
 
       - run: |
-          opam pin ocaml-protoc 3.0.1 -y -n
-          opam pin pbrt 3.0.1 -y -n
+          opam pin https://github.com/mransan/ocaml-protoc.git#5510694deffde13283742b8ad116fab61b65dfbc -y -n
           opam install pbrt -y
 
       # We cannot install packages that need eio on ocaml versions before 5

Makefile

@@ -11,7 +11,7 @@ clean:
 	@dune clean
 
 protoc-gen:
-	FORCE_GENPROTO=true @dune build @lint
+	FORCE_GENPROTO=true dune build @lint
 
 format:
 	@dune build @fmt --auto-promote

dune-project

@@ -37,8 +37,8 @@
   (alcotest :with-test)
   (pbrt
    (and
-    (>= 3.0)
-    (< 4.0)))
+    (>= 4.0)
+    (< 5.0)))
   (ocaml-lsp-server :with-dev-setup)
   (ocamlformat
    (and

flake.nix

@@ -23,6 +23,13 @@
         overlay = final: prev:
           {
             # You can add overrides here
+            pbrt = prev.pbrt.overrideAttrs (oldAttrs: {
+              src = pkgs.fetchgit {
+                url = "https://github.com/mransan/ocaml-protoc.git";
+                rev = "5510694deffde13283742b8ad116fab61b65dfbc";
+                sha256 = "sha256-0eQEaAZMs/OydNLsEKxdbdwx0/Ots6fLEpYg89VxK3k=";
+              };
+            });
           };
         scope' = scope.overrideScope overlay;
         # Packages from devPackagesQuery

opentelemetry.opam

@@ -21,7 +21,7 @@ depends: [
   "thread-local-storage" {>= "0.2" & < "0.3"}
   "odoc" {with-doc}
   "alcotest" {with-test}
-  "pbrt" {>= "3.0" & < "4.0"}
+  "pbrt" {>= "4.0" & < "5.0"}
   "ocaml-lsp-server" {with-dev-setup}
   "ocamlformat" {with-dev-setup & >= "0.27" & < "0.28"}
   "mtime" {>= "1.4"}

src/client-cohttp-eio/opentelemetry_client_cohttp_eio.ml

@@ -81,8 +81,14 @@ let report_err_ = function
   | `Sysbreak -> Printf.eprintf "opentelemetry: ctrl-c captured, stopping\n%!"
   | `Failure msg ->
     Format.eprintf "@[<2>opentelemetry: export failed: %s@]@." msg
-  | `Status (code, { Opentelemetry.Proto.Status.code = scode; message; details })
-    ->
+  | `Status
+      ( code,
+        {
+          Opentelemetry.Proto.Status.code = scode;
+          message;
+          details;
+          _presence = _;
+        } ) ->
     let pp_details out l =
       List.iter
         (fun s -> Format.fprintf out "%S;@ " (Bytes.unsafe_to_string s))

src/client-cohttp-lwt/opentelemetry_client_cohttp_lwt.ml

@@ -61,8 +61,14 @@ let report_err_ = function
   | `Sysbreak -> Printf.eprintf "opentelemetry: ctrl-c captured, stopping\n%!"
   | `Failure msg ->
     Format.eprintf "@[<2>opentelemetry: export failed: %s@]@." msg
-  | `Status (code, { Opentelemetry.Proto.Status.code = scode; message; details })
-    ->
+  | `Status
+      ( code,
+        {
+          Opentelemetry.Proto.Status.code = scode;
+          message;
+          details;
+          _presence = _;
+        } ) ->
     let pp_details out l =
       List.iter
         (fun s -> Format.fprintf out "%S;@ " (Bytes.unsafe_to_string s))

src/client-ocurl/opentelemetry_client_ocurl.ml

@@ -117,6 +117,8 @@ module Backend_impl : sig
 
   val send_event : t -> Event.t -> unit
 
+  val n_bytes_sent : unit -> int
+
   val shutdown : t -> on_done:(unit -> unit) -> unit
 end = struct
   open Opentelemetry.Proto
@@ -187,6 +189,10 @@ end = struct
 
   let[@inline] send_event (self : t) ev : unit = B_queue.push self.q ev
 
+  let n_bytes_sent_ = Atomic.make 0
+
+  let[@inline] n_bytes_sent () = Atomic.get n_bytes_sent_
+
   (** Thread that, in a loop, reads from [q] to get the next message to send via
       http *)
   let bg_thread_loop (self : t) : unit =
@@ -199,7 +205,9 @@ end = struct
         Self_trace.with_ ~kind:Span_kind_producer name
           ~attrs:[ "n", `Int (List.length l) ]
       in
-      conv l |> send_http_ ~stop ~config ~url client
+      let msg = conv l in
+      ignore (Atomic.fetch_and_add n_bytes_sent_ (String.length msg) : int);
+      send_http_ ~stop ~config ~url client msg
     in
     try
       while not (Atomic.get stop) do
@@ -471,3 +479,5 @@ let with_setup ?stop ?config ?(enable = true) () f =
     Fun.protect ~finally:remove_backend f
   ) else
     f ()
+
+let n_bytes_sent = Backend_impl.n_bytes_sent

src/client-ocurl/opentelemetry_client_ocurl.mli

@@ -11,6 +11,9 @@ val set_headers : (string * string) list -> unit
 module Atomic = Opentelemetry_atomic.Atomic
 module Config = Config
 
+val n_bytes_sent : unit -> int
+(** Global counter of bytes sent (or attempted to be sent) *)
+
 val create_backend :
   ?stop:bool Atomic.t ->
   ?config:Config.t ->

src/client/self_trace.ml

@@ -1,6 +1,6 @@
 module OT = Opentelemetry
 
-let enabled = Atomic.make true
+let enabled = Atomic.make false
 
 let add_event (scope : OT.Scope.t) ev = OT.Scope.add_event scope (fun () -> ev)
 

src/client/signal.ml

@@ -54,23 +54,22 @@ module Encode = struct
     resource_logs
     |> resource_to_string ~encoder
          ~ctor:(fun r ->
-           Logs_service.default_export_logs_service_request ~resource_logs:r ())
+           Logs_service.make_export_logs_service_request ~resource_logs:r ())
          ~enc:Logs_service.encode_pb_export_logs_service_request
 
   let metrics ?encoder resource_metrics =
     resource_metrics
     |> resource_to_string ~encoder
          ~ctor:(fun r ->
-           Metrics_service.default_export_metrics_service_request
+           Metrics_service.make_export_metrics_service_request
              ~resource_metrics:r ())
          ~enc:Metrics_service.encode_pb_export_metrics_service_request
 
   let traces ?encoder resource_spans =
     resource_spans
     |> resource_to_string ~encoder
          ~ctor:(fun r ->
-           Trace_service.default_export_trace_service_request ~resource_spans:r
-             ())
+           Trace_service.make_export_trace_service_request ~resource_spans:r ())
          ~enc:Trace_service.encode_pb_export_trace_service_request
 end