opentelemetry-instrumentation-excon 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55f08b360e4258d9bd2997473e1dbb1338c5477d5c799e63c7502ef1a56579e8
-  data.tar.gz: d78813a8340f4c2fd778e67f36d0bfd13583a1f4694ffc1f77b4462da59a0ffd
+  metadata.gz: a921d5ad6cdca93a94fd432db5cf0d8ef32438912de3ed1d598dc32421b59913
+  data.tar.gz: dd27126b88bf80c23e3edaf7387dceb85cc5f8127bedc57158572133d551187e
 SHA512:
-  metadata.gz: e0681af77b94c0867317c7cac240265eb0791b6985bdbf3b77f728db1ada771c4049f33a15744ea091e44ead5108a5fe823de766431bf23ac0b6283c50c7ed08
-  data.tar.gz: 5f4898589653da3c992839620d3fcf2c407616ff83726ae4e8ae1cb921032aeb13b9357c44846b77c01bf8ccb9210147fc8dcb584438539f3a30e5514e3ef107
+  metadata.gz: c138a2b32ca6a3d6c99510a6bdd16407f2451e2e870dc8cf14403628c2268ddb85c3f61d20d3331d868cc76a02c11eaa5b89150714751fc4c76941700b9fc61a
+  data.tar.gz: ec4d44aea8941398abf1eae8247487c3f1973e6dee70e32c4fa5e3e577e15f9d7e5d1c7e69135f7adece7733db3a8a1ce9bd5546c5c5e19848f6ed6fee8b55ff

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-excon
 
+### v0.26.1 / 2025-11-25
+
+* FIXED: Update support for unknown HTTP methods to match semantic conventions
+
 ### v0.26.0 / 2025-10-22
 
 * BREAKING CHANGE: Min Ruby Version 3.2

data/lib/opentelemetry/instrumentation/excon/http_helper.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module Excon
+      # Utility module for HTTP-related helper methods
+      # @api private
+      module HttpHelper
+        # Lightweight struct to hold span creation attributes
+        SpanCreationAttributes = Struct.new(:span_name, :normalized_method, :original_method, keyword_init: true)
+
+        # Pre-computed mapping to avoid string allocations during normalization
+        METHOD_CACHE = {
+          'CONNECT' => 'CONNECT',
+          'DELETE' => 'DELETE',
+          'GET' => 'GET',
+          'HEAD' => 'HEAD',
+          'OPTIONS' => 'OPTIONS',
+          'PATCH' => 'PATCH',
+          'POST' => 'POST',
+          'PUT' => 'PUT',
+          'TRACE' => 'TRACE',
+          'connect' => 'CONNECT',
+          'delete' => 'DELETE',
+          'get' => 'GET',
+          'head' => 'HEAD',
+          'options' => 'OPTIONS',
+          'patch' => 'PATCH',
+          'post' => 'POST',
+          'put' => 'PUT',
+          'trace' => 'TRACE',
+          :connect => 'CONNECT',
+          :delete => 'DELETE',
+          :get => 'GET',
+          :head => 'HEAD',
+          :options => 'OPTIONS',
+          :patch => 'PATCH',
+          :post => 'POST',
+          :put => 'PUT',
+          :trace => 'TRACE'
+        }.freeze
+
+        # Pre-computed span names for old semantic conventions to avoid allocations
+        OLD_SPAN_NAMES = {
+          'CONNECT' => 'HTTP CONNECT',
+          'DELETE' => 'HTTP DELETE',
+          'GET' => 'HTTP GET',
+          'HEAD' => 'HTTP HEAD',
+          'OPTIONS' => 'HTTP OPTIONS',
+          'PATCH' => 'HTTP PATCH',
+          'POST' => 'HTTP POST',
+          'PUT' => 'HTTP PUT',
+          'TRACE' => 'HTTP TRACE'
+        }.freeze
+
+        private_constant :METHOD_CACHE, :OLD_SPAN_NAMES
+
+        # Prepares all span data for the specified semantic convention in a single call
+        # @param method [String, Symbol] The HTTP method
+        # @param semconv [Symbol] The semantic convention to use (:stable or :old)
+        # @return [SpanCreationAttributes] struct containing span_name, normalized_method, and original_method
+        def self.span_attrs_for(method, semconv: :stable)
+          normalized = METHOD_CACHE[method]
+          if normalized
+            span_name = semconv == :old ? OLD_SPAN_NAMES[normalized] : normalized
+            SpanCreationAttributes.new(
+              span_name: span_name,
+              normalized_method: normalized,
+              original_method: nil
+            )
+          else
+            SpanCreationAttributes.new(
+              span_name: 'HTTP',
+              normalized_method: '_OTHER',
+              original_method: method.to_s
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opentelemetry/instrumentation/excon/middlewares/dup/tracer_middleware.rb

@@ -11,45 +11,36 @@ module OpenTelemetry
         module Dup
           # Excon middleware for instrumentation
           class TracerMiddleware < ::Excon::Middleware::Base
-            HTTP_METHODS_TO_UPPERCASE = %w[connect delete get head options patch post put trace].each_with_object({}) do |method, hash|
-              uppercase_method = method.upcase
-              hash[method] = uppercase_method
-              hash[method.to_sym] = uppercase_method
-              hash[uppercase_method] = uppercase_method
-            end.freeze
-
-            HTTP_METHODS_TO_SPAN_NAMES = HTTP_METHODS_TO_UPPERCASE.values.each_with_object({}) do |uppercase_method, hash|
-              hash[uppercase_method] ||= uppercase_method
-            end.freeze
-
             # Constant for the HTTP status range
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
 
-              http_method = HTTP_METHODS_TO_UPPERCASE[datum[:method]]
+              span_data = HttpHelper.span_attrs_for(datum[:method])
+
               cleansed_url = OpenTelemetry::Common::Utilities.cleanse_url(::Excon::Utils.request_uri(datum))
               attributes = {
                 OpenTelemetry::SemanticConventions::Trace::HTTP_HOST => datum[:host],
-                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => http_method,
+                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => span_data.normalized_method,
                 OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => datum[:scheme],
                 OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => datum[:path],
                 OpenTelemetry::SemanticConventions::Trace::HTTP_URL => cleansed_url,
                 OpenTelemetry::SemanticConventions::Trace::NET_PEER_NAME => datum[:hostname],
                 OpenTelemetry::SemanticConventions::Trace::NET_PEER_PORT => datum[:port],
-                'http.request.method' => http_method,
+                'http.request.method' => span_data.normalized_method,
                 'url.scheme' => datum[:scheme],
                 'url.path' => datum[:path],
                 'url.full' => cleansed_url,
                 'server.address' => datum[:hostname],
                 'server.port' => datum[:port]
               }
+              attributes['http.request.method_original'] = span_data.original_method if span_data.original_method
               attributes['url.query'] = datum[:query] if datum[:query]
               peer_service = Excon::Instrumentation.instance.config[:peer_service]
               attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = peer_service if peer_service
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-              span = tracer.start_span(HTTP_METHODS_TO_SPAN_NAMES[http_method], attributes: attributes, kind: :client)
+              span = tracer.start_span(span_data.span_name, attributes: attributes, kind: :client)
               ctx = OpenTelemetry::Trace.context_with_span(span)
               datum[:otel_span] = span
               datum[:otel_token] = OpenTelemetry::Context.attach(ctx)

data/lib/opentelemetry/instrumentation/excon/middlewares/old/tracer_middleware.rb

@@ -11,27 +11,17 @@ module OpenTelemetry
         module Old
           # Excon middleware for instrumentation
           class TracerMiddleware < ::Excon::Middleware::Base
-            HTTP_METHODS_TO_UPPERCASE = %w[connect delete get head options patch post put trace].each_with_object({}) do |method, hash|
-              uppercase_method = method.upcase
-              hash[method] = uppercase_method
-              hash[method.to_sym] = uppercase_method
-              hash[uppercase_method] = uppercase_method
-            end.freeze
-
-            HTTP_METHODS_TO_SPAN_NAMES = HTTP_METHODS_TO_UPPERCASE.values.each_with_object({}) do |uppercase_method, hash|
-              hash[uppercase_method] ||= "HTTP #{uppercase_method}"
-            end.freeze
-
             # Constant for the HTTP status range
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
 
-              http_method = HTTP_METHODS_TO_UPPERCASE[datum[:method]]
+              span_data = HttpHelper.span_attrs_for(datum[:method], semconv: :old)
+
               attributes = {
                 OpenTelemetry::SemanticConventions::Trace::HTTP_HOST => datum[:host],
-                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => http_method,
+                OpenTelemetry::SemanticConventions::Trace::HTTP_METHOD => span_data.normalized_method,
                 OpenTelemetry::SemanticConventions::Trace::HTTP_SCHEME => datum[:scheme],
                 OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET => datum[:path],
                 OpenTelemetry::SemanticConventions::Trace::HTTP_URL => OpenTelemetry::Common::Utilities.cleanse_url(::Excon::Utils.request_uri(datum)),
@@ -41,7 +31,7 @@ module OpenTelemetry
               peer_service = Excon::Instrumentation.instance.config[:peer_service]
               attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = peer_service if peer_service
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-              span = tracer.start_span(HTTP_METHODS_TO_SPAN_NAMES[http_method], attributes: attributes, kind: :client)
+              span = tracer.start_span(span_data.span_name, attributes: attributes, kind: :client)
               ctx = OpenTelemetry::Trace.context_with_span(span)
               datum[:otel_span] = span
               datum[:otel_token] = OpenTelemetry::Context.attach(ctx)

data/lib/opentelemetry/instrumentation/excon/middlewares/stable/tracer_middleware.rb

@@ -11,37 +11,28 @@ module OpenTelemetry
         module Stable
           # Excon middleware for instrumentation
           class TracerMiddleware < ::Excon::Middleware::Base
-            HTTP_METHODS_TO_UPPERCASE = %w[connect delete get head options patch post put trace].each_with_object({}) do |method, hash|
-              uppercase_method = method.upcase
-              hash[method] = uppercase_method
-              hash[method.to_sym] = uppercase_method
-              hash[uppercase_method] = uppercase_method
-            end.freeze
-
-            HTTP_METHODS_TO_SPAN_NAMES = HTTP_METHODS_TO_UPPERCASE.values.each_with_object({}) do |uppercase_method, hash|
-              hash[uppercase_method] ||= uppercase_method
-            end.freeze
-
             # Constant for the HTTP status range
             HTTP_STATUS_SUCCESS_RANGE = (100..399)
 
             def request_call(datum)
               return @stack.request_call(datum) if untraced?(datum)
 
-              http_method = HTTP_METHODS_TO_UPPERCASE[datum[:method]]
+              span_data = HttpHelper.span_attrs_for(datum[:method])
+
               attributes = {
-                'http.request.method' => http_method,
+                'http.request.method' => span_data.normalized_method,
                 'url.scheme' => datum[:scheme],
                 'url.path' => datum[:path],
                 'url.full' => OpenTelemetry::Common::Utilities.cleanse_url(::Excon::Utils.request_uri(datum)),
                 'server.address' => datum[:hostname],
                 'server.port' => datum[:port]
               }
+              attributes['http.request.method_original'] = span_data.original_method if span_data.original_method
               attributes['url.query'] = datum[:query] if datum[:query]
               peer_service = Excon::Instrumentation.instance.config[:peer_service]
               attributes[OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = peer_service if peer_service
               attributes.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-              span = tracer.start_span(HTTP_METHODS_TO_SPAN_NAMES[http_method], attributes: attributes, kind: :client)
+              span = tracer.start_span(span_data.span_name, attributes: attributes, kind: :client)
               ctx = OpenTelemetry::Trace.context_with_span(span)
               datum[:otel_span] = span
               datum[:otel_token] = OpenTelemetry::Context.attach(ctx)

data/lib/opentelemetry/instrumentation/excon/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Excon
-      VERSION = '0.26.0'
+      VERSION = '0.26.1'
     end
   end
 end

data/lib/opentelemetry/instrumentation/excon.rb

@@ -15,5 +15,6 @@ module OpenTelemetry
   end
 end
 
+require_relative 'excon/http_helper'
 require_relative 'excon/instrumentation'
 require_relative 'excon/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-excon
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-22 00:00:00.000000000 Z
+date: 2025-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-base
@@ -39,6 +39,7 @@ files:
 - lib/opentelemetry/instrumentation.rb
 - lib/opentelemetry/instrumentation/concerns/untraced_hosts.rb
 - lib/opentelemetry/instrumentation/excon.rb
+- lib/opentelemetry/instrumentation/excon/http_helper.rb
 - lib/opentelemetry/instrumentation/excon/instrumentation.rb
 - lib/opentelemetry/instrumentation/excon/middlewares/dup/tracer_middleware.rb
 - lib/opentelemetry/instrumentation/excon/middlewares/old/tracer_middleware.rb
@@ -51,10 +52,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-excon/0.26.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-excon/0.26.1/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/excon
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-excon/0.26.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-excon/0.26.1
 post_install_message:
 rdoc_options: []
 require_paths: