Merge branch 'main' into update-all-changelog-to-remove-logger

arielvalentin · web-flow · commit 009adcd2350a · 2025-10-14T22:17:50.000-05:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -214,7 +214,7 @@ merge. You'll probably get some feedback from these fine folks which helps to
 make the project that much better. Respond to the feedback and work with your
 reviewer(s) to resolve any issues.
 
-The some of the things the code owners are looking for include:
+Some of the things the code owners are looking for include:
 
 * a signed [CNCF CLA][cncf-cla]
 * a passing CI build
@@ -246,10 +246,10 @@ Releases are normally performed using GitHub Actions.
     `Open release request` workflow, and run the workflow manually using the
     dropdown in the upper right.
      * Releases must be run from the main branch.
-     * If you leave the `Gems to release` field, blank, and the script will
+     * If you leave the `Gems to release` field blank, the script will
         find all the gems that have had conventional-commit-tagged changes since
         their last release. Alternately, you can specify which gems to release
-        by including their names, space-delimited, in this this field. You can
+        by including their names, space-delimited, in this field. You can
         optionally append `:<version>` to any gem in the list to specify the
         version to release, or omit the version to let the script decide based
         on conventional commits. You can also use the special name `all` to
diff --git a/helpers/mysql/README.md b/helpers/mysql/README.md
@@ -1,6 +1,6 @@
 # OpenTelemetry Instrumentation Helpers: MySQL
 
-This Ruby gem contains logic shared among MySQL adapter libraries, such as mysql2 and trilogy. It's intended for use by by gem authors instrumenting MySQL adapter libraries.
+This Ruby gem contains logic shared among MySQL adapter libraries, such as mysql2 and trilogy. It's intended for use by gem authors instrumenting MySQL adapter libraries.
 
 ## Usage
 
diff --git a/helpers/sql-obfuscation/README.md b/helpers/sql-obfuscation/README.md
@@ -8,7 +8,7 @@ All future development, bug fixes, and feature releases will occur in the new ge
 
 ## OpenTelemetry Instrumentation Helpers: SQL Obfuscation
 
-This Ruby gem contains logic to obfuscate SQL. It's intended for use by by gem authors instrumenting SQL adapter libraries, such as mysql2, pg, and trilogy.
+This Ruby gem contains logic to obfuscate SQL. It's intended for use by gem authors instrumenting SQL adapter libraries, such as mysql2, pg, and trilogy.
 
 The logic is largely drawn from the [New Relic Ruby agent's SQL Obfuscation Helpers module][new-relic-obfuscation-helpers].
 
diff --git a/helpers/sql-obfuscation/lib/opentelemetry/helpers/sql_obfuscation.rb b/helpers/sql-obfuscation/lib/opentelemetry/helpers/sql_obfuscation.rb
@@ -96,8 +96,8 @@ def generate_regex(dialect)
       # @param sql [String] The SQL to obfuscate.
       # @param obfuscation_limit [optional Integer] the length at which the SQL string will not be obfuscated
       # @param adapter [optional Symbol] the type of database adapter calling the method. `:default`, `:mysql` and `:postgres` are supported.
-      # @return [String] The SQL query string where the values are replaced with "?". When the sql statement exceeds the obufscation limit
-      #  the first matched pair from the SQL statement will be returned, with an appended truncation message. If trunaction is unsuccessful,
+      # @return [String] The SQL query string where the values are replaced with "?". When the sql statement exceeds the obfuscation limit
+      #  the first matched pair from the SQL statement will be returned, with an appended truncation message. If truncation is unsuccessful,
       #  a string describing the error will be returned.
       #
       # @api public
diff --git a/helpers/sql-processor/README.md b/helpers/sql-processor/README.md
@@ -1,6 +1,6 @@
 # OpenTelemetry Instrumentation Helpers: SQL Processor
 
-This Ruby gem contains logic to process SQL, including obfuscation. It's intended for use by by gem authors instrumenting SQL adapter libraries, such as mysql2, pg, and trilogy.
+This Ruby gem contains logic to process SQL, including obfuscation. It's intended for use by gem authors instrumenting SQL adapter libraries, such as mysql2, pg, and trilogy.
 
 Obfuscation logic is largely drawn from the [New Relic Ruby agent's SQL Obfuscation Helpers module][new-relic-obfuscation-helpers].
 
diff --git a/helpers/sql-processor/lib/opentelemetry/helpers/sql_obfuscation.rb b/helpers/sql-processor/lib/opentelemetry/helpers/sql_obfuscation.rb
@@ -96,8 +96,8 @@ def generate_regex(dialect)
       # @param sql [String] The SQL to obfuscate.
       # @param obfuscation_limit [optional Integer] the length at which the SQL string will not be obfuscated
       # @param adapter [optional Symbol] the type of database adapter calling the method. `:default`, `:mysql` and `:postgres` are supported.
-      # @return [String] The SQL query string where the values are replaced with "?". When the sql statement exceeds the obufscation limit
-      #  the first matched pair from the SQL statement will be returned, with an appended truncation message. If trunaction is unsuccessful,
+      # @return [String] The SQL query string where the values are replaced with "?". When the sql statement exceeds the obfuscation limit
+      #  the first matched pair from the SQL statement will be returned, with an appended truncation message. If truncation is unsuccessful,
       #  a string describing the error will be returned.
       #
       # @api public
diff --git a/instrumentation/CONTRIBUTING.md b/instrumentation/CONTRIBUTING.md
@@ -47,7 +47,7 @@ The following steps are required to contribute a new instrumentation library:
 
 This repository contains a script to generate a new instrumentation library.
 
-The snippet below demonstrates how to generate a an instrumentation for the `werewolf` gem, starting from the repository root.
+The snippet below demonstrates how to generate an instrumentation for the `werewolf` gem, starting from the repository root.
 
 ```console
 
@@ -137,7 +137,7 @@ module OpenTelemetry
         end
 
         compatible do
-          Gem::Version.new(::Wereworlf::VERSION) >= MINIMUM_VERSION
+          Gem::Version.new(::Werewolf::VERSION) >= MINIMUM_VERSION
         end
       end
     end
@@ -189,7 +189,7 @@ If the attribute is specific to your instrumentation, then consider namespacing
 
 Code that is not tested will not be accepted by maintainers. We understand that providing 100% test coverage is not always possible but we still ask that you provide your best effort when writing automated tests.
 
-Most of the libraries instrument introduce changes outside of our control. For this reason, integration or state-based tests are preferred over interaction (mock) tests.
+Most of the libraries we instrument introduce changes outside of our control. For this reason, integration or state-based tests are preferred over interaction (mock) tests.
 
 When you do in fact run into cases where test doubles or API stubs are absolutely necessary, we recommend using the [`rspec-mocks`](https://github.com/rspec/rspec-mocks) and [`webmocks`](https://github.com/bblimke/webmock) gems.
 
diff --git a/instrumentation/aws_sdk/README.md b/instrumentation/aws_sdk/README.md
@@ -38,8 +38,8 @@ This instrumentation offers the following configuration options:
  to Message Attributes for SQS/SNS messages.
 * `:enable_internal_instrumentation` (default: `false`): When set to `true`, any spans with 
  span kind of `internal` are traced.
-* `:suppress_internal_instrumentation`: **Deprecated**. This configuration has been 
- deprecated in a favor of `:enable_internal_instrumentation`
+* `:suppress_internal_instrumentation`: **Deprecated**. This configuration has been
+ deprecated in favor of `:enable_internal_instrumentation`
 
 ## Integration with SDK V3's Telemetry support
 AWS SDK for Ruby V3 added support for Observability which includes a new configuration, 
diff --git a/instrumentation/aws_sdk/lib/opentelemetry/instrumentation/aws_sdk/instrumentation.rb b/instrumentation/aws_sdk/lib/opentelemetry/instrumentation/aws_sdk/instrumentation.rb
@@ -26,9 +26,9 @@ module AwsSdk
       # - `true` - Internal spans are traced.
       #
       # ### `:suppress_internal_instrumentation` (deprecated)
-      # This configuration has been deprecated in a favor of `:enable_internal_instrumentation`
+      # This configuration has been deprecated in favor of `:enable_internal_instrumentation`
       #
-      # @example An explicit default configurations
+      # @example An explicit default configuration
       #   OpenTelemetry::SDK.configure do |c|
       #     c.use 'OpenTelemetry::Instrumentation::AwsSdk', {
       #       inject_messaging_context: false,
@@ -105,7 +105,7 @@ def telemetry_plugin?
 
         # Patches AWS SDK V3's telemetry plugin for integration
         # This patch supports configuration set by this gem and
-        # additional span attributes that was not provided by the plugin
+        # additional span attributes that were not provided by the plugin
         def patch_telemetry_plugin
           ::Aws::Plugins::Telemetry::Handler.prepend(Patches::Handler)
         end
@@ -125,7 +125,7 @@ def loaded_service_clients
 
         # This check does the following:
         # 1 - Checks if the service client is autoload or not
-        # 2 - Validates whether if is a service client
+        # 2 - Validates whether it is a service client
         # note that Seahorse::Client::Base is a superclass for V3 clients
         # but for V2, it is Aws::Client
         # rubocop:disable Style/MultipleComparison
diff --git a/instrumentation/base/lib/opentelemetry/instrumentation/base.rb b/instrumentation/base/lib/opentelemetry/instrumentation/base.rb
@@ -53,7 +53,7 @@ module Instrumentation
     #
     # OpenTelemetry::Instrumentation::Sinatra.instance.tracer
     #
-    # The instrumention class establishes a convention for disabling an instrumentation
+    # The instrumentation class establishes a convention for disabling an instrumentation
     # by environment variable and local configuration. An instrumentation disabled
     # by environment variable will take precedence over local config. The
     # convention for environment variable name is the library name, upcased with
diff --git a/instrumentation/ethon/CHANGELOG.md b/instrumentation/ethon/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-ethon
 
+### v0.24.2 / 2025-10-14
+
+* FIXED: Raise original Ethon error after span updates
+
 ### v0.24.1 / 2025-09-30
 
 * FIXED: Min OTel Ruby API 1.7
diff --git a/instrumentation/ethon/README.md b/instrumentation/ethon/README.md
@@ -10,7 +10,7 @@ Install the gem using:
 gem install opentelemetry-instrumentation-ethon
 ```
 
-Or, if you use [bundler][bundler-home], include `opentelemetry-instrumentation-ethon` to your `Gemfile`.
+Or, if you use [bundler][bundler-home], include `opentelemetry-instrumentation-ethon` in your `Gemfile`.
 
 ## Usage
 
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/dup/easy.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/dup/easy.rb
@@ -39,10 +39,13 @@ def perform
               otel_before_request
               super
             rescue StandardError => e
-              # If an exception occurs before we can call `complete`, we should add and error status and close the span
+              # If an exception occurs before we can call `complete`
+              # we should add an error status and close the span
+              # and raise the original error
               @otel_span&.status = OpenTelemetry::Trace::Status.error("Request threw an exception: #{e.message}")
               @otel_span&.finish
               @otel_span = nil
+              raise e
             end
 
             def complete
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/old/easy.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/old/easy.rb
@@ -36,10 +36,13 @@ def perform
               otel_before_request
               super
             rescue StandardError => e
-              # If an exception occurs before we can call `complete`, we should add and error status and close the span
+              # If an exception occurs before we can call `complete`
+              # we should add an error status and close the span
+              # and raise the original error
               @otel_span&.status = OpenTelemetry::Trace::Status.error("Request threw an exception: #{e.message}")
               @otel_span&.finish
               @otel_span = nil
+              raise e
             end
 
             def complete
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/stable/easy.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/patches/stable/easy.rb
@@ -39,10 +39,13 @@ def perform
               otel_before_request
               super
             rescue StandardError => e
-              # If an exception occurs before we can call `complete`, we should add and error status and close the span
+              # If an exception occurs before we can call `complete`
+              # we should add an error status and close the span
+              # and raise the original error
               @otel_span&.status = OpenTelemetry::Trace::Status.error("Request threw an exception: #{e.message}")
               @otel_span&.finish
               @otel_span = nil
+              raise e
             end
 
             def complete
diff --git a/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/version.rb b/instrumentation/ethon/lib/opentelemetry/instrumentation/ethon/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Ethon
-      VERSION = '0.24.1'
+      VERSION = '0.24.2'
     end
   end
 end
diff --git a/instrumentation/ethon/test/opentelemetry/instrumentation/ethon/dup/instrumentation_test.rb b/instrumentation/ethon/test/opentelemetry/instrumentation/ethon/dup/instrumentation_test.rb
@@ -83,23 +83,26 @@
           end
         end
 
-        it 'when the perform fails before complete with an exception' do
-          Ethon::Curl.stub(:easy_perform, ->(_handle) { raise StandardError, 'Connection failed' }) do
-            easy.perform
-
-            # NOTE: check the finished spans since we expect to have closed it
-            span = exporter.finished_spans.first
-            _(span.name).must_equal 'HTTP'
-            _(span.attributes['http.method']).must_equal 'N/A'
-            _(span.attributes['http.status_code']).must_be_nil
-            _(span.attributes['http.url']).must_equal 'http://example.com/test'
-            _(span.attributes['http.request.method']).must_equal '_OTHER'
-            _(span.attributes['http.response.status_code']).must_be_nil
-            _(span.attributes['url.full']).must_equal 'http://example.com/test'
-            _(span.status.code).must_equal(
-              OpenTelemetry::Trace::Status::ERROR
-            )
-            _(easy.instance_eval { @otel_span }).must_be_nil
+        describe 'when the perform fails before complete with an exception' do
+          it 'raises the original error and closes the span with error status' do
+            Ethon::Curl.stub(:easy_perform, ->(_handle) { raise StandardError, 'Connection failed' }) do
+              assert_raises StandardError, 'Connection failed' do
+                easy.perform
+              end
+              # NOTE: check the finished spans since we expect to have closed it
+              span = exporter.finished_spans.first
+              _(span.name).must_equal 'HTTP'
+              _(span.attributes['http.method']).must_equal 'N/A'
+              _(span.attributes['http.status_code']).must_be_nil
+              _(span.attributes['http.url']).must_equal 'http://example.com/test'
+              _(span.attributes['http.request.method']).must_equal '_OTHER'
+              _(span.attributes['http.response.status_code']).must_be_nil
+              _(span.attributes['url.full']).must_equal 'http://example.com/test'
+              _(span.status.code).must_equal(
+                OpenTelemetry::Trace::Status::ERROR
+              )
+              _(easy.instance_eval { @otel_span }).must_be_nil
+            end
           end
         end
       end
diff --git a/instrumentation/ethon/test/opentelemetry/instrumentation/ethon/old/instrumentation_test.rb b/instrumentation/ethon/test/opentelemetry/instrumentation/ethon/old/instrumentation_test.rb
@@ -78,20 +78,24 @@
           end
         end
 
-        it 'when the perform fails before complete with an exception' do
-          Ethon::Curl.stub(:easy_perform, ->(_handle) { raise StandardError, 'Connection failed' }) do
-            easy.perform
-
-            # NOTE: check the finished spans since we expect to have closed it
-            span = exporter.finished_spans.first
-            _(span.name).must_equal 'HTTP N/A'
-            _(span.attributes['http.method']).must_equal 'N/A'
-            _(span.attributes['http.status_code']).must_be_nil
-            _(span.attributes['http.url']).must_equal 'http://example.com/test'
-            _(span.status.code).must_equal(
-              OpenTelemetry::Trace::Status::ERROR
-            )
-            _(easy.instance_eval { @otel_span }).must_be_nil
+        describe 'when the perform fails before complete with an exception' do
+          it 'raises the original error and closes the span with error status' do
+            Ethon::Curl.stub(:easy_perform, ->(_handle) { raise StandardError, 'Connection failed' }) do
+              assert_raises StandardError, 'Connection failed' do
+                easy.perform
+              end
+
+              # NOTE: check the finished spans since we expect to have closed it
+              span = exporter.finished_spans.first
+              _(span.name).must_equal 'HTTP N/A'
+              _(span.attributes['http.method']).must_equal 'N/A'
+              _(span.attributes['http.status_code']).must_be_nil
+              _(span.attributes['http.url']).must_equal 'http://example.com/test'
+              _(span.status.code).must_equal(
+                OpenTelemetry::Trace::Status::ERROR
+              )
+              _(easy.instance_eval { @otel_span }).must_be_nil
+            end
           end
         end
       end
diff --git a/instrumentation/ethon/test/opentelemetry/instrumentation/ethon/stable/instrumentation_test.rb b/instrumentation/ethon/test/opentelemetry/instrumentation/ethon/stable/instrumentation_test.rb
@@ -79,20 +79,24 @@
           end
         end
 
-        it 'when the perform fails before complete with an exception' do
-          Ethon::Curl.stub(:easy_perform, ->(_handle) { raise StandardError, 'Connection failed' }) do
-            easy.perform
-
-            # NOTE: check the finished spans since we expect to have closed it
-            span = exporter.finished_spans.first
-            _(span.name).must_equal 'HTTP'
-            _(span.attributes['http.request.method']).must_equal '_OTHER'
-            _(span.attributes['http.response.status_code']).must_be_nil
-            _(span.attributes['url.full']).must_equal 'http://example.com/test'
-            _(span.status.code).must_equal(
-              OpenTelemetry::Trace::Status::ERROR
-            )
-            _(easy.instance_eval { @otel_span }).must_be_nil
+        describe 'when the perform fails before complete with an exception' do
+          it 'raises the original error and closes the span with error status' do
+            Ethon::Curl.stub(:easy_perform, ->(_handle) { raise StandardError, 'Connection failed' }) do
+              assert_raises StandardError, 'Connection failed' do
+                easy.perform
+              end
+
+              # NOTE: check the finished spans since we expect to have closed it
+              span = exporter.finished_spans.first
+              _(span.name).must_equal 'HTTP'
+              _(span.attributes['http.request.method']).must_equal '_OTHER'
+              _(span.attributes['http.response.status_code']).must_be_nil
+              _(span.attributes['url.full']).must_equal 'http://example.com/test'
+              _(span.status.code).must_equal(
+                OpenTelemetry::Trace::Status::ERROR
+              )
+              _(easy.instance_eval { @otel_span }).must_be_nil
+            end
           end
         end
       end
diff --git a/instrumentation/excon/README.md b/instrumentation/excon/README.md
@@ -10,7 +10,7 @@ Install the gem using:
 gem install opentelemetry-instrumentation-excon
 ```
 
-Or, if you use [bundler][bundler-home], include `opentelemetry-instrumentation-excon` to your `Gemfile`.
+Or, if you use [bundler][bundler-home], include `opentelemetry-instrumentation-excon` in your `Gemfile`.
 
 ## Usage
 
diff --git a/instrumentation/grpc/README.md b/instrumentation/grpc/README.md
@@ -16,7 +16,7 @@ Install the gem using:
 gem install opentelemetry-instrumentation-grpc
 ```
 
-Or, if you use [bundler][bundler-home], include `opentelemetry-instrumentation-grpc` to your `Gemfile`.
+Or, if you use [bundler][bundler-home], include `opentelemetry-instrumentation-grpc` in your `Gemfile`.
 
 
 ## Usage
diff --git a/instrumentation/logger/lib/opentelemetry/instrumentation/logger/patches/logger.rb b/instrumentation/logger/lib/opentelemetry/instrumentation/logger/patches/logger.rb
@@ -8,7 +8,7 @@ module OpenTelemetry
   module Instrumentation
     module Logger
       module Patches
-        # Instrumention for methods from Ruby's Logger class
+        # Instrumentation for methods from Ruby's Logger class
         module Logger
           attr_writer :skip_otel_emit
 
diff --git a/instrumentation/pg/README.md b/instrumentation/pg/README.md
@@ -50,9 +50,9 @@ OpenTelemetry::SDK.configure do |c|
     # will be included on all spans from this instrumentation:
     peer_service: 'postgres:readonly',
 
-    # By default, this instrumentation obfuscate/sanitize the executed SQL as the `db.statement`
+    # By default, this instrumentation obfuscates/sanitizes the executed SQL as the `db.statement`
     # semantic attribute. Optionally, you may disable the inclusion of this attribute entirely by
-    # setting this option to :omit or disbale sanitization the attribute by setting to :include
+    # setting this option to :omit or disable sanitization of the attribute by setting it to :include
     db_statement: :include,
   }
 end
diff --git a/instrumentation/que/README.md b/instrumentation/que/README.md
diff --git a/instrumentation/rack/README.md b/instrumentation/rack/README.md
diff --git a/instrumentation/redis/test/opentelemetry/instrumentation/redis_client_test.rb b/instrumentation/redis/test/opentelemetry/instrumentation/redis_client_test.rb
diff --git a/instrumentation/ruby_kafka/lib/opentelemetry/instrumentation/ruby_kafka/patches/producer.rb b/instrumentation/ruby_kafka/lib/opentelemetry/instrumentation/ruby_kafka/patches/producer.rb
diff --git a/instrumentation/sinatra/README.md b/instrumentation/sinatra/README.md
diff --git a/processor/baggage/README.md b/processor/baggage/README.md
diff --git a/propagator/ottrace/README.md b/propagator/ottrace/README.md
diff --git a/resources/aws/lib/opentelemetry/resource/detector/aws/eks.rb b/resources/aws/lib/opentelemetry/resource/detector/aws/eks.rb
diff --git a/resources/azure/README.md b/resources/azure/README.md

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ module Instrumentation`
`53`	`53`	`#`
`54`	`54`	`# OpenTelemetry::Instrumentation::Sinatra.instance.tracer`
`55`	`55`	`#`
`56`		`- # The instrumention class establishes a convention for disabling an instrumentation`
	`56`	`+ # The instrumentation class establishes a convention for disabling an instrumentation`
`57`	`57`	`# by environment variable and local configuration. An instrumentation disabled`
`58`	`58`	`# by environment variable will take precedence over local config. The`
`59`	`59`	`# convention for environment variable name is the library name, upcased with`