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

move protobuf code to opentelemetry.proto
imandra-ai · Nov 17, 2023 · 211c328 · 211c328
2 parents 6362bc5 + 794527e
commit 211c328
Show file tree

Hide file tree

Showing 81 changed files with 48 additions and 65 deletions.
diff --git a/.github/workflows/main.yml b/.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' }}
diff --git a/dune-project b/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"))
diff --git a/opentelemetry-client-cohttp-lwt.opam b/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}

diff --git a/opentelemetry-client-ocurl.opam b/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}

diff --git a/opentelemetry-cohttp-lwt.opam b/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}

diff --git a/opentelemetry-lwt.opam b/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}

diff --git a/opentelemetry.opam b/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"}

diff --git a/src/core/dune b/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))
diff --git a/src/lock.ml → src/core/lock.ml b/src/lock.ml → src/core/lock.ml
diff --git a/src/lock.mli → src/core/lock.mli b/src/lock.mli → src/core/lock.mli
diff --git a/src/opentelemetry.ml → src/core/opentelemetry.ml b/src/opentelemetry.ml → 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

diff --git a/src/rand_bytes.ml → src/core/rand_bytes.ml b/src/rand_bytes.ml → src/core/rand_bytes.ml
diff --git a/src/rand_bytes.mli → src/core/rand_bytes.mli b/src/rand_bytes.mli → src/core/rand_bytes.mli
diff --git a/src/proto/.ocamlformat-ignore b/src/proto/.ocamlformat-ignore
@@ -0,0 +1 @@
+*
diff --git a/src/common_pb.ml → src/proto/common_pb.ml b/src/common_pb.ml → src/proto/common_pb.ml
diff --git a/src/common_pb.mli → src/proto/common_pb.mli b/src/common_pb.mli → src/proto/common_pb.mli
diff --git a/src/common_pp.ml → src/proto/common_pp.ml b/src/common_pp.ml → src/proto/common_pp.ml
diff --git a/src/common_pp.mli → src/proto/common_pp.mli b/src/common_pp.mli → src/proto/common_pp.mli
diff --git a/src/common_types.ml → src/proto/common_types.ml b/src/common_types.ml → src/proto/common_types.ml
diff --git a/src/common_types.mli → src/proto/common_types.mli b/src/common_types.mli → src/proto/common_types.mli
diff --git a/src/dune → src/proto/dune b/src/dune → 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 ###
 

diff --git a/src/logs_pb.ml → src/proto/logs_pb.ml b/src/logs_pb.ml → src/proto/logs_pb.ml
diff --git a/src/logs_pb.mli → src/proto/logs_pb.mli b/src/logs_pb.mli → src/proto/logs_pb.mli
diff --git a/src/logs_pp.ml → src/proto/logs_pp.ml b/src/logs_pp.ml → src/proto/logs_pp.ml
diff --git a/src/logs_pp.mli → src/proto/logs_pp.mli b/src/logs_pp.mli → src/proto/logs_pp.mli
diff --git a/src/logs_service_pb.ml → src/proto/logs_service_pb.ml b/src/logs_service_pb.ml → src/proto/logs_service_pb.ml
diff --git a/src/logs_service_pb.mli → src/proto/logs_service_pb.mli b/src/logs_service_pb.mli → src/proto/logs_service_pb.mli
diff --git a/src/logs_service_pp.ml → src/proto/logs_service_pp.ml b/src/logs_service_pp.ml → src/proto/logs_service_pp.ml
diff --git a/src/logs_service_pp.mli → src/proto/logs_service_pp.mli b/src/logs_service_pp.mli → src/proto/logs_service_pp.mli
diff --git a/src/logs_service_types.ml → src/proto/logs_service_types.ml b/src/logs_service_types.ml → src/proto/logs_service_types.ml
diff --git a/src/logs_service_types.mli → src/proto/logs_service_types.mli b/src/logs_service_types.mli → src/proto/logs_service_types.mli
diff --git a/src/logs_types.ml → src/proto/logs_types.ml b/src/logs_types.ml → src/proto/logs_types.ml
diff --git a/src/logs_types.mli → src/proto/logs_types.mli b/src/logs_types.mli → src/proto/logs_types.mli
diff --git a/src/metrics_pb.ml → src/proto/metrics_pb.ml b/src/metrics_pb.ml → src/proto/metrics_pb.ml
diff --git a/src/metrics_pb.mli → src/proto/metrics_pb.mli b/src/metrics_pb.mli → src/proto/metrics_pb.mli
diff --git a/src/metrics_pp.ml → src/proto/metrics_pp.ml b/src/metrics_pp.ml → src/proto/metrics_pp.ml
diff --git a/src/metrics_pp.mli → src/proto/metrics_pp.mli b/src/metrics_pp.mli → src/proto/metrics_pp.mli
diff --git a/src/metrics_service_pb.ml → src/proto/metrics_service_pb.ml b/src/metrics_service_pb.ml → src/proto/metrics_service_pb.ml
diff --git a/src/metrics_service_pb.mli → src/proto/metrics_service_pb.mli b/src/metrics_service_pb.mli → src/proto/metrics_service_pb.mli
diff --git a/src/metrics_service_pp.ml → src/proto/metrics_service_pp.ml b/src/metrics_service_pp.ml → src/proto/metrics_service_pp.ml
diff --git a/src/metrics_service_pp.mli → src/proto/metrics_service_pp.mli b/src/metrics_service_pp.mli → src/proto/metrics_service_pp.mli
diff --git a/src/metrics_service_types.ml → src/proto/metrics_service_types.ml b/src/metrics_service_types.ml → src/proto/metrics_service_types.ml
diff --git a/src/metrics_service_types.mli → src/proto/metrics_service_types.mli b/src/metrics_service_types.mli → src/proto/metrics_service_types.mli
diff --git a/src/metrics_types.ml → src/proto/metrics_types.ml b/src/metrics_types.ml → src/proto/metrics_types.ml
diff --git a/src/metrics_types.mli → src/proto/metrics_types.mli b/src/metrics_types.mli → src/proto/metrics_types.mli
diff --git a/src/resource_pb.ml → src/proto/resource_pb.ml b/src/resource_pb.ml → src/proto/resource_pb.ml
diff --git a/src/resource_pb.mli → src/proto/resource_pb.mli b/src/resource_pb.mli → src/proto/resource_pb.mli
diff --git a/src/resource_pp.ml → src/proto/resource_pp.ml b/src/resource_pp.ml → src/proto/resource_pp.ml
diff --git a/src/resource_pp.mli → src/proto/resource_pp.mli b/src/resource_pp.mli → src/proto/resource_pp.mli
diff --git a/src/resource_types.ml → src/proto/resource_types.ml b/src/resource_types.ml → src/proto/resource_types.ml
diff --git a/src/resource_types.mli → src/proto/resource_types.mli b/src/resource_types.mli → src/proto/resource_types.mli
diff --git a/src/status.proto → src/proto/status.proto b/src/status.proto → src/proto/status.proto
diff --git a/src/status_pb.ml → src/proto/status_pb.ml b/src/status_pb.ml → src/proto/status_pb.ml
diff --git a/src/status_pb.mli → src/proto/status_pb.mli b/src/status_pb.mli → src/proto/status_pb.mli
diff --git a/src/status_pp.ml → src/proto/status_pp.ml b/src/status_pp.ml → src/proto/status_pp.ml
diff --git a/src/status_pp.mli → src/proto/status_pp.mli b/src/status_pp.mli → src/proto/status_pp.mli
diff --git a/src/status_types.ml → src/proto/status_types.ml b/src/status_types.ml → src/proto/status_types.ml
diff --git a/src/status_types.mli → src/proto/status_types.mli b/src/status_types.mli → src/proto/status_types.mli
diff --git a/src/trace_pb.ml → src/proto/trace_pb.ml b/src/trace_pb.ml → src/proto/trace_pb.ml
diff --git a/src/trace_pb.mli → src/proto/trace_pb.mli b/src/trace_pb.mli → src/proto/trace_pb.mli
diff --git a/src/trace_pp.ml → src/proto/trace_pp.ml b/src/trace_pp.ml → src/proto/trace_pp.ml
diff --git a/src/trace_pp.mli → src/proto/trace_pp.mli b/src/trace_pp.mli → src/proto/trace_pp.mli
diff --git a/src/trace_service_pb.ml → src/proto/trace_service_pb.ml b/src/trace_service_pb.ml → src/proto/trace_service_pb.ml
diff --git a/src/trace_service_pb.mli → src/proto/trace_service_pb.mli b/src/trace_service_pb.mli → src/proto/trace_service_pb.mli
diff --git a/src/trace_service_pp.ml → src/proto/trace_service_pp.ml b/src/trace_service_pp.ml → src/proto/trace_service_pp.ml
diff --git a/src/trace_service_pp.mli → src/proto/trace_service_pp.mli b/src/trace_service_pp.mli → src/proto/trace_service_pp.mli
diff --git a/src/trace_service_types.ml → src/proto/trace_service_types.ml b/src/trace_service_types.ml → src/proto/trace_service_types.ml
diff --git a/src/trace_service_types.mli → src/proto/trace_service_types.mli b/src/trace_service_types.mli → src/proto/trace_service_types.mli
diff --git a/src/trace_types.ml → src/proto/trace_types.ml b/src/trace_types.ml → src/proto/trace_types.ml
diff --git a/src/trace_types.mli → src/proto/trace_types.mli b/src/trace_types.mli → src/proto/trace_types.mli
diff --git a/tests/cohttp/dune b/tests/cohttp/dune
@@ -0,0 +1,4 @@
+(tests
+ (names test_get_url)
+ (package opentelemetry-client-cohttp-lwt)
+ (libraries opentelemetry opentelemetry-client-cohttp-lwt))
diff --git a/tests/test_get_url.expected → tests/cohttp/test_get_url.expected b/tests/test_get_url.expected → tests/cohttp/test_get_url.expected
@@ -1,2 +1 @@
-ocurl url = http://localhost:3000
 cohttp url = http://localhost:3000
diff --git a/tests/test_get_url.ml → tests/cohttp/test_get_url.ml b/tests/test_get_url.ml → 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 ()
diff --git a/tests/core/dune b/tests/core/dune
@@ -0,0 +1,5 @@
+
+(tests
+ (names test_trace_context )
+ (package opentelemetry)
+ (libraries opentelemetry))
diff --git a/tests/test_trace_context.expected → tests/core/test_trace_context.expected b/tests/test_trace_context.expected → tests/core/test_trace_context.expected
diff --git a/tests/test_trace_context.ml → tests/core/test_trace_context.ml b/tests/test_trace_context.ml → tests/core/test_trace_context.ml
diff --git a/tests/dune b/tests/dune
diff --git a/tests/implicit_scope/sync/dune b/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))
diff --git a/tests/ocurl/dune b/tests/ocurl/dune
@@ -0,0 +1,5 @@
+
+(tests
+ (names test_get_url)
+ (package opentelemetry-client-ocurl)
+ (libraries opentelemetry opentelemetry-client-ocurl))
diff --git a/tests/ocurl/test_get_url.expected b/tests/ocurl/test_get_url.expected
@@ -0,0 +1 @@
+ocurl url = http://localhost:3000
diff --git a/tests/ocurl/test_get_url.ml b/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 ()