Skip to content

Commit

Permalink
keep a test of the deprecated opentelemetry:start_tracer_provider fun…
Browse files Browse the repository at this point in the history
…ction
  • Loading branch information
tsloughter committed Apr 5, 2023
1 parent 2300d09 commit 68e5c6c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion apps/opentelemetry/src/otel_tracer_provider_sup.erl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ start_link() ->

%% here to support deprecated function `opentelemetry:start_tracer_provider/2'
start(Name, Config) ->
supervisor:start_child(?MODULE, [Name, otel_resource:create([]), Config]).
start(Name, otel_resource:create([]), Config).

start(Name, Resource, Config) ->
supervisor:start_child(?MODULE, [Name, Resource, Config]).
Expand Down
11 changes: 9 additions & 2 deletions apps/opentelemetry/test/opentelemetry_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -640,10 +640,17 @@ multiple_tracer_providers(_Config) ->
scheduled_delay_ms => 1,
exporter => {otel_exporter_pid, self()}}}],
deny_list => []})),


?assertEqual(Resource, otel_tracer_provider:resource(test_provider)),

%% keep around a test of the deprecated API function for starting a tracer provider
?assertMatch({ok, _}, opentelemetry:start_tracer_provider(deprecated_test_provider_start,
#{id_generator => otel_id_generator,
sampler => {otel_sampler_always_on, []},
processors => [{otel_batch_processor, #{name => test_batch_2,
scheduled_delay_ms => 1000,
exporter => {otel_exporter_pid, self()}}}],
deny_list => []})),

GlobalResource = otel_tracer_provider:resource(),
GlobalResourceAttributes = otel_attributes:map(otel_resource:attributes(GlobalResource)),
?assertMatch(#{'process.executable.name' := <<"erl">>}, GlobalResourceAttributes),
Expand Down
2 changes: 1 addition & 1 deletion apps/opentelemetry_api/src/otel_tracer_provider.erl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
-deprecated({start, 2, "start the TracerProvider through the SDK"}).

start(Name, Config) ->
supervisor:start_child(otel_tracer_provider_sup, [Name, Config]).
otel_tracer_provider_sup:start(Name, Config).

-spec get_tracer(Name, Vsn, SchemaUrl) -> Tracer when
Name :: atom(),
Expand Down

0 comments on commit 68e5c6c

Please sign in to comment.