Merge branch 'main' into resolve_unused_variable_warning

Author: ferd

CHANGELOG.md

@@ -73,8 +73,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [Add `instrument_unit` to view criteria](https://github.com/open-telemetry/opentelemetry-erlang/pull/604)
 - [Validate instrument name](https://github.com/open-telemetry/opentelemetry-erlang/pull/604)
-- [Handle `explict_bucket_boundaries` advisory parameter](https://github.com/open-telemetry/opentelemetry-erlang/pull/628)
-- [Rename `boundaries` to `explict_bucket_boundaries` in histogram explicit aggregation options](https://github.com/open-telemetry/opentelemetry-erlang/pull/628)
+- [Handle `explicit_bucket_boundaries` advisory parameter](https://github.com/open-telemetry/opentelemetry-erlang/pull/628)
+- [Rename `boundaries` to `explicit_bucket_boundaries` in histogram explicit aggregation options](https://github.com/open-telemetry/opentelemetry-erlang/pull/628)
 - [Allow creating wildcard views](https://github.com/open-telemetry/opentelemetry-erlang/pull/624)
 - [Exemplars support](https://github.com/open-telemetry/opentelemetry-erlang/pull/692)
 - [Metric
@@ -484,9 +484,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Attribute values now validate against what is allowable per the specification
   rather than allowing anything the protobuf could encode. This may be breaking
   to some users who were relying on the incorrect behavior, such as allowing
-  dictionaries or non-homogenous lists/tuples. The one exception we have
+  dictionaries or non-homogeneous lists/tuples. The one exception we have
   kept is continuing to allow atoms in place of binaries for performance.
-- Attribute values of type list/tuple must be homogenous.
+- Attribute values of type list/tuple must be homogeneous.
 - Span start opts are now validated. Previously, opts underwent no validations.
 - Event and link attributes are now validated. Previously only span attributes
   were validated.

apps/opentelemetry/src/otel_batch_processor.erl

@@ -95,7 +95,7 @@ current_tab_to_list(RegName) ->
     ets:tab2list(?CURRENT_TABLE(RegName)).
 -endif.
 
-%% require a unique name to distiguish multiple batch processors while
+%% require a unique name to distinguish multiple batch processors while
 %% still having a single name, instead of a possibly changing pid, to
 %% communicate with the processor
 %% @doc Starts a Batch Span Processor.

apps/opentelemetry/src/otel_simple_processor.erl

@@ -64,7 +64,7 @@
 -define(DEFAULT_EXPORTER_TIMEOUT_MS, timer:minutes(5)).
 -define(NAME_TO_ATOM(Name, Unique), list_to_atom(lists:concat([Name, "_", Unique]))).
 
-%% require a unique name to distiguish multiple simple processors while
+%% require a unique name to distinguish multiple simple processors while
 %% still having a single name, instead of a possibly changing pid, to
 %% communicate with the processor
 %% @doc Starts a Simple Span Processor.

apps/opentelemetry/src/otel_tracer_server.erl

@@ -161,7 +161,7 @@ init_processor(SpanProcessorSup, ProcessorModule, Config) ->
         true ->
             try supervisor:start_child(SpanProcessorSup,
                                        [ProcessorModule,
-                                        %% use a unique reference to distiguish multiple processors of the same type while
+                                        %% use a unique reference to distinguish multiple processors of the same type while
                                         %% still having a single name, instead of a possibly changing pid, to
                                         %% communicate with the processor
                                         maps:merge(#{name => erlang:ref_to_list(erlang:make_ref())},

apps/opentelemetry/test/opentelemetry_SUITE.erl

@@ -1025,10 +1025,10 @@ too_many_attributes(Config) ->
     ?set_current_span(SpanCtx),
 
     %% tuple tests cover lists, as well.
-    ?set_attribute(attr1, {homogenous, tuple}),
+    ?set_attribute(attr1, {homogeneous, tuple}),
 
-    %% dropped because of non-homogenous
-    ?set_attribute(<<"attr-2-dropped">>, {non_homogenous, <<"attributes">>}),
+    %% dropped because of non-homogeneous
+    ?set_attribute(<<"attr-2-dropped">>, {non_homogeneous, <<"attributes">>}),
 
     ?set_attribute(<<"attr-3">>, attr_3_value),
 
@@ -1045,7 +1045,7 @@ too_many_attributes(Config) ->
     otel_span:end_span(SpanCtx),
     [Span] = assert_exported(Tid, SpanCtx),
 
-    ?assertEqual(#{attr1 => [homogenous, tuple],
+    ?assertEqual(#{attr1 => [homogeneous, tuple],
                    <<"attr-3">> => 4}, otel_attributes:map(Span#span.attributes)),
     ?assertEqual(3, otel_attributes:dropped(Span#span.attributes)),
 
@@ -1055,7 +1055,7 @@ too_many_attributes(Config) ->
     ?set_current_span(SpanCtx2),
 
     ?set_attributes(#{<<"attr-1">> => <<"attr-value-1">>,
-                      <<"attr-2">> => {homogenous, attribute},
+                      <<"attr-2">> => {homogeneous, attribute},
                       <<"attr-3">> => attr_3_value,
                       <<"attr-4">> => <<"attr-value-4">>}),
 

apps/opentelemetry_api/include/opentelemetry.hrl

@@ -13,7 +13,7 @@
 %% limitations under the License.
 %%%------------------------------------------------------------------------
 
-%% convert 2 strings (one meant to be like a namspace and the other a unique name)
+%% convert 2 strings (one meant to be like a namespace and the other a unique name)
 %% to an atom for use registering a process
 -define(REG_NAME(Name), list_to_atom(lists:concat([?MODULE, "_", Name]))).
 -define(GLOBAL_TRACER_PROVIDER_NAME, global).

apps/opentelemetry_api/src/opentelemetry.erl

@@ -437,7 +437,7 @@ event(_, _, _) ->
 
 %% @doc Creates a list of Span events from the given `List'.
 %%
-%% This is a conveneince function to create a list of Span events from a list
+%% This is a convenience function to create a list of Span events from a list
 %% of `{Time, Name, Attributes}' or `{Name, Attributes}' tuples. It's equivalent
 %% to calling {@link event/2} or {@link event/3} multiple times. This function
 %% also automatically filters out any invalid tuple.

apps/opentelemetry_api/src/otel_propagator_text_map_composite.erl

@@ -39,7 +39,7 @@
 
 %% @doc Create a new Composite TextMap Propagator.
 %%
-%% The `Propagators' list is a list of atoms that represnet the <i>suffix</i>
+%% The `Propagators' list is a list of atoms that represent the <i>suffix</i>
 %% of the module name of the TextMap Propagator to be used.
 -spec create([otel_propagator:builtin()]) -> otel_propagator:t().
 create(Propagators) ->

apps/opentelemetry_api_experimental/src/otel_meter_noop.erl

@@ -32,7 +32,7 @@
 record(_Meter, _Name, _Number, _Attributes) ->
     ok.
 
-record(_Insturment, _Number, _Attributes) ->
+record(_Instrument, _Number, _Attributes) ->
     ok.
 
 %%

apps/opentelemetry_experimental/src/otel_aggregation_histogram_explicit.erl

@@ -41,7 +41,7 @@
 %% since we need the Key in the MatchHead for the index to be used we
 %% can't use `ets:fun2ms' as it will shadow `Key' in the `fun' head
 -if(?OTP_RELEASE >= 26).
--define(AGGREATE_MATCH_SPEC(Key, Value, BucketCounts),
+-define(AGGREGATE_MATCH_SPEC(Key, Value, BucketCounts),
         [
          {
           {explicit_histogram_aggregation,Key,'_','_','_','_','_','$1','$2','$3'},
@@ -62,7 +62,7 @@
         ]
        ).
 -else.
--define(AGGREATE_MATCH_SPEC(Key, Value, BucketCounts),
+-define(AGGREGATE_MATCH_SPEC(Key, Value, BucketCounts),
         [
          {
           {explicit_histogram_aggregation,Key,'_','_','_','_','_','$1','$2','$3'},
@@ -199,7 +199,7 @@ aggregate(Ctx, Table, ExemplarsTab, #stream{name=Name,
             counters:add(BucketCounts, BucketIdx, 1),
 
             Key = {Name, Attributes, ReaderId, Generation},
-            MS = ?AGGREATE_MATCH_SPEC(Key, Value, BucketCounts),
+            MS = ?AGGREGATE_MATCH_SPEC(Key, Value, BucketCounts),
             case ets:select_replace(Table, MS) of
                 1 ->
                     otel_metric_exemplar_reservoir:offer(Ctx, ExemplarReservoir, ExemplarsTab, Key, Value, DroppedAttributes),