async-http 0.56.5 → 0.56.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7152de875b7dee12eed4876f7a8cd55ce3c091011d87fdc9389fb52bae092686
-  data.tar.gz: 812fa1a3eb74072dac8d10fa074c6f442a9017e2f9d65b2f53fe9fd72db0d90d
+  metadata.gz: f8a62982c0ca9bd57cf326b34e0f697a6fac7af99de50cf98fe36b7cc93fb4cd
+  data.tar.gz: 16e52379346b1d2e7a9ad115c1859c8c8ba3c3e229e2f1a6385eaf9f5477ca12
 SHA512:
-  metadata.gz: 9e3d63e16368697ad7e146b3448cf5b19ae7147db9f65356252dcee05a83fb852e2a03350bbe591eab21a530100d1c3830b9d76758f81e21366c45542a8a5bbb
-  data.tar.gz: b9d013071286319e2a45ca85de0dad52fe030f1230319fb68d7ec5f4d1d999e96fbbba23cebf0021ff32c826c597d16c862c834f98d3bb2773f13fb6a56f242d
+  metadata.gz: f0d95e9e50f34b39a8725ef5cef5b8affb7a3feee22eda029e5c064ca7afd254aa77d2ce5fba65d0a8903e8c65875a6e3756fa98a204725f322a2e2c3fb0c570
+  data.tar.gz: 71c38354bd9ce92fb507bd7e36b0e557fb7073eeb30fcbba1c44511ac1d9cf96d5ca6e0c8556e86b036b4dc53fb3fd394eaf7975f16b8509e50cbdd58c1de399

data/lib/async/http/client.rb

@@ -28,6 +28,8 @@ require 'async/pool/controller'
 require 'protocol/http/body/completable'
 require 'protocol/http/methods'
 
+require 'traces/provider'
+
 require_relative 'protocol'
 
 module Async
@@ -136,6 +138,46 @@ module Async
 					@pool.release(connection) if connection
 				end
 			end
+
+			def inspect
+				"#<#{self.class} authority=#{@authority.inspect}>"
+			end
+
+			Traces::Provider(self) do
+				def call(request)
+					attributes = {
+						'http.method': request.method,
+						'http.authority': request.authority || self.authority,
+						'http.scheme': request.scheme || self.scheme,
+						'http.path': request.path,
+					}
+					
+					if protocol = request.protocol
+						attributes['http.protocol'] = protocol
+					end
+					
+					if length = request.body&.length
+						attributes['http.request.length'] = length
+					end
+					
+					trace('async.http.client.call', attributes: attributes) do |span|
+						if context = trace_context(span)
+							request.headers['traceparent'] = context.to_s
+							# request.headers['tracestate'] = context.state
+						end
+						
+						super.tap do |response|
+							if status = response&.status
+								span['http.status_code'] = status
+							end
+							
+							if length = response.body&.length
+								span['http.response.length'] = length
+							end
+						end
+					end
+				end
+			end
 			
 			protected
 			

data/lib/async/http/endpoint.rb

@@ -43,7 +43,7 @@ module Async
 				uri_klass = URI.scheme_list[scheme.upcase] || URI::HTTP
 				
 				self.new(
-					uri_klass.new(scheme, nil, hostname, nil, nil, nil, nil, nil, nil),
+					uri_klass.new(scheme, nil, hostname, nil, nil, nil, nil, nil, nil).normalize,
 					**options
 				)
 			end
@@ -241,4 +241,4 @@ module Async
 			end
 		end
 	end
-end
+end

data/lib/async/http/protocol/http1/client.rb

@@ -34,6 +34,7 @@ module Async
 						
 						Console.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
 						
+						# Mark the start of the trailers:
 						trailer = request.headers.trailer!
 						
 						# We carefully interpret https://tools.ietf.org/html/rfc7230#section-6.3.1 to implement this correctly.

data/lib/async/http/protocol/http2/stream.rb

@@ -34,7 +34,6 @@ module Async
 						super
 						
 						@headers = nil
-						@trailer = nil
 						
 						# Input buffer, reading request body, or response body (receive_data):
 						@length = nil
@@ -62,11 +61,7 @@ module Async
 					
 					def receive_trailing_headers(headers, end_stream)
 						headers.each do |key, value|
-							if @trailer.include?(key)
-								add_header(key, value)
-							else
-								raise ::Protocol::HTTP2::HeaderError, "Cannot add trailer #{key} as it was not specified as a trailer!"
-							end
+							add_header(key, value)
 						end
 					end
 					
@@ -74,9 +69,7 @@ module Async
 						if @headers.nil?
 							@headers = ::Protocol::HTTP::Headers.new
 							self.receive_initial_headers(super, frame.end_stream?)
-							
-							@trailer = @headers[TRAILER]
-						elsif @trailer and frame.end_stream?
+						elsif frame.end_stream?
 							self.receive_trailing_headers(super, frame.end_stream?)
 						else
 							raise ::Protocol::HTTP2::HeaderError, "Unable to process headers!"
@@ -152,7 +145,7 @@ module Async
 							send_reset_stream(::Protocol::HTTP2::Error::INTERNAL_ERROR)
 						else
 							# Write trailer?
-							if trailer
+							if trailer&.any?
 								send_headers(nil, trailer, ::Protocol::HTTP2::END_STREAM)
 							else
 								send_data(nil, ::Protocol::HTTP2::END_STREAM)

data/lib/async/http/relative_location.rb

@@ -28,11 +28,11 @@ module Async
 	module HTTP
 		class TooManyRedirects < StandardError
 		end
-
+		
 		# A client wrapper which transparently handles both relative and absolute redirects to a given maximum number of hops.
 		class RelativeLocation < ::Protocol::HTTP::Middleware
 			DEFAULT_METHOD = GET
-
+			
 			# maximum_hops is the max number of redirects. Set to 0 to allow 1 request with no redirects.
 			def initialize(app, maximum_hops = 3)
 				super(app)
@@ -51,7 +51,7 @@ module Async
 				
 				while hops <= @maximum_hops
 					response = super(request)
-
+					
 					if response.redirection?
 						hops += 1
 						response.finish

data/lib/async/http/server.rb

@@ -23,9 +23,12 @@
 require 'async/io/endpoint'
 require 'async/io/stream'
 
-require_relative 'protocol'
 require 'protocol/http/middleware'
 
+require 'traces/provider'
+
+require_relative 'protocol'
+
 module Async
 	module HTTP
 		class Server < ::Protocol::HTTP::Middleware
@@ -70,6 +73,42 @@ module Async
 			def run
 				@endpoint.accept(&self.method(:accept))
 			end
+			
+			Traces::Provider(self) do
+				def call(request)
+					if trace_parent = request.headers['traceparent']
+						self.trace_context = Traces::Context.parse(trace_parent.join, request.headers['tracestate'], remote: true)
+					end
+					
+					attributes = {
+						'http.method': request.method,
+						'http.authority': request.authority,
+						'http.scheme': request.scheme,
+						'http.path': request.path,
+						'http.user_agent': request.headers['user-agent'],
+					}
+					
+					if length = request.body&.length
+						attributes['http.request.length'] = length
+					end
+					
+					if protocol = request.protocol
+						attributes['http.protocol'] = protocol
+					end
+					
+					trace('async.http.server.call', attributes: attributes) do |span|
+						super.tap do |response|
+							if status = response&.status
+								span['http.status_code'] = status
+							end
+							
+							if length = response&.body&.length
+								span['http.response.length'] = length
+							end
+						end
+					end
+				end
+			end
 		end
 	end
 end

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.56.5"
+		VERSION = "0.56.6"
 	end
 end

metadata

@@ -1,14 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.56.5
+  version: 0.56.6
 platform: ruby
 authors:
 - Samuel Williams
+- Brian Morearty
+- Bruno Sutic
+- Janko Marohnić
+- Adam Daniels
+- Cyril Roelandt
+- Denis Talakevich
+- Ian Ker-Seymer
+- Igor Sidorov
+- Marco Concetto Rudilosso
+- Olle Jonsson
+- Orgad Shaneh
+- Stefan Wrobel
+- TheAthlete
+- Trevor Turk
+- samshadwell
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
+  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
+  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
+  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
+  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
+  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
+  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
+  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
+  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
+  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
+  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
+  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
+  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
+  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
+  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
+  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
+  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
+  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
+  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
+  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
+  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
+  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
+  HiLJ8VOFx6w=
+  -----END CERTIFICATE-----
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -94,6 +137,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: traces
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +194,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: localhost
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,33 +208,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: localhost
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 description:
 email:
 executables: []
@@ -244,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A HTTP client and server library.

metadata.gz.sig

@@ -0,0 +1,4 @@
+��Ը�|D|�,�:���l&�l�^�	f�ȿ,���������
+�g�z��*0��o�ñ7ym�L̅���iʦ��0Nx�
+�H�1H�w����^}Pg"�B�B�l8�,m#k�Ixù:z�Iݽ�ZhPw{����E�����M�kl	F��3A�L�uf�vω�[/�%B����������
q��}�a��D�
����ϒ���X�n<�m�ܐp���hѶWdZc.g�[Pڛ��z:���ɰ~k=�'~�O��=w�8��P�B�DrF5	�S�&�	���?�뮝�����Ŗ�����h���j��6t���t���oDw����V�?L|��X��M��
+��)���SXE'@�iJ�U�7l\wgwHkQފ��e�]�