fix: start simplecov before library code is loaded

open-telemetry · Jan 24, 2025 · 6faa684 · 6faa684
1 parent f1ec3e7
commit 6faa684
Show file tree

Hide file tree

Showing 59 changed files with 73 additions and 39 deletions.
diff --git a/.simplecov b/.simplecov
@@ -0,0 +1,15 @@
+require 'digest'
+
+digest = Digest::MD5.new
+digest.update('test')
+digest.update(ENV.fetch('BUNDLE_GEMFILE', 'gemfile')) if ENV['APPRAISAL_INITIALIZED']
+
+ENV['ENABLE_COVERAGE'] ||= 1
+
+if ENV['ENABLE_COVERAGE'].to_i.positive?
+  SimpleCov.command_name(digest.hexdigest)
+  SimpleCov.minimum_coverage(85)
+  SimpleCov.start do
+    add_filter %r{^/test/}
+  end
+end
diff --git a/helpers/mysql/test/test_helper.rb b/helpers/mysql/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/action_mailer/test/test_helper.rb b/instrumentation/action_mailer/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'logger'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)

diff --git a/instrumentation/action_pack/test/test_helper.rb b/instrumentation/action_pack/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'logger'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)

diff --git a/instrumentation/action_view/test/test_helper.rb b/instrumentation/action_view/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'logger'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)

diff --git a/instrumentation/active_job/test/test_helper.rb b/instrumentation/active_job/test/test_helper.rb
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 ENV['OTEL_LOG_LEVEL'] ||= 'fatal'
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/active_model_serializers/test/test_helper.rb b/instrumentation/active_model_serializers/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/active_record/test/test_helper.rb b/instrumentation/active_record/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/active_support/test/test_helper.rb b/instrumentation/active_support/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/all/test/test_helper.rb b/instrumentation/all/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/aws_lambda/test/test_helper.rb b/instrumentation/aws_lambda/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/aws_sdk/test/test_helper.rb b/instrumentation/aws_sdk/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/base/test/test_helper.rb b/instrumentation/base/test/test_helper.rb
@@ -4,12 +4,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 
-SimpleCov.start
-SimpleCov.minimum_coverage 85
-
 require 'opentelemetry-instrumentation-base'
 require 'minitest/autorun'
 

diff --git a/instrumentation/bunny/test/test_helper.rb b/instrumentation/bunny/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/concurrent_ruby/test/test_helper.rb b/instrumentation/concurrent_ruby/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/dalli/test/test_helper.rb b/instrumentation/dalli/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/delayed_job/test/test_helper.rb b/instrumentation/delayed_job/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'logger'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)

diff --git a/instrumentation/ethon/test/test_helper.rb b/instrumentation/ethon/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/excon/test/test_helper.rb b/instrumentation/excon/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/faraday/test/test_helper.rb b/instrumentation/faraday/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/grape/test/test_helper.rb b/instrumentation/grape/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/graphql/test/test_helper.rb b/instrumentation/graphql/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/grpc/test/test_helper.rb b/instrumentation/grpc/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/gruf/test/test_helper.rb b/instrumentation/gruf/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'opentelemetry/sdk'
 require 'minitest/autorun'
 require 'webmock/minitest'

diff --git a/instrumentation/http/test/test_helper.rb b/instrumentation/http/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/http_client/test/test_helper.rb b/instrumentation/http_client/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/httpx/test/test_helper.rb b/instrumentation/httpx/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/koala/test/test_helper.rb b/instrumentation/koala/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/lmdb/test/test_helper.rb b/instrumentation/lmdb/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/mongo/test/test_helper.rb b/instrumentation/mongo/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/mysql2/test/test_helper.rb b/instrumentation/mysql2/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/net_http/test/test_helper.rb b/instrumentation/net_http/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'net/http'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)

diff --git a/instrumentation/pg/test/test_helper.rb b/instrumentation/pg/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/que/test/test_helper.rb b/instrumentation/que/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/racecar/test/test_helper.rb b/instrumentation/racecar/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/rack/test/test_helper.rb b/instrumentation/rack/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 require 'rack/events'

diff --git a/instrumentation/rails/Rakefile b/instrumentation/rails/Rakefile
@@ -23,10 +23,14 @@ namespace :test do
     t.libs << 'test/railtie'
     t.test_files = FileList['test/railtie/**/*_test.rb']
   end
+
+  task :start_coverage do |t|
+    require 'simplecov'
+  end
 end
 
 desc 'Run all tests'
-task test: %i[test:instrumentation test:railtie]
+task test: %i[test:start_coverage test:instrumentation test:railtie]
 
 YARD::Rake::YardocTask.new do |t|
   t.stats_options = ['--list-undoc']

diff --git a/instrumentation/rails/test/instrumentation/test_helper.rb b/instrumentation/rails/test/instrumentation/test_helper.rb
@@ -5,11 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require 'logger'
-
 require 'simplecov'
-SimpleCov.command_name(:instrumentation_tests) # custom name required to merge with the 'railtie' tests
-SimpleCov.start
-
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/rails/test/railtie/test_helper.rb b/instrumentation/rails/test/railtie/test_helper.rb
@@ -9,10 +9,7 @@
 ENV['RAILS_ENV'] = 'test'
 
 require 'logger'
-
 require 'simplecov'
-SimpleCov.command_name(:railtie_tests) # custom name required to merge with the 'instrumentation' tests
-SimpleCov.start
 
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)

diff --git a/instrumentation/rake/test/test_helper.rb b/instrumentation/rake/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/rdkafka/test/test_helper.rb b/instrumentation/rdkafka/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/redis/test/test_helper.rb b/instrumentation/redis/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/resque/test/test_helper.rb b/instrumentation/resque/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/restclient/test/test_helper.rb b/instrumentation/restclient/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

diff --git a/instrumentation/rspec/test/test_helper.rb b/instrumentation/rspec/test/test_helper.rb
@@ -4,7 +4,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# This gem does not use Bundler to require gems because it is testing confilicting features between rspec and minitest.
+# This gem does not use Bundler to require gems because it is testing conflicting features between rspec and minitest.
+require 'simplecov'
 require 'opentelemetry/sdk'
 require 'opentelemetry-test-helpers'
 

diff --git a/instrumentation/ruby_kafka/test/test_helper.rb b/instrumentation/ruby_kafka/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'simplecov'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)