Merge branch 'main' into dependabot/bundler/rubocop-tw-1.75.1

Author: kaylareopelle

.cspell.yml

@@ -38,6 +38,7 @@ words:
   - gemfile
   - Gitter
   - gruf
+  - hibachrach
   - HTTPX
   - httpx
   - instrumenter

.github/workflows/ossf-scorecard.yml

@@ -0,0 +1,48 @@
+name: OSSF Scorecard
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "18 23 * * 6" # once a week
+  workflow_dispatch:
+
+permissions: read-all
+
+jobs:
+  analysis:
+    if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed for Code scanning upload
+      security-events: write
+      # Needed for GitHub OIDC token if publish_results is true
+      id-token: write
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable
+      # uploads of run results in SARIF format to the repository Actions tab.
+      # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        with:
+          sarif_file: results.sarif

.toys/.data/releases.yml

@@ -255,3 +255,7 @@ gems:
     directory: resources/google_cloud_platform
     version_rb_path: lib/opentelemetry/resource/detector/google_cloud_platform/version.rb
     version_constant: [OpenTelemetry, Resource, Detector, GoogleCloudPlatform, VERSION]
+
+  - name: opentelemetry-instrumentation-grpc
+    directory: instrumentation/grpc
+    version_constant: [OpenTelemetry, Instrumentation, Grpc, VERSION]

instrumentation/grpc/CHANGELOG.md

@@ -1,10 +1,10 @@
 # Release History: opentelemetry-instrumentation-grpc
 
-### v0.2.0 / 2025-01-16
+### v0.2.0 / 2025-04-02
 
-* BREAKING CHANGE: Set minimum supported version to Ruby 3.1
-
-* ADDED: Set minimum supported version to Ruby 3.1
+* ADDED: Add gRPC trace demonstration
+* ADDED: Migrate gRPC instrumentation to OpenTelemetry tooling
+* ADDED: Transferred ownership of the gem from @hibachrach to OpenTelemetry
 
 ### v0.1.3 / 2024-09-11
 

instrumentation/grpc/README.md

@@ -1,6 +1,4 @@
 # OpenTelemetry gRPC Instrumentation
-> [!CAUTION]
-> This gem is not ready for release by the open-telemetry org yet, but other versions are available on RubyGems
 
 [![Gem Version](https://badge.fury.io/rb/opentelemetry-instrumentation-grpc.svg)](https://badge.fury.io/rb/opentelemetry-instrumentation-grpc)
 [![GitHub Actions CI Status](https://github.com/hibachrach/opentelemetry-instrumentation-grpc/actions/workflows/main.yml/badge.svg)](https://github.com/hibachrach/opentelemetry-instrumentation-grpc/actions?query=branch%3Amain)

instrumentation/grpc/opentelemetry-instrumentation-grpc.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency 'opentelemetry-api', '~> 1.2'
+  spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

instrumentation/sidekiq/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-sidekiq
 
+### v0.26.1 / 2025-04-01
+
+* FIXED: Add support for Sidekiq 8
+
 ### v0.26.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1

instrumentation/sidekiq/lib/opentelemetry/instrumentation/sidekiq/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Sidekiq
-      VERSION = '0.26.0'
+      VERSION = '0.26.1'
     end
   end
 end

releases/Gemfile

@@ -47,10 +47,8 @@ Dir['../propagator/**/version.rb'].each do |f|
   gem "opentelemetry-propagator-#{name}", version
 end
 
-excluded_instrumentations = %w[grpc]
 Dir['../instrumentation/**/version.rb'].each do |f|
   name = f.match(%r{instrumentation/(\w+)/lib})[1]
-  next if excluded_instrumentations.include?(name)
 
   version = File.read(f).match(/VERSION = '([\d\.]+)'/)[1]
   gem "opentelemetry-instrumentation-#{name}", version