RubyGems - opentelemetry-instrumentation-http_client - Versions diffs - 0.26.0 → 0.26.1 - Mend

opentelemetry-instrumentation-http_client 0.26.0 → 0.26.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 173a5c572cbaf59ec176945876b38627014fbf069a9f12a6e940b7b7b1ea8600
-  data.tar.gz: 47d7e1efebbd6921459e64035cba102c7beb639fc411760f2ac5d5b1f756c06d
+  metadata.gz: 9ebfac04300052a282f08d6ad26b6aea718d46973e89be8583b66e11ac598e06
+  data.tar.gz: 5f20e179aee50b6c64778d09ed1f0d8afcf0703bea09f1caf50eca3eeba71a7d
 SHA512:
-  metadata.gz: e8a46e0f0102b6743f3b73a6bbfed4b555249e3fe4314b2163f169cf27a7d13bc42597731a37dfa8970a0b19add688221a2875f9fd309ca5fde53c33c3dfd092
-  data.tar.gz: '0965757a3c4a87a130e7f7056b66be0f7b26d428451a574cc82a09e6a02406d8ccc102654ea53f0b947608dad2831f5c208d2411723d643d18c5c761764f4a56'
+  metadata.gz: 76bfb9567d20b11bb08d8d1c040bdccbe59f643cb4c9001687a1c4dc8f7475824bb9c20e0d709fb4352170daf16cb34aff8c415cbf5e78c4a6d9147ca5d4d6ea
+  data.tar.gz: 5383ad9c9c9cdcc2bfa8d193c56fb4fc918c3785e961375c8396ebd09c3ae3a3b663eb5217e974ac920700de58a5c9e7658ef456723197c0dc1958a956ab492a

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-http_client
+### 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/http_client/http_helper.rb ADDED Viewed

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+module OpenTelemetry
+  module Instrumentation
+    module HttpClient
+      # Module for normalizing HTTP 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/http_client/patches/dup/client.rb CHANGED Viewed

@@ -20,16 +20,17 @@ module OpenTelemetry
               uri = req.header.request_uri
               url = "#{uri.scheme}://#{uri.host}"
               request_method = req.header.request_method
+              span_data = HttpHelper.span_attrs_for(request_method)
               attributes = {
-                'http.method' => request_method,
+                'http.method' => span_data.normalized_method,
                 'http.scheme' => uri.scheme,
                 'http.target' => uri.path,
                 'http.url' => url,
                 'net.peer.name' => uri.host,
                 'net.peer.port' => uri.port,
                 # stable semantic conventions
-                'http.request.method' => request_method,
+                'http.request.method' => span_data.normalized_method,
                 'url.scheme' => uri.scheme,
                 'url.path' => uri.path,
                 'url.full' => url,
@@ -37,9 +38,10 @@ module OpenTelemetry
                 'server.port' => uri.port
               }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+              attributes['http.request.method_original'] = span_data.original_method if span_data.original_method
               attributes['url.query'] = uri.query unless uri.query.nil?
-              tracer.in_span(request_method, attributes: attributes, kind: :client) do |span|
+              tracer.in_span(span_data.span_name, attributes: attributes, kind: :client) do |span|
                 OpenTelemetry.propagation.inject(req.header)
                 super.tap do
                   response = conn.pop

data/lib/opentelemetry/instrumentation/http_client/patches/old/client.rb CHANGED Viewed

@@ -20,9 +20,10 @@ module OpenTelemetry
               uri = req.header.request_uri
               url = "#{uri.scheme}://#{uri.host}"
               request_method = req.header.request_method
+              span_data = HttpHelper.span_attrs_for(request_method, semconv: :old)
               attributes = {
-                'http.method' => request_method,
+                'http.method' => span_data.normalized_method,
                 'http.scheme' => uri.scheme,
                 'http.target' => uri.path,
                 'http.url' => url,
@@ -30,7 +31,7 @@ module OpenTelemetry
                 'net.peer.port' => uri.port
               }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
-              tracer.in_span("HTTP #{request_method}", attributes: attributes, kind: :client) do |span|
+              tracer.in_span(span_data.span_name, attributes: attributes, kind: :client) do |span|
                 OpenTelemetry.propagation.inject(req.header)
                 super.tap do
                   response = conn.pop

data/lib/opentelemetry/instrumentation/http_client/patches/stable/client.rb CHANGED Viewed

@@ -20,9 +20,10 @@ module OpenTelemetry
               uri = req.header.request_uri
               url = "#{uri.scheme}://#{uri.host}"
               request_method = req.header.request_method
+              span_data = HttpHelper.span_attrs_for(request_method)
               attributes = {
-                'http.request.method' => request_method,
+                'http.request.method' => span_data.normalized_method,
                 'url.scheme' => uri.scheme,
                 'url.path' => uri.path,
                 'url.full' => url,
@@ -30,9 +31,10 @@ module OpenTelemetry
                 'server.port' => uri.port
               }.merge!(OpenTelemetry::Common::HTTP::ClientContext.attributes)
+              attributes['http.request.method_original'] = span_data.original_method if span_data.original_method
               attributes['url.query'] = uri.query unless uri.query.nil?
-              tracer.in_span(request_method, attributes: attributes, kind: :client) do |span|
+              tracer.in_span(span_data.span_name, attributes: attributes, kind: :client) do |span|
                 OpenTelemetry.propagation.inject(req.header)
                 super.tap do
                   response = conn.pop

data/lib/opentelemetry/instrumentation/http_client/version.rb CHANGED Viewed

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

data/lib/opentelemetry/instrumentation/http_client.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-http_client
 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
@@ -38,6 +38,7 @@ files:
 - lib/opentelemetry-instrumentation-http_client.rb
 - lib/opentelemetry/instrumentation.rb
 - lib/opentelemetry/instrumentation/http_client.rb
+- lib/opentelemetry/instrumentation/http_client/http_helper.rb
 - lib/opentelemetry/instrumentation/http_client/instrumentation.rb
 - lib/opentelemetry/instrumentation/http_client/patches/dup/client.rb
 - lib/opentelemetry/instrumentation/http_client/patches/dup/session.rb
@@ -50,10 +51,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-http_client/0.26.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-http_client/0.26.1/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/http_client
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-http_client/0.26.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-http_client/0.26.1
 post_install_message:
 rdoc_options: []
 require_paths: