Merge branch 'main' into fix-rdkafka-deprecation-warning

open-telemetry · Sep 19, 2023 · b1452ba · b1452ba
2 parents c942dc9 + 352812e
commit b1452ba
Show file tree

Hide file tree

Showing 97 changed files with 1,427 additions and 85 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -177,7 +177,15 @@ updates:
   directory: "/resource_detectors"
   schedule:
     interval: weekly
+- package-ecosystem: bundler
+  directory: "/resources/azure"
+  schedule:
+    interval: weekly
 - package-ecosystem: bundler
   directory: "/resources/container"
   schedule:
     interval: weekly
+- package-ecosystem: bundler
+  directory: "/resources/google_cloud_platform"
+  schedule:
+    interval: weekly
diff --git a/.github/workflows/ci-contrib-canary.yml b/.github/workflows/ci-contrib-canary.yml
@@ -64,7 +64,9 @@ jobs:
       matrix:
         gem:
           - resource_detectors
+          - resource-detector-azure
           - resource-detector-container
+          - resource-detector-google_cloud_platform
         os:
           - ubuntu-latest
           - macos-latest

diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml
@@ -55,7 +55,9 @@ jobs:
       matrix:
         gem:
           - resource_detectors
+          - resource-detector-azure
           - resource-detector-container
+          - resource-detector-google_cloud_platform
         os:
           - ubuntu-latest
     name: "opentelemetry-${{ matrix.gem }} / ${{ matrix.os }}"

diff --git a/.toys/.data/releases.yml b/.toys/.data/releases.yml
@@ -114,10 +114,6 @@ gems:
     directory: instrumentation/active_model_serializers
     version_constant: [OpenTelemetry, Instrumentation, ActiveModelSerializers, VERSION]
 
-  - name: opentelemetry-instrumentation-all
-    directory: instrumentation/all
-    version_constant: [OpenTelemetry, Instrumentation, All, VERSION]
-
   - name: opentelemetry-instrumentation-concurrent_ruby
     directory: instrumentation/concurrent_ruby
     version_constant: [OpenTelemetry, Instrumentation, ConcurrentRuby, VERSION]
@@ -195,6 +191,10 @@ gems:
     directory: instrumentation/sinatra
     version_constant: [OpenTelemetry, Instrumentation, Sinatra, VERSION]
 
+  - name: opentelemetry-instrumentation-all
+    directory: instrumentation/all
+    version_constant: [OpenTelemetry, Instrumentation, All, VERSION]
+
   - name: opentelemetry-propagator-ottrace
     directory: propagator/ottrace
     version_constant: [OpenTelemetry, Propagator, OTTrace, VERSION]
@@ -208,7 +208,17 @@ gems:
     version_rb_path: lib/opentelemetry/resource/detectors/version.rb
     version_constant: [OpenTelemetry, Resource, Detectors, VERSION]
 
+  - name: opentelemetry-resource-detector-azure
+    directory: resources/azure
+    version_rb_path: lib/opentelemetry/resource/detector/azure/version.rb
+    version_constant: [OpenTelemetry, Resource, Detector, Azure, VERSION]
+
   - name: opentelemetry-resource-detector-container
     directory: resources/container
     version_rb_path: lib/opentelemetry/resource/detector/container/version.rb
     version_constant: [OpenTelemetry, Resource, Detector, Container, VERSION]
+
+  - name: opentelemetry-resource-detector-google_cloud_platform
+    directory: resources/google_cloud_platform
+    version_rb_path: lib/opentelemetry/resource/detector/google_cloud_platform/version.rb
+    version_constant: [OpenTelemetry, Resource, Detector, GoogleCloudPlatform, VERSION]
diff --git a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/instrumentation/active_job/CHANGELOG.md b/instrumentation/active_job/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-active_job
 
+### v0.6.0 / 2023-09-07
+
+* FIXED: Align messaging instrumentation operation names
+
 ### v0.5.2 / 2023-08-03
 
 * FIXED: Add code semconv attributes

diff --git a/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/version.rb b/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveJob
-      VERSION = '0.5.2'
+      VERSION = '0.6.0'
     end
   end
 end
diff --git a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec b/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/...n/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec b/...n/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-mocks'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/instrumentation/active_support/CHANGELOG.md b/instrumentation/active_support/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-active_support
 
+### v0.4.2 / 2023-09-07
+
+FIXED: Reduce Object allocation
+
 ### v0.4.1 / 2023-06-05
 
 * FIXED: Base config options 

diff --git a/instrumentation/active_support/lib/opentelemetry/instrumentation/active_support/version.rb b/instrumentation/active_support/lib/opentelemetry/instrumentation/active_support/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveSupport
-      VERSION = '0.4.1'
+      VERSION = '0.4.2'
     end
   end
 end
diff --git a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/instrumentation/all/CHANGELOG.md b/instrumentation/all/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-all
 
+### v0.50.1 / 2023-09-07
+
+* FIXED: Align messaging instrumentation operation names (Resque)
+
+### v0.50.0 / 2023-09-07
+
+* FIXED: Align messaging instrumentation operation names
+
 ### v0.40.0 / 2023-08-07
 
 * ADDED: Add Gruf instrumentation

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.40.0'
+      VERSION = '0.50.1'
     end
   end
 end
diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
@@ -27,11 +27,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1'
-  spec.add_dependency 'opentelemetry-instrumentation-aws_sdk', '~> 0.4.1'
-  spec.add_dependency 'opentelemetry-instrumentation-bunny', '~> 0.20.1'
+  spec.add_dependency 'opentelemetry-instrumentation-aws_sdk', '~> 0.5.0'
+  spec.add_dependency 'opentelemetry-instrumentation-bunny', '~> 0.21.0'
   spec.add_dependency 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.1'
   spec.add_dependency 'opentelemetry-instrumentation-dalli', '~> 0.24.1'
-  spec.add_dependency 'opentelemetry-instrumentation-delayed_job', '~> 0.20.1'
+  spec.add_dependency 'opentelemetry-instrumentation-delayed_job', '~> 0.21.0'
   spec.add_dependency 'opentelemetry-instrumentation-ethon', '~> 0.21.1'
   spec.add_dependency 'opentelemetry-instrumentation-excon', '~> 0.21.1'
   spec.add_dependency 'opentelemetry-instrumentation-faraday', '~> 0.23.1'
@@ -46,17 +46,17 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-mysql2', '~> 0.24.2'
   spec.add_dependency 'opentelemetry-instrumentation-net_http', '~> 0.22.1'
   spec.add_dependency 'opentelemetry-instrumentation-pg', '~> 0.25.2'
-  spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.6.1'
-  spec.add_dependency 'opentelemetry-instrumentation-racecar', '~> 0.2.1'
+  spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.7.0'
+  spec.add_dependency 'opentelemetry-instrumentation-racecar', '~> 0.3.0'
   spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.23.1'
-  spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.27.1'
+  spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.28.0'
   spec.add_dependency 'opentelemetry-instrumentation-rake', '~> 0.2.1'
-  spec.add_dependency 'opentelemetry-instrumentation-rdkafka', '~> 0.3.1'
+  spec.add_dependency 'opentelemetry-instrumentation-rdkafka', '~> 0.4.0'
   spec.add_dependency 'opentelemetry-instrumentation-redis', '~> 0.25.1'
-  spec.add_dependency 'opentelemetry-instrumentation-resque', '~> 0.4.1'
+  spec.add_dependency 'opentelemetry-instrumentation-resque', '~> 0.5.0'
   spec.add_dependency 'opentelemetry-instrumentation-restclient', '~> 0.22.1'
-  spec.add_dependency 'opentelemetry-instrumentation-ruby_kafka', '~> 0.20.1'
-  spec.add_dependency 'opentelemetry-instrumentation-sidekiq', '~> 0.24.1'
+  spec.add_dependency 'opentelemetry-instrumentation-ruby_kafka', '~> 0.21.0'
+  spec.add_dependency 'opentelemetry-instrumentation-sidekiq', '~> 0.25.0'
   spec.add_dependency 'opentelemetry-instrumentation-sinatra', '~> 0.23.1'
   spec.add_dependency 'opentelemetry-instrumentation-trilogy', '~> 0.56.1'
 

diff --git a/instrumentation/aws_sdk/CHANGELOG.md b/instrumentation/aws_sdk/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-aws_sdk
 
+### v0.5.0 / 2023-09-07
+
+* FIXED: Align messaging instrumentation operation names
+
 ### v0.4.2 / 2023-08-03
 
 * FIXED: Remove inline linter rules

diff --git a/instrumentation/aws_sdk/lib/opentelemetry/instrumentation/aws_sdk/version.rb b/instrumentation/aws_sdk/lib/opentelemetry/instrumentation/aws_sdk/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module AwsSdk
-      VERSION = '0.4.2'
+      VERSION = '0.5.0'
     end
   end
 end
diff --git a/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec b/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-mocks'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/instrumentation/bunny/CHANGELOG.md b/instrumentation/bunny/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-bunny
 
+### v0.21.0 / 2023-09-07
+
+* FIXED: Align messaging instrumentation operation names
+
 ### v0.20.1 / 2023-06-05
 
 * FIXED: Base config options 

diff --git a/instrumentation/bunny/lib/opentelemetry/instrumentation/bunny/version.rb b/instrumentation/bunny/lib/opentelemetry/instrumentation/bunny/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Bunny
-      VERSION = '0.20.1'
+      VERSION = '0.21.0'
     end
   end
 end
diff --git a/instrumentation/delayed_job/CHANGELOG.md b/instrumentation/delayed_job/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-delayed_job
 
+### v0.21.0 / 2023-09-07
+
+* FIXED: Align messaging instrumentation operation names
+
 ### v0.20.1 / 2023-06-05
 
 * FIXED: Base config options 

diff --git a/instrumentation/delayed_job/lib/opentelemetry/instrumentation/delayed_job/version.rb b/instrumentation/delayed_job/lib/opentelemetry/instrumentation/delayed_job/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module DelayedJob
-      VERSION = '0.20.1'
+      VERSION = '0.21.0'
     end
   end
 end
diff --git a/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec b/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec b/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)

diff --git a/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec b/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-mocks'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.7.6'
+  spec.add_development_dependency 'webmock', '~> 3.19'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)