Test refactor

Author: hannahramadan

instrumentation/http/test/instrumentation/http/instrumentation_test.rb

@@ -38,4 +38,30 @@
       _(instrumentation.install({})).must_equal(true)
     end
   end
+
+  describe 'determine_semconv' do
+    it 'returns "dup" when OTEL_SEMCONV_STABILITY_OPT_IN includes other configs' do
+      OpenTelemetry::TestHelpers.with_env('OTEL_SEMCONV_STABILITY_OPT_IN' => 'http/dup, database') do
+        _(determine_semconv).must_equal('dup')
+      end
+    end
+
+    it 'returns "dup" when OTEL_SEMCONV_STABILITY_OPT_IN includes both http/dup and http' do
+      OpenTelemetry::TestHelpers.with_env('OTEL_SEMCONV_STABILITY_OPT_IN' => 'http/dup, http') do
+        _(determine_semconv).must_equal('dup')
+      end
+    end
+
+    it 'returns "stable" when OTEL_SEMCONV_STABILITY_OPT_IN is http' do
+      OpenTelemetry::TestHelpers.with_env('OTEL_SEMCONV_STABILITY_OPT_IN' => 'http') do
+        _(determine_semconv).must_equal('stable')
+      end
+    end
+
+    it 'returns "old" when OTEL_SEMCONV_STABILITY_OPT_IN is empty' do
+      OpenTelemetry::TestHelpers.with_env('OTEL_SEMCONV_STABILITY_OPT_IN' => '') do
+        _(determine_semconv).must_equal('old')
+      end
+    end
+  end
 end

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

@@ -44,27 +44,6 @@
     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

@@ -28,15 +28,6 @@
     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,17 +42,6 @@
     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,15 +24,6 @@
   # 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'
-      instrumentation.install({}) # simulate a fresh install
-
-      _(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,17 +45,6 @@
     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,15 +28,6 @@
     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!