diff --git a/CHANGES.md b/CHANGES.md index a2623710..455d37e7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,8 @@ `ambient-context` 0.2 package directly instead. To configure the storage backend, call `Ambient_context.set_current_storage` (e.g. `Ambient_context.set_current_storage Ambient_context_lwt.storage`). +- move to ezcurl 0.3 +- add a `hmap` in Scope.t ## 0.12 diff --git a/dune-project b/dune-project index a9a20eba..6fca45e8 100644 --- a/dune-project +++ b/dune-project @@ -5,11 +5,11 @@ (generate_opam_files true) (source - (github imandra-ai/ocaml-opentelemetry)) + (github ocaml-tracing/ocaml-opentelemetry)) (version 0.12) -(authors "the Imandra team and contributors") +(authors "the Imandra team" "ocaml-tracing contributors") (maintainers "Simon Cruanes " @@ -33,6 +33,8 @@ (and (>= 0.2) (< 0.3))) + (mtime + (>= "2.0")) (odoc :with-doc) (alcotest :with-test) (pbrt @@ -102,6 +104,19 @@ (opentelemetry (= :version)) (odoc :with-doc) + (containers + (and + (>= 3.12) + :with-test)) + (cohttp-lwt-unix :with-test) + (opentelemetry-client-cohttp-lwt + (and + (= :version) + :with-test)) + (opentelemetry-cohttp-lwt + (and + (= :version) + :with-test)) (logs (>= "0.7.0")) (alcotest :with-test)) @@ -135,6 +150,8 @@ (opentelemetry (= :version)) (odoc :with-doc) + (opentelemetry-lwt + (= :version)) (lwt (>= "5.3")) (lwt_ppx @@ -160,8 +177,16 @@ (odoc :with-doc) (cohttp-eio (>= 6.1.0)) + (eio + (>= 1.2)) (eio_main :with-test) - tls-eio + (tls-eio + (>= 2.0)) + (cohttp-lwt-unix :with-test) + (lwt_ppx + (and + (>= 2.0) + :with-test)) (alcotest :with-test) (containers :with-test)) (synopsis "Collector client for opentelemetry, using cohttp + eio")) diff --git a/opentelemetry-client-cohttp-eio.opam b/opentelemetry-client-cohttp-eio.opam index 7e85a1c8..79ccb79f 100644 --- a/opentelemetry-client-cohttp-eio.opam +++ b/opentelemetry-client-cohttp-eio.opam @@ -7,10 +7,10 @@ maintainer: [ "Matt Bray " "ELLIOTTCABLE " ] -authors: ["the Imandra team and contributors"] +authors: ["the Imandra team" "ocaml-tracing contributors"] license: "MIT" -homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" -bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" +homepage: "https://github.com/ocaml-tracing/ocaml-opentelemetry" +bug-reports: "https://github.com/ocaml-tracing/ocaml-opentelemetry/issues" depends: [ "dune" {>= "2.9"} "ocaml" {>= "5.00"} @@ -20,8 +20,11 @@ depends: [ "opentelemetry" {= version} "odoc" {with-doc} "cohttp-eio" {>= "6.1.0"} + "eio" {>= "1.2"} "eio_main" {with-test} - "tls-eio" + "tls-eio" {>= "2.0"} + "cohttp-lwt-unix" {with-test} + "lwt_ppx" {>= "2.0" & with-test} "alcotest" {with-test} "containers" {with-test} ] @@ -41,4 +44,4 @@ build: [ ] ["dune" "install" "-p" name "--create-install-files" name] ] -dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" +dev-repo: "git+https://github.com/ocaml-tracing/ocaml-opentelemetry.git" diff --git a/opentelemetry-client-cohttp-lwt.opam b/opentelemetry-client-cohttp-lwt.opam index 4c137c5e..a11f461d 100644 --- a/opentelemetry-client-cohttp-lwt.opam +++ b/opentelemetry-client-cohttp-lwt.opam @@ -7,16 +7,17 @@ maintainer: [ "Matt Bray " "ELLIOTTCABLE " ] -authors: ["the Imandra team and contributors"] +authors: ["the Imandra team" "ocaml-tracing contributors"] license: "MIT" -homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" -bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" +homepage: "https://github.com/ocaml-tracing/ocaml-opentelemetry" +bug-reports: "https://github.com/ocaml-tracing/ocaml-opentelemetry/issues" depends: [ "dune" {>= "2.9"} "ocaml" {>= "4.08"} "mtime" {>= "1.4"} "opentelemetry" {= version} "odoc" {with-doc} + "opentelemetry-lwt" {= version} "lwt" {>= "5.3"} "lwt_ppx" {>= "2.0"} "cohttp-lwt" {>= "6.0"} @@ -40,4 +41,4 @@ build: [ ] ["dune" "install" "-p" name "--create-install-files" name] ] -dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" +dev-repo: "git+https://github.com/ocaml-tracing/ocaml-opentelemetry.git" diff --git a/opentelemetry-client-ocurl.opam b/opentelemetry-client-ocurl.opam index a87813d2..20988cbb 100644 --- a/opentelemetry-client-ocurl.opam +++ b/opentelemetry-client-ocurl.opam @@ -7,10 +7,10 @@ maintainer: [ "Matt Bray " "ELLIOTTCABLE " ] -authors: ["the Imandra team and contributors"] +authors: ["the Imandra team" "ocaml-tracing contributors"] license: "MIT" -homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" -bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" +homepage: "https://github.com/ocaml-tracing/ocaml-opentelemetry" +bug-reports: "https://github.com/ocaml-tracing/ocaml-opentelemetry/issues" depends: [ "dune" {>= "2.9"} "ocaml" {>= "4.08"} @@ -37,4 +37,4 @@ build: [ ] ["dune" "install" "-p" name "--create-install-files" name] ] -dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" +dev-repo: "git+https://github.com/ocaml-tracing/ocaml-opentelemetry.git" diff --git a/opentelemetry-cohttp-lwt.opam b/opentelemetry-cohttp-lwt.opam index 67c89ed5..ecf8ed30 100644 --- a/opentelemetry-cohttp-lwt.opam +++ b/opentelemetry-cohttp-lwt.opam @@ -7,10 +7,10 @@ maintainer: [ "Matt Bray " "ELLIOTTCABLE " ] -authors: ["the Imandra team and contributors"] +authors: ["the Imandra team" "ocaml-tracing contributors"] license: "MIT" -homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" -bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" +homepage: "https://github.com/ocaml-tracing/ocaml-opentelemetry" +bug-reports: "https://github.com/ocaml-tracing/ocaml-opentelemetry/issues" depends: [ "dune" {>= "2.9"} "ocaml" {>= "4.08"} @@ -37,4 +37,4 @@ build: [ ] ["dune" "install" "-p" name "--create-install-files" name] ] -dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" +dev-repo: "git+https://github.com/ocaml-tracing/ocaml-opentelemetry.git" diff --git a/opentelemetry-logs.opam b/opentelemetry-logs.opam index cf76368f..3bb83cfc 100644 --- a/opentelemetry-logs.opam +++ b/opentelemetry-logs.opam @@ -7,15 +7,19 @@ maintainer: [ "Matt Bray " "ELLIOTTCABLE " ] -authors: ["the Imandra team and contributors"] +authors: ["the Imandra team" "ocaml-tracing contributors"] license: "MIT" -homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" -bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" +homepage: "https://github.com/ocaml-tracing/ocaml-opentelemetry" +bug-reports: "https://github.com/ocaml-tracing/ocaml-opentelemetry/issues" depends: [ "dune" {>= "2.9"} "ocaml" {>= "4.08"} "opentelemetry" {= version} "odoc" {with-doc} + "containers" {>= "3.12" & with-test} + "cohttp-lwt-unix" {with-test} + "opentelemetry-client-cohttp-lwt" {= version & with-test} + "opentelemetry-cohttp-lwt" {= version & with-test} "logs" {>= "0.7.0"} "alcotest" {with-test} ] @@ -35,4 +39,4 @@ build: [ ] ["dune" "install" "-p" name "--create-install-files" name] ] -dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" +dev-repo: "git+https://github.com/ocaml-tracing/ocaml-opentelemetry.git" diff --git a/opentelemetry-lwt.opam b/opentelemetry-lwt.opam index 49246444..86081e7b 100644 --- a/opentelemetry-lwt.opam +++ b/opentelemetry-lwt.opam @@ -7,11 +7,11 @@ maintainer: [ "Matt Bray " "ELLIOTTCABLE " ] -authors: ["the Imandra team and contributors"] +authors: ["the Imandra team" "ocaml-tracing contributors"] license: "MIT" tags: ["instrumentation" "tracing" "opentelemetry" "datadog" "lwt"] -homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" -bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" +homepage: "https://github.com/ocaml-tracing/ocaml-opentelemetry" +bug-reports: "https://github.com/ocaml-tracing/ocaml-opentelemetry/issues" depends: [ "dune" {>= "2.9"} "ocaml" {>= "4.08"} @@ -38,4 +38,4 @@ build: [ ] ["dune" "install" "-p" name "--create-install-files" name] ] -dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" +dev-repo: "git+https://github.com/ocaml-tracing/ocaml-opentelemetry.git" diff --git a/opentelemetry.opam b/opentelemetry.opam index 4e4bb8d6..3a087704 100644 --- a/opentelemetry.opam +++ b/opentelemetry.opam @@ -7,11 +7,11 @@ maintainer: [ "Matt Bray " "ELLIOTTCABLE " ] -authors: ["the Imandra team and contributors"] +authors: ["the Imandra team" "ocaml-tracing contributors"] license: "MIT" tags: ["instrumentation" "tracing" "opentelemetry" "datadog" "jaeger"] -homepage: "https://github.com/imandra-ai/ocaml-opentelemetry" -bug-reports: "https://github.com/imandra-ai/ocaml-opentelemetry/issues" +homepage: "https://github.com/ocaml-tracing/ocaml-opentelemetry" +bug-reports: "https://github.com/ocaml-tracing/ocaml-opentelemetry/issues" depends: [ "dune" {>= "2.9"} "ocaml" {>= "4.08"} @@ -19,6 +19,7 @@ depends: [ "hmap" "atomic" "thread-local-storage" {>= "0.2" & < "0.3"} + "mtime" {>= "2.0"} "odoc" {with-doc} "alcotest" {with-test} "pbrt" {>= "3.0" & < "4.0"} @@ -46,4 +47,4 @@ build: [ ] ["dune" "install" "-p" name "--create-install-files" name] ] -dev-repo: "git+https://github.com/imandra-ai/ocaml-opentelemetry.git" +dev-repo: "git+https://github.com/ocaml-tracing/ocaml-opentelemetry.git" diff --git a/tests/client_e2e/dune b/tests/client_e2e/dune index d553490f..8952b1a7 100644 --- a/tests/client_e2e/dune +++ b/tests/client_e2e/dune @@ -33,7 +33,7 @@ (package opentelemetry-client-cohttp-lwt) (enabled_if (>= %{ocaml_version} 5.0)) - (deps %{bin:emit1_cohttp} %{bin:emit1_eio}) + (deps %{bin:emit1_cohttp}) (libraries clients_e2e_lib alcotest opentelemetry opentelemetry.client)) (tests