From 044336d9f8956e1d8115b22deaf32ac2000ebc2d Mon Sep 17 00:00:00 2001
From: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com>
Date: Wed, 16 Oct 2024 13:06:02 -0700
Subject: [PATCH 1/6] fix: Coerce aggregation_temporality to symbol (#1741)

The OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE env var sets the
temporality as a string. However, checks throughout the metrics SDK and
the OTLP exporter expect the temporality to be a symbol.

Now, when aggregations that use this env var are initialized, the
temporality will be coerced into a symbol.
---
 .../aggregation/explicit_bucket_histogram.rb  |  3 ++-
 .../sdk/metrics/aggregation/sum.rb            |  2 +-
 .../explicit_bucket_histogram_test.rb         | 21 +++++++++++++++++++
 .../sdk/metrics/aggregation/sum_test.rb       | 21 +++++++++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram.rb b/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram.rb
index 53ab4ae12..0d357e1d4 100644
--- a/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram.rb
+++ b/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram.rb
@@ -25,7 +25,8 @@ def initialize(
             boundaries: DEFAULT_BOUNDARIES,
             record_min_max: true
           )
-            @aggregation_temporality = aggregation_temporality
+
+            @aggregation_temporality = aggregation_temporality.to_sym
             @boundaries = boundaries && !boundaries.empty? ? boundaries.sort : nil
             @record_min_max = record_min_max
           end
diff --git a/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/sum.rb b/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/sum.rb
index f9e98d3e9..c2771b38e 100644
--- a/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/sum.rb
+++ b/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/sum.rb
@@ -15,7 +15,7 @@ class Sum
 
           def initialize(aggregation_temporality: ENV.fetch('OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE', :delta))
             # TODO: the default should be :cumulative, see issue #1555
-            @aggregation_temporality = aggregation_temporality
+            @aggregation_temporality = aggregation_temporality.to_sym
           end
 
           def collect(start_time, end_time, data_points)
diff --git a/metrics_sdk/test/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram_test.rb b/metrics_sdk/test/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram_test.rb
index 52ae01926..4666ce37e 100644
--- a/metrics_sdk/test/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram_test.rb
+++ b/metrics_sdk/test/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram_test.rb
@@ -22,6 +22,27 @@
   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::ExplicitBucketHistogram.new
+      _(exp.instance_variable_get(:@aggregation_temporality)).must_equal :delta
+    end
+
+    it 'sets parameters from the environment and converts them to symbols' do
+      exp = OpenTelemetry::TestHelpers.with_env('OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE' => 'potato') do
+        OpenTelemetry::SDK::Metrics::Aggregation::ExplicitBucketHistogram.new
+      end
+      _(exp.instance_variable_get(:@aggregation_temporality)).must_equal :potato
+    end
+
+    it 'prefers explicit parameters rather than the environment and converts them to symbols' do
+      exp = OpenTelemetry::TestHelpers.with_env('OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE' => 'potato') do
+        OpenTelemetry::SDK::Metrics::Aggregation::ExplicitBucketHistogram.new(aggregation_temporality: 'pickles')
+      end
+      _(exp.instance_variable_get(:@aggregation_temporality)).must_equal :pickles
+    end
+  end
+
   describe '#collect' do
     it 'returns all the data points' do
       ebh.update(0, {}, data_points)
diff --git a/metrics_sdk/test/opentelemetry/sdk/metrics/aggregation/sum_test.rb b/metrics_sdk/test/opentelemetry/sdk/metrics/aggregation/sum_test.rb
index 18e07ec32..66e7667ec 100644
--- a/metrics_sdk/test/opentelemetry/sdk/metrics/aggregation/sum_test.rb
+++ b/metrics_sdk/test/opentelemetry/sdk/metrics/aggregation/sum_test.rb
@@ -15,6 +15,27 @@
   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::ExplicitBucketHistogram.new
+      _(exp.instance_variable_get(:@aggregation_temporality)).must_equal :delta
+    end
+
+    it 'sets parameters from the environment and converts them to symbols' do
+      exp = OpenTelemetry::TestHelpers.with_env('OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE' => 'potato') do
+        OpenTelemetry::SDK::Metrics::Aggregation::ExplicitBucketHistogram.new
+      end
+      _(exp.instance_variable_get(:@aggregation_temporality)).must_equal :potato
+    end
+
+    it 'prefers explicit parameters rather than the environment and converts them to symbols' do
+      exp = OpenTelemetry::TestHelpers.with_env('OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE' => 'potato') do
+        OpenTelemetry::SDK::Metrics::Aggregation::ExplicitBucketHistogram.new(aggregation_temporality: 'pickles')
+      end
+      _(exp.instance_variable_get(:@aggregation_temporality)).must_equal :pickles
+    end
+  end
+
   it 'sets the timestamps' do
     sum_aggregation.update(0, {}, data_points)
     ndp = sum_aggregation.collect(start_time, end_time, data_points)[0]

From cb05fa505bab68eef187018d9a248735e6625b0f Mon Sep 17 00:00:00 2001
From: Xuan <112967240+xuan-cao-swi@users.noreply.github.com>
Date: Wed, 16 Oct 2024 17:20:59 -0400
Subject: [PATCH 2/6] Update Instrument validation and move to SDK (#1735)

Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com>
---
 .../lib/opentelemetry/metrics/meter.rb        | 13 ----
 .../test/opentelemetry/metrics/meter_test.rb  | 57 ++++++-----------
 .../lib/opentelemetry/sdk/metrics/meter.rb    | 13 ++++
 .../opentelemetry/sdk/metrics/meter_test.rb   | 61 +++++++++++++++++++
 4 files changed, 92 insertions(+), 52 deletions(-)

diff --git a/metrics_api/lib/opentelemetry/metrics/meter.rb b/metrics_api/lib/opentelemetry/metrics/meter.rb
index 1335437c0..f44b58611 100644
--- a/metrics_api/lib/opentelemetry/metrics/meter.rb
+++ b/metrics_api/lib/opentelemetry/metrics/meter.rb
@@ -15,8 +15,6 @@ class Meter
       UP_DOWN_COUNTER = Instrument::UpDownCounter.new
       OBSERVABLE_UP_DOWN_COUNTER = Instrument::ObservableUpDownCounter.new
 
-      NAME_REGEX = /\A[a-zA-Z][-.\w]{0,62}\z/
-
       private_constant(:COUNTER, :OBSERVABLE_COUNTER, :HISTOGRAM, :OBSERVABLE_GAUGE, :UP_DOWN_COUNTER, :OBSERVABLE_UP_DOWN_COUNTER)
 
       DuplicateInstrumentError = Class.new(OpenTelemetry::Error)
@@ -56,23 +54,12 @@ def create_observable_up_down_counter(name, callback:, unit: nil, description: n
       private
 
       def create_instrument(kind, name, unit, description, callback)
-        raise InstrumentNameError if name.nil?
-        raise InstrumentNameError if name.empty?
-        raise InstrumentNameError unless NAME_REGEX.match?(name)
-        raise InstrumentUnitError if unit && (!unit.ascii_only? || unit.size > 63)
-        raise InstrumentDescriptionError if description && (description.size > 1023 || !utf8mb3_encoding?(description.dup))
-
         @mutex.synchronize do
           OpenTelemetry.logger.warn("duplicate instrument registration occurred for instrument #{name}") if @instrument_registry.include? name
 
           @instrument_registry[name] = yield
         end
       end
-
-      def utf8mb3_encoding?(string)
-        string.force_encoding('UTF-8').valid_encoding? &&
-          string.each_char { |c| return false if c.bytesize >= 4 }
-      end
     end
   end
 end
diff --git a/metrics_api/test/opentelemetry/metrics/meter_test.rb b/metrics_api/test/opentelemetry/metrics/meter_test.rb
index 493c373b5..ec9b53e6e 100644
--- a/metrics_api/test/opentelemetry/metrics/meter_test.rb
+++ b/metrics_api/test/opentelemetry/metrics/meter_test.rb
@@ -7,11 +7,6 @@
 require 'test_helper'
 
 describe OpenTelemetry::Metrics::Meter do
-  INSTRUMENT_NAME_ERROR = OpenTelemetry::Metrics::Meter::InstrumentNameError
-  INSTRUMENT_UNIT_ERROR = OpenTelemetry::Metrics::Meter::InstrumentUnitError
-  INSTRUMENT_DESCRIPTION_ERROR = OpenTelemetry::Metrics::Meter::InstrumentDescriptionError
-  DUPLICATE_INSTRUMENT_ERROR = OpenTelemetry::Metrics::Meter::DuplicateInstrumentError
-
   let(:meter_provider) { OpenTelemetry::Metrics::MeterProvider.new }
   let(:meter) { meter_provider.meter('test-meter') }
 
@@ -24,50 +19,34 @@
       end
     end
 
-    it 'instrument name must not be nil' do
-      _(-> { meter.create_counter(nil) }).must_raise(INSTRUMENT_NAME_ERROR)
-    end
-
-    it 'instument name must not be an empty string' do
-      _(-> { meter.create_counter('') }).must_raise(INSTRUMENT_NAME_ERROR)
-    end
-
-    it 'instrument name must have an alphabetic first character' do
-      _(meter.create_counter('one_counter'))
-      _(-> { meter.create_counter('1_counter') }).must_raise(INSTRUMENT_NAME_ERROR)
-    end
-
-    it 'instrument name must not exceed 63 character limit' do
-      long_name = 'a' * 63
-      meter.create_counter(long_name)
-      _(-> { meter.create_counter(long_name + 'a') }).must_raise(INSTRUMENT_NAME_ERROR)
+    it 'test create_counter' do
+      counter = meter.create_counter('test')
+      _(counter.class).must_equal(OpenTelemetry::Metrics::Instrument::Counter)
     end
 
-    it 'instrument name must belong to alphanumeric characters, _, ., and -' do
-      meter.create_counter('a_-..-_a')
-      _(-> { meter.create_counter('a@') }).must_raise(INSTRUMENT_NAME_ERROR)
-      _(-> { meter.create_counter('a!') }).must_raise(INSTRUMENT_NAME_ERROR)
+    it 'test create_histogram' do
+      counter = meter.create_histogram('test')
+      _(counter.class).must_equal(OpenTelemetry::Metrics::Instrument::Histogram)
     end
 
-    it 'instrument unit must be ASCII' do
-      _(-> { meter.create_counter('a_counter', unit: 'á') }).must_raise(INSTRUMENT_UNIT_ERROR)
+    it 'test create_up_down_counter' do
+      counter = meter.create_up_down_counter('test')
+      _(counter.class).must_equal(OpenTelemetry::Metrics::Instrument::UpDownCounter)
     end
 
-    it 'instrument unit must not exceed 63 characters' do
-      long_unit = 'a' * 63
-      meter.create_counter('a_counter', unit: long_unit)
-      _(-> { meter.create_counter('b_counter', unit: long_unit + 'a') }).must_raise(INSTRUMENT_UNIT_ERROR)
+    it 'test create_observable_counter' do
+      counter = meter.create_observable_counter('test', callback: -> {})
+      _(counter.class).must_equal(OpenTelemetry::Metrics::Instrument::ObservableCounter)
     end
 
-    it 'instrument description must be utf8mb3' do
-      _(-> { meter.create_counter('a_counter', description: '💩'.dup) }).must_raise(INSTRUMENT_DESCRIPTION_ERROR)
-      _(-> { meter.create_counter('b_counter', description: "\xc2".dup) }).must_raise(INSTRUMENT_DESCRIPTION_ERROR)
+    it 'test create_observable_gauge' do
+      counter = meter.create_observable_gauge('test', callback: -> {})
+      _(counter.class).must_equal(OpenTelemetry::Metrics::Instrument::ObservableGauge)
     end
 
-    it 'instrument description must not exceed 1023 characters' do
-      long_description = 'a' * 1023
-      meter.create_counter('a_counter', description: long_description)
-      _(-> { meter.create_counter('b_counter', description: long_description + 'a') }).must_raise(INSTRUMENT_DESCRIPTION_ERROR)
+    it 'test create_observable_up_down_counter' do
+      counter = meter.create_observable_up_down_counter('test', callback: -> {})
+      _(counter.class).must_equal(OpenTelemetry::Metrics::Instrument::ObservableUpDownCounter)
     end
   end
 end
diff --git a/metrics_sdk/lib/opentelemetry/sdk/metrics/meter.rb b/metrics_sdk/lib/opentelemetry/sdk/metrics/meter.rb
index 8db3ea992..1307817ec 100644
--- a/metrics_sdk/lib/opentelemetry/sdk/metrics/meter.rb
+++ b/metrics_sdk/lib/opentelemetry/sdk/metrics/meter.rb
@@ -11,6 +11,8 @@ module SDK
     module Metrics
       # {Meter} is the SDK implementation of {OpenTelemetry::Metrics::Meter}.
       class Meter < OpenTelemetry::Metrics::Meter
+        NAME_REGEX = /\A[a-zA-Z][-.\w]{0,62}\z/
+
         # @api private
         #
         # Returns a new {Meter} instance.
@@ -34,6 +36,12 @@ def add_metric_reader(metric_reader)
         end
 
         def create_instrument(kind, name, unit, description, callback)
+          raise InstrumentNameError if name.nil?
+          raise InstrumentNameError if name.empty?
+          raise InstrumentNameError unless NAME_REGEX.match?(name)
+          raise InstrumentUnitError if unit && (!unit.ascii_only? || unit.size > 63)
+          raise InstrumentDescriptionError if description && (description.size > 1023 || !utf8mb3_encoding?(description.dup))
+
           super do
             case kind
             when :counter then OpenTelemetry::SDK::Metrics::Instrument::Counter.new(name, unit, description, @instrumentation_scope, @meter_provider)
@@ -45,6 +53,11 @@ def create_instrument(kind, name, unit, description, callback)
             end
           end
         end
+
+        def utf8mb3_encoding?(string)
+          string.force_encoding('UTF-8').valid_encoding? &&
+            string.each_char { |c| return false if c.bytesize >= 4 }
+        end
       end
     end
   end
diff --git a/metrics_sdk/test/opentelemetry/sdk/metrics/meter_test.rb b/metrics_sdk/test/opentelemetry/sdk/metrics/meter_test.rb
index 6a6cba2fd..e8415d8d3 100644
--- a/metrics_sdk/test/opentelemetry/sdk/metrics/meter_test.rb
+++ b/metrics_sdk/test/opentelemetry/sdk/metrics/meter_test.rb
@@ -58,4 +58,65 @@
       _(instrument).must_be_instance_of OpenTelemetry::SDK::Metrics::Instrument::ObservableUpDownCounter
     end
   end
+
+  describe 'creating an instrument' do
+    INSTRUMENT_NAME_ERROR = OpenTelemetry::Metrics::Meter::InstrumentNameError
+    INSTRUMENT_UNIT_ERROR = OpenTelemetry::Metrics::Meter::InstrumentUnitError
+    INSTRUMENT_DESCRIPTION_ERROR = OpenTelemetry::Metrics::Meter::InstrumentDescriptionError
+    DUPLICATE_INSTRUMENT_ERROR = OpenTelemetry::Metrics::Meter::DuplicateInstrumentError
+
+    it 'duplicate instrument registration logs a warning' do
+      OpenTelemetry::TestHelpers.with_test_logger do |log_stream|
+        meter.create_counter('a_counter')
+        meter.create_counter('a_counter')
+        _(log_stream.string).must_match(/duplicate instrument registration occurred for instrument a_counter/)
+      end
+    end
+
+    it 'instrument name must not be nil' do
+      _(-> { meter.create_counter(nil) }).must_raise(INSTRUMENT_NAME_ERROR)
+    end
+
+    it 'instument name must not be an empty string' do
+      _(-> { meter.create_counter('') }).must_raise(INSTRUMENT_NAME_ERROR)
+    end
+
+    it 'instrument name must have an alphabetic first character' do
+      _(meter.create_counter('one_counter'))
+      _(-> { meter.create_counter('1_counter') }).must_raise(INSTRUMENT_NAME_ERROR)
+    end
+
+    it 'instrument name must not exceed 63 character limit' do
+      long_name = 'a' * 63
+      meter.create_counter(long_name)
+      _(-> { meter.create_counter(long_name + 'a') }).must_raise(INSTRUMENT_NAME_ERROR)
+    end
+
+    it 'instrument name must belong to alphanumeric characters, _, ., and -' do
+      meter.create_counter('a_-..-_a')
+      _(-> { meter.create_counter('a@') }).must_raise(INSTRUMENT_NAME_ERROR)
+      _(-> { meter.create_counter('a!') }).must_raise(INSTRUMENT_NAME_ERROR)
+    end
+
+    it 'instrument unit must be ASCII' do
+      _(-> { meter.create_counter('a_counter', unit: 'á') }).must_raise(INSTRUMENT_UNIT_ERROR)
+    end
+
+    it 'instrument unit must not exceed 63 characters' do
+      long_unit = 'a' * 63
+      meter.create_counter('a_counter', unit: long_unit)
+      _(-> { meter.create_counter('b_counter', unit: long_unit + 'a') }).must_raise(INSTRUMENT_UNIT_ERROR)
+    end
+
+    it 'instrument description must be utf8mb3' do
+      _(-> { meter.create_counter('a_counter', description: '💩'.dup) }).must_raise(INSTRUMENT_DESCRIPTION_ERROR)
+      _(-> { meter.create_counter('b_counter', description: "\xc2".dup) }).must_raise(INSTRUMENT_DESCRIPTION_ERROR)
+    end
+
+    it 'instrument description must not exceed 1023 characters' do
+      long_description = 'a' * 1023
+      meter.create_counter('a_counter', description: long_description)
+      _(-> { meter.create_counter('b_counter', description: long_description + 'a') }).must_raise(INSTRUMENT_DESCRIPTION_ERROR)
+    end
+  end
 end

From 4c9f7e1a942663856cade347d84cff67ac4f0c3d Mon Sep 17 00:00:00 2001
From: Xuan <112967240+xuan-cao-swi@users.noreply.github.com>
Date: Wed, 16 Oct 2024 17:33:56 -0400
Subject: [PATCH 3/6] fix: add warning if invalid meter name given (#1734)

Co-authored-by: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com>
---
 metrics_sdk/lib/opentelemetry/sdk/metrics/meter_provider.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metrics_sdk/lib/opentelemetry/sdk/metrics/meter_provider.rb b/metrics_sdk/lib/opentelemetry/sdk/metrics/meter_provider.rb
index 1f3f86705..4538a88db 100644
--- a/metrics_sdk/lib/opentelemetry/sdk/metrics/meter_provider.rb
+++ b/metrics_sdk/lib/opentelemetry/sdk/metrics/meter_provider.rb
@@ -37,6 +37,7 @@ def meter(name, version: nil)
             OpenTelemetry.logger.warn 'calling MeterProvider#meter after shutdown, a noop meter will be returned.'
             OpenTelemetry::Metrics::Meter.new
           else
+            OpenTelemetry.logger.warn "Invalid meter name provided: #{name.nil? ? 'nil' : 'empty'} value" if name.to_s.empty?
             @mutex.synchronize { @meter_registry[Key.new(name, version)] ||= Meter.new(name, version, self) }
           end
         end

From 0c372cdb7bc8f087cc5d2e3ff148133ab3a6686b Mon Sep 17 00:00:00 2001
From: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com>
Date: Tue, 22 Oct 2024 14:56:14 -0700
Subject: [PATCH 4/6] test: Resolve Truffle ruby intermittent failures on
 exporters (#1752)

* test: Use Zlib.gunzip to compare body with estr

Zlib.gzip adds a timestamp, which may be different than the one in the
encoded req.body due to the test timing, and may cause an intermittent
failure. Compare the unzipped request with the encoded_estr to avoid
the timestamp interfering with the equality check.

Co-authored-by: Tanna McClure <tannalynn@users.noreply.github.com>

* test: Remove skip for TruffleRuby

The assertions in this test differ from the other intermittent failures.
Hopefully, the test is not failing and was skipped because the name
of the test is the same as others.

* chore: Remove comment

---------

Co-authored-by: Tanna McClure <tannalynn@users.noreply.github.com>
---
 .../test/opentelemetry/exporter/otlp/common/common_test.rb   | 3 ---
 .../opentelemetry/exporter/otlp/http/trace_exporter_test.rb  | 5 +----
 .../exporter/otlp/metrics/metrics_exporter_test.rb           | 4 +---
 .../otlp/test/opentelemetry/exporter/otlp/exporter_test.rb   | 5 +----
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/exporter/otlp-common/test/opentelemetry/exporter/otlp/common/common_test.rb b/exporter/otlp-common/test/opentelemetry/exporter/otlp/common/common_test.rb
index 1d079711d..ea0635ff1 100644
--- a/exporter/otlp-common/test/opentelemetry/exporter/otlp/common/common_test.rb
+++ b/exporter/otlp-common/test/opentelemetry/exporter/otlp/common/common_test.rb
@@ -41,9 +41,6 @@
     end
 
     it 'translates all the things' do
-      # TODO: See issue #1507 to fix
-      skip 'Intermittently fails' if RUBY_ENGINE == 'truffleruby'
-
       OpenTelemetry.tracer_provider = OpenTelemetry::SDK::Trace::TracerProvider.new(resource: OpenTelemetry::SDK::Resources::Resource.telemetry_sdk)
       tracer = OpenTelemetry.tracer_provider.tracer('tracer', 'v0.0.1')
       other_tracer = OpenTelemetry.tracer_provider.tracer('other_tracer')
diff --git a/exporter/otlp-http/test/opentelemetry/exporter/otlp/http/trace_exporter_test.rb b/exporter/otlp-http/test/opentelemetry/exporter/otlp/http/trace_exporter_test.rb
index 11f286595..1e3cf78ef 100644
--- a/exporter/otlp-http/test/opentelemetry/exporter/otlp/http/trace_exporter_test.rb
+++ b/exporter/otlp-http/test/opentelemetry/exporter/otlp/http/trace_exporter_test.rb
@@ -468,9 +468,6 @@
     end
 
     it 'translates all the things' do
-      # TODO: See issue #1507 to fix
-      skip 'Intermittently fails' if RUBY_ENGINE == 'truffleruby'
-
       stub_request(:post, 'http://localhost:4318/v1/traces').to_return(status: 200)
       processor = OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(exporter)
       tracer = OpenTelemetry.tracer_provider.tracer('tracer', 'v0.0.1')
@@ -635,7 +632,7 @@
       )
 
       assert_requested(:post, 'http://localhost:4318/v1/traces') do |req|
-        req.body == Zlib.gzip(encoded_etsr)
+        Zlib.gunzip(req.body) == encoded_etsr
       end
     end
   end
diff --git a/exporter/otlp-metrics/test/opentelemetry/exporter/otlp/metrics/metrics_exporter_test.rb b/exporter/otlp-metrics/test/opentelemetry/exporter/otlp/metrics/metrics_exporter_test.rb
index bd9d45876..93176ce33 100644
--- a/exporter/otlp-metrics/test/opentelemetry/exporter/otlp/metrics/metrics_exporter_test.rb
+++ b/exporter/otlp-metrics/test/opentelemetry/exporter/otlp/metrics/metrics_exporter_test.rb
@@ -556,8 +556,6 @@
     end
 
     it 'translates all the things' do
-      skip 'Intermittently fails' if RUBY_ENGINE == 'truffleruby'
-
       stub_request(:post, 'http://localhost:4318/v1/metrics').to_return(status: 200)
       meter_provider.add_metric_reader(exporter)
       meter   = meter_provider.meter('test')
@@ -639,7 +637,7 @@
       )
 
       assert_requested(:post, 'http://localhost:4318/v1/metrics') do |req|
-        req.body == Zlib.gzip(encoded_etsr) # is asserting that the body of the HTTP request is equal to the result of gzipping the encoded_etsr.
+        Zlib.gunzip(req.body) == encoded_etsr
       end
     end
   end
diff --git a/exporter/otlp/test/opentelemetry/exporter/otlp/exporter_test.rb b/exporter/otlp/test/opentelemetry/exporter/otlp/exporter_test.rb
index f37fc3a8d..2303f2e5d 100644
--- a/exporter/otlp/test/opentelemetry/exporter/otlp/exporter_test.rb
+++ b/exporter/otlp/test/opentelemetry/exporter/otlp/exporter_test.rb
@@ -611,9 +611,6 @@
     end
 
     it 'translates all the things' do
-      # TODO: See issue #1507 to fix
-      skip 'Intermittently fails' if RUBY_ENGINE == 'truffleruby'
-
       stub_request(:post, 'http://localhost:4318/v1/traces').to_return(status: 200)
       processor = OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(exporter)
       tracer = OpenTelemetry.tracer_provider.tracer('tracer', 'v0.0.1')
@@ -778,7 +775,7 @@
       )
 
       assert_requested(:post, 'http://localhost:4318/v1/traces') do |req|
-        req.body == Zlib.gzip(encoded_etsr)
+        Zlib.gunzip(req.body) == encoded_etsr
       end
     end
   end

From 555b062ef9421784c132aa9b97b29ec637b13b0f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:13:49 -0700
Subject: [PATCH 5/6] release: Release 2 gems (#1754)

* release: Release 2 gems

* opentelemetry-metrics-api 0.1.1 (was 0.1.0)
* opentelemetry-metrics-sdk 0.3.0 (was 0.2.0)

* chore: Update CHANGELOG for metrics api

* chore: Increase minimum metrics API version

Refactors prevent a lower version from being compatible with the latest
metrics SDK

* chore: Use fixed instead of added in changelog

---------

Co-authored-by: Daniel Azuma <dazuma@gmail.com>
Co-authored-by: Kayla Reopelle <kreopelle@newrelic.com>
---
 metrics_api/CHANGELOG.md                             | 4 ++++
 metrics_api/lib/opentelemetry/metrics/version.rb     | 2 +-
 metrics_sdk/CHANGELOG.md                             | 6 ++++++
 metrics_sdk/lib/opentelemetry/sdk/metrics/version.rb | 2 +-
 metrics_sdk/opentelemetry-metrics-sdk.gemspec        | 2 +-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/metrics_api/CHANGELOG.md b/metrics_api/CHANGELOG.md
index bdadf3885..afbcca5ea 100644
--- a/metrics_api/CHANGELOG.md
+++ b/metrics_api/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-metrics-api
 
+### v0.1.1 / 2024-10-22
+
+* FIXED: Refactor instrument validation
+
 ### v0.1.0 / 2024-07-31
 
 Initial release.
diff --git a/metrics_api/lib/opentelemetry/metrics/version.rb b/metrics_api/lib/opentelemetry/metrics/version.rb
index a1238c721..ab557fc81 100644
--- a/metrics_api/lib/opentelemetry/metrics/version.rb
+++ b/metrics_api/lib/opentelemetry/metrics/version.rb
@@ -7,6 +7,6 @@
 module OpenTelemetry
   module Metrics
     ## Current OpenTelemetry metrics version
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end
diff --git a/metrics_sdk/CHANGELOG.md b/metrics_sdk/CHANGELOG.md
index 1328411e2..d8be534a1 100644
--- a/metrics_sdk/CHANGELOG.md
+++ b/metrics_sdk/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History: opentelemetry-metrics-sdk
 
+### v0.3.0 / 2024-10-22
+
+* ADDED: Add basic metrics view
+* FIXED: Coerce aggregation_temporality to symbol
+* FIXED: Add warning if invalid meter name given
+
 ### v0.2.0 / 2024-08-27
 
 * ADDED: Add basic periodic exporting metric_reader
diff --git a/metrics_sdk/lib/opentelemetry/sdk/metrics/version.rb b/metrics_sdk/lib/opentelemetry/sdk/metrics/version.rb
index 4016895fb..17e0d9570 100644
--- a/metrics_sdk/lib/opentelemetry/sdk/metrics/version.rb
+++ b/metrics_sdk/lib/opentelemetry/sdk/metrics/version.rb
@@ -8,7 +8,7 @@ module OpenTelemetry
   module SDK
     module Metrics
       # Current OpenTelemetry metrics sdk version
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     end
   end
 end
diff --git a/metrics_sdk/opentelemetry-metrics-sdk.gemspec b/metrics_sdk/opentelemetry-metrics-sdk.gemspec
index f7459963e..1919305ac 100644
--- a/metrics_sdk/opentelemetry-metrics-sdk.gemspec
+++ b/metrics_sdk/opentelemetry-metrics-sdk.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'opentelemetry-api', '~> 1.1'
-  spec.add_dependency 'opentelemetry-metrics-api'
+  spec.add_dependency 'opentelemetry-metrics-api', '~> 0.1.1'
   spec.add_dependency 'opentelemetry-sdk', '~> 1.2'
 
   spec.add_development_dependency 'benchmark-ipsa', '~> 0.2.0'

From be01344514c533a1760a507b8d6133acffda22af Mon Sep 17 00:00:00 2001
From: Kayla Reopelle <87386821+kaylareopelle@users.noreply.github.com>
Date: Fri, 15 Nov 2024 13:05:15 -0800
Subject: [PATCH 6/6] test: Add workaround for windows test failure (#1751)

We have to instantiate the processor outside of the stub so that the
stub can be applied to the processor, but the method we're stubbing
runs on initialization, so we sometimes run out of expectations.

If we explicitly set 'OTEL_RUBY_BLRP_START_THREAD_ON_BOOT' to 'false'
for the 'removes the older log records from the batch if full' test, the
stubbed `work` method will not run outside of the stub block.

Co-authored-by: Tanna McClure <tannalynn@users.noreply.github.com>
---
 .../export/batch_log_record_processor_test.rb | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/logs_sdk/test/opentelemetry/sdk/logs/export/batch_log_record_processor_test.rb b/logs_sdk/test/opentelemetry/sdk/logs/export/batch_log_record_processor_test.rb
index a7ed0c362..cff2b718d 100644
--- a/logs_sdk/test/opentelemetry/sdk/logs/export/batch_log_record_processor_test.rb
+++ b/logs_sdk/test/opentelemetry/sdk/logs/export/batch_log_record_processor_test.rb
@@ -186,20 +186,23 @@ def to_log_record_data
     end
 
     it 'removes the older log records from the batch if full' do
-      processor = BatchLogRecordProcessor.new(TestExporter.new, max_queue_size: 1, max_export_batch_size: 1)
+      # Windows intermittently fails if we don't set this
+      OpenTelemetry::TestHelpers.with_env('OTEL_RUBY_BLRP_START_THREAD_ON_BOOT' => 'false') do
+        processor = BatchLogRecordProcessor.new(TestExporter.new, max_queue_size: 1, max_export_batch_size: 1)
 
-      # Don't actually try to export, we're looking at the log records array
-      processor.stub(:work, nil) do
-        older_log_record = TestLogRecord.new
-        newest_log_record = TestLogRecord.new
+        # Don't actually try to export, we're looking at the log records array
+        processor.stub(:work, nil) do
+          older_log_record = TestLogRecord.new
+          newest_log_record = TestLogRecord.new
 
-        processor.on_emit(older_log_record, mock_context)
-        processor.on_emit(newest_log_record, mock_context)
+          processor.on_emit(older_log_record, mock_context)
+          processor.on_emit(newest_log_record, mock_context)
 
-        records = processor.instance_variable_get(:@log_records)
+          records = processor.instance_variable_get(:@log_records)
 
-        assert_includes(records, newest_log_record)
-        refute_includes(records, older_log_record)
+          assert_includes(records, newest_log_record)
+          refute_includes(records, older_log_record)
+        end
       end
     end