Merge pull request #47 from imandra-ai/wip-cleanup-core-library

move protobuf code to opentelemetry.proto

.github/workflows/main.yml

@@ -40,12 +40,12 @@ jobs:
 
       - run: opam exec -- dune build @install -p opentelemetry,opentelemetry-lwt,opentelemetry-client-ocurl,opentelemetry-cohttp-lwt,opentelemetry-client-cohttp-lwt
 
-      - run: opam pin ocaml-protoc 2.3 -y
+      - run: opam pin ocaml-protoc 2.4 -y
 
       - run: opam exec -- dune build @lint
 
       # check that nothing changed
-      - run: git diff --quiet --exit-code
+      - run: git diff --exit-code
 
       - run: opam exec -- dune build @runtest
         if: ${{ matrix.os == 'ubuntu-latest' }}

dune-project

@@ -30,14 +30,6 @@
   ambient-context
   (odoc :with-doc)
   (alcotest :with-test)
-  (opentelemetry-client-cohttp-lwt
-   (and
-    :with-test
-    (= :version)))
-  (opentelemetry-client-ocurl
-   (and
-    :with-test
-    (= :version)))
   (pbrt
    (>= 2.3))
   (ocaml-lsp-server :with-dev-setup)
@@ -70,15 +62,7 @@
    (>= "5.3"))
   (lwt_ppx
    (>= "2.0"))
-  (alcotest :with-test)
-  (opentelemetry-client-cohttp-lwt
-   (and
-    :with-test
-    (= :version)))
-  (opentelemetry-client-ocurl
-   (and
-    :with-test
-    (= :version))))
+  (alcotest :with-test))
  (tags
   (instrumentation tracing opentelemetry datadog lwt)))
 
@@ -99,11 +83,7 @@
   (ezcurl
    (>= 0.2.3))
   ocurl
-  (alcotest :with-test)
-  (opentelemetry-client-cohttp-lwt
-   (and
-    :with-test
-    (= :version))))
+  (alcotest :with-test))
  (synopsis "Collector client for opentelemetry, using http + ezcurl"))
 
 (package
@@ -120,15 +100,7 @@
    (>= "5.3"))
   (cohttp-lwt
    (>= "4.0.0"))
-  (alcotest :with-test)
-  (opentelemetry-client-cohttp-lwt
-   (and
-    :with-test
-    (= :version)))
-  (opentelemetry-client-ocurl
-   (and
-    :with-test
-    (= :version))))
+  (alcotest :with-test))
  (synopsis "Opentelemetry tracing for Cohttp HTTP servers"))
 
 (package
@@ -150,9 +122,5 @@
    (>= "2.0"))
   cohttp-lwt
   cohttp-lwt-unix
-  (alcotest :with-test)
-  (opentelemetry-client-ocurl
-   (and
-    :with-test
-    (= :version))))
+  (alcotest :with-test))
  (synopsis "Collector client for opentelemetry, using cohttp + lwt"))

opentelemetry-client-cohttp-lwt.opam

@@ -23,7 +23,6 @@ depends: [
   "cohttp-lwt"
   "cohttp-lwt-unix"
   "alcotest" {with-test}
-  "opentelemetry-client-ocurl" {with-test & = version}
 ]
 build: [
   ["dune" "subst"] {dev}

opentelemetry-client-ocurl.opam

@@ -21,7 +21,6 @@ depends: [
   "ezcurl" {>= "0.2.3"}
   "ocurl"
   "alcotest" {with-test}
-  "opentelemetry-client-cohttp-lwt" {with-test & = version}
 ]
 build: [
   ["dune" "subst"] {dev}

opentelemetry-cohttp-lwt.opam

@@ -20,8 +20,6 @@ depends: [
   "lwt" {>= "5.3"}
   "cohttp-lwt" {>= "4.0.0"}
   "alcotest" {with-test}
-  "opentelemetry-client-cohttp-lwt" {with-test & = version}
-  "opentelemetry-client-ocurl" {with-test & = version}
 ]
 build: [
   ["dune" "subst"] {dev}

opentelemetry-lwt.opam

@@ -22,8 +22,6 @@ depends: [
   "lwt" {>= "5.3"}
   "lwt_ppx" {>= "2.0"}
   "alcotest" {with-test}
-  "opentelemetry-client-cohttp-lwt" {with-test & = version}
-  "opentelemetry-client-ocurl" {with-test & = version}
 ]
 build: [
   ["dune" "subst"] {dev}

opentelemetry.opam

@@ -19,8 +19,6 @@ depends: [
   "ambient-context"
   "odoc" {with-doc}
   "alcotest" {with-test}
-  "opentelemetry-client-cohttp-lwt" {with-test & = version}
-  "opentelemetry-client-ocurl" {with-test & = version}
   "pbrt" {>= "2.3"}
   "ocaml-lsp-server" {with-dev-setup}
   "ocamlformat" {with-dev-setup & >= "0.24" & < "0.25"}

src/core/dune

@@ -0,0 +1,7 @@
+(library
+ (name opentelemetry)
+ (synopsis "API for opentelemetry instrumentation")
+ (flags :standard -warn-error -a+8)
+ (libraries opentelemetry.proto ambient-context ptime ptime.clock.os pbrt threads
+   opentelemetry.atomic)
+ (public_name opentelemetry))

src/core/opentelemetry.ml

@@ -19,6 +19,8 @@ end
 
    This is mostly useful internally. Users should not need to touch it. *)
 module Proto = struct
+  open Opentelemetry_proto
+
   module Common = struct
     include Common_types
     include Common_pp
@@ -887,6 +889,7 @@ end
 
     See {{: https://opentelemetry.io/docs/reference/specification/overview/#metric-signal} the spec} *)
 module Metrics = struct
+  open Opentelemetry_proto
   open Metrics_types
 
   type t = Metrics_types.metric
@@ -989,6 +992,7 @@ end
 
     See {{: https://opentelemetry.io/docs/reference/specification/overview/#log-signal} the spec} *)
 module Logs = struct
+  open Opentelemetry_proto
   open Logs_types
 
   type t = log_record

src/proto/.ocamlformat-ignore

@@ -0,0 +1 @@
+*

src/proto/dune

@@ -1,10 +1,9 @@
 (library
- (name opentelemetry)
- (synopsis "API for opentelemetry instrumentation")
+ (name opentelemetry_proto)
+ (public_name opentelemetry.proto)
+ (synopsis "Protobuf generated code for opentelemetry")
  (flags :standard -warn-error -a+8)
- (libraries ambient-context ptime ptime.clock.os pbrt threads
-   opentelemetry.atomic)
- (public_name opentelemetry))
+ (libraries pbrt))
 
 ; ### protobuf rules ###
 

tests/cohttp/dune

@@ -0,0 +1,4 @@
+(tests
+ (names test_get_url)
+ (package opentelemetry-client-cohttp-lwt)
+ (libraries opentelemetry opentelemetry-client-cohttp-lwt))

tests/cohttp/test_get_url.expected

@@ -1,2 +1 @@
-ocurl url = http://localhost:3000
 cohttp url = http://localhost:3000

tests/cohttp/test_get_url.ml

@@ -1,17 +1,9 @@
 let url = "http://localhost:3000"
 
-let ocurl () =
-  let config = Opentelemetry_client_ocurl.Config.make ~url () in
-  Opentelemetry_client_ocurl.with_setup ~config () @@ fun () ->
-  let url = Opentelemetry_client_ocurl.get_url () in
-  print_endline @@ Printf.sprintf "ocurl url = %s" url
-
 let cohttp () =
   let config = Opentelemetry_client_cohttp_lwt.Config.make ~url () in
   Opentelemetry_client_cohttp_lwt.with_setup ~config () @@ fun () ->
   let url = Opentelemetry_client_cohttp_lwt.get_url () in
   print_endline @@ Printf.sprintf "cohttp url = %s" url
 
-let () =
-  ocurl ();
-  cohttp ()
+let () = cohttp ()

tests/core/dune

@@ -0,0 +1,5 @@
+
+(tests
+ (names test_trace_context )
+ (package opentelemetry)
+ (libraries opentelemetry))

tests/dune

@@ -1,4 +0,0 @@
-(tests
- (names test_trace_context test_get_url)
- (libraries opentelemetry opentelemetry-client-ocurl
-   opentelemetry-client-cohttp-lwt))

tests/implicit_scope/sync/dune

@@ -1,3 +1,4 @@
 (tests
  (names test_implicit_scope_sync)
+ (package opentelemetry-client-cohttp-lwt)
  (libraries alcotest opentelemetry opentelemetry-client-cohttp-lwt))

tests/ocurl/dune

@@ -0,0 +1,5 @@
+
+(tests
+ (names test_get_url)
+ (package opentelemetry-client-ocurl)
+ (libraries opentelemetry opentelemetry-client-ocurl))

tests/ocurl/test_get_url.expected

@@ -0,0 +1 @@
+ocurl url = http://localhost:3000

tests/ocurl/test_get_url.ml

@@ -0,0 +1,9 @@
+let url = "http://localhost:3000"
+
+let ocurl () =
+  let config = Opentelemetry_client_ocurl.Config.make ~url () in
+  Opentelemetry_client_ocurl.with_setup ~config () @@ fun () ->
+  let url = Opentelemetry_client_ocurl.get_url () in
+  print_endline @@ Printf.sprintf "ocurl url = %s" url
+
+let () = ocurl ()