http_instrumentation 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c62a0d7cd2f490aab2e2dfda4ca18b6cfe794cc013e65862b1e5e0984a121e7
-  data.tar.gz: be98556c0d7c90633278f6eae1688a0b9e07ddf5ad0065122ef7aefc6b36adb2
+  metadata.gz: 7a0f448a4cfc986fa5464322bbeaad7c72ceecd10fc50bc73c1cf4d8803c1526
+  data.tar.gz: b38f47152964ca8df8f21dd7f04f054c89e2bb904de075b5dbe358fe7960ea17
 SHA512:
-  metadata.gz: 7239288a4d4ec3ab8545d0bacc37c47cd3eeb7be7786c1434bcc1fca2f7bb717597fd13319573a107acf0be8bf5cce79c2caa89ba1b30ec7a560efcc05fae05b
-  data.tar.gz: 2b2020627f1ea45b8707827115f18337fa5fb42b11e673ff4078bd96241a8f495f9dba70fa38a7c21911d2692b05d19692ddd8042bc685d547caf549f64acbad
+  metadata.gz: df71fb5803be041e6764d7448610005338ddb9f1f3a2f0b70eef52b83c00bd7ec22827149b2afd6fb4ed573de17b093410034b68085bfb3ce6684c352552823c
+  data.tar.gz: d15c618345381bb7c2d96f5ab5fc0384d33080be5d2ccb205624058ae6ece2f81e01487527667045049f6cf4ecfa17792e25e3fb6e6dff80f5705948c0cc1e79

data/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.0.4
+
+### Fixed
+- A request URL that parses as an opaque URI (e.g. `localhost:8080/path`, which parses with the scheme `localhost`) or that has an empty host (e.g. `http:///path`) no longer raises a `URI::Error` from the instrumentation after the request completes. Because the error was raised while normalizing the event payload, the published event also kept the raw `:url` value (such as a `URI` object) instead of a string.
+
 ## 1.0.3
 
 ### Fixed

data/README.md

@@ -33,12 +33,12 @@ The payload on event notifications for all HTTP requests will include:
 
 If a single HTTP request was made, then these keys will exist as well:
 
-* `:uri` - The URI for the request
-* `:url` - The URL for the request with any query string stripped off
-* `:http_method` - The HTTP method for the request
-* `:status_code` - The numeric HTTP status code for the response
+* `:uri` - The URI for the request (`URI`)
+* `:url` - The URL for the request with any query string stripped off (`String`)
+* `:http_method` - The HTTP method for the request (`Symbol`)
+* `:status_code` - The numeric HTTP status code for the response (`Integer`)
 
-These additional values will not be present if multiple, concurrent requests were made. Only the typhoeus, ethon, and httpx libraries support making concurrent requests.
+These additional values will not be present if multiple, concurrent requests were made. Only the typhoeus, ethon, and httpx libraries support making concurrent requests. Any of the values can also be nil if the request was corrupted or invalid.
 
 ```ruby
 ActiveSupport::Notifications.monotonic_subscribe("request.http") do |*args|

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/http_instrumentation.rb

@@ -148,17 +148,19 @@ module HTTPInstrumentation
     end
 
     # Remove any sensitive information from the given URL. Also normalizes
-    # the host and protocol by downcasing them.
+    # the host and protocol by downcasing them. Returns nil if the value
+    # cannot be parsed or sanitized as a URI.
     #
     # @param url [URI] the sanitized URL
     def sanitized_uri(url)
       return nil if url.nil?
 
-      begin
-        uri = URI(url.to_s)
-      rescue URI::Error
-        return nil
-      end
+      uri = URI(url.to_s)
+
+      # Opaque URIs (e.g. "localhost:8080/path" parses with scheme "localhost")
+      # have no user, host, or query components to sanitize, and the component
+      # setters raise on them.
+      return uri if uri.opaque
 
       uri.password = nil
       uri.user = nil
@@ -176,6 +178,8 @@ module HTTPInstrumentation
       end
 
       uri
+    rescue URI::Error
+      nil
     end
 
     def uri_without_query_string(uri)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_instrumentation
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Brian Durand
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: ActiveSupoprt instrumentation for a variety of Ruby HTTP client libraries.
 test_files: []