diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index 9605b96..eb1abdd 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/kubernetes-manifests/checkoutservice.yaml @@ -57,6 +57,11 @@ spec: value: "currencyservice:7000" - name: CART_SERVICE_ADDR value: "cartservice:7070" + - name: POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: NODE_NAME valueFrom: fieldRef: diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index 8736102..da7e39f 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -73,6 +73,11 @@ spec: value: "adservice:9555" - name: ENV_PLATFORM value: "gcp" + - name: POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: NODE_NAME valueFrom: fieldRef: diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index 04b8e05..0895222 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/kubernetes-manifests/productcatalogservice.yaml @@ -40,6 +40,11 @@ spec: env: - name: PORT value: "3550" + - name: POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: NODE_NAME valueFrom: fieldRef: diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index df30f62..92a27ec 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/kubernetes-manifests/shippingservice.yaml @@ -39,6 +39,11 @@ spec: env: - name: PORT value: "50051" + - name: POD_IP + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: status.podIP - name: NODE_NAME valueFrom: fieldRef: diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index db78a5f..4b4289f 100644 --- a/src/checkoutservice/main.go +++ b/src/checkoutservice/main.go @@ -39,8 +39,9 @@ import ( ) const ( - listenPort = "5050" - usdCurrency = "USD" + listenPort = "5050" + usdCurrency = "USD" + k8sIPLabelName = "k8s.pod.ip" ) var log *logrus.Logger @@ -131,6 +132,9 @@ func initJaegerTracing() { Endpoint: fmt.Sprintf("http://%s", svcAddr), Process: jaeger.Process{ ServiceName: "checkoutservice", + Tags: []jaeger.Tag{ + jaeger.StringTag(k8sIPLabelName, os.Getenv("POD_IP")), + }, }, }) if err != nil { diff --git a/src/frontend/main.go b/src/frontend/main.go index 3084fdc..c4fd9e2 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -43,6 +43,8 @@ const ( cookiePrefix = "shop_" cookieSessionID = cookiePrefix + "session-id" cookieCurrency = cookiePrefix + "currency" + + k8sIPLabelName = "k8s.pod.ip" ) var ( @@ -168,6 +170,9 @@ func initJaegerTracing(log logrus.FieldLogger) { Endpoint: fmt.Sprintf("http://%s", svcAddr), Process: jaeger.Process{ ServiceName: "frontend", + Tags: []jaeger.Tag{ + jaeger.StringTag(k8sIPLabelName, os.Getenv("POD_IP")), + }, }, }) if err != nil { diff --git a/src/productcatalogservice/server.go b/src/productcatalogservice/server.go index 7732a5e..a367362 100644 --- a/src/productcatalogservice/server.go +++ b/src/productcatalogservice/server.go @@ -54,6 +54,8 @@ var ( port = "3550" reloadCatalog bool + + k8sIPLabelName = "k8s.pod.ip" ) func init() { @@ -161,6 +163,9 @@ func initJaegerTracing() { Endpoint: fmt.Sprintf("http://%s", svcAddr), Process: jaeger.Process{ ServiceName: "productcatalogservice", + Tags: []jaeger.Tag{ + jaeger.StringTag(k8sIPLabelName, os.Getenv("POD_IP")), + }, }, }) if err != nil { diff --git a/src/shippingservice/main.go b/src/shippingservice/main.go index a13e417..3227673 100644 --- a/src/shippingservice/main.go +++ b/src/shippingservice/main.go @@ -38,7 +38,8 @@ import ( ) const ( - defaultPort = "50051" + defaultPort = "50051" + k8sIPLabelName = "k8s.pod.ip" ) var log *logrus.Logger @@ -167,6 +168,9 @@ func initJaegerTracing() { Endpoint: fmt.Sprintf("http://%s", svcAddr), Process: jaeger.Process{ ServiceName: "shippingservice", + Tags: []jaeger.Tag{ + jaeger.StringTag(k8sIPLabelName, os.Getenv("POD_IP")), + }, }, }) if err != nil {