File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -77,6 +77,7 @@ def _deduplicate_metadata_tokens(*headers: str) -> str:
7777 # Deduplicate while preserving order
7878 return " " .join (dict .fromkeys (token_list ))
7979
80+
8081def _extract_metrics_header (metadata ) -> Tuple [str , List [Tuple [str , str ]]]:
8182 """Extract x-google-api-client header from metadata list.
8283
@@ -172,11 +173,11 @@ def __call__(
172173 final_metadata = list (self ._static_metadata )
173174 user_x_goog , remaining = _extract_metrics_header (user_metadata )
174175
175- merged_header = _deduplicate_metadata_tokens (self ._x_goog_api_client , user_x_goog )
176+ merged_header = _deduplicate_metadata_tokens (
177+ self ._x_goog_api_client , user_x_goog
178+ )
176179 if merged_header :
177- final_metadata .append (
178- (client_info .METRICS_METADATA_KEY , merged_header )
179- )
180+ final_metadata .append ((client_info .METRICS_METADATA_KEY , merged_header ))
180181 final_metadata .extend (remaining )
181182 kwargs ["metadata" ] = final_metadata
182183 elif self ._default_metadata :
Original file line number Diff line number Diff line change @@ -126,9 +126,11 @@ def test_extract_metrics_header_duplicate_tokens():
126126 ("other-header" , "value" ),
127127 ("x-goog-api-client" , "token4 token2" ),
128128 ]
129-
130- metric_str , arbitrary_metadata = google .api_core .gapic_v1 .method ._extract_metrics_header (metadata )
131-
129+
130+ metric_str , arbitrary_metadata = (
131+ google .api_core .gapic_v1 .method ._extract_metrics_header (metadata )
132+ )
133+
132134 # Should maintain order of first appearance and eliminate duplicates
133135 assert metric_str == "token1 token2 token3 token4"
134136 assert arbitrary_metadata == [("other-header" , "value" )]
@@ -155,7 +157,10 @@ def test_invoke_wrapped_method_with_duplicate_x_goog_api_client_metadata():
155157 mock .sentinel .request ,
156158 metadata = [
157159 ("x-goog-api-client" , "override-client/2.0" ),
158- ("x-goog-api-client" , "override-client/2.0 grpc/1.76.0 custom-user-agent/1.0" ),
160+ (
161+ "x-goog-api-client" ,
162+ "override-client/2.0 grpc/1.76.0 custom-user-agent/1.0" ,
163+ ),
159164 ("other-header" , "value" ),
160165 ],
161166 )
You can’t perform that action at this time.
0 commit comments