gems: update opentelemetry-instrumentation-rack requirement from ~> 0.22.0 to >= 0.22, < 0.26

Updates the requirements on [opentelemetry-instrumentation-rack](https://github.com/open-telemetry/opentelemetry-ruby-contrib) to permit the latest version.
- [Release notes](https://github.com/open-telemetry/opentelemetry-ruby-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/rack/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-rack/v0.22.0...opentelemetry-instrumentation-rack/v0.25.0)

---
updated-dependencies:
- dependency-name: opentelemetry-instrumentation-rack
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/renovate.json5

@@ -20,13 +20,6 @@
       matchManagers: ["bundler"],
       enabled: false,
     },
-    // Only quarter update since noisy/stable tools
-    {
-      matchPackageNames: [
-        "aquasecurity/trivy",
-      ],
-      schedule: ["* 0-8 1 */3 *"],
-    },
     // Commit message formats
     {
       matchDatasources: ["docker"],
@@ -40,7 +33,7 @@
   customManagers: [
     {
       customType: "regex",
-      managerFilePatterns: ["/.rb$/", "/^Rakefile$/"],
+      fileMatch: ["\.rb$", "^Rakefile$"],
       matchStrings: [
         "renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s.*_version = '(?<currentValue>.*)'\\s"
       ]

.github/workflows/ci.yml

@@ -18,10 +18,10 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
+        - '3.0'
         - '3.1'
         - '3.2'
         - '3.3'
-        - '3.4'
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby-version }}

.rubocop.yml

@@ -1,4 +1,4 @@
-plugins:
+require:
 - rubocop-rake
 - rubocop-rspec
 

CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## 3.11.0
-
-IMPROVEMENTS:
-
-- add Ruby 3.4 support
-
 ## 3.10.0
 
 IMPROVEMENTS:

Rakefile

@@ -3,9 +3,11 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
+require 'bundler/audit/task'
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
+Bundler::Audit::Task.new
 
 desc 'Run experimental solargraph type checker'
 task :solargraph do
@@ -16,7 +18,7 @@ end
 hadolint_version = 'v2.12.0'
 
 # renovate: datasource=github-tags depName=aquasecurity/trivy
-trivy_version = 'v0.61.0'
+trivy_version = 'v0.54.1'
 
 namespace :docker do
   ci_image = 'cmur2/dyndnsd:ci'
@@ -66,14 +68,7 @@ namespace :docker do
   end
 end
 
-namespace :bundle do
-  desc 'Check for vulnerabilities with bundler-audit'
-  task :audit do
-    sh 'bundler-audit check --ignore GHSA-vvfq-8hwr-qm4m' if !RUBY_VERSION.start_with?('3.0')
-  end
-end
-
-task default: [:rubocop, :spec, 'bundle:audit']
+task default: [:rubocop, :spec, 'bundle:audit', :solargraph]
 
 desc 'Run all tasks desired for CI'
 task ci: [:default, 'docker:lint', :build, 'docker:build', 'docker:e2e']

docker/Dockerfile

@@ -1,11 +1,11 @@
-FROM alpine:3.22.1
+FROM alpine:3.20.3
 
 EXPOSE 5353 8080
 
 ARG DYNDNSD_VERSION
 
 RUN apk --no-cache add openssl ca-certificates && \
-    apk --no-cache add ruby ruby-webrick && \
+    apk --no-cache add ruby ruby-etc ruby-io-console ruby-json ruby-webrick && \
     apk --no-cache add --virtual .build-deps linux-headers ruby-dev build-base tzdata && \
     gem install --no-document dyndnsd -v ${DYNDNSD_VERSION} && \
     rm -rf /usr/lib/ruby/gems/*/cache/ && \

docker/ci/Dockerfile

@@ -1,11 +1,11 @@
-FROM alpine:3.22.1
+FROM alpine:3.20.3
 
 EXPOSE 5353 8080
 
 COPY pkg/dyndnsd-*.gem /tmp/dyndnsd.gem
 
 RUN apk --no-cache add openssl ca-certificates && \
-    apk --no-cache add ruby ruby-webrick && \
+    apk --no-cache add ruby ruby-etc ruby-io-console ruby-json ruby-webrick && \
     apk --no-cache add --virtual .build-deps linux-headers ruby-dev build-base tzdata && \
     gem install --no-document /tmp/dyndnsd.gem && \
     rm -rf /usr/lib/ruby/gems/*/cache/ && \

dyndnsd.gemspec

@@ -29,11 +29,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'async', '~> 1.31.0'
   s.add_dependency 'async-dns', '~> 1.3.0'
-  s.add_dependency 'base64', '~> 0.2.0' # needed for async
-  s.add_dependency 'logger', '>= 1.6', '< 1.8'
   s.add_dependency 'metriks'
   s.add_dependency 'opentelemetry-exporter-jaeger', '~> 0.22.0'
-  s.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.22.0'
+  s.add_dependency 'opentelemetry-instrumentation-rack', '>= 0.22', '< 0.26'
   s.add_dependency 'opentelemetry-sdk', '~> 1.2.0'
   s.add_dependency 'rack', '~> 3.0'
   s.add_dependency 'rackup', '~> 2'
@@ -44,8 +42,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop', '~> 1.79.1'
-  s.add_development_dependency 'rubocop-rake', '~> 0.7.1'
-  s.add_development_dependency 'rubocop-rspec', '~> 3.6.0'
-  s.add_development_dependency 'solargraph', '~> 0.55.0'
+  s.add_development_dependency 'rubocop', '~> 1.67.0'
+  s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 3.1.0'
+  s.add_development_dependency 'solargraph', '~> 0.49.0'
 end

lib/dyndnsd.rb

@@ -138,7 +138,7 @@ module Dyndnsd
     # @param params [Hash{String => String}]
     # @return [Array<String>]
     def extract_v4_and_v6_address(params)
-      return [] if !params['myip']
+      return [] if !(params['myip'])
       begin
         IPAddr.new(params['myip'], Socket::AF_INET)
         IPAddr.new(params['myip6'], Socket::AF_INET6)
@@ -207,7 +207,7 @@ module Dyndnsd
       params = Rack::Utils.parse_query(env['QUERY_STRING'])
 
       # require hostname parameter
-      return [422, {'X-DynDNS-Response' => 'hostname_missing'}, []] if !params['hostname']
+      return [422, {'X-DynDNS-Response' => 'hostname_missing'}, []] if !(params['hostname'])
 
       hostnames = params['hostname'].split(',')
 

lib/dyndnsd/updater/zone_transfer_server.rb

@@ -89,7 +89,7 @@ module Dyndnsd
       # @return [Array{Array{Object}}]
       def self.parse_endpoints(endpoint_list)
         endpoint_list.map { |addr_string| addr_string.split('@') }
-                     .map { |addr_parts| [addr_parts[0], addr_parts[1]&.to_i || 53] }
+                     .map { |addr_parts| [addr_parts[0], addr_parts[1].to_i || 53] }
                      .map { |addr| [:tcp, :udp].map { |type| [type] + addr } }
                      .flatten(1)
       end