Merge branch 'main' into fix-rack-middleware-args

Author: kaylareopelle

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

@@ -212,12 +212,11 @@ jobs:
           build: true
     services:
       redis:
-        image: redis:6.2
+        image: bitnamilegacy/redis:6.2
         ports:
           - 6379:6379
-        command: ["redis-server", "--appendonly", "yes", "--requirepass", "${REDIS_PASSWORD}"]
         options: >-
-          --health-cmd "sh -c 'redis-cli -a \"$REDIS_PASSWORD\" ping | grep PONG'"
+          --health-cmd "redis-cli ping"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5

.github/workflows/ossf-scorecard.yml

@@ -24,7 +24,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+      - uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif

.instrumentation_generator/templates/gemspec.tt

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = ">= #{File.read(File.expand_path('../../gemspecs/RUBY_REQUIREMENT', __dir__))}"
 
-  spec.add_dependency 'opentelemetry-api', '~> <%= opentelemetry_version %>'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> <%= instrumentation_base_version %>'
 
   if spec.respond_to?(:metadata)

docker-compose.yml

@@ -198,19 +198,13 @@ services:
       - postgres_socket:/var/run/postgresql
 
   redis:
-    image: redis:6.2
+    image: bitnamilegacy/redis:6.2
     environment:
       - REDIS_PASSWORD=passw0rd
     volumes:
       - redis_data:/data
     ports:
       - "16379:6379"
-    command: ["redis-server", "--appendonly", "yes", "--requirepass", "${REDIS_PASSWORD}"]
-    options: >-
-      --health-cmd "sh -c 'redis-cli -a \"$REDIS_PASSWORD\" ping | grep PONG'"
-      --health-interval 10s
-      --health-timeout 5s
-      --health-retries 5
 
   rabbitmq:
     image: rabbitmq:3.8-alpine

helpers/mysql/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-helpers-mysql
 
+### v0.3.0 / 2025-09-30
+
+* ADDED: Bump minimum API Version to 1.7
+
 ### v0.2.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1

helpers/mysql/lib/opentelemetry/helpers/mysql/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module MySQL
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     end
   end
 end

helpers/mysql/opentelemetry-helpers-mysql.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = ">= #{File.read(File.expand_path('../../gemspecs/RUBY_REQUIREMENT', __dir__))}"
 
-  spec.add_dependency 'opentelemetry-api', '~> 1.0'
+  spec.add_dependency 'opentelemetry-api', '~> 1.7'
   spec.add_dependency 'opentelemetry-common', '~> 0.21'
 
   if spec.respond_to?(:metadata)

helpers/sql/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-helpers-sql
 
+### v0.2.0 / 2025-09-30
+
+* ADDED: Bump minimum API Version to 1.7
+
 ### v0.1.1 / 2025-04-14
 
 * (No significant changes)

helpers/sql/lib/opentelemetry/helpers/sql/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module Sql
-      VERSION = '0.1.1'
+      VERSION = '0.2.0'
     end
   end
 end

helpers/sql/opentelemetry-helpers-sql.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = ">= #{File.read(File.expand_path('../../gemspecs/RUBY_REQUIREMENT', __dir__))}"
 
-  spec.add_dependency 'opentelemetry-api', '~> 1.0'
+  spec.add_dependency 'opentelemetry-api', '~> 1.7'
 
   if spec.respond_to?(:metadata)
     spec.metadata['changelog_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}/file/CHANGELOG.md"