update polaris version

pull/964/head
seanyu 2 years ago
parent fffb724b0b
commit 65f81aa049

@ -73,7 +73,7 @@
<revision>1.11.0-2022.0.1-SNAPSHOT</revision> <revision>1.11.0-2022.0.1-SNAPSHOT</revision>
<!-- Dependencies --> <!-- Dependencies -->
<polaris.version>1.11.6</polaris.version> <polaris.version>1.12.0-SNAPSHOT</polaris.version>
<guava.version>31.1-jre</guava.version> <guava.version>31.1-jre</guava.version>
<mocktio.version>4.9.0</mocktio.version> <mocktio.version>4.9.0</mocktio.version>
<byte-buddy.version>1.12.19</byte-buddy.version> <byte-buddy.version>1.12.19</byte-buddy.version>

@ -119,7 +119,6 @@ public abstract class AbstractPolarisReporterAdapter {
resultRequest.setMethod(uri.getPath()); resultRequest.setMethod(uri.getPath());
resultRequest.setRetCode(statusCode == null ? -1 : statusCode); resultRequest.setRetCode(statusCode == null ? -1 : statusCode);
resultRequest.setDelay(delay); resultRequest.setDelay(delay);
resultRequest.setProtocol(getProtocol(uri));
resultRequest.setCallerService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, MetadataContext.LOCAL_SERVICE)); resultRequest.setCallerService(new ServiceKey(MetadataContext.LOCAL_NAMESPACE, MetadataContext.LOCAL_SERVICE));
resultRequest.setCallerIp(this.context.getConfig().getGlobal().getAPI().getBindIP()); resultRequest.setCallerIp(this.context.getConfig().getGlobal().getAPI().getBindIP());
resultRequest.setHost(StringUtils.isBlank(calleeHost) ? uri.getHost() : calleeHost); resultRequest.setHost(StringUtils.isBlank(calleeHost) ? uri.getHost() : calleeHost);
@ -157,8 +156,7 @@ public abstract class AbstractPolarisReporterAdapter {
calleeServiceKey, calleeServiceKey,
StringUtils.isBlank(calleeHost) ? uri.getHost() : calleeHost, StringUtils.isBlank(calleeHost) ? uri.getHost() : calleeHost,
calleePort == null ? getPort(uri) : calleePort, calleePort == null ? getPort(uri) : calleePort,
callerServiceKey, callerServiceKey
getProtocol(uri)
); );
return new ResourceStat(resource, statusCode == null ? -1 : statusCode, delay, getDefaultRetStatus(statusCode, exception)); return new ResourceStat(resource, statusCode == null ? -1 : statusCode, delay, getDefaultRetStatus(statusCode, exception));
} }
@ -257,14 +255,6 @@ public abstract class AbstractPolarisReporterAdapter {
return retStatus; return retStatus;
} }
private String getProtocol(URI uri) {
String scheme = uri.getScheme();
if (StringUtils.isBlank(scheme)) {
scheme = "http";
}
return scheme;
}
private int getPort(URI uri) { private int getPort(URI uri) {
// -1 means access directly by url, and use http default port number 80 // -1 means access directly by url, and use http default port number 80
return uri.getPort() == -1 ? 80 : uri.getPort(); return uri.getPort() == -1 ? 80 : uri.getPort();

Loading…
Cancel
Save