async-http 0.90.2 → 0.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f3d3f7847e4ca1d36ea14f2e2a429aaee69540f417eccde36d0e78b046cdd04
-  data.tar.gz: 72254daf856acd1339850a6af190dc3aa302483b00a31891bbc0bcbb41edbe4d
+  metadata.gz: ae6c0e0cd15050304be680a8c0b5e49447fb83c6533b7aefebec427a83ae3aac
+  data.tar.gz: 614910bd99032d2f19672876eada276fba03a887feafec21f3a50263410f272e
 SHA512:
-  metadata.gz: d116c25e3ef63211b53222cc2baf36c7469b4da0526d464a30981bbde0e18abdf1860bb4f84a2ac19e89a4ea9ed1f43698e08139214773092e2dd82f74cb8233
-  data.tar.gz: 5550db7a5ddca2f6e0512184a5706504226315337af5eaa357a1f9756afcc01718ce09e00e06cd845c52c19d3ec45180fbbcf4f6447942f767cf9fc73dd29e41
+  metadata.gz: 301c38b5c92a927d11d73420e88a47442e3dbcc7445850bb269412dc1c2c4edf3dd97456e8bbbed13de1fa013dec139652b274248ae882e294ce48912d3935e9
+  data.tar.gz: 6e2dc40b2761b4484191368b2ebadea5045d1d35c28306bbd09b97d5433badeb1c5e31a1c9af54222e7583377488bdcf4f300b545882d7ed1d303c2470c13716

data/lib/async/http/client.rb

@@ -11,8 +11,6 @@ require "async/pool/controller"
 require "protocol/http/body/completable"
 require "protocol/http/methods"
 
-require "traces/provider"
-
 require_relative "protocol"
 
 module Async
@@ -168,56 +166,6 @@ module Async
 					@protocol.client(@endpoint.connect)
 				end
 			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
-					
-					Traces.trace("async.http.client.call", attributes: attributes) do |span|
-						if context = Traces.trace_context
-							request.headers["traceparent"] = context.to_s
-							# request.headers['tracestate'] = context.state
-						end
-						
-						super.tap do |response|
-							if version = response&.version
-								span["http.version"] = version
-							end
-							
-							if status = response&.status
-								span["http.status_code"] = status
-							end
-							
-							if length = response.body&.length
-								span["http.response.length"] = length
-							end
-						end
-					end
-				end
-				
-				def make_response(request, connection, attempt)
-					attributes = {
-						attempt: attempt,
-					}
-					
-					Traces.trace("async.http.client.make_response", attributes: attributes) do
-						super
-					end
-				end
-			end
 		end
 	end
 end

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

@@ -5,8 +5,6 @@
 
 require_relative "connection"
 
-require "traces/provider"
-
 module Async
 	module HTTP
 		module Protocol
@@ -88,20 +86,6 @@ module Async
 						self.close(error)
 						raise
 					end
-					
-					Traces::Provider(self) do
-						def write_request(...)
-							Traces.trace("async.http.protocol.http1.client.write_request") do
-								super
-							end
-						end
-						
-						def read_response(...)
-							Traces.trace("async.http.protocol.http1.client.read_response") do
-								super
-							end
-						end
-					end
 				end
 			end
 		end

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

@@ -6,7 +6,6 @@
 require_relative "connection"
 require_relative "response"
 
-require "traces/provider"
 require "protocol/http2/client"
 
 module Async
@@ -46,20 +45,6 @@ module Async
 					def read_response(response)
 						response.wait
 					end
-					
-					Traces::Provider(self) do
-						def write_request(...)
-							Traces.trace("async.http.protocol.http2.client.write_request") do
-								super
-							end
-						end
-						
-						def read_response(...)
-							Traces.trace("async.http.protocol.http2.client.read_response") do
-								super
-							end
-						end
-					end
 				end
 			end
 		end

data/lib/async/http/server.rb

@@ -7,7 +7,6 @@
 require "async"
 require "io/endpoint"
 require "protocol/http/middleware"
-require "traces/provider"
 
 require_relative "protocol"
 
@@ -70,43 +69,6 @@ module Async
 					task.children.each(&:wait)
 				end
 			end
-			
-			Traces::Provider(self) do
-				def call(request)
-					if trace_parent = request.headers["traceparent"]
-						Traces.trace_context = Traces::Context.parse(trace_parent.join, request.headers["tracestate"], remote: true)
-					end
-					
-					attributes = {
-						'http.version': request.version,
-						'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
-					
-					Traces.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

@@ -5,6 +5,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.90.2"
+		VERSION = "0.91.0"
 	end
 end

data/lib/traces/provider/async/http/client.rb

@@ -0,0 +1,51 @@
+require_relative "../../../../async/http/client"
+
+Traces::Provider(Async::HTTP::Client) 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
+		
+		Traces.trace("async.http.client.call", attributes: attributes) do |span|
+			if context = Traces.trace_context
+				request.headers["traceparent"] = context.to_s
+				# request.headers['tracestate'] = context.state
+			end
+			
+			super.tap do |response|
+				if version = response&.version
+					span["http.version"] = version
+				end
+				
+				if status = response&.status
+					span["http.status_code"] = status
+				end
+				
+				if length = response.body&.length
+					span["http.response.length"] = length
+				end
+			end
+		end
+	end
+	
+	def make_response(request, connection, attempt)
+		attributes = {
+			attempt: attempt,
+		}
+		
+		Traces.trace("async.http.client.make_response", attributes: attributes) do
+			super
+		end
+	end
+end

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

@@ -0,0 +1,15 @@
+require_relative "../../../../../../async/http/protocol/http1/client"
+
+Traces::Provider(Async::HTTP::Protocol::HTTP1::Client) do
+	def write_request(...)
+		Traces.trace("async.http.protocol.http1.client.write_request") do
+			super
+		end
+	end
+	
+	def read_response(...)
+		Traces.trace("async.http.protocol.http1.client.read_response") do
+			super
+		end
+	end
+end

data/lib/traces/provider/async/http/protocol/http2/client.rb

@@ -0,0 +1,15 @@
+require_relative "../../../../../../async/http/protocol/http2/client"
+
+Traces::Provider(Async::HTTP::Protocol::HTTP2::Client) do
+	def write_request(...)
+		Traces.trace("async.http.protocol.http2.client.write_request") do
+			super
+		end
+	end
+	
+	def read_response(...)
+		Traces.trace("async.http.protocol.http2.client.read_response") do
+			super
+		end
+	end
+end

data/lib/traces/provider/async/http/server.rb

@@ -0,0 +1,38 @@
+require_relative "../../../../async/http/server"
+
+Traces::Provider(Async::HTTP::Server) do
+	def call(request)
+		if trace_parent = request.headers["traceparent"]
+			Traces.trace_context = Traces::Context.parse(trace_parent.join, request.headers["tracestate"], remote: true)
+		end
+		
+		attributes = {
+			'http.version': request.version,
+			'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
+		
+		Traces.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

data/lib/traces/provider/async/http.rb

@@ -0,0 +1,2 @@
+require_relative "http/client"
+require_relative "http/server"

data/readme.md

@@ -16,6 +16,10 @@ Please see the [project documentation](https://socketry.github.io/async-http/) f
 
 Please see the [project releases](https://socketry.github.io/async-http/releases/index) for all releases.
 
+### v0.91.0
+
+  - Move all default trace providers into `traces/provider/async/http`.
+
 ### v0.90.2
 
   - Don't emit `resource:` keyword argument in traces - it's unsupported by OpenTelemetry.
@@ -55,10 +59,6 @@ Please see the [project releases](https://socketry.github.io/async-http/releases
   - Remove `Async::HTTP::Body::Delayed` with no replacement.
   - Remove `Async::HTTP::Body::Slowloris` with no replacement.
 
-### v0.75.0
-
-  - Better handling of HTTP/1 \<-\> HTTP/2 proxying, specifically upgrade/CONNECT requests.
-
 ## See Also
 
   - [benchmark-http](https://github.com/socketry/benchmark-http) — A benchmarking tool to report on web server concurrency.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.91.0
+
+  - Move all default trace providers into `traces/provider/async/http`.
+
 ## v0.90.2
 
   - Don't emit `resource:` keyword argument in traces - it's unsupported by OpenTelemetry.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.90.2
+  version: 0.91.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -238,6 +238,11 @@ files:
 - lib/metrics/provider/async/http.rb
 - lib/metrics/provider/async/http/client.rb
 - lib/metrics/provider/async/http/server.rb
+- lib/traces/provider/async/http.rb
+- lib/traces/provider/async/http/client.rb
+- lib/traces/provider/async/http/protocol/http1/client.rb
+- lib/traces/provider/async/http/protocol/http2/client.rb
+- lib/traces/provider/async/http/server.rb
 - license.md
 - readme.md
 - releases.md