Fix type specs

Author: albertored

apps/opentelemetry_api_experimental/include/match_spec.hrl

@@ -1,4 +1,8 @@
+-ifndef(MATCH_SPEC_TYPES_DEFINED).
+
 -type match_var() :: '_' | '$1' | '$2' | '$3' | '$4' | '$5' | '$6' | '$7' | '$8' | '$9'.
 -type match_spec(A) :: A | match_var() | {const, A}.
 
 -define(MATCH_SPEC_TYPES_DEFINED, true).
+
+-endif.

apps/opentelemetry_api_experimental/include/otel_metrics.hrl

@@ -1,6 +1,4 @@
--ifndef(MATCH_SPEC_TYPES_DEFINED).
 -include_lib("match_spec.hrl").
--endif.
 
 -record(instrument, {module          :: match_spec(module()),
                      meter           :: match_spec(otel_meter:t()),

apps/opentelemetry_experimental/include/otel_metrics.hrl

@@ -1,9 +1,10 @@
--ifndef(MATCH_SPEC_TYPES_DEFINED).
 -include_lib("opentelemetry_api_experimental/include/match_spec.hrl").
--endif.
 
 -define(DEFAULT_METER_PROVIDER, otel_meter_provider_default).
 
+-type key_inner_match_spec() :: {match_spec(atom()), match_spec(opentelemetry:attributes_map()), match_spec(reference())}.
+-type key_match_spec() :: match_spec(otel_aggregation:key()) | key_inner_match_spec()  | {key_inner_match_spec()}.
+
 -record(meter,
         {
          module                  :: module() | '_',
@@ -26,7 +27,7 @@
 -record(sum_aggregation,
         {
          %% TODO: attributes should be a tuple of just the values, sorted by attribute name
-         key :: match_spec(otel_aggregation:key()) |  otel_aggregation:key_match_spec() | undefined | {element, 2, '$_'},
+         key :: key_match_spec() | undefined | {element, 2, '$_'},
          start_time_unix_nano :: match_spec(integer()) | undefined,
          last_start_time_unix_nano :: match_spec(integer()) | undefined,
          checkpoint :: match_spec(number()) | undefined | {'+', '$2', '$3'} | {'+', '$3', '$4'},
@@ -38,7 +39,7 @@
 -record(last_value_aggregation,
         {
          %% TODO: attributes should be a tuple of just the values, sorted by attribute name
-         key :: match_spec(otel_aggregation:key()) | otel_aggregation:key_match_spec() | undefined,
+         key :: key_match_spec() | undefined,
          checkpoint :: match_spec(number()) | undefined,
          value :: match_spec(number()) | undefined,
          start_time_unix_nano :: match_spec(integer()) | undefined,
@@ -58,8 +59,8 @@
 -record(explicit_histogram_aggregation,
         {
          %% TODO: attributes should be a tuple of just the values, sorted by attribute name
-         key :: match_spec(otel_aggregation:key()) | otel_aggregation:key_match_spec() | undefined,
-         start_time_unix_nano :: integer() | {const, eqwalizer:dynamic()} | '$9' | '$2' | undefined,
+         key :: key_match_spec() | undefined,
+         start_time_unix_nano :: match_spec(integer()) | undefined,
          %% instrument_temporality :: otel_aggregation:temporality(),
          %% default: [0.0, 5.0, 10.0, 25.0, 50.0, 75.0, 100.0, 250.0, 500.0, 1000.0]
          explicit_bucket_boundaries :: match_spec([float()]) | undefined,

apps/opentelemetry_experimental/src/otel_aggregation.erl

@@ -12,13 +12,11 @@
              otel_aggregation_last_value:t() | otel_aggregation_histogram_explicit:t().
 
 -type key() :: {atom(), opentelemetry:attributes_map(), reference()}.
--type key_match_spec() :: match_spec(otel_aggregation:key()) | {match_spec(atom()), match_spec(opentelemetry:attributes_map()), match_spec(reference())}.
 
 -type options() :: map().
 
 -export_type([t/0,
               key/0,
-              key_match_spec/0,
               options/0]).
 
 %% Returns the aggregation's record as it is seen and updated by

apps/opentelemetry_experimental/src/otel_meter_server.erl

@@ -258,7 +258,7 @@ add_view_(Name, Criteria, Config, InstrumentsTab, CallbacksTab, ViewAggregations
         {ok, NewView} -> 
             _ = update_view_aggregations(InstrumentsTab, CallbacksTab, ViewAggregationsTab, [NewView], Readers),
             {reply, true, State#state{views=[NewView | Views]}};
-        error ->
+        {error, named_wildcard_view} ->
             {reply, false, State}
     end.
 
@@ -299,7 +299,7 @@ new_view(ViewConfig) ->
                                     aggregation_options => AggregationOptions
                                    }) of
         {ok, View} -> {true, View};
-        error -> false
+        {error, named_wildcard_view} -> false
     end.
 
 %% Match the Instrument to views and then store a per-Reader aggregation for the View

apps/opentelemetry_experimental/src/otel_view.erl

@@ -52,16 +52,16 @@
 -include_lib("opentelemetry_api/include/gradualizer.hrl").
 
 
--spec new(criteria() | undefined, config()) -> {ok, t()} | error.
+-spec new(criteria() | undefined, config()) -> {ok, t()} | {error, named_wildcard_view}.
 new(Criteria, Config) ->
     new(undefined, Criteria, Config).
 
--spec new(name(), criteria() | undefined, config()) -> {ok, t()} | error.
+-spec new(name(), criteria() | undefined, config()) -> {ok, t()} | {error, named_wildcard_view}.
 new(undefined, Criteria, Config) ->
     {ok, do_new(Criteria, Config)};
 new(Name, #{instrument_name := '*'}, _Config) ->
     ?LOG_INFO("Wildacrd Views can not have a name, discarding view ~s", [Name]),
-    error;
+    {error, named_wildcard_view};
 new(Name, Criteria, Config) ->
     View = do_new(Criteria, Config),
     {ok, View#view{name=Name}}.

apps/opentelemetry_experimental/test/otel_metrics_SUITE.erl

@@ -485,7 +485,7 @@ wildcard_view(_Config) ->
     ?assertMatch([{#view{}, _}], otel_view:match_instrument_to_views(Counter, [View])),
 
     %% not possible to create wildcard views with a name
-    error = otel_view:new(view_name, ViewCriteria, ViewConfig),
+    {error, named_wildcard_view} = otel_view:new(view_name, ViewCriteria, ViewConfig),
 
     ok.