fix merge conflict

pull/917/head
seanyu 3 years ago
parent ba123a4fa3
commit a2b80a50f5

@ -129,7 +129,6 @@ public class EnhancedRestTemplateReporter extends AbstractPolarisReporterAdapter
if (Boolean.parseBoolean(response.getHeaders().getFirst(POLARIS_CIRCUIT_BREAKER_FALLBACK_HEADER))) { if (Boolean.parseBoolean(response.getHeaders().getFirst(POLARIS_CIRCUIT_BREAKER_FALLBACK_HEADER))) {
return; return;
} }
ServiceCallResult resultRequest = createServiceCallResult(url);
try { try {
ServiceCallResult resultRequest = createServiceCallResult(url, response); ServiceCallResult resultRequest = createServiceCallResult(url, response);
Map<String, String> loadBalancerContext = MetadataContextHolder.get().getLoadbalancerMetadata(); Map<String, String> loadBalancerContext = MetadataContextHolder.get().getLoadbalancerMetadata();

Loading…
Cancel
Save