Merge pull request #5651 from psafont/test-tracing

dune-project

@@ -22,10 +22,6 @@
   (name xml-light2)
 )
 
-(package
-  (name xen-api-sdk)
-)
-
 (package
   (name xen-api-client-lwt)
 )
@@ -65,10 +61,37 @@
 
 (package
   (name xapi-tracing)
+  (depends
+   ocaml
+   dune
+   (alcotest :with-test)
+   re
+   uri
+   (uuid :with-test)
+   (xapi-log :version)
+   (xapi-stdext-threads :version)
+  )
+  (synopsis "Allows to instrument code to generate tracing information")
+  (description "This library provides modules to allow gathering runtime traces.")
 )
 
 (package
   (name xapi-tracing-export)
+  (depends
+   ocaml
+   cohttp-posix
+   dune
+   cohttp
+   rpclib
+   (xapi-log :version)
+   (xapi-open-uri :version)
+   (xapi-stdext-threads :version)
+   (xapi-stdext-unix :version)
+   (xapi-tracing :version)
+   (zstd :version)
+  )
+  (synopsis "Export traces in multiple protocols and formats")
+  (description "This library export traces is able to push traces to http endpoints or generate compressed tarballs in the filesystem.")
 )
 
 (package
@@ -93,18 +116,56 @@
 
 (package
   (name rrdd-plugin)
+  (synopsis "A plugin library for the xapi performance monitoring daemon")
+  (description "This library allows one to expose a datasource which can then be sampled by the performance monitoring daemon.")
+  (depends
+   ocaml
+   astring
+   rpclib
+   (xapi-forkexecd :version)
+   (xapi-stdext-pervasives :version)
+   (xapi-stdext-std :version)
+   (xapi-stdext-threads :version)
+   (xapi-stdext-unix :version)
+   (xapi-idl :version)
+   xenstore_transport
+  )
 )
 
 (package
   (name xapi-rrdd)
+  (synopsis "Performance monitoring daemon for xapi")
+  (description "This daemon monitors 'datasources' i.e. time-varying values such as performance counters and records the samples in RRD archives. These archives can be used to examine historical performance trends.")
+  (depends
+   (ocaml (>= "4.02.0"))
+   dune-build-info
+   astring
+   (gzip :version)
+   (http-lib :version)
+   inotify
+   io-page
+   mtime
+   ppx_deriving_rpc
+   rpclib
+   systemd
+   (ezxenstore :version)
+   (uuid :version)
+   (xapi-backtrace :version)
+   (xapi-idl :version)
+   (xapi-rrd :version)
+   (xapi-stdext-threads :version)
+  )
 )
 
 (package
   (name xapi-rrd-transport-utils)
-)
-
-(package
-  (name xapi-rrd-transport)
+  (synopsis "Shared-memory protocols for exposing performance counters")
+  (description "VMs running on a Xen host can use this library to expose performance counters which can be sampled by the xapi performance monitoring daemon.")
+  (authors "John Else")
+  (depends
+   ocaml
+   cmdliner
+  )
 )
 
 (package

ocaml/libs/tracing/dune

@@ -28,4 +28,5 @@
 (test
  (name test_tracing)
  (modules test_tracing)
+ (package xapi-tracing)
  (libraries tracing alcotest uuid))

rrdd-plugin.opam

@@ -1,34 +1,38 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-maintainer: "[email protected]"
-authors: "[email protected]"
+synopsis: "A plugin library for the xapi performance monitoring daemon"
+description:
+  "This library allows one to expose a datasource which can then be sampled by the performance monitoring daemon."
+maintainer: ["Xapi project maintainers"]
+authors: ["[email protected]"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
 depends: [
+  "dune" {>= "2.0"}
   "ocaml"
-  "dune" {build & >= "1.0+beta10"}
   "astring"
   "rpclib"
-  "xapi-forkexecd"
-  "xapi-stdext-pervasives"
-  "xapi-stdext-std"
-  "xapi-stdext-threads"
-  "xapi-stdext-unix"
-  "xapi-idl"
-  "xapi-rrd-transport" {>= "0.9.0"}
+  "xapi-forkexecd" {version}
+  "xapi-stdext-pervasives" {version}
+  "xapi-stdext-std" {version}
+  "xapi-stdext-threads" {version}
+  "xapi-stdext-unix" {version}
+  "xapi-idl" {version}
   "xenstore_transport"
 ]
-synopsis: "A plugin library for the xapi performance monitoring daemon"
-description: """
-This library allows one to expose a datasource which can then be
-sampled by the performance monitoring daemon."""
-url {
-  src:
-    "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"

xapi-rrd-transport-utils.opam

@@ -1,22 +1,30 @@
 # This file is generated by dune, edit dune-project instead
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 opam-version: "2.0"
-maintainer: "[email protected]"
-authors: "John Else"
-homepage: "https://github.com/xapi-project/xen-api"
-dev-repo: "git+https://github.com/xapi-project/xen-api.git"
-bug-reports: "https://github.com/xapi-project/xen-api"
-build: [[ "dune" "build" "-p" name "-j" jobs ]]
+synopsis: "Shared-memory protocols for exposing performance counters"
+description:
+  "VMs running on a Xen host can use this library to expose performance counters which can be sampled by the xapi performance monitoring daemon."
+maintainer: ["Xapi project maintainers"]
+authors: ["John Else"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+homepage: "https://xapi-project.github.io/"
+bug-reports: "https://github.com/xapi-project/xen-api/issues"
 depends: [
+  "dune" {>= "2.0"}
   "ocaml"
-  "dune" {build & >= "1.0+beta10"}
   "cmdliner"
-  "xapi-rrd-transport" {>= "2.0.0"}
 ]
-synopsis: "Shared-memory protocols for exposing performance counters"
-description: """
-VMs running on a Xen host can use this library to expose performance
-counters which can be sampled by the xapi performance monitoring daemon."""
-url {
-  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
-}
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"