Support passage-v0.1.3
diff --git a/README.md b/README.md
index 998c3d3..03a4223 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,10 @@
> ok = jaeger_passage:start_tracer(example_tracer, Sampler).
% Starts a root span.
-> RootSpan = passage:start_root_span(example_root, example_tracer).
+> RootSpan = passage:start_span(example_root, [{tracer, example_tracer}]).
% Starts a child span.
-> ChildSpan = passage:start_span(example_child, {child_of, RootSpan}).
+> ChildSpan = passage:start_span(example_child, [{child_of, RootSpan}]).
% Finishes the spans
> passage:finish_span(ChildSpan).
diff --git a/doc/overview.edoc b/doc/overview.edoc
index eafd607..d2e8434 100644
--- a/doc/overview.edoc
+++ b/doc/overview.edoc
@@ -16,10 +16,10 @@
> ok = jaeger_passage:start_tracer(example_tracer, Sampler).
%% Starts a root span.
-> RootSpan = passage:start_root_span(example_root, example_tracer).
+> RootSpan = passage:start_span(example_root, [{tracer, example_tracer}]).
%% Starts a child span.
-> ChildSpan = passage:start_span(example_child, {child_of, RootSpan}).
+> ChildSpan = passage:start_span(example_child, [{child_of, RootSpan}]).
%% Finishes the spans
> passage:finish_span(ChildSpan).
diff --git a/rebar.lock b/rebar.lock
index cd64abb..e2edb83 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,10 +1,10 @@
{"1.1.0",
[{<<"local">>,{pkg,<<"local">>,<<"0.2.0">>},0},
- {<<"passage">>,{pkg,<<"passage">>,<<"0.1.2">>},0},
+ {<<"passage">>,{pkg,<<"passage">>,<<"0.1.3">>},0},
{<<"thrift_protocol">>,{pkg,<<"thrift_protocol">>,<<"0.1.2">>},0}]}.
[
{pkg_hash,[
{<<"local">>, <<"91466ED42F5E3509E097C4F57ED58C03362D64D537EF8B4AF0CA90774F7DBAD3">>},
- {<<"passage">>, <<"9613603D27D26848148E7983D34E76DBCEB0789E58DD60706051EA33CB7736F5">>},
+ {<<"passage">>, <<"AD09BDD1F270D412430BB3443AFBE7DCA057DA0BD4F04DE613E24FC13093F171">>},
{<<"thrift_protocol">>, <<"A3741E439567F6D7D232ACFF42AFF9ED317A1A32BF5F7EB1CC89F90DDEA0361B">>}]}
].
diff --git a/src/jaeger_passage.erl b/src/jaeger_passage.erl
index a65efdf..df23d12 100644
--- a/src/jaeger_passage.erl
+++ b/src/jaeger_passage.erl
@@ -57,8 +57,8 @@
%% [example_tracer] = jaeger_passage_reporter:which_reporters().
%%
%% %% Starts and finishes spans
-%% passage_pd:start_root_span(example_span, example_tracer).
-%% passage_pd:error_log("Hello World").
+%% passage_pd:start_span(example_span, [{tracer, example_tracer}]).
+%% passage_pd:log(#{message => "something wrong"}, [error]).
%% passage_pd:finish_span().
%%
%% %% Stops `example_tracer'
diff --git a/src/jaeger_passage_reporter.erl b/src/jaeger_passage_reporter.erl
index 98f8ffb..053d9dc 100644
--- a/src/jaeger_passage_reporter.erl
+++ b/src/jaeger_passage_reporter.erl
@@ -15,7 +15,7 @@
%% ok = passage_tracer_registry:register(example_tracer, Context, Sampler, Reporter).
%%
%% %% Starts and finishes a span
-%% Span = passage:start_root_span(example, example_tracer).
+%% Span = passage:start_span(example, [{tracer, example_tracer}]).
%%
%% passage:finish_span(Span). % The span will send to the jaeger agent on the localhost
%% '''
diff --git a/src/jaeger_passage_thrift.erl b/src/jaeger_passage_thrift.erl
index 46726cf..a2fb1ae 100644
--- a/src/jaeger_passage_thrift.erl
+++ b/src/jaeger_passage_thrift.erl
@@ -121,7 +121,7 @@
}
}.
--spec make_references(passage_span:normalized_refs()) -> thrift_protocol:thrift_list().
+-spec make_references(passage:refs()) -> thrift_protocol:thrift_list().
make_references(Refs) ->
Elements =
lists:filtermap(
@@ -135,7 +135,7 @@
Refs),
?LIST(Elements).
--spec make_reference(passage_span:normalized_ref()) -> thrift_protocol:struct().
+-spec make_reference(passage:ref()) -> thrift_protocol:struct().
make_reference(Ref) ->
RefType =
case Ref of
diff --git a/test/jaeger_passage_repoter_tests.erl b/test/jaeger_passage_repoter_tests.erl
index 38f8927..7aa1dd0 100644
--- a/test/jaeger_passage_repoter_tests.erl
+++ b/test/jaeger_passage_repoter_tests.erl
@@ -19,9 +19,9 @@
ok = passage_tracer_registry:register(test_tracer, Context, Sampler, Reporter),
%% Starts and finishes spans
- passage_pd:start_root_span(test_root, test_tracer),
+ passage_pd:start_span(test_root, [{tracer, test_tracer}]),
passage_pd:start_span(test_child),
- passage_pd:error_log("Hello World"),
+ passage_pd:log(#{message => "Hello World"}),
passage_pd:finish_span(),
passage_pd:finish_span(),
timer:sleep(50),
diff --git a/test/jaeger_passage_span_context_tests.erl b/test/jaeger_passage_span_context_tests.erl
index c792d50..d128c75 100644
--- a/test/jaeger_passage_span_context_tests.erl
+++ b/test/jaeger_passage_span_context_tests.erl
@@ -17,7 +17,7 @@
{"Binary format",
fun () ->
ok = start_tracer(),
- Span0 = passage:start_root_span(foo, tracer),
+ Span0 = passage:start_span(foo, [{tracer, tracer}]),
Span1 = passage:set_baggage_items(Span0, #{<<"a">> => <<"b">>}),
#{<<"binary">> := Injected} =
@@ -35,7 +35,7 @@
{"TextMap format",
fun () ->
ok = start_tracer(),
- Span0 = passage:start_root_span(foo, tracer),
+ Span0 = passage:start_span(foo, [{tracer, tracer}]),
Span1 = passage:set_baggage_items(Span0, #{<<"a">> => <<"b">>}),
#{<<"uber-trace-id">> := _, <<"uberctx-a">> := _} = Injected =
@@ -53,7 +53,7 @@
{"HttpHeader format",
fun () ->
ok = start_tracer(),
- Span0 = passage:start_root_span(foo, tracer),
+ Span0 = passage:start_span(foo, [{tracer, tracer}]),
Span1 = passage:set_baggage_items(Span0, #{<<"a">> => <<"b">>}),
#{<<"uber-trace-id">> := _, <<"uberctx-a">> := _} = Injected =
diff --git a/test/jaeger_passage_tests.erl b/test/jaeger_passage_tests.erl
index 93ed769..8eecded 100644
--- a/test/jaeger_passage_tests.erl
+++ b/test/jaeger_passage_tests.erl
@@ -17,9 +17,9 @@
[test_tracer] = jaeger_passage_reporter:which_reporters(),
%% Starts and finishes spans
- passage_pd:start_root_span(test_root, test_tracer),
+ passage_pd:start_span(test_root, [{tracer, test_tracer}]),
passage_pd:start_span(test_child),
- passage_pd:error_log("Hello World"),
+ passage_pd:log(#{message => "Hello World"}),
passage_pd:finish_span(),
passage_pd:finish_span(),
timer:sleep(50),
