Add tests for environment variable

Author: hannahramadan

instrumentation/http/lib/opentelemetry/instrumentation/http/instrumentation.rb

@@ -22,12 +22,12 @@ class Instrumentation < OpenTelemetry::Instrumentation::Base
         option :span_name_formatter, default: nil, validate: :callable
 
         def determine_semconv
-          stability_opt_in = ENV.fetch('OTEL_SEMCONV_STABILITY_OPT_IN', nil)
-          values = stability_opt_in&.split(',')
+          stability_opt_in = ENV.fetch('OTEL_SEMCONV_STABILITY_OPT_IN', '')
+          values = stability_opt_in.split(',').map(&:strip)
 
-          if values&.include?('http/dup')
+          if values.include?('http/dup')
             'dup'
-          elsif values&.include?('http')
+          elsif values.include?('http')
             'stable'
           else
             'old'

instrumentation/http/test/instrumentation/http/patches/dup/client_test.rb

@@ -23,7 +23,7 @@
   before do
     skip unless ENV['BUNDLE_GEMFILE'].include?('dup')
 
-    ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http/dup, database'
+    ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http/dup'
     exporter.reset
     @orig_propagation = OpenTelemetry.propagation
     propagator = OpenTelemetry::Trace::Propagation::TraceContext.text_map_propagator
@@ -44,6 +44,29 @@
     OpenTelemetry.propagation = @orig_propagation
   end
 
+  describe 'installation' do
+    it 'applies the correct patch when stability options include only http/dup and database' do
+      ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http/dup, database'
+
+      # simulate a fresh install:
+      instrumentation.instance_variable_set(:@installed, false)
+      instrumentation.install(config)
+
+      _(HTTP::Client.ancestors).must_include OpenTelemetry::Instrumentation::HTTP::Patches::Dup::Client
+    end
+
+    it 'applies the http/dup patch and excludes the Stable patch when both http and http/dup are present' do
+      ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http, http/dup'
+
+      # simulate a fresh install:
+      instrumentation.instance_variable_set(:@installed, false)
+      instrumentation.install(config)
+
+      _(HTTP::Client.ancestors).must_include OpenTelemetry::Instrumentation::HTTP::Patches::Dup::Client
+      _(HTTP::Client.ancestors).wont_include OpenTelemetry::Instrumentation::HTTP::Patches::Stable::Client
+    end
+  end
+
   describe '#perform' do
     it 'traces a simple request' do
       HTTP.get('http://example.com/success')

instrumentation/http/test/instrumentation/http/patches/dup/connection_test.rb

@@ -17,7 +17,7 @@
   before do
     skip unless ENV['BUNDLE_GEMFILE'].include?('dup')
 
-    ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http/dup, database'
+    ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http/dup'
     exporter.reset
     instrumentation.install({})
   end
@@ -28,6 +28,15 @@
     instrumentation.instance_variable_set(:@installed, false)
   end
 
+  describe 'installation' do
+    it 'installs the patch when env var has multiple configs' do
+      ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http/dup, database'
+      instrumentation.install({}) # simulate a fresh install:
+
+      _(HTTP::Connection.ancestors).must_include OpenTelemetry::Instrumentation::HTTP::Patches::Dup::Connection
+    end
+  end
+
   describe '#connect' do
     it 'emits span on connect' do
       WebMock.allow_net_connect!

instrumentation/http/test/instrumentation/http/patches/old/client_test.rb

@@ -42,6 +42,18 @@
     OpenTelemetry.propagation = @orig_propagation
   end
 
+  describe 'installation' do
+    it 'applies the correct patch when stability options do not include HTTP stability modes' do
+      ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'database'
+
+      # simulate a fresh install:
+      instrumentation.instance_variable_set(:@installed, false)
+      instrumentation.install(config)
+
+      _(HTTP::Client.ancestors).must_include OpenTelemetry::Instrumentation::HTTP::Patches::Old::Client
+    end
+  end
+
   describe '#perform' do
     it 'traces a simple request' do
       HTTP.get('http://example.com/success')

instrumentation/http/test/instrumentation/http/patches/old/connection.rb

@@ -24,6 +24,18 @@
   # Force re-install of instrumentation
   after { instrumentation.instance_variable_set(:@installed, false) }
 
+  describe 'installation' do
+    it 'applies the correct patch when stability options do not include HTTP stability modes' do
+      ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'database'
+
+      # simulate a fresh install:
+      instrumentation.instance_variable_set(:@installed, false)
+      instrumentation.install(config)
+
+      _(HTTP::Connection.ancestors).must_include OpenTelemetry::Instrumentation::HTTP::Patches::Old::Connection
+    end
+  end
+
   describe '#connect' do
     it 'emits span on connect' do
       WebMock.allow_net_connect!

instrumentation/http/test/instrumentation/http/patches/stable/client_test.rb

@@ -45,6 +45,18 @@
     OpenTelemetry.propagation = @orig_propagation
   end
 
+  describe 'installation' do
+    it 'applies the correct patch when stability options include only http/dup and database' do
+      ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http, database'
+
+      # simulate a fresh install:
+      instrumentation.instance_variable_set(:@installed, false)
+      instrumentation.install(config)
+
+      _(HTTP::Client.ancestors).must_include OpenTelemetry::Instrumentation::HTTP::Patches::Stable::Client
+    end
+  end
+
   describe '#perform' do
     it 'traces a simple request' do
       HTTP.get('http://example.com/success')

instrumentation/http/test/instrumentation/http/patches/stable/connection.rb

@@ -28,6 +28,15 @@
     instrumentation.instance_variable_set(:@installed, false)
   end
 
+  describe 'installation' do
+    it 'installs the patch when env var has multiple configs' do
+      ENV['OTEL_SEMCONV_STABILITY_OPT_IN'] = 'http/dup, database'
+      instrumentation.install({}) # simulate a fresh install:
+
+     _(HTTP::Connection.ancestors).must_include OpenTelemetry::Instrumentation::HTTP::Patches::Dup::Connection
+    end
+  end
+
   describe '#connect' do
     it 'emits span on connect' do
       WebMock.allow_net_connect!