Merge branch 'main' into logger-instrumentation

Author: kaylareopelle

.github/actions/test_gem/action.yml

@@ -19,6 +19,16 @@ inputs:
     required: false
     type: boolean
     default: false
+  coverage:
+    description: Enforce test coverage
+    required: false
+    type: boolean
+    default: false
+  minimum_coverage:
+    description: Minimum test coverage
+    required: false
+    type: string
+    default: 85
   build:
     description: Build gem
     required: false
@@ -62,11 +72,19 @@ runs:
           fi
         fi
 
+    # Install ImageMagick for active_storage testing.
+    # Unfortunately, as of ubuntu-24.04, ImageMagick is no longer pre-installed in Github Actions.
+    # See https://github.com/actions/runner-images/issues/10772
+    - name: Install ImageMagick for active_storage testing
+      if: "${{ inputs.gem == 'opentelemetry-instrumentation-active_storage' }}"
+      shell: bash
+      run: sudo apt update && sudo apt install -y imagemagick
+
     # Install ruby and bundle dependencies and cache!
     # ...but not for appraisals, sadly.
     - name: Install Ruby ${{ inputs.ruby }} with dependencies
       if: "${{ steps.setup.outputs.appraisals == 'false' }}"
-      uses: ruby/setup-ruby@v1.202.0
+      uses: ruby/setup-ruby@v1.221.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -77,7 +95,7 @@ runs:
     # If we're using appraisals, do it all manually.
     - name: Install Ruby ${{ inputs.ruby }} without dependencies
       if: "${{ steps.setup.outputs.appraisals == 'true' }}"
-      uses: ruby/setup-ruby@v1.202.0
+      uses: ruby/setup-ruby@v1.221.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         bundler:  "latest"
@@ -153,6 +171,14 @@ runs:
         bundle exec rake rubocop
       working-directory: "${{ steps.setup.outputs.gem_dir }}"
 
+    - name: Coverage
+      shell: bash
+      if: "${{ inputs.coverage == 'true' }}"
+      # This starts a new simplecov run which tracks nothing of its own,
+      # but merges with the existing coverage reports generated during testing.
+      run: 'bundle exec ruby -e ''require "simplecov"; SimpleCov.minimum_coverage(${{ inputs.minimum_coverage }})'''
+      working-directory: "${{ steps.setup.outputs.gem_dir }}"
+
     - name: Build Gem
       shell: bash
       if: "${{ inputs.build == 'true' }}"

.github/dependabot.yml

@@ -1,199 +1,15 @@
 ---
 version: 2
 updates:
-- package-ecosystem: github-actions
-  directory: "/"
-  schedule:
-    interval: daily
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/helpers/mysql"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/helpers/sql-obfuscation"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/propagator/ottrace"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/propagator/xray"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/que"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/http_client"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/mysql2"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/sinatra"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/sidekiq"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/dalli"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/racecar"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/redis"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/ruby_kafka"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/concurrent_ruby"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/active_model_serializers"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/rake"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/action_view"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/bunny"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/all"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/aws_sdk"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/aws_lambda"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/active_record"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/faraday"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/resque"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/rdkafka"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/pg"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/ethon"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/lmdb"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/active_support"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/http"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/graphql"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/trilogy"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/net_http"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/rack"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/action_pack"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/mongo"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/restclient"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/koala"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/active_job"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/excon"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/rspec"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/base"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/delayed_job"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/instrumentation/rails"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/resources/azure"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/resources/container"
-  schedule:
-    interval: weekly
-- package-ecosystem: bundler
-  directory: "/resources/google_cloud_platform"
-  schedule:
-    interval: weekly
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: weekly
+    groups:
+      all-gems:
+        patterns:
+          - "**/Gemfile"