4646_expected_metric_names = [
4747 "http.server.active_requests" ,
4848 "http.server.duration" ,
49+ "http.server.response.size" ,
50+ "http.server.request.size" ,
4951]
5052_recommended_attrs = {
5153 "http.server.active_requests" : _active_requests_count_attrs ,
5254 "http.server.duration" : _duration_attrs ,
55+ "http.server.response.size" : _duration_attrs ,
56+ "http.server.request.size" : _duration_attrs ,
5357}
5458
5559
5660async def http_app (scope , receive , send ):
5761 message = await receive ()
62+ scope ["headers" ] = [(b"content-length" , b"128" )]
5863 assert scope ["type" ] == "http"
5964 if message .get ("type" ) == "http.request" :
6065 await send (
6166 {
6267 "type" : "http.response.start" ,
6368 "status" : 200 ,
64- "headers" : [[b"Content-Type" , b"text/plain" ]],
69+ "headers" : [
70+ [b"Content-Type" , b"text/plain" ],
71+ [b"content-length" , b"1024" ],
72+ ],
6573 }
6674 )
6775 await send ({"type" : "http.response.body" , "body" : b"*" })
@@ -94,6 +102,7 @@ async def error_asgi(scope, receive, send):
94102 assert isinstance (scope , dict )
95103 assert scope ["type" ] == "http"
96104 message = await receive ()
105+ scope ["headers" ] = [(b"content-length" , b"128" )]
97106 if message .get ("type" ) == "http.request" :
98107 try :
99108 raise ValueError
@@ -103,7 +112,10 @@ async def error_asgi(scope, receive, send):
103112 {
104113 "type" : "http.response.start" ,
105114 "status" : 200 ,
106- "headers" : [[b"Content-Type" , b"text/plain" ]],
115+ "headers" : [
116+ [b"Content-Type" , b"text/plain" ],
117+ [b"content-length" , b"1024" ],
118+ ],
107119 }
108120 )
109121 await send ({"type" : "http.response.body" , "body" : b"*" })
@@ -126,7 +138,8 @@ def validate_outputs(self, outputs, error=None, modifiers=None):
126138 # Check http response start
127139 self .assertEqual (response_start ["status" ], 200 )
128140 self .assertEqual (
129- response_start ["headers" ], [[b"Content-Type" , b"text/plain" ]]
141+ response_start ["headers" ],
142+ [[b"Content-Type" , b"text/plain" ], [b"content-length" , b"1024" ]],
130143 )
131144
132145 exc_info = self .scope .get ("hack_exc_info" )
@@ -352,6 +365,7 @@ def test_traceresponse_header(self):
352365 response_start ["headers" ],
353366 [
354367 [b"Content-Type" , b"text/plain" ],
368+ [b"content-length" , b"1024" ],
355369 [b"traceresponse" , f"{ traceresponse } .encode ()],
356370 [b"access-control-expose-headers" , b"traceresponse" ],
357371 ],
@@ -565,6 +579,7 @@ def test_basic_metric_success(self):
565579 "http.flavor" : "1.0" ,
566580 }
567581 metrics_list = self .memory_metrics_reader .get_metrics_data ()
582+ # pylint: disable=too-many-nested-blocks
568583 for resource_metric in metrics_list .resource_metrics :
569584 for scope_metrics in resource_metric .scope_metrics :
570585 for metric in scope_metrics .metrics :
@@ -575,9 +590,14 @@ def test_basic_metric_success(self):
575590 dict (point .attributes ),
576591 )
577592 self .assertEqual (point .count , 1 )
578- self .assertAlmostEqual (
579- duration , point .sum , delta = 5
580- )
593+ if metric .name == "http.server.duration" :
594+ self .assertAlmostEqual (
595+ duration , point .sum , delta = 5
596+ )
597+ elif metric .name == "http.server.response.size" :
598+ self .assertEqual (1024 , point .sum )
599+ elif metric .name == "http.server.request.size" :
600+ self .assertEqual (128 , point .sum )
581601 elif isinstance (point , NumberDataPoint ):
582602 self .assertDictEqual (
583603 expected_requests_count_attributes ,
@@ -602,13 +622,12 @@ async def target_asgi(scope, receive, send):
602622 app = otel_asgi .OpenTelemetryMiddleware (target_asgi )
603623 self .seed_app (app )
604624 self .send_default_request ()
605-
606625 metrics_list = self .memory_metrics_reader .get_metrics_data ()
607626 assertions = 0
608627 for resource_metric in metrics_list .resource_metrics :
609628 for scope_metrics in resource_metric .scope_metrics :
610629 for metric in scope_metrics .metrics :
611- if metric .name != "http.server.duration " :
630+ if metric .name == "http.server.active_requests " :
612631 continue
613632 for point in metric .data .data_points :
614633 if isinstance (point , HistogramDataPoint ):
@@ -617,7 +636,7 @@ async def target_asgi(scope, receive, send):
617636 expected_target ,
618637 )
619638 assertions += 1
620- self .assertEqual (assertions , 1 )
639+ self .assertEqual (assertions , 3 )
621640
622641 def test_no_metric_for_websockets (self ):
623642 self .scope = {
0 commit comments