Merge 3db36a3 into 4b38bb4

Author: tsloughter

apps/opentelemetry/src/otel_tracer_default.erl

@@ -56,7 +56,7 @@ with_span(Ctx, Tracer, SpanName, Opts, Fun) ->
         %% in this function. If spans in `Fun()' were started and not finished properly
         %% they will be abandoned and it be up to the `otel_span_sweeper' to eventually remove them.
         _ = otel_span_ets:end_span(SpanCtx),
-        otel_ctx:attach(Ctx)
+        otel_ctx:detach(Ctx)
     end.
 
 -spec b3_propagators() -> {otel_propagator:text_map_extractor(), otel_propagator:text_map_injector()}.

apps/opentelemetry_api/include/otel_tracer.hrl

@@ -10,6 +10,9 @@
 -define(start_span(SpanName, StartOpts),
         otel_tracer:start_span(?current_tracer, SpanName, StartOpts)).
 
+-define(with_span(SpanName, Fun),
+        otel_tracer:with_span(?current_tracer, SpanName, #{}, Fun)).
+
 -define(with_span(SpanName, StartOpts, Fun),
         otel_tracer:with_span(?current_tracer, SpanName, StartOpts, Fun)).
 

apps/opentelemetry_api/src/otel_ctx.erl

@@ -41,7 +41,9 @@
 -type t() :: map().
 -type key() :: term().
 -type value() :: term().
--type token() :: reference().
+
+%% at this time the "token" is actually the context map itself
+-type token() :: term().
 
 -export_type([t/0,
               key/0,

apps/opentelemetry_exporter/src/opentelemetry_exporter.erl

@@ -43,13 +43,15 @@
 %% for testing
 -export([to_proto_by_instrumentation_library/1,
          to_proto/1,
+         endpoints/1,
          merge_with_environment/1]).
 
 -include_lib("kernel/include/logger.hrl").
 -include_lib("opentelemetry_api/include/opentelemetry.hrl").
 -include_lib("opentelemetry/include/otel_span.hrl").
 
--define(DEFAULT_ENDPOINTS, [{http, "localhost", 9090, []}]).
+-define(DEFAULT_ENDPOINTS, [{https, "localhost", 4317, []}]).
+-define(DEFAULT_PORT, 4317).
 
 -record(state, {protocol :: grpc | http_protobuf | http_json,
                 channel_pid :: pid() | undefined,
@@ -140,24 +142,43 @@ headers(_) ->
     [].
 
 endpoints(List) when is_list(List) ->
-    case io_lib:printable_list(List) of
-        true ->
-            [endpoint(uri_string:parse(List))];
+    Endpoints = case io_lib:printable_list(List) of
+                    true ->
+                        [List];
+                    false ->
+                        List
+                end,
+
+    lists:filtermap(fun endpoint/1, Endpoints);
+endpoints(Endpoint) ->
+    lists:filtermap(fun endpoint/1, [Endpoint]).
+
+endpoint(Endpoint) ->
+    case parse_endpoint(Endpoint) of
         false ->
-            lists:filtermap(fun endpoint/1, List)
+            ?LOG_WARNING("Failed to parse and ignoring exporter endpoint ~p", [Endpoint]),
+            false;
+        Parsed ->
+            Parsed
     end.
 
-endpoint({_, _, _, _}=E) ->
+parse_endpoint({_, _, _, _}=E) ->
     {true, E};
-endpoint(#{host := Host, port := Port, scheme := Scheme}) ->
-    {true, {Scheme, Host, Port, []}};
-endpoint(String) ->
-    case io_lib:printable_list(String) of
-        true ->
-            endpoint(uri_string:parse(String));
-        false ->
-            false
-    end.
+parse_endpoint(#{host := Host, port := Port, scheme := Scheme}) ->
+    {true, {scheme(Scheme), Host, Port, []}};
+parse_endpoint(#{host := Host, scheme := Scheme}) ->
+    {true, {scheme(Scheme), Host, ?DEFAULT_PORT, []}};
+parse_endpoint(String) when is_list(String) orelse is_binary(String) ->
+    parse_endpoint(uri_string:parse(unicode:characters_to_list(String)));
+parse_endpoint(_) ->
+    false.
+
+scheme(Scheme) when Scheme =:= "https" orelse Scheme =:= <<"https">> ->
+    https;
+scheme(Scheme) when Scheme =:= "http" orelse Scheme =:= <<"http">> ->
+    http;
+scheme(Scheme) ->
+    Scheme.
 
 merge_with_environment(Opts) ->
     %% exporters are initalized by calling their `init/1' function from `opentelemetry'.

apps/opentelemetry_exporter/test/opentelemetry_exporter_SUITE.erl

@@ -43,6 +43,23 @@ configuration(_Config) ->
         ?assertMatch(#{endpoints := [{http, "localhost", 9090, []}]},
                      opentelemetry_exporter:merge_with_environment(#{endpoints => [{http, "localhost", 9090, []}]})),
 
+        ?assertMatch([{http, "localhost", 443, []}],
+                     opentelemetry_exporter:endpoints(["http://localhost:443"])),
+
+        ?assertMatch([{http, "localhost", 443, []}],
+             opentelemetry_exporter:endpoints([<<"http://localhost:443">>])),
+
+        ?assertMatch([{http, "localhost", 443, []}],
+             opentelemetry_exporter:endpoints(<<"http://localhost:443">>)),
+
+        ?assertMatch([{http, "localhost", 443, []}],
+             opentelemetry_exporter:endpoints(<<"http://localhost:443/ignored/path">>)),
+
+        ?assertMatch([{http, "localhost", 4317, []}],
+             opentelemetry_exporter:endpoints("http://localhost")),
+
+        ?assertMatch([], opentelemetry_exporter:endpoints("://badendpoint")),
+
         application:set_env(opentelemetry_exporter, otlp_endpoint, "http://localhost:5353"),
         ?assertMatch(#{endpoints := "http://localhost:5353"},
                      opentelemetry_exporter:merge_with_environment(#{})),