Merge branch 'main' into enable-arguement-forwarding-linter

arielvalentin · web-flow · commit 2721a35b14e2 · 2025-02-05T01:08:57.000-06:00
diff --git a/instrumentation/action_pack/CHANGELOG.md b/instrumentation/action_pack/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-action_pack
 
+### v0.12.0 / 2025-02-04
+
+* ADDED: Strip Rails `(.:format)` suffix from `http.route`
+
 ### v0.11.0 / 2025-01-16
 
 * BREAKING CHANGE: Drop Support for EoL Rails 6.1
diff --git a/instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/version.rb b/instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionPack
-      VERSION = '0.11.0'
+      VERSION = '0.12.0'
     end
   end
 end
diff --git a/instrumentation/all/CHANGELOG.md b/instrumentation/all/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Release History: opentelemetry-instrumentation-all
 
+### v0.73.0 / 2025-02-04
+
+* CHANGED: opentelemetry-instrumentation-redis v0.26.1
+* CHANGED: opentelemetry-instrumentation-rails v0.36.0
+* CHANGED: opentelemetry-instrumentation-aws_lambda v0.3.0
+* CHANGED: opentelemetry-instrumentation-action_pack v0.12.0
+
 ### v0.72.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1
diff --git a/instrumentation/all/lib/opentelemetry/instrumentation/all.rb b/instrumentation/all/lib/opentelemetry/instrumentation/all.rb
@@ -12,6 +12,7 @@
 require 'opentelemetry-instrumentation-active_record'
 require 'opentelemetry-instrumentation-action_view'
 require 'opentelemetry-instrumentation-action_mailer'
+require 'opentelemetry-instrumentation-active_storage'
 require 'opentelemetry-instrumentation-aws_sdk'
 require 'opentelemetry-instrumentation-aws_lambda'
 require 'opentelemetry-instrumentation-bunny'
diff --git a/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb b/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module All
-      VERSION = '0.72.0'
+      VERSION = '0.73.0'
     end
   end
 end
diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.1'
 
   spec.add_dependency 'opentelemetry-instrumentation-active_model_serializers', '~> 0.22.0'
-  spec.add_dependency 'opentelemetry-instrumentation-aws_lambda', '~> 0.2.0'
+  spec.add_dependency 'opentelemetry-instrumentation-aws_lambda', '~> 0.3.0'
   spec.add_dependency 'opentelemetry-instrumentation-aws_sdk', '~> 0.8.0'
   spec.add_dependency 'opentelemetry-instrumentation-bunny', '~> 0.22.0'
   spec.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.22.0'
@@ -50,10 +50,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.9.0'
   spec.add_dependency 'opentelemetry-instrumentation-racecar', '~> 0.4.0'
   spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.26.0'
-  spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.35.0'
+  spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.36.0'
   spec.add_dependency 'opentelemetry-instrumentation-rake', '~> 0.3.0'
   spec.add_dependency 'opentelemetry-instrumentation-rdkafka', '~> 0.5.0'
-  spec.add_dependency 'opentelemetry-instrumentation-redis', '~> 0.26.0'
+  spec.add_dependency 'opentelemetry-instrumentation-redis', '~> 0.26.1'
   spec.add_dependency 'opentelemetry-instrumentation-resque', '~> 0.6.0'
   spec.add_dependency 'opentelemetry-instrumentation-restclient', '~> 0.23.0'
   spec.add_dependency 'opentelemetry-instrumentation-ruby_kafka', '~> 0.22.0'
diff --git a/instrumentation/aws_lambda/CHANGELOG.md b/instrumentation/aws_lambda/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release History: opentelemetry-instrumentation-aws_lambda
 
+### v0.3.0 / 2025-02-04
+
+* ADDED: AWS Lambda programmatic wrap
+* FIXED: AWS Lambda test fix
+
 ### v0.2.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1
diff --git a/instrumentation/aws_lambda/lib/opentelemetry/instrumentation/aws_lambda/version.rb b/instrumentation/aws_lambda/lib/opentelemetry/instrumentation/aws_lambda/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module AwsLambda
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     end
   end
 end
diff --git a/instrumentation/grpc/.rubocop.yml b/instrumentation/grpc/.rubocop.yml
@@ -3,3 +3,4 @@ inherit_from: ../../.rubocop.yml
 AllCops:
   Exclude:
     - 'test/support/proto/*.rb'
+    - 'example/proto/*.rb'
diff --git a/instrumentation/grpc/example/example_impl.rb b/instrumentation/grpc/example/example_impl.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+class ExampleImpl < ::Proto::Example::ExampleAPI::Service
+  def example(_req, _call)
+    Proto::Example::ExampleResponse.new(response_name: 'Hello')
+  end
+end
diff --git a/instrumentation/grpc/example/proto/example_api.proto b/instrumentation/grpc/example/proto/example_api.proto
@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package proto.example;
+
+service ExampleAPI {
+  rpc Example(ExampleRequest) returns (ExampleResponse);
+}
+
+message ExampleRequest {
+  uint64 id = 1;
+  string name = 2;
+}
+
+message ExampleResponse {
+  string response_name = 1;
+}
diff --git a/instrumentation/grpc/example/proto/example_api_pb.rb b/instrumentation/grpc/example/proto/example_api_pb.rb
diff --git a/instrumentation/grpc/example/proto/example_api_services_pb.rb b/instrumentation/grpc/example/proto/example_api_services_pb.rb
diff --git a/instrumentation/grpc/example/trace_demonstration.rb b/instrumentation/grpc/example/trace_demonstration.rb
@@ -0,0 +1,35 @@
+require_relative './proto/example_api_services_pb'
+require_relative './example_impl'
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'grpc'
+  gem 'opentelemetry-api'
+  gem 'opentelemetry-common'
+  gem 'opentelemetry-instrumentation-grpc', path: '../'
+  gem 'opentelemetry-sdk'
+end
+
+ENV['OTEL_TRACES_EXPORTER'] = 'console'
+OpenTelemetry::SDK.configure do |c|
+  c.use 'OpenTelemetry::Instrumentation::Grpc'
+end
+
+
+# start the server
+@service = ExampleImpl.new
+server = GRPC::RpcServer.new(pool_size: 1, poll_period: 1)
+server_port = server.add_http2_port('localhost:0', :this_port_is_insecure)
+server.handle(ExampleImpl)
+server_thread = Thread.new { server.run }
+server.wait_till_running
+
+
+# make a request
+stub = Proto::Example::ExampleAPI::Stub.new("localhost:#{server_port}", :this_channel_is_insecure)
+stub.example(Proto::Example::ExampleRequest.new(id: 1, name: 'test!'))
+
+server.stop
+server_thread.join
diff --git a/instrumentation/que/Appraisals b/instrumentation/que/Appraisals
@@ -6,12 +6,19 @@
 
 appraise 'que-1.x' do
   gem 'que', '~> 1.4'
+  gem 'activerecord', '~> 7.1.0'
 end
 
 appraise 'que-2.x' do
-  gem 'que', '~> 2.3'
+  gem 'que', '~> 2.4'
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+    gem 'activerecord', '~> 7.2.0'
+  else
+    gem 'activerecord'
+  end
 end
 
 appraise 'que-latest' do
   gem 'que'
+  gem 'activerecord'
 end
diff --git a/instrumentation/que/Gemfile b/instrumentation/que/Gemfile
@@ -9,7 +9,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'activerecord', '< 7.2.0', '> 7.0.0'
   gem 'pg'
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
diff --git a/instrumentation/rails/CHANGELOG.md b/instrumentation/rails/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release History: opentelemetry-instrumentation-rails
 
+### v0.36.0 / 2025-02-04
+
+* ADDED: Add active_storage instrumentation to `rails`
+* ADDED: Strip Rails `(.:format)` suffix from `http.route` (action_pack)
+
 ### v0.35.1 / 2025-01-28
 
 * DOCS: Required version in Rails README from 0.24 to 0.34.
diff --git a/instrumentation/rails/Gemfile b/instrumentation/rails/Gemfile
@@ -17,6 +17,7 @@ group :test, :development do
   gem 'opentelemetry-instrumentation-action_pack', path: '../action_pack'
   gem 'opentelemetry-instrumentation-active_record', path: '../active_record'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
+  gem 'opentelemetry-instrumentation-active_storage', path: '../active_storage'
   gem 'opentelemetry-instrumentation-action_view', path: '../action_view'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
   if RUBY_VERSION >= '3.4'
diff --git a/instrumentation/rails/lib/opentelemetry/instrumentation/rails.rb b/instrumentation/rails/lib/opentelemetry/instrumentation/rails.rb
@@ -20,6 +20,7 @@ module Rails
 require 'opentelemetry-instrumentation-action_view'
 require 'opentelemetry-instrumentation-action_mailer'
 require 'opentelemetry-instrumentation-active_record'
+require 'opentelemetry-instrumentation-active_storage'
 require 'opentelemetry-instrumentation-active_job'
 require 'opentelemetry-instrumentation-concurrent_ruby'
 require_relative 'rails/instrumentation'
diff --git a/instrumentation/rails/lib/opentelemetry/instrumentation/rails/version.rb b/instrumentation/rails/lib/opentelemetry/instrumentation/rails/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rails
-      VERSION = '0.35.1'
+      VERSION = '0.36.0'
     end
   end
 end
diff --git a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
@@ -27,10 +27,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-instrumentation-action_mailer', '~> 0.4.0'
-  spec.add_dependency 'opentelemetry-instrumentation-action_pack', '~> 0.11.0'
+  spec.add_dependency 'opentelemetry-instrumentation-action_pack', '~> 0.12.0'
   spec.add_dependency 'opentelemetry-instrumentation-action_view', '~> 0.9.0'
   spec.add_dependency 'opentelemetry-instrumentation-active_job', '~> 0.8.0'
   spec.add_dependency 'opentelemetry-instrumentation-active_record', '~> 0.9.0'
+  spec.add_dependency 'opentelemetry-instrumentation-active_storage', '~> 0.1.0'
   spec.add_dependency 'opentelemetry-instrumentation-active_support', '~> 0.8.0'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.23.0'
   spec.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.22.0'
diff --git a/instrumentation/redis/CHANGELOG.md b/instrumentation/redis/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-redis
 
+### v0.26.1 / 2025-02-04
+
+* FIXED: Do not expose auth params with Redis 5
+
 ### v0.26.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1
diff --git a/instrumentation/redis/lib/opentelemetry/instrumentation/redis/version.rb b/instrumentation/redis/lib/opentelemetry/instrumentation/redis/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Redis
-      VERSION = '0.26.0'
+      VERSION = '0.26.1'
     end
   end
 end
