Skip to content

Commit

Permalink
Add create_span and new end_span/2 (open-telemetry#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
tsloughter committed Feb 22, 2020
1 parent 5af3a9f commit 4876b23
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 7 deletions.
2 changes: 1 addition & 1 deletion rebar.config
@@ -1,5 +1,5 @@
{erl_opts, [debug_info]}.
{deps, [wts]}.
{deps, [{wts, "~> 0.4"}]}.

{profiles,
[{docs, [{deps, [edown]},
Expand Down
6 changes: 2 additions & 4 deletions rebar.lock
@@ -1,8 +1,6 @@
{"1.1.0",
[{<<"rfc3339">>,{pkg,<<"rfc3339">>,<<"0.9.0">>},1},
{<<"wts">>,{pkg,<<"wts">>,<<"0.3.0">>},0}]}.
[{<<"wts">>,{pkg,<<"wts">>,<<"0.4.0">>},0}]}.
[
{pkg_hash,[
{<<"rfc3339">>, <<"2075653DC9407541C84B1E15F8BDA2ABE95FB17C9694025E079583F2D19C1060">>},
{<<"wts">>, <<"5CDF22C775CB1EBAE24C326A5DB6074D753C42F4BD12A9AA47CC62D3E2C71AD1">>}]}
{<<"wts">>, <<"62D9DC400AD29F0D233F0665B9C75C8F8EB0A8AF75EEC921056BA4A73B0605A2">>}]}
].
11 changes: 10 additions & 1 deletion src/ot_tracer.erl
Expand Up @@ -18,6 +18,7 @@
-module(ot_tracer).

-export([start_span/3,
create_span/3,
set_span/2,
with_span/3,
with_span/4,
Expand All @@ -39,11 +40,14 @@
-callback start_span(opentelemetry:tracer(),
opentelemetry:span_name(),
ot_span:start_opts()) -> opentelemetry:span_ctx().
-callback create_span(opentelemetry:tracer(),
opentelemetry:span_name(),
ot_span:start_opts()) -> opentelemetry:span_ctx().
-callback set_span(opentelemetry:tracer(), opentelemetry:span_ctx()) -> ok.
-callback with_span(opentelemetry:tracer(), opentelemetry:span_name(), traced_fun(T)) -> T.
-callback with_span(opentelemetry:tracer(), opentelemetry:span_name(), ot_span:start_opts(), traced_fun(T)) -> T.
-callback end_span(opentelemetry:tracer()) -> boolean() | {error, term()}.
-callback end_span(opentelemetry:tracer(), ot_tracer:tracer_ctx()) -> boolean() | {error, term()}.
-callback end_span(opentelemetry:tracer(), opentelemetry:span_ctx()) -> boolean() | {error, term()}.
-callback current_ctx(opentelemetry:tracer()) -> tracer_ctx().
-callback current_span_ctx(opentelemetry:tracer()) -> opentelemetry:span_ctx().
-callback span_module(opentelemetry:tracer()) -> module().
Expand All @@ -53,6 +57,11 @@
start_span(Tracer={Module, _}, Name, Opts) ->
Module:start_span(Tracer, Name, Opts).

-spec create_span(opentelemetry:tracer(), opentelemetry:span_name(), ot_span:start_opts())
-> opentelemetry:span_ctx().
create_span(Tracer={Module, _}, Name, Opts) ->
Module:create_span(Tracer, Name, Opts).

-spec set_span(opentelemetry:tracer(), opentelemetry:span_ctx()) -> ok.
set_span(Tracer={Module, _}, SpanCtx) when is_atom(Module) ->
Module:set_span(Tracer, SpanCtx).
Expand Down
8 changes: 7 additions & 1 deletion src/ot_tracer_noop.erl
Expand Up @@ -20,6 +20,7 @@
-behaviour(ot_tracer).

-export([start_span/3,
create_span/3,
set_span/2,
with_span/3,
with_span/4,
Expand All @@ -43,6 +44,11 @@
start_span(_, _Name, _) ->
?NOOP_SPAN_CTX.

-spec create_span(opentelemetry:tracer(), opentelemetry:span_name(), ot_span:start_opts())
-> opentelemetry:span_ctx().
create_span(_, _Name, _Opts) ->
?NOOP_SPAN_CTX.

-spec set_span(opentelemetry:tracer(), opentelemetry:span_ctx()) -> ok.
set_span(_, _SpanCtx) ->
ok.
Expand Down Expand Up @@ -71,6 +77,6 @@ span_module(_) ->
end_span(_) ->
true.

-spec end_span(opentelemetry:tracer(), ot_tracer:tracer_ctx()) -> boolean() | {error, term()}.
-spec end_span(opentelemetry:tracer(), ot_tracer:span_ctx()) -> boolean() | {error, term()}.
end_span(_, _) ->
true.

0 comments on commit 4876b23

Please sign in to comment.