[skywalking] branch envoy-access-log updated: Improve the method of grab service name

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch envoy-access-log
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/envoy-access-log by this push:
     new 503d30d  Improve the method of grab service name
     new 31b7273  Merge remote-tracking branch 'origin/envoy-access-log' into envoy-access-log
503d30d is described below

commit 503d30df74e55b9a1c430a74dcf030732bcc555d
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Sat Apr 20 10:50:01 2019 +0800

    Improve the method of grab service name
---
 .../receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java
index bd539d9..a951925 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java
@@ -34,6 +34,7 @@ import io.kubernetes.client.Configuration;
 import io.kubernetes.client.apis.CoreV1Api;
 import io.kubernetes.client.apis.ExtensionsV1beta1Api;
 import io.kubernetes.client.models.V1ObjectMeta;
+import io.kubernetes.client.models.V1OwnerReference;
 import io.kubernetes.client.models.V1Pod;
 import io.kubernetes.client.models.V1PodList;
 import io.kubernetes.client.util.Config;
@@ -108,14 +109,16 @@ public class K8sALSServiceMeshHTTPAnalysis implements ALSHTTPAnalysis {
         DependencyResource meta = dr
                 .getOwnerResource("ReplicaSet", ownerReference ->
                         extensionsApi.readNamespacedReplicaSet(ownerReference.getName(), podMeta.getNamespace(),
-                "", true, true).getMetadata())
-                .getOwnerResource("Deployment", ownerReference ->
-                        extensionsApi.readNamespacedDeployment(ownerReference.getName(), podMeta.getNamespace(),
-                        "", true, true).getMetadata());
+                "", true, true).getMetadata());
         ServiceMetaInfo result = new ServiceMetaInfo();
-        result.setServiceName(String.format("%s.%s", meta.getMetadata().getName(), meta.getMetadata().getNamespace()));
+        if (meta.getMetadata().getOwnerReferences() != null && meta.getMetadata().getOwnerReferences().size() > 0) {
+            V1OwnerReference owner = meta.getMetadata().getOwnerReferences().get(0);
+            result.setServiceName(String.format("%s.%s", owner.getName(), meta.getMetadata().getNamespace()));
+        } else {
+            result.setServiceName(String.format("%s.%s", meta.getMetadata().getName(), meta.getMetadata().getNamespace()));
+        }
         result.setServiceInstanceName(String.format("%s.%s", podMeta.getName(), podMeta.getNamespace()));
-        result.setTags(transformLabelsToTags(meta.getMetadata().getLabels()));
+        result.setTags(transformLabelsToTags(podMeta.getLabels()));
         return result;
     }