Skip to content

Commit

Permalink
require trace 0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
c-cube committed Mar 21, 2024
1 parent 715578c commit 7d50a0b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
5 changes: 1 addition & 4 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@
(< 0.25))))
(depopts trace)
(conflicts
(trace
(or
(< 0.4)
(>= 0.7))))
(trace (< 0.7)))
(tags
(instrumentation tracing opentelemetry datadog jaeger)))

Expand Down
2 changes: 1 addition & 1 deletion opentelemetry.opam
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ depends: [
]
depopts: ["trace"]
conflicts: [
"trace" {< "0.4" | >= "0.7"}
"trace" {< "0.7"}
]
build: [
["dune" "subst"] {dev}
Expand Down
2 changes: 1 addition & 1 deletion src/trace/opentelemetry_trace.ml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ module Internal = struct
end)

(** key to access a OTEL scope from an explicit span *)
let k_explicit_scope : Otel.Scope.t Otrace.Meta_map.Key.t =
let k_explicit_scope : Otel.Scope.t Otrace.Meta_map.key =
Otrace.Meta_map.Key.create ()

(** Per-thread set of active spans. *)
Expand Down

0 comments on commit 7d50a0b

Please sign in to comment.