Merge branch 'main' into test-link-event-attr

Author: tsloughter

apps/opentelemetry/src/otel_events.erl

@@ -83,7 +83,7 @@ new_event(#{system_time_nano := Timestamp,
            attributes=otel_attributes:new(Attributes, AttributePerEventLimit, AttributeValueLengthLimit)};
 new_event(#{name := Name,
             attributes := Attributes}, AttributePerEventLimit, AttributeValueLengthLimit) ->
-    #event{system_time_nano=erlang:system_time(nanosecond),
+    #event{system_time_nano=opentelemetry:timestamp(),
            name=Name,
            attributes=otel_attributes:new(Attributes, AttributePerEventLimit, AttributeValueLengthLimit)};
 new_event({Time, Name, Attributes}, AttributePerEventLimit, AttributeValueLengthLimit)

apps/opentelemetry/test/opentelemetry_SUITE.erl

@@ -377,7 +377,7 @@ update_span_data(Config) ->
     ?set_current_span(SpanCtx1),
     ?set_attribute(<<"key-1">>, <<"value-1">>),
 
-    Events = opentelemetry:events([{erlang:system_time(nanosecond),
+    Events = opentelemetry:events([{opentelemetry:timestamp(),
                                     <<"event-name">>, []}]),
     Status = opentelemetry:status(0, <<"status">>),
 

apps/opentelemetry_api/src/opentelemetry.erl

@@ -341,7 +341,7 @@ link(_, _, _, _) ->
       Name :: event_name(),
       Attributes :: attributes_map().
 event(Name, Attributes) ->
-    event(erlang:system_time(nanosecond), Name, Attributes).
+    event(opentelemetry:timestamp(), Name, Attributes).
 
 -spec event(Timestamp, Name, Attributes) -> event() | undefined when
       Timestamp :: non_neg_integer(),
@@ -362,7 +362,7 @@ event(_, _, _) ->
     undefined.
 
 events(List) ->
-    Now = erlang:system_time(nanosecond),
+    Now = opentelemetry:timestamp(),
     lists:filtermap(fun({Time, Name, Attributes}) ->
                             case event(Time, Name, Attributes) of
                                 undefined ->

apps/opentelemetry_exporter/src/opentelemetry_exporter.erl

@@ -278,23 +278,29 @@ parse_endpoint({Scheme, Host, Port, _}, DefaultSSLOpts) ->
              port => Port,
              path => [],
              ssl_options => update_ssl_opts(HostString, DefaultSSLOpts)}};
-parse_endpoint(Endpoint=#{host := Host, port := _Port, scheme := _Scheme, path := Path}, DefaultSSLOpts) ->
-    HostString = unicode:characters_to_list(Host),
-    {true, maps:merge(#{host => HostString,
-                        path => unicode:characters_to_list(Path),
-                        port => ?DEFAULT_PORT,
-                        ssl_options => update_ssl_opts(HostString, DefaultSSLOpts)}, Endpoint)};
 parse_endpoint(Endpoint=#{host := Host, scheme := _Scheme, path := Path}, DefaultSSLOpts) ->
     HostString = unicode:characters_to_list(Host),
     {true, maps:merge(#{host => unicode:characters_to_list(Host),
                         port => ?DEFAULT_PORT,
                         path => unicode:characters_to_list(Path),
                         ssl_options => update_ssl_opts(HostString, DefaultSSLOpts)}, Endpoint)};
 parse_endpoint(String, DefaultSSLOpts) when is_list(String) orelse is_binary(String) ->
-    parse_endpoint(uri_string:parse(unicode:characters_to_list(String)), DefaultSSLOpts);
+    ParsedUri = maybe_add_scheme_port(uri_string:parse(unicode:characters_to_list(String))),
+    parse_endpoint(ParsedUri, DefaultSSLOpts);
 parse_endpoint(_, _) ->
     false.
 
+maybe_add_scheme_port(Uri=#{port := _Port}) ->
+    Uri;
+maybe_add_scheme_port(Uri=#{scheme := "http"}) ->
+    Uri#{port => 80};
+maybe_add_scheme_port(Uri=#{scheme := "https"}) ->
+    Uri#{port => 443};
+%% an unknown scheme
+maybe_add_scheme_port(Uri) ->
+    Uri.
+
+
 %% if no ssl opts are defined by the user then use defaults from `tls_certificate_check'
 update_ssl_opts(Host, undefined) ->
     tls_certificate_check:options(Host);

apps/opentelemetry_exporter/test/opentelemetry_exporter_SUITE.erl

@@ -75,9 +75,9 @@ configuration(_Config) ->
                      opentelemetry_exporter:endpoints(<<"https://localhost:443">>, [])),
 
         ?assertMatch([#{scheme := "https", host := "localhost", port := 443, path := "/used/path"}],
-                     opentelemetry_exporter:endpoints(<<"https://localhost:443/used/path">>, [])),
+                     opentelemetry_exporter:endpoints(<<"https://localhost/used/path">>, [])),
 
-        ?assertMatch([#{scheme := "http", host := "localhost", port := 4318, path := []}],
+        ?assertMatch([#{scheme := "http", host := "localhost", port := 80, path := []}],
                      opentelemetry_exporter:endpoints("http://localhost", [])),
 
         ?assertMatch([], opentelemetry_exporter:endpoints("://badendpoint", [])),
@@ -151,10 +151,10 @@ ets_instrumentation_info(_Config) ->
               start_time = opentelemetry:timestamp(),
               end_time = opentelemetry:timestamp(),
               links = otel_links:new([], 128, 128, 128),
-              events = otel_events:add([#event{system_time_nano=erlang:system_time(nanosecond),
+              events = otel_events:add([#event{system_time_nano=opentelemetry:timestamp(),
                                                name = <<"event-1">>,
                                                attributes = [{<<"attr-1">>, <<"value-1">>}]},
-                                        #event{system_time_nano=erlang:system_time(nanosecond),
+                                        #event{system_time_nano=opentelemetry:timestamp(),
                                                name = <<"event-2">>,
                                                attributes = [{<<"attr-3">>, <<"value-3">>}]}], Events1),
               attributes = otel_attributes:new([{<<"attr-2">>, <<"value-2">>}], 128, 128),
@@ -171,10 +171,10 @@ ets_instrumentation_info(_Config) ->
                       start_time = opentelemetry:timestamp(),
                       end_time = opentelemetry:timestamp(),
                       links = otel_links:new([], 128, 128, 128),
-                      events = otel_events:add([#event{system_time_nano=erlang:system_time(nanosecond),
+                      events = otel_events:add([#event{system_time_nano=opentelemetry:timestamp(),
                                                        name = <<"event-1">>,
                                                        attributes = [{<<"attr-1">>, <<"value-1">>}]},
-                                                #event{system_time_nano=erlang:system_time(nanosecond),
+                                                #event{system_time_nano=opentelemetry:timestamp(),
                                                        name = <<"event-2">>,
                                                        attributes = [{<<"attr-3">>, <<"value-3">>}]}], Events2),
                       attributes = otel_attributes:new([{<<"attr-2">>, <<"value-2">>}], 128, 128),
@@ -207,10 +207,10 @@ span_round_trip(_Config) ->
               start_time = opentelemetry:timestamp(),
               end_time = opentelemetry:timestamp(),
               links = otel_links:new([], 128, 128, 128),
-              events = otel_events:add([#event{system_time_nano=erlang:system_time(nanosecond),
+              events = otel_events:add([#event{system_time_nano=opentelemetry:timestamp(),
                                                name = <<"event-1">>,
                                                attributes = [{<<"attr-1">>, <<"value-1">>}]},
-                                        #event{system_time_nano=erlang:system_time(nanosecond),
+                                        #event{system_time_nano=opentelemetry:timestamp(),
                                                name = event_2,
                                                attributes = [{<<"attr-3">>, <<"value-3">>}]}], Events),
               attributes = otel_attributes:new([{<<"attr-2">>, <<"value-2">>},
@@ -268,10 +268,10 @@ verify_export(Config) ->
               start_time = opentelemetry:timestamp(),
               end_time = opentelemetry:timestamp(),
               links = otel_links:new([], 128, 128, 128),
-              events = otel_events:add([#event{system_time_nano=erlang:system_time(nanosecond),
+              events = otel_events:add([#event{system_time_nano=opentelemetry:timestamp(),
                                                name = <<"event-1">>,
                                                attributes = otel_attributes:new([{<<"attr-1">>, <<"value-1">>}], 128, 128)},
-                                        #event{system_time_nano=erlang:system_time(nanosecond),
+                                        #event{system_time_nano=opentelemetry:timestamp(),
                                                name = <<"event-2">>,
                                                attributes = otel_attributes:new([{<<"attr-3">>, <<"value-3">>}], 128, 128)}], Events),
               status = #status{code=?OTEL_STATUS_UNSET,
@@ -289,10 +289,10 @@ verify_export(Config) ->
                       start_time = opentelemetry:timestamp(),
                       end_time = opentelemetry:timestamp(),
                       links = otel_links:new([Link1], 128, 128, 128),
-                      events = otel_events:add([#event{system_time_nano=erlang:system_time(nanosecond),
+                      events = otel_events:add([#event{system_time_nano=opentelemetry:timestamp(),
                                                        name = <<"event-1">>,
                                                        attributes = otel_attributes:new([{<<"attr-1">>, <<"value-1">>}], 128, 128)},
-                                                #event{system_time_nano=erlang:system_time(nanosecond),
+                                                #event{system_time_nano=opentelemetry:timestamp(),
                                                        name = <<"event-2">>,
                                                        attributes = otel_attributes:new([{<<"attr-3">>, <<"value-3">>}], 128, 128)}], Events),
                       status = #status{code=?OTEL_STATUS_ERROR,

apps/opentelemetry_zipkin/test/opentelemetry_zipkin_SUITE.erl

@@ -32,10 +32,10 @@ verify_export(_Config) ->
               kind = ?SPAN_KIND_CLIENT,
               start_time = opentelemetry:timestamp(),
               end_time = opentelemetry:timestamp(),
-              events = [#event{system_time_nano=erlang:system_time(nanosecond),
+              events = [#event{system_time_nano=opentelemetry:timestamp(),
                                name = <<"event-1">>,
                                attributes = [{<<"attr-1">>, <<"value-1">>}]},
-                        #event{system_time_nano=erlang:system_time(nanosecond),
+                        #event{system_time_nano=opentelemetry:timestamp(),
                                name = <<"event-2">>,
                                attributes = [{<<"attr-3">>, <<"value-3">>}]}],
               status=opentelemetry:status(?SPAN_KIND_INTERNAL, <<"some message about status">>),
@@ -49,10 +49,10 @@ verify_export(_Config) ->
                       kind = ?SPAN_KIND_SERVER,
                       start_time = opentelemetry:timestamp(),
                       end_time = opentelemetry:timestamp(),
-                      events = [#event{system_time_nano=erlang:system_time(nanosecond),
+                      events = [#event{system_time_nano=opentelemetry:timestamp(),
                                        name = <<"event-1">>,
                                        attributes = [{<<"attr-1">>, <<"value-1">>}]},
-                                #event{system_time_nano=erlang:system_time(nanosecond),
+                                #event{system_time_nano=opentelemetry:timestamp(),
                                        name = <<"event-2">>,
                                        attributes = [{<<"attr-3">>, <<"value-3">>}]}],
                       attributes = [{<<"attr-2">>, <<"value-2">>}]},