Merge branch 'main' into website_docs-instrumentation

open-telemetry · May 8, 2021 · 94b08c6 · 94b08c6
2 parents a94c96e + ac4bae7
commit 94b08c6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/apps/opentelemetry/rebar.config b/apps/opentelemetry/rebar.config
@@ -1,2 +1,2 @@
 {erl_opts, [debug_info]}.
-{deps, [{opentelemetry_api, "~> 1.0.0-rc.1"}]}.
+{deps, [{opentelemetry_api, "~> 1.0.0-rc.2"}]}.
diff --git a/apps/opentelemetry_api/VERSION b/apps/opentelemetry_api/VERSION
@@ -1 +1 @@
-1.0.0-rc.1
+1.0.0-rc.2
diff --git a/apps/opentelemetry_api/lib/open_telemetry/ctx.ex b/apps/opentelemetry_api/lib/open_telemetry/ctx.ex
@@ -5,6 +5,8 @@ defmodule OpenTelemetry.Ctx do
   `OpenTelemetry.Baggage` handle updating the Context.
   """
 
+  @type t() :: :otel_ctx.t()
+
   defdelegate new(), to: :otel_ctx
   defdelegate attach(ctx), to: :otel_ctx
   defdelegate detach(token), to: :otel_ctx

diff --git a/apps/opentelemetry_api/lib/open_telemetry/tracer.ex b/apps/opentelemetry_api/lib/open_telemetry/tracer.ex
@@ -62,7 +62,7 @@ defmodule OpenTelemetry.Tracer do
   end
 
   @doc """
-  Takes a `t:OpenTelemetry.ctx/0` and the `t:OpenTelemetry.span_ctx/0` and the Tracer sets
+  Takes a `t:OpenTelemetry.Ctx.t/0` and the `t:OpenTelemetry.span_ctx/0` and the Tracer sets
   it to the current span in the pass Context.
   """
   def set_current_span(ctx, span_ctx) do