Merge branch 'main' into add_shoryuken_instrumentation

open-telemetry · Nov 3, 2023 · e7240c7 · e7240c7
2 parents 2292f62 + 5858549
commit e7240c7
Show file tree

Hide file tree

Showing 39 changed files with 46 additions and 1,023 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -177,10 +177,6 @@ updates:
   directory: "/instrumentation/rails"
   schedule:
     interval: weekly
-- package-ecosystem: bundler
-  directory: "/resource_detectors"
-  schedule:
-    interval: weekly
 - package-ecosystem: bundler
   directory: "/resources/azure"
   schedule:

diff --git a/.github/workflows/ci-contrib-canary.yml b/.github/workflows/ci-contrib-canary.yml
@@ -63,7 +63,6 @@ jobs:
       fail-fast: false
       matrix:
         gem:
-          - resource_detectors
           - resource-detector-azure
           - resource-detector-container
           - resource-detector-google_cloud_platform

diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml
@@ -54,7 +54,6 @@ jobs:
       fail-fast: false
       matrix:
         gem:
-          - resource_detectors
           - resource-detector-azure
           - resource-detector-container
           - resource-detector-google_cloud_platform

diff --git a/.toys/.data/releases.yml b/.toys/.data/releases.yml
@@ -203,11 +203,6 @@ gems:
     directory: propagator/xray
     version_constant: [OpenTelemetry, Propagator, XRay, VERSION]
 
-  - name: opentelemetry-resource_detectors
-    directory: resource_detectors
-    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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -67,15 +67,15 @@ _Setting up a running Ruby environment is outside the scope of this document._
 This repository contains multiple Ruby gems:
 
  *  Various instrumentation gems located in subdirectories of `instrumentation`
+ *  Various resource detector gems located in subdirectories of `resources`
  *  `opentelemetry-propagator-xray` located in the `propagator/xray` directory
  *  `opentelemetry-propagator-ottrace` located in the `propagator/ottrace` directory
- *  `opentelemetry-resource_detectors` located in the `resource_detectors` directory
 
 Each of these gems has its configuration and tests.
 
-For example, to test `opentelemetry-resource_detectors` you would:
+For example, to test `opentelemetry-instrumentation-action_pack` you would:
 
- 1. Change directory to `resource_detectors`
+ 1. Change directory to `instrumentation/action_pack`
  2. Install the bundle with `bundle install`
  3. Run the tests with `bundle exec rake`
 

diff --git a/Gemfile b/Gemfile
@@ -7,4 +7,4 @@
 source 'https://rubygems.org'
 
 gem 'rake', '~> 13.0'
-gem 'rubocop', '~> 1.56.2'
+gem 'rubocop', '~> 1.57.1'
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ using OpenTelemetry with minimal changes to your application. See the
 This repository also contains libraries to aid with interoperablity with vendor specific tracing solutions:
 
 - [Context Propagation](propagator/): OTTrace and Amazon X-Ray
-- [Resource Detectors](resource_detectors/):
+- [Resource Detectors](resources/):
   - Azure
   - Container
   - Google Cloud Platform

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.4 / 2023-10-31
+
+* FIXED: Remove call to ActiveSupport::Notifications.notifier#synchronize deprecated in Rails 7.2
+
 ### v0.4.3 / 2023-10-16
 
 * FIXED: Add Rails 7.1 compatibility

diff --git a/...tation/active_support/lib/opentelemetry/instrumentation/active_support/span_subscriber.rb b/...tation/active_support/lib/opentelemetry/instrumentation/active_support/span_subscriber.rb
@@ -30,19 +30,23 @@ def self.subscribe(
 
         subscriber_object = ::ActiveSupport::Notifications.subscribe(pattern, subscriber)
 
-        ::ActiveSupport::Notifications.notifier.synchronize do
-          subscribers = ::ActiveSupport::Notifications.notifier.instance_variable_get(:@string_subscribers)[pattern]
-
-          if subscribers.nil?
-            OpenTelemetry.handle_error(
-              message: 'Unable to move OTEL ActiveSupport Notifications subscriber to the front of the notifications list which may cause incomplete traces.' \
-                       'Please report an issue here: ' \
-                       'https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/new?labels=bug&template=bug_report.md&title=ActiveSupport%20Notifications%20subscribers%20list%20is%20nil'
-            )
-          else
-            subscribers.unshift(
-              subscribers.delete(subscriber_object)
-            )
+        # this can be removed once we drop support for Rails < 7.2
+        # see https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/707 for more context
+        if ::ActiveSupport::Notifications.notifier.respond_to?(:synchronize)
+          ::ActiveSupport::Notifications.notifier.synchronize do
+            subscribers = ::ActiveSupport::Notifications.notifier.instance_variable_get(:@string_subscribers)[pattern]
+
+            if subscribers.nil?
+              OpenTelemetry.handle_error(
+                message: 'Unable to move OTEL ActiveSupport Notifications subscriber to the front of the notifications list which may cause incomplete traces.' \
+                         'Please report an issue here: ' \
+                         'https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/new?labels=bug&template=bug_report.md&title=ActiveSupport%20Notifications%20subscribers%20list%20is%20nil'
+              )
+            else
+              subscribers.unshift(
+                subscribers.delete(subscriber_object)
+              )
+            end
           end
         end
         subscriber_object

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.3'
+      VERSION = '0.4.4'
     end
   end
 end
diff --git a/instrumentation/all/CHANGELOG.md b/instrumentation/all/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-all
 
+### v0.51.1 / 2023-10-27
+
+* ADDED: Instrument connect and ping (Trilogy)
+
 ### v0.51.0 / 2023-10-16
 
 * CHANGED: See [#695](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/695) for details

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.51.0'
+      VERSION = '0.51.1'
     end
   end
 end
diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
@@ -58,7 +58,7 @@ Gem::Specification.new do |spec|
   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'
+  spec.add_dependency 'opentelemetry-instrumentation-trilogy', '~> 0.57.0'
 
   spec.add_development_dependency 'active_model_serializers'
   spec.add_development_dependency 'activesupport'

diff --git a/instrumentation/base/opentelemetry-instrumentation-base.gemspec b/instrumentation/base/opentelemetry-instrumentation-base.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.56.1'
+  spec.add_development_dependency 'rubocop', '~> 1.57.1'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'yard', '~> 0.9'
 

diff --git a/instrumentation/grape/CHANGELOG.md b/instrumentation/grape/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-grape
 
+### v0.1.5 / 2023-10-31
+
+* FIXED: Remove dependency on ActiveSupport core extensions from Grape instrumentation
+
 ### v0.1.4 / 2023-08-02
 
 * FIXED: Fix opentelemetry-api version constraint in grape gemspec

diff --git a/instrumentation/grape/lib/opentelemetry/instrumentation/grape/version.rb b/instrumentation/grape/lib/opentelemetry/instrumentation/grape/version.rb
@@ -8,7 +8,7 @@ module OpenTelemetry
   module Instrumentation
     module Grape
       # Current gem version
-      VERSION = '0.1.4'
+      VERSION = '0.1.5'
     end
   end
 end
diff --git a/instrumentation/trilogy/CHANGELOG.md b/instrumentation/trilogy/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-trilogy
 
+### v0.57.0 / 2023-10-27
+
+* ADDED: Instrument connect and ping
+
 ### v0.56.3 / 2023-08-03
 
 * FIXED: Remove inline linter rules

diff --git a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Trilogy
-      VERSION = '0.56.3'
+      VERSION = '0.57.0'
     end
   end
 end
diff --git a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.56.1'
+  spec.add_development_dependency 'rubocop', '~> 1.57.1'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'yard', '~> 0.9'
 

diff --git a/propagator/xray/opentelemetry-propagator-xray.gemspec b/propagator/xray/opentelemetry-propagator-xray.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.4'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.56.1'
+  spec.add_development_dependency 'rubocop', '~> 1.57.1'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'yard', '~> 0.9'
 

diff --git a/releases/Gemfile b/releases/Gemfile
@@ -36,7 +36,6 @@ gem 'trilogy'
 
 gem 'opentelemetry-api'
 gem 'opentelemetry-sdk'
-gem 'opentelemetry-resource_detectors'
 
 Dir['../propagator/**/version.rb'].each do |f|
   name = f.match(%r{propagator/(\w+)/lib})[1]

diff --git a/resource_detectors/.rubocop.yml b/resource_detectors/.rubocop.yml
diff --git a/resource_detectors/.yardopts b/resource_detectors/.yardopts
diff --git a/resource_detectors/CHANGELOG.md b/resource_detectors/CHANGELOG.md
diff --git a/resource_detectors/Gemfile b/resource_detectors/Gemfile