update tests to match new API

Author: hauleth

src/oc_internal_timer.erl

@@ -1,3 +1,18 @@
+%%%------------------------------------------------------------------------
+%% Copyright 2017, OpenCensus Authors
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%% http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%%------------------------------------------------------------------------
+
 -module(oc_internal_timer).
 
 -callback ping() -> ok.

src/oc_reporter_pid.erl

@@ -23,10 +23,10 @@
          handle_call/2,
          handle_event/2]).
 
-init(Pid) -> Pid.
+init(Pid) -> {ok, Pid}.
 
 handle_call(_Msg, State) -> {ok, ok, State}.
 
-handle_event(Spans, Pid) ->
+handle_event({spans, Spans}, Pid) ->
     [Pid ! {span, Span} || Span <- Spans],
     {ok, Pid}.

src/oc_reporter_stdout.erl

@@ -21,8 +21,7 @@
          handle_call/2,
          handle_event/2]).
 
-init(_) ->
-    ok.
+init(Opts) -> {ok, Opts}.
 
 handle_call(_Msg, State) -> {ok, ok, State}.
 

src/oc_span.erl

@@ -47,7 +47,7 @@ finish_span(#span_ctx{tracestate=Tracestate}, Span=#span{}) ->
     %% update tracestate to what the context has when finished
     Span1 = Span#span{end_time=EndTime,
                       tracestate=Tracestate},
-    oc_reporter:store_span(Span1);
+    oc_trace_reporter:store_span(Span1);
 finish_span(_, _) ->
     true.
 

src/oc_stat_sup.erl

@@ -13,6 +13,8 @@
 %% limitations under the License.
 %%%------------------------------------------------------------------------
 
+%% @private
+
 -module(oc_stat_sup).
 
 -export([start_link/1, init/1]).

src/oc_trace.erl

@@ -203,17 +203,17 @@ update_trace_options(should_sample, #span_ctx{trace_id=TraceId,
 %% Finish a span, setting the end_time.
 %% @end
 %%--------------------------------------------------------------------
--spec finish_span(maybe(opencensus:span_ctx())) -> boolean().
+-spec finish_span(maybe(opencensus:span_ctx())) -> ok | {error, invalid_span} | {error, no_report_buffer}.
 finish_span(SpanCtx=#span_ctx{span_id=SpanId,
                               trace_options=TraceOptions}) when ?IS_ENABLED(TraceOptions) ->
     case ets:take(?SPAN_TAB, SpanId) of
         [SpanData] ->
             oc_span:finish_span(SpanCtx, SpanData);
         _ ->
-            false
+            {error, invalid_span}
     end;
 finish_span(_) ->
-    true.
+    {error, invalid_span}.
 
 %%--------------------------------------------------------------------
 %% @doc

src/oc_trace_reporter.erl

@@ -43,11 +43,12 @@ start_link(Handlers) ->
         Other -> Other
     end.
 
--spec store_span(opencensus:span()) -> true | {error, invalid_span} | {error, no_report_buffer}.
+-spec store_span(opencensus:span()) -> ok | {error, invalid_span} | {error, no_report_buffer}.
 store_span(Span=#span{}) ->
     try
         [{_, Buffer}] = ets:lookup(?BUFFER_STATUS, current_buffer),
-        ets:insert(Buffer, Span)
+        true = ets:insert(Buffer, Span),
+        ok
     catch
         error:badarg ->
             {error, no_report_buffer}

src/oc_trace_sup.erl

@@ -13,13 +13,16 @@
 %% limitations under the License.
 %%%------------------------------------------------------------------------
 
+%% @private
+
 -module(oc_trace_sup).
 
 -behaviour(supervisor).
 
 -export([start_link/1, init/1]).
 
 -include("opencensus.hrl").
+-include("oc_logger.hrl").
 
 start_link(Opts) ->
     supervisor:start_link(?MODULE, Opts).

src/ocp.erl

@@ -171,7 +171,7 @@ current_tags() ->
 %% Finishes the span in the current pdict context.
 %% @end
 %%--------------------------------------------------------------------
--spec finish_span() -> boolean().
+-spec finish_span() -> ok | {error, invalid_span} | {error, no_report_buffer}.
 finish_span() ->
     CurrentCtx = current_span_ctx(),
     ParentCtx = oc_trace:parent_span_ctx(CurrentCtx),

src/opencensus_sup.erl

@@ -12,9 +12,11 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
+%%%------------------------------------------------------------------------
+
 %% @doc opencensus top level supervisor.
+%% @private
 %% @end
-%%%------------------------------------------------------------------------
 
 -module(opencensus_sup).
 
@@ -24,15 +26,13 @@
 
 -export([init/1]).
 
--define(SERVER, ?MODULE).
-
 start_link() ->
     supervisor:start_link(?MODULE, []).
 
 init([]) ->
     ok = oc_sampler:init(application:get_env(opencensus, sampler, {oc_sampler_always, []})),
 
-    StatOpts = application:get_env(opencensus, metric, []),
+    StatOpts = application:get_env(opencensus, stat, []),
     StatSup = #{id => stat,
                 start => {oc_stat_sup, start_link, [StatOpts]},
                 type => supervisor},