Merge branch 'main' into dependabot/github_actions/github/codeql-action-3.28.17

Author: kaylareopelle

instrumentation/action_pack/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-action_pack
 
+### v0.12.1 / 2025-05-07
+
+* FIXED: Account for `nil` routes
+
 ### v0.12.0 / 2025-02-04
 
 * ADDED: Strip Rails `(.:format)` suffix from `http.route`

instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionPack
-      VERSION = '0.12.0'
+      VERSION = '0.12.1'
     end
   end
 end

instrumentation/aws_sdk/example/Gemfile

@@ -2,7 +2,10 @@
 
 source 'https://rubygems.org'
 
-gem 'aws-sdk'
+gem 'aws-sdk-core', '~> 3.203.0'
+gem 'aws-sdk-sns', '~> 1.83.0'
 gem 'opentelemetry-api'
-gem 'opentelemetry-instrumentation-aws_sdk'
+gem 'opentelemetry-instrumentation-aws_sdk', '~> 0.7.0'
 gem 'opentelemetry-sdk'
+# AWS SDK core needs an XML library
+gem 'rexml'

instrumentation/aws_sdk/example/trace_demonstration.rb

@@ -13,8 +13,10 @@
 ENV['OTEL_TRACES_EXPORTER'] ||= 'console'
 
 OpenTelemetry::SDK.configure do |c|
-  c.use 'OpenTelemetry::Instrumentation::AwsSdk', suppress_internal_instrumentation: false
+  c.use 'OpenTelemetry::Instrumentation::AwsSdk'
 end
 
-sns = Aws::SNS::Client.new
+# For more examples and options, see also https://docs.aws.amazon.com/sdk-for-ruby/v3/developer-guide/observability.html 
+otel_provider = Aws::Telemetry::OTelProvider.new
+sns = Aws::SNS::Client.new(telemetry_provider: otel_provider)
 sns.publish message: 'ruby sending message to sns'

resources/aws/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release History: opentelemetry-resource-detector-aws
 
+### v0.3.0 / 2025-05-07
+
+* ADDED: Contribute aws lambda resource detector
+* FIXED: Add missing semantic conventions require in AWS resource detectors
+
 ### v0.2.0 / 2025-04-29
 
 * ADDED: Contribute aws ecs resource detector

resources/aws/lib/opentelemetry/resource/detector/aws/version.rb

@@ -8,7 +8,7 @@ module OpenTelemetry
   module Resource
     module Detector
       module AWS
-        VERSION = '0.2.0'
+        VERSION = '0.3.0'
       end
     end
   end