Merge branch 'main' into logger-instrumentation

open-telemetry · Apr 23, 2024 · d838da7 · d838da7
2 parents f7646f8 + c642531
commit d838da7
Show file tree

Hide file tree

Showing 24 changed files with 48 additions and 21 deletions.
diff --git a/.github/workflows/conventional-commits.yaml b/.github/workflows/conventional-commits.yaml
@@ -22,7 +22,7 @@ jobs:
     name: Conventional Commits Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: dev-build-deploy/commit-me@v1.4.0
+      - uses: dev-build-deploy/commit-me@v1.4.1
         env:
           FORCE_COLOR: 3
         with:

diff --git a/.github/workflows/installation-tests.yml b/.github/workflows/installation-tests.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1.173.0
+      - uses: ruby/setup-ruby@v1.174.0
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.173.0
+        uses: ruby/setup-ruby@v1.174.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.173.0
+        uses: ruby/setup-ruby@v1.174.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.173.0
+        uses: ruby/setup-ruby@v1.174.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
@@ -48,7 +48,7 @@ jobs:
           chmod 0600 $HOME/.gem/credentials
           printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
 
-      - uses: ruby/setup-ruby@v1.173.0
+      - uses: ruby/setup-ruby@v1.174.0
         with:
           ruby-version: "3.0"
           bundler: latest

diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.173.0
+        uses: ruby/setup-ruby@v1.174.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.173.0
+        uses: ruby/setup-ruby@v1.174.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

diff --git a/README.md b/README.md
@@ -28,7 +28,6 @@ The Ruby special interest group (SIG) meets regularly. See the OpenTelemetry
 Approvers ([@open-telemetry/ruby-contrib-approvers](https://github.com/orgs/open-telemetry/teams/ruby-contrib-approvers)):
 
 - [Josef Šimánek](https://github.com/simi)
-- [Kayla Reopelle](https://github.com/kaylareopelle), New Relic
 - [Xuan Cao](https://github.com/xuan-cao-swi), Solarwinds
 
 *Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver).*
@@ -39,6 +38,7 @@ Maintainers ([@open-telemetry/ruby-contrib-maintainers](https://github.com/orgs/
 - [Daniel Azuma](https://github.com/dazuma), Google
 - [Eric Mustin](https://github.com/ericmustin)
 - [Francis Bogsanyi](https://github.com/fbogsany), Shopify
+- [Kayla Reopelle](https://github.com/kaylareopelle), New Relic
 - [Matthew Wear](https://github.com/mwear), Lightstep
 - [Robb Kidd](https://github.com/robbkidd), Honeycomb
 - [Robert Laurin](https://github.com/robertlaurin), Shopify

diff --git a/instrumentation/active_record/CHANGELOG.md b/instrumentation/active_record/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-active_record
 
+### v0.7.1 / 2024-04-05
+
+* FIXED: Instrumentation/active_record: add `:allow_retry` option to `find_by_sql` patch
+
 ### v0.7.0 / 2023-11-22
 
 * BREAKING CHANGE: Drop Rails 6.0 EOL

diff --git a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/version.rb b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveRecord
-      VERSION = '0.7.0'
+      VERSION = '0.7.1'
     end
   end
 end
diff --git a/instrumentation/graphql/CHANGELOG.md b/instrumentation/graphql/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-graphql
 
+### v0.28.1 / 2024-04-10
+
+* FIXED: Analyze span names in GraphQL instrumentation
+
 ### v0.28.0 / 2024-02-16
 
 * BREAKING CHANGE: GraphQL Legacy Tracer perf improvements [#867](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/867).

diff --git a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/tracers/graphql_trace.rb b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/tracers/graphql_trace.rb
@@ -89,11 +89,11 @@ def validate(query:, validate:, &block)
           end
 
           def analyze_multiplex(multiplex:, &block)
-            tracer.in_span('graphql.analyze_query', &block)
+            tracer.in_span('graphql.analyze_multiplex', &block)
           end
 
           def analyze_query(query:, &block)
-            tracer.in_span('graphql.analyze_multiplex', &block)
+            tracer.in_span('graphql.analyze_query', &block)
           end
 
           def execute_query(query:, &block)

diff --git a/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/version.rb b/instrumentation/graphql/lib/opentelemetry/instrumentation/graphql/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module GraphQL
-      VERSION = '0.28.0'
+      VERSION = '0.28.1'
     end
   end
 end
diff --git a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb
@@ -47,8 +47,8 @@
           'graphql.lex',
           'graphql.parse',
           'graphql.validate',
-          'graphql.analyze_multiplex',
           'graphql.analyze_query',
+          'graphql.analyze_multiplex',
           'graphql.execute_query',
           'graphql.execute_query_lazy',
           'graphql.execute_multiplex'

diff --git a/instrumentation/racecar/CHANGELOG.md b/instrumentation/racecar/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-racecar
 
+### v0.3.1 / 2024-04-05
+
+* FIXED: Fix markdown header
+
 ### v0.3.0 / 2023-09-07
 
 * FIXED: Align messaging instrumentation operation names

diff --git a/instrumentation/racecar/README.md b/instrumentation/racecar/README.md
@@ -13,7 +13,7 @@ gem install opentelemetry-instrumentation-racecar
 
 Or, if you use [bundler][bundler-home], include `opentelemetry-instrumentation-racecar` in your `Gemfile`.
 
-## Runtime requirements
+## Runtime requirements
 
 This instrumentation is built on top of Racecar's integration with `ActiveSupport::Notifications`. `ActiveSupport::Notification` will need to be loaded before the instrumentation is installed (as below) or the installation will cancel.
 

diff --git a/instrumentation/racecar/lib/opentelemetry/instrumentation/racecar/version.rb b/instrumentation/racecar/lib/opentelemetry/instrumentation/racecar/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Racecar
-      VERSION = '0.3.0'
+      VERSION = '0.3.1'
     end
   end
 end
diff --git a/instrumentation/rack/CHANGELOG.md b/instrumentation/rack/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-rack
 
+### v0.24.1 / 2024-04-05
+
+* DOCS: Fix typo where Rake is mentioned instead of Rack
+
 ### v0.24.0 / 2024-01-06
 
 * BREAKING CHANGE: Use Rack Events By Default

diff --git a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rack
-      VERSION = '0.24.0'
+      VERSION = '0.24.1'
     end
   end
 end
diff --git a/instrumentation/rdkafka/CHANGELOG.md b/instrumentation/rdkafka/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-rdkafka
 
+### v0.4.3 / 2024-04-05
+
+* FIXED: Suppress deprecation warning in Rdkafka Instrumentation
+
 ### v0.4.2 / 2023-11-23
 
 * FIXED: Retry Release of 0.4.1 [#730](https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/730)

diff --git a/instrumentation/rdkafka/lib/opentelemetry/instrumentation/rdkafka/patches/consumer.rb b/instrumentation/rdkafka/lib/opentelemetry/instrumentation/rdkafka/patches/consumer.rb
@@ -10,6 +10,13 @@ module Rdkafka
       module Patches
         # The Consumer module contains the instrumentation patch for the Consumer class
         module Consumer
+          GETTER = if Gem::Version.new(::Rdkafka::VERSION) >= Gem::Version.new('0.13.0')
+                     Context::Propagation.text_map_getter
+                   else
+                     OpenTelemetry::Common::Propagation.symbol_key_getter
+                   end
+          private_constant :GETTER
+
           def each
             super do |message|
               attributes = {
@@ -23,7 +30,7 @@ def each
               message_key = extract_message_key(message.key)
               attributes['messaging.kafka.message_key'] = message_key if message_key
 
-              parent_context = OpenTelemetry.propagation.extract(message.headers, getter: OpenTelemetry::Common::Propagation.symbol_key_getter)
+              parent_context = OpenTelemetry.propagation.extract(message.headers, getter: GETTER)
               span_context = OpenTelemetry::Trace.current_span(parent_context).context
               links = [OpenTelemetry::Trace::Link.new(span_context)] if span_context.valid?
 
@@ -47,7 +54,7 @@ def each_batch(max_items: 100, bytes_threshold: Float::INFINITY, timeout_ms: 250
                 }
 
                 links = messages.map do |message|
-                  trace_context = OpenTelemetry.propagation.extract(message.headers, getter: OpenTelemetry::Common::Propagation.symbol_key_getter)
+                  trace_context = OpenTelemetry.propagation.extract(message.headers, getter: GETTER)
                   span_context = OpenTelemetry::Trace.current_span(trace_context).context
                   OpenTelemetry::Trace::Link.new(span_context) if span_context.valid?
                 end

diff --git a/instrumentation/rdkafka/lib/opentelemetry/instrumentation/rdkafka/version.rb b/instrumentation/rdkafka/lib/opentelemetry/instrumentation/rdkafka/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rdkafka
-      VERSION = '0.4.2'
+      VERSION = '0.4.3'
     end
   end
 end
diff --git a/...urces/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec b/...urces/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 1.62'
   spec.add_development_dependency 'rubocop-performance', '~> 1.20'
   spec.add_development_dependency 'simplecov', '~> 0.17'
-  spec.add_development_dependency 'webmock', '~> 3.19.1'
+  spec.add_development_dependency 'webmock', '~> 3.20.0'
   spec.add_development_dependency 'yard', '~> 0.9'
 
   if spec.respond_to?(:metadata)