Skip to content

Commit

Permalink
Merge pull request #1648 from daizhenyu/develop-2.1.x-okhttp
Browse files Browse the repository at this point in the history
fix the issue that xds routing fails when okhttp2.2.0 is used
  • Loading branch information
Sherlockhan authored Oct 14, 2024
2 parents 6fe851e + 864bbfb commit 8c7fe58
Showing 1 changed file with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package io.sermant.router.spring.interceptor;

import com.squareup.okhttp.Headers;
import com.squareup.okhttp.HttpUrl;
import com.squareup.okhttp.Request;

import io.sermant.core.common.LoggerFactory;
Expand All @@ -31,6 +30,7 @@

import java.io.IOException;
import java.net.URI;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -89,8 +89,15 @@ private Map<String, String> getHeaders(Request request) {
}

private Request rebuildRequest(Request request, URI uri, ServiceInstance serviceInstance) {
URL url = null;
try {
url = new URL(BaseHttpRouterUtils.rebuildUrlByXdsServiceInstance(uri, serviceInstance));
} catch (IOException e) {
LOGGER.log(Level.WARNING, "Convert url string to url failed.", e.getMessage());
return request;
}
return request.newBuilder()
.url(HttpUrl.parse(BaseHttpRouterUtils.rebuildUrlByXdsServiceInstance(uri, serviceInstance)))
.url(url)
.build();
}

Expand Down

0 comments on commit 8c7fe58

Please sign in to comment.