Sync fork to upstream v0.91.1 (drop re-add GHA SHA pins, merge 353 upstream commits)

.github/CODEOWNERS

@@ -1,2 +1,2 @@
-* @c-cube @mattjbray
+* @c-cube
 

.github/workflows/format.yml

@@ -0,0 +1,18 @@
+name: format
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  format:
+    name: format
+    runs-on: ubuntu-latest
+    container: ghcr.io/ocaml-tracing/ocaml-opentelemetry/ci-4.14:latest
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - run: opam exec -- make format-check

.github/workflows/gh-pages.yml

@@ -5,29 +5,33 @@ on:
     branches:
       - main
 
+permissions:
+  contents: write
+  packages: read
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    container: ghcr.io/ocaml-tracing/ocaml-opentelemetry/ci-5.4:latest
 
-      # needed for depext to work
-      - run: sudo apt-get update && sudo apt-get install mccs
-
-      - uses: ocaml/setup-ocaml@15d660006c1d3110d77c34b7faa3bddefe8b82f0 # v3.7.0
+    steps:
+      - uses: actions/checkout@v6
         with:
-          ocaml-compiler: '5.1.x'
-          dune-cache: true
-          allow-prerelease-opam: true
+          submodules: recursive
 
-      - name: Deps
-        run: opam install odig opentelemetry opentelemetry-lwt opentelemetry-client-ocurl opentelemetry-cohttp-lwt
+      - name: Install local packages
+        run: opam exec -- dune build @install && opam exec -- dune install
 
-      - name: Build
-        run: opam exec -- odig odoc --cache-dir=_doc/ opentelemetry opentelemetry-lwt opentelemetry-client-ocurl opentelemetry-cohttp-lwt
+      - name: Build documentation
+        run: |
+          opam exec -- odig odoc --cache-dir=_doc/ \
+            opentelemetry opentelemetry-client opentelemetry-lwt \
+            opentelemetry-cohttp-lwt opentelemetry-client-ocurl \
+            opentelemetry-client-ocurl-lwt opentelemetry-client-cohttp-lwt \
+            opentelemetry-client-cohttp-eio opentelemetry-logs
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
+        uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./_doc/html

.github/workflows/main.yml

@@ -11,62 +11,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - ubuntu-latest
-            #- windows-latest
-            #- macos-latest
-        ocaml-compiler:
-          - 4.08.x
-          - 4.13.x
-          - 5.0.x
-          - 5.3.x
-
-    runs-on: ${{ matrix.os }}
+        include:
+          - ocaml-version: "4.08"
+            container: ghcr.io/ocaml-tracing/ocaml-opentelemetry/ci-4.08:latest
+            eio: false
+          - ocaml-version: "4.14"
+            container: ghcr.io/ocaml-tracing/ocaml-opentelemetry/ci-4.14:latest
+            eio: false
+          - ocaml-version: "5.4"
+            container: ghcr.io/ocaml-tracing/ocaml-opentelemetry/ci-5.4:latest
+            eio: true
+
+    runs-on: ubuntu-latest
+    container: ${{ matrix.container }}
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
-      # needed for depext to work
-      - run: sudo apt-get update && sudo apt-get install mccs
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@15d660006c1d3110d77c34b7faa3bddefe8b82f0 # v3.7.0
-        with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          opam-depext-flags: --with-test
-          dune-cache: true
-          allow-prerelease-opam: true
-
-      - run: |
-          opam pin ocaml-protoc 3.0.1 -y -n
-          opam pin pbrt 3.0.1 -y -n
-          opam install pbrt -y
-
-      # We cannot install packages that need eio on ocaml versions before 5
-      - run: |
-          packages=$(ls ./*.opam | grep -v eio)
-          opam install $packages --deps-only --with-test --solver=mccs
-        if: ${{ ! (startsWith(matrix.ocaml-compiler, '5')) }}
-
-      # We should be able to install all packages on ocaml 5
-      - run: opam install . --deps-only --with-test --solver=mccs
-        if: ${{ startsWith(matrix.ocaml-compiler, '5') }}
-
-      - run: opam exec -- dune build @install -p opentelemetry,opentelemetry-lwt,opentelemetry-client-ocurl,opentelemetry-cohttp-lwt,opentelemetry-client-cohttp-lwt,opentelemetry-logs
+      - name: Build
+        run: opam exec -- dune build @install -p opentelemetry,opentelemetry-client,opentelemetry-lwt,opentelemetry-cohttp-lwt,opentelemetry-client-ocurl,opentelemetry-client-ocurl-lwt,opentelemetry-client-cohttp-lwt,opentelemetry-logs
 
-      - run: opam pin trace --dev -y -n
-      - run: opam install trace
-      - run: opam exec -- dune build @install -p opentelemetry
+      - name: Build eio packages
+        if: ${{ matrix.eio }}
+        run: opam exec -- dune build @install -p opentelemetry-client-cohttp-eio,opentelemetry,opentelemetry-client,opentelemetry-lwt,opentelemetry-cohttp-lwt,opentelemetry-client-ocurl,opentelemetry-client-ocurl-lwt,opentelemetry-client-cohttp-lwt,opentelemetry-logs
 
-      - run: opam install ocaml-protoc
-      - run: opam exec -- dune build @lint
+      - name: Lint (protoc check)
+        run: opam exec -- dune build @lint
 
-      # check that nothing changed
-      - run: git diff --exit-code
+      - name: Check no generated files changed
+        run: git diff --exit-code
 
-      - run: opam exec -- dune build @runtest
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+      - name: Run tests
+        run: opam exec -- dune build @runtest

.gitignore

@@ -6,3 +6,5 @@ _opam
 .merlin
 *.install
 *.exe
+*.tmp
+/.env

.pre-commit-config.yaml

@@ -0,0 +1,10 @@
+repos:
+  - repo: local
+    hooks:
+      - id: ocamlformat
+        name: ocamlformat check
+        entry: make format-check
+        language: system
+        files: \.(ml|mli)$
+        pass_filenames: false
+        stages: [pre-push]

CHANGES.md

@@ -1,3 +1,49 @@
+## 0.91.1
+
+- fix: lazy init of random generators
+- fix: in trace, respect ~parent:P_none
+
+## 0.91
+
+- expose Self_debug.level_above
+- config: better defaults in Sdk, have batching enabled by default
+
+- better error message for otlp http failures
+- bounded queue: provide a per-item measure function for better errors/metrics
+- fix: retries are self_debug logged at warning level
+- move from ocurl to curl as a dep
+
+## 0.90
+
+- major refactor: split library into `opentelemetry.core`, `opentelemetry`,
+  `opentelemetry.util`, `opentelemetry.emitter`, `opentelemetry.atomic`, revamp internals
+- per-signal providers: separate trace, meter, and logger providers replace
+  the single monolithic exporter
+- `opentelemetry.ambient-context` is now a standalone library, once again
+- new `opentelemetry-client-ocurl-lwt` package
+- client: split `opentelemetry-client-sync` off of the main client library
+- client: add support for `http/json` protocol alongside `http/protobuf`
+- client: add HTTP retry with exponential backoff
+- client: overhaul bounded queue; introduce generic consumer framework
+- client: add `Exporter_add_batching`, `Emitter_add_batching`, `Emitter_sample`,
+  `Emitter_limit_interval` combinators. Batching is factored out of individual
+  client libraries.
+- client: add sampler as an emitter transformer
+- client: add `exporter_stdout` and `debug_exporter`
+- client: add `self_metrics` and `self_debug` to exporters
+- client: add `after_shutdown` callback in ocurl/ocurl-lwt clients
+- `Span.dummy`: inert span that is never modified
+- `Span.record_exception` now also sets the span status to error
+- `Span.set_span_status` added in `opentelemetry.trace`
+- `Span`: carry flags to `span_link`
+- `Span`: now mutable thanks to ocaml-protoc 4.0, replaces old `Scope.t` entirely
+- `Meter.emit` and `Meter_provider.emit_l` added
+- emitter: add `flat_map`, `tap`, `to_list`, `enabled` combinators
+- clock abstraction added; `ptime` used by default in logger and metrics
+- interval limiter used for `metrics_callbacks`
+- update to OTEL spec 1.8.0
+- update semantic conventions
+- various bug fixes and performance improvements
 
 ## 0.12
 

Makefile

@@ -11,15 +11,33 @@ clean:
 	@dune clean
 
 protoc-gen:
-	FORCE_GENPROTO=true @dune build @lint
+	FORCE_GENPROTO=true dune build @lint
+
+update-submodules:
+	git submodule update --init
+
+doc:
+	@dune build @doc
+
+PACKAGES=$(shell opam show . -f name)
+odig-doc:
+	@odig odoc --cache-dir=_doc/ $(PACKAGES)
 
 format:
 	@dune build @fmt --auto-promote
 
+format-check:
+	@dune build $(DUNE_OPTS) @fmt --display=quiet
+
+setup-githooks:
+	uvx pre-commit install --hook-type pre-push
+
 WATCH ?= @all
 watch:
 	@dune build $(WATCH) -w $(OPTS)
 
+include deps/Makefile.ci
+
 VERSION=$(shell awk '/^version:/ {print $$2}' opentelemetry.opam)
 update_next_tag:
 	@echo "update version to $(VERSION)..."

README.md

@@ -7,10 +7,10 @@ connectors to talk to opentelemetry software such as [jaeger](https://www.jaeger
 
 - library `opentelemetry` should be used to instrument your code
   and possibly libraries. It doesn't communicate with anything except
-  a backend (default: dummy backend);
-- library `opentelemetry-client-ocurl` is a backend that communicates
+  an exporter (default: no-op);
+- library `opentelemetry-client-ocurl` is an exporter that communicates
   via http+protobuf with some collector (otelcol, datadog-agent, etc.) using cURL bindings;
-- library `opentelemetry-client-cohttp-lwt` is a backend that communicates
+- library `opentelemetry-client-cohttp-lwt` is an exporter that communicates
   via http+protobuf with some collector using cohttp.
 
 ## License
@@ -39,14 +39,14 @@ module Otel = Opentelemetry
 let (let@) = (@@)
 
 let foo () =
-  let@ scope = Otel.Trace.with_  "foo"
+  let@ span = Otel.Tracer.with_ "foo"
       ~attrs:["hello", `String "world"] in
-  do_work();
-  Otel.Metrics.(
-    emit [
-      gauge ~name:"foo.x" [int 42];
-    ]);
-  do_more_work();
+  do_work ();
+  let now = Otel.Clock.now Otel.Meter.default.clock in
+  Otel.Meter.emit1 Otel.Meter.default
+    Otel.Metrics.(gauge ~name:"foo.x" [int ~now 42]);
+  Otel.Span.add_event span (Otel.Event.make "work done");
+  do_more_work ();
   ()
 ```
 
@@ -56,14 +56,14 @@ If you're writing a top-level application, you need to perform some initial conf
 
 1. Set the [`service_name`][];
 2. optionally configure [ambient-context][] with the appropriate storage for your environment — TLS, Lwt, Eio…;
-3. and install a [`Collector`][] (usually by calling your collector's `with_setup` function.)
+3. and install an exporter (usually by calling your client library's `with_setup` function.)
 
 For example, if your application is using Lwt, and you're using `ocurl` as your collector, you might do something like this:
 
 ```ocaml
 let main () =
   Otel.Globals.service_name := "my_service";
-  Otel.GC_metrics.basic_setup();
+  Otel.Gc_metrics.setup ();
 
   Opentelemetry_ambient_context.set_storage_provider (Opentelemetry_ambient_context_lwt.storage ());
   Opentelemetry_client_ocurl.with_setup () @@ fun () ->
@@ -72,33 +72,55 @@ let main () =
   (* … *)
 ```
 
-  [`service_name`]: <https://v3.ocaml.org/p/opentelemetry/0.5/doc/Opentelemetry/Globals/index.html#val-service_name>
-  [`Collector`]: <https://v3.ocaml.org/p/opentelemetry/0.5/doc/Opentelemetry/Collector/index.html>
+  [`service_name`]: <https://v3.ocaml.org/p/opentelemetry/latest/doc/Opentelemetry/Globals/index.html#val-service_name>
   [ambient-context]: now vendored as `opentelemetry.ambient-context`, formerly <https://v3.ocaml.org/p/ambient-context>
 
+## Migration 0.13 → v0.90
+
+see `doc/migration_guide_v0.90.md`
+
 ## Configuration
 
-The library is configurable via `Opentelemetry.Config`, via the standard
-opentelemetry env variables, or with some custom environment variables.
+### Environment Variables
+
+The library supports standard OpenTelemetry environment variables:
+
+**General:**
+- `OTEL_SDK_DISABLED` - disable the SDK (default: false)
+- `OTEL_SERVICE_NAME` - service name
+- `OTEL_RESOURCE_ATTRIBUTES` - comma-separated key=value resource attributes
+- `OTEL_OCAML_DEBUG=1` - print debug messages from the opentelemetry library
+
+**Exporter endpoints:**
+- `OTEL_EXPORTER_OTLP_ENDPOINT` - base endpoint (default: http://localhost:4318)
+- `OTEL_EXPORTER_OTLP_TRACES_ENDPOINT` - traces endpoint
+- `OTEL_EXPORTER_OTLP_METRICS_ENDPOINT` - metrics endpoint
+- `OTEL_EXPORTER_OTLP_LOGS_ENDPOINT` - logs endpoint
+
+**Exporter configuration:**
+- `OTEL_EXPORTER_OTLP_PROTOCOL` - protocol: http/protobuf or http/json (default: http/protobuf)
+
+**Headers:**
+- `OTEL_EXPORTER_OTLP_HEADERS` - headers as comma-separated key=value pairs
+- `OTEL_EXPORTER_OTLP_TRACES_HEADERS` - traces-specific headers
+- `OTEL_EXPORTER_OTLP_METRICS_HEADERS` - metrics-specific headers
+- `OTEL_EXPORTER_OTLP_LOGS_HEADERS` - logs-specific headers
 
-- `OTEL_EXPORTER_OTLP_ENDPOINT` sets the http endpoint to send signals to
-- `OTEL_OCAML_DEBUG=1` to print some debug messages from the opentelemetry library ide
-- `OTEL_RESOURCE_ATTRIBUTES` sets a comma separated list of custom resource attributes
 
-## Collector opentelemetry-client-ocurl
+## opentelemetry-client-ocurl
 
-This is a synchronous collector that uses the http+protobuf format
-to send signals (metrics, traces, logs) to some other collector (eg. `otelcol`
+This is a synchronous exporter that uses the http+protobuf format
+to send signals (metrics, traces, logs) to some collector (eg. `otelcol`
 or the datadog agent).
 
-Do note that this backend uses a thread pool and is incompatible
+Do note that it uses a thread pool and is incompatible
 with uses of `fork` on some Unixy systems.
 See [#68](https://github.com/imandra-ai/ocaml-opentelemetry/issues/68) for a possible workaround.
 
-## Collector opentelemetry-client-cohttp-lwt
+## opentelemetry-client-cohttp-lwt
 
-This is a Lwt-friendly collector that uses cohttp to send
-signals to some other collector (e.g. `otelcol`). It must be run
+This is a Lwt-friendly exporter that uses cohttp to send
+signals to some collector (e.g. `otelcol`). It must be run
 inside a `Lwt_main.run` scope.
 
 ## Opentelemetry-trace