Skip to content

Commit c55f4c4

Browse files
authored
Let Envoy ALS support more address type in sidecar role (#13376)
1 parent 8a61edd commit c55f4c4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8sALSServiceMeshHTTPAnalysis.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ protected Result analyzeSideCar(final Result previousResult, final HTTPAccessLog
103103
properties.hasDownstreamDirectRemoteAddress()
104104
? properties.getDownstreamDirectRemoteAddress()
105105
: properties.getDownstreamRemoteAddress();
106-
final ServiceMetaInfo downstreamService = find(downstreamRemoteAddress.getSocketAddress().getAddress());
106+
final ServiceMetaInfo downstreamService = find(Addresses.getAddressIP(downstreamRemoteAddress));
107107
final Address downstreamLocalAddress = properties.getDownstreamLocalAddress();
108108
if (!isValid(downstreamRemoteAddress) || !isValid(downstreamLocalAddress)) {
109109
return previousResult;
110110
}
111-
final ServiceMetaInfo localService = find(downstreamLocalAddress.getSocketAddress().getAddress());
111+
final ServiceMetaInfo localService = find(Addresses.getAddressIP(downstreamLocalAddress));
112112

113113
final var result = Result.builder();
114114
final var previousMetrics = previousResult.getMetrics();
@@ -135,7 +135,7 @@ protected Result analyzeSideCar(final Result previousResult, final HTTPAccessLog
135135
if (!isValid(upstreamRemoteAddress)) {
136136
return result.metrics(ServiceMeshMetrics.newBuilder().setHttpMetrics(sources)).service(localService).build();
137137
}
138-
final ServiceMetaInfo destService = find(upstreamRemoteAddress.getSocketAddress().getAddress());
138+
final ServiceMetaInfo destService = find(Addresses.getAddressIP(upstreamRemoteAddress));
139139

140140
final HTTPServiceMeshMetric.Builder metric = newAdapter(entry, downstreamService, destService).adaptToUpstreamMetrics();
141141

0 commit comments

Comments
 (0)