Skip to content

[Excon] Fix error with upper-case HTTP methods #1147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertlaurin merged 5 commits into from
Mar 30, 2022
+19 −13
Merged

[Excon] Fix error with upper-case HTTP methods #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96b2b72
fix(excon): Fix error with upper-case HTTP methods
hosamaly Mar 15, 2022
de9d2b3
perf(excon): Reduce memory allocation for span names
hosamaly Mar 15, 2022
354ba78
refactor(excon): Use frozen hashes for constants in TracerMiddleware
hosamaly Mar 19, 2022
45008b5
Merge branch 'main' into fix-excon-http-method-detection
robertlaurin Mar 22, 2022
c854652
Merge branch 'main' into fix-excon-http-method-detection
robertlaurin Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions ...umentation/excon/lib/opentelemetry/instrumentation/excon/middlewares/tracer_middleware.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,24 @@ module Excon
module Middlewares
# Excon middleware for instrumentation
class TracerMiddleware < ::Excon::Middleware::Base
HTTP_METHODS_SYMBOL_TO_STRING = {
connect: 'CONNECT',
delete: 'DELETE',
get: 'GET',
head: 'HEAD',
options: 'OPTIONS',
patch: 'PATCH',
post: 'POST',
put: 'PUT',
trace: 'TRACE'
}.freeze
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

def request_call(datum)
begin
unless datum.key?(:otel_span)
http_method = HTTP_METHODS_SYMBOL_TO_STRING[datum[:method]]
http_method = HTTP_METHODS_TO_UPPERCASE[datum[:method]]
attributes = span_creation_attributes(datum, http_method)
tracer.start_span(
"HTTP #{http_method}",
HTTP_METHODS_TO_SPAN_NAMES[http_method],
attributes: attributes,
kind: :client
).tap do |span|
Expand Down
7 changes: 7 additions & 0 deletions instrumentation/excon/test/opentelemetry/instrumentation/excon/instrumentation_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@
)
end

specify 'after request with capital-letters HTTP method' do
::Excon.new('http://example.com/success')
.request(method: 'GET')

_(span.attributes['http.method']).must_equal 'GET'
end

it 'after request with failure code' do
::Excon.get('http://example.com/failure')

Expand Down