drop aggregation_temporality method and instance variable for last_value and drop aggregation (#1885)

Author: xuan-cao-swi

metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/drop.rb

@@ -10,10 +10,6 @@ module Metrics
       module Aggregation
         # Contains the implementation of the Drop aggregation
         class Drop
-          def initialize
-            @aggregation_temporality = nil
-          end
-
           def collect(start_time, end_time, data_points)
             data_points.values.map!(&:dup)
           end
@@ -28,10 +24,6 @@ def update(increment, attributes, data_points)
             )
             nil
           end
-
-          def aggregation_temporality
-            nil
-          end
         end
       end
     end

metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/last_value.rb

@@ -10,28 +10,14 @@ module Metrics
       module Aggregation
         # Contains the implementation of the LastValue aggregation
         class LastValue
-          def initialize(aggregation_temporality: :delta)
-            @aggregation_temporality = aggregation_temporality == :cumulative ? AggregationTemporality.cumulative : AggregationTemporality.delta
-          end
-
           def collect(start_time, end_time, data_points)
-            if @aggregation_temporality.delta?
-              # Set timestamps and 'move' data point values to result.
-              ndps = data_points.values.map! do |ndp|
-                ndp.start_time_unix_nano = start_time
-                ndp.time_unix_nano = end_time
-                ndp
-              end
-              data_points.clear
-              ndps
-            else
-              # Update timestamps and take a snapshot.
-              data_points.values.map! do |ndp|
-                ndp.start_time_unix_nano ||= start_time # Start time of a data point is from the first observation.
-                ndp.time_unix_nano = end_time
-                ndp.dup
-              end
+            ndps = data_points.values.map! do |ndp|
+              ndp.start_time_unix_nano = start_time
+              ndp.time_unix_nano = end_time
+              ndp
             end
+            data_points.clear
+            ndps
           end
 
           def update(increment, attributes, data_points)
@@ -44,10 +30,6 @@ def update(increment, attributes, data_points)
             )
             nil
           end
-
-          def aggregation_temporality
-            @aggregation_temporality.temporality
-          end
         end
       end
     end

metrics_sdk/lib/opentelemetry/sdk/metrics/state/metric_stream.rb

@@ -72,6 +72,7 @@ def update(value, attributes)
           def aggregate_metric_data(start_time, end_time, aggregation: nil)
             aggregator = aggregation || @default_aggregation
             is_monotonic = aggregator.respond_to?(:monotonic?) ? aggregator.monotonic? : nil
+            aggregation_temporality = aggregator.respond_to?(:aggregation_temporality) ? aggregator.aggregation_temporality : nil
 
             MetricData.new(
               @name,
@@ -81,7 +82,7 @@ def aggregate_metric_data(start_time, end_time, aggregation: nil)
               @meter_provider.resource,
               @instrumentation_scope,
               aggregator.collect(start_time, end_time, @data_points),
-              aggregator.aggregation_temporality,
+              aggregation_temporality,
               start_time,
               end_time,
               is_monotonic

metrics_sdk/test/opentelemetry/sdk/metrics/aggregation/last_value_test.rb

@@ -8,35 +8,12 @@
 
 describe OpenTelemetry::SDK::Metrics::Aggregation::LastValue do
   let(:data_points) { {} }
-  let(:last_value_aggregation) { OpenTelemetry::SDK::Metrics::Aggregation::LastValue.new(aggregation_temporality:) }
-  let(:aggregation_temporality) { :delta }
+  let(:last_value_aggregation) { OpenTelemetry::SDK::Metrics::Aggregation::LastValue.new }
 
   # Time in nano
   let(:start_time) { (Time.now.to_r * 1_000_000_000).to_i }
   let(:end_time) { ((Time.now + 60).to_r * 1_000_000_000).to_i }
 
-  describe '#initialize' do
-    it 'defaults to the delta aggregation temporality' do
-      exp = OpenTelemetry::SDK::Metrics::Aggregation::LastValue.new
-      _(exp.aggregation_temporality).must_equal :delta
-    end
-
-    it 'valid aggregation_temporality delta as symbol from parameters' do
-      exp = OpenTelemetry::SDK::Metrics::Aggregation::LastValue.new(aggregation_temporality: :delta)
-      _(exp.aggregation_temporality).must_equal :delta
-    end
-
-    it 'valid aggregation_temporality cumulative as symbol from parameters' do
-      exp = OpenTelemetry::SDK::Metrics::Aggregation::LastValue.new(aggregation_temporality: :cumulative)
-      _(exp.aggregation_temporality).must_equal :cumulative
-    end
-
-    it 'invalid aggregation_temporality pickles as symbol from parameters return to defaults delta' do
-      exp = OpenTelemetry::SDK::Metrics::Aggregation::LastValue.new(aggregation_temporality: :pickles)
-      _(exp.aggregation_temporality).must_equal :delta
-    end
-  end
-
   it 'sets the timestamps' do
     last_value_aggregation.update(0, {}, data_points)
     ndp = last_value_aggregation.collect(start_time, end_time, data_points)[0]

metrics_sdk/test/opentelemetry/sdk/metrics/instrument/gauge_test.rb

@@ -28,7 +28,6 @@
     _(last_snapshot[0].instrumentation_scope.name).must_equal('test')
     _(last_snapshot[0].data_points[0].attributes).must_equal('foo' => 'bar')
     _(last_snapshot[0].data_points[0].value).must_equal(-2)
-    _(last_snapshot[0].aggregation_temporality).must_equal(:delta)
   end
 
   it 'gauge should count 1 for last recording' do

metrics_sdk/test/opentelemetry/sdk/metrics/instrument/observable_gauge_test.rb

@@ -29,7 +29,6 @@
     _(last_snapshot[0].instrumentation_scope.name).must_equal('test')
     _(last_snapshot[0].data_points[0].value).must_equal(10)
     _(last_snapshot[0].data_points[0].attributes).must_equal({})
-    _(last_snapshot[0].aggregation_temporality).must_equal(:delta)
   end
 
   it 'counts with observe' do
@@ -49,6 +48,5 @@
 
     _(last_snapshot[0].data_points[1].value).must_equal(10)
     _(last_snapshot[0].data_points[1].attributes).must_equal({})
-    _(last_snapshot[0].aggregation_temporality).must_equal(:delta)
   end
 end