Merge branch 'main' into main

Author: arielvalentin

.cspell.yml

@@ -38,6 +38,7 @@ words:
   - gemfile
   - Gitter
   - gruf
+  - hibachrach
   - HTTPX
   - httpx
   - instrumenter
@@ -81,3 +82,4 @@ words:
   - webmocks
   - Xuan
   - yardoc
+  - traceparent

.github/actions/test_gem/action.yml

@@ -84,7 +84,7 @@ runs:
     # ...but not for appraisals, sadly.
     - name: Install Ruby ${{ inputs.ruby }} with dependencies
       if: "${{ steps.setup.outputs.appraisals == 'false' }}"
-      uses: ruby/setup-ruby@v1.218.0
+      uses: ruby/setup-ruby@v1.239.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -95,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.218.0
+      uses: ruby/setup-ruby@v1.239.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         bundler:  "latest"

.github/dependabot.yml

@@ -1,207 +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/sql"
-  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: bundler
-  directory: "/instrumentation/grpc"
-  schedule:
-    interval: weekly
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: weekly
+    groups:
+      all-gems:
+        patterns:
+          - "**/Gemfile"

.github/workflows/check-spelling.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: streetsidesoftware/cspell-action@v6
+      - uses: streetsidesoftware/cspell-action@v7
         with:
           # Files should be consistent with check:spelling files
           files: |

.github/workflows/ci-contrib.yml

@@ -59,7 +59,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-helpers-${{ matrix.gem }}"
-          ruby: "jruby-9.4.10.0"
+          ruby: "jruby-9.4.12.0"
 
   propagators:
     strategy:
@@ -69,6 +69,7 @@ jobs:
           - ottrace
           - vitess
           - xray
+          - google_cloud_trace_context
         os:
           - ubuntu-latest
     name: "propagator-${{ matrix.gem }} / ${{ matrix.os }}"
@@ -103,13 +104,14 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-propagator-${{ matrix.gem }}"
-          ruby: "jruby-9.4.10.0"
+          ruby: "jruby-9.4.12.0"
 
   resource-detectors:
     strategy:
       fail-fast: false
       matrix:
         gem:
+          - resource-detector-aws
           - resource-detector-azure
           - resource-detector-container
           - resource-detector-google_cloud_platform
@@ -148,7 +150,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-${{ matrix.gem }}"
-          ruby: "jruby-9.4.10.0"
+          ruby: "jruby-9.4.12.0"
 
   processors:
     strategy:
@@ -191,4 +193,47 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-processor-${{ matrix.gem }}"
-          ruby: "jruby-9.4.10.0"
+          ruby: "jruby-9.4.12.0"
+
+  samplers:
+    strategy:
+      fail-fast: false
+      matrix:
+        gem:
+          - xray
+        os:
+          - ubuntu-latest
+    name: "samplers-${{ matrix.gem }} / ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: "Test Ruby 3.4"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-sampler-${{ matrix.gem }}"
+          ruby: "3.4"
+      - name: "Test Ruby 3.3"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-sampler-${{ matrix.gem }}"
+          ruby: "3.3"
+      - name: "Test Ruby 3.2"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-sampler-${{ matrix.gem }}"
+          ruby: "3.2"
+      - name: "Test Ruby 3.1"
+        uses: ./.github/actions/test_gem
+        with:
+          gem:  "opentelemetry-sampler-${{ matrix.gem }}"
+          ruby: "3.1"
+          yard: true
+          rubocop: true
+          coverage: true
+          build: true
+      - name: "Test JRuby"
+        if: "${{ matrix.os == 'ubuntu-latest' }}"
+        uses: ./.github/actions/test_gem
+        with:
+          gem: "opentelemetry-sampler-${{ matrix.gem }}"
+          ruby: "jruby-9.4.12.0"

.github/workflows/ci-instrumentation-with-services.yml

@@ -57,7 +57,7 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem:  "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "jruby-9.4.10.0"
+          ruby: "jruby-9.4.12.0"
     services:
       memcached:
         image: memcached:alpine

.github/workflows/ci-instrumentation.yml

@@ -114,4 +114,4 @@ jobs:
         uses: ./.github/actions/test_gem
         with:
           gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
-          ruby: "jruby-9.4.10.0"
+          ruby: "jruby-9.4.12.0"

.github/workflows/ci-markdownlint.yml

@@ -12,9 +12,9 @@ jobs:
       # equivalent cli: markdownlint-cli2  "**/*.md" "#**/CHANGELOG.md"  --config .markdownlint.json
       - name: "Markdown Lint Check"
         uses: DavidAnson/markdownlint-cli2-action@v19
+        continue-on-error: true
         with:
           fix: false
           globs: |
             **/*.md
             !**/CHANGELOG.md
-          continue-on-error: true

.github/workflows/fossa.yml

@@ -0,0 +1,21 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry