From 13db5982f7d1420e5318dcb1d58a06f4aa01de9d Mon Sep 17 00:00:00 2001
From: LutzLange <lutz.lange@instana.com>
Date: Fri, 17 Apr 2020 10:30:16 +0200
Subject: [PATCH] Revert "Instana enablement for frontend"

This reverts commit ad5939d7f0004f965a0cfcc32f75484063d2a768.
---
 kubernetes-manifests/adservice.yaml             |  2 +-
 kubernetes-manifests/cartservice.yaml           |  2 +-
 kubernetes-manifests/checkoutservice.yaml       |  2 +-
 kubernetes-manifests/currencyservice.yaml       |  2 +-
 kubernetes-manifests/emailservice.yaml          |  2 +-
 kubernetes-manifests/frontend.yaml              | 12 +++---------
 kubernetes-manifests/paymentservice.yaml        |  2 +-
 kubernetes-manifests/productcatalogservice.yaml |  2 +-
 kubernetes-manifests/recommendationservice.yaml |  2 +-
 kubernetes-manifests/shippingservice.yaml       |  2 +-
 src/frontend/main.go                            | 13 ++++---------
 11 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml
index 602c7b2..713ebcd 100644
--- a/kubernetes-manifests/adservice.yaml
+++ b/kubernetes-manifests/adservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: addserver
+      - name: server
         image: adservice
         ports:
         - containerPort: 9555
diff --git a/kubernetes-manifests/cartservice.yaml b/kubernetes-manifests/cartservice.yaml
index 0c29e3a..fcfe0f5 100644
--- a/kubernetes-manifests/cartservice.yaml
+++ b/kubernetes-manifests/cartservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: cartserver
+      - name: server
         image: cartservice
         ports:
         - containerPort: 7070
diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml
index ae30e63..501210a 100644
--- a/kubernetes-manifests/checkoutservice.yaml
+++ b/kubernetes-manifests/checkoutservice.yaml
@@ -26,7 +26,7 @@ spec:
         app: checkoutservice
     spec:
       containers:
-        - name: checkoutserver
+        - name: server
           image: checkoutservice
           ports:
           - containerPort: 5050
diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml
index b9d0a0d..6d1b21a 100644
--- a/kubernetes-manifests/currencyservice.yaml
+++ b/kubernetes-manifests/currencyservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: currencyserver
+      - name: server
         image: currencyservice
         ports:
         - name: grpc
diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml
index 0a95ca3..2ae3823 100644
--- a/kubernetes-manifests/emailservice.yaml
+++ b/kubernetes-manifests/emailservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: emailserver
+      - name: server
         image: emailservice
         ports:
         - containerPort: 8080
diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml
index 27c0605..5c5cd32 100644
--- a/kubernetes-manifests/frontend.yaml
+++ b/kubernetes-manifests/frontend.yaml
@@ -26,7 +26,7 @@ spec:
         app: frontend
     spec:
       containers:
-        - name: frontendserver
+        - name: server
           image: frontend
           ports:
           - containerPort: 8080
@@ -63,14 +63,8 @@ spec:
             value: "checkoutservice:5050"
           - name: AD_SERVICE_ADDR
             value: "adservice:9555"
-          - name: JAEGER_SERVICE_HOST
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
-          - name: JAEGER_SERVICE_PORT
-            value: "42699"
-          - name: JAEGER_SERVICE_PATH
-            value: "/com.instana.plugin.jaeger.trace"
+          # - name: JAEGER_SERVICE_ADDR
+          #   value: "jaeger-collector:14268"
           resources:
             requests:
               cpu: 100m
diff --git a/kubernetes-manifests/paymentservice.yaml b/kubernetes-manifests/paymentservice.yaml
index bc83a98..fa62c08 100644
--- a/kubernetes-manifests/paymentservice.yaml
+++ b/kubernetes-manifests/paymentservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: paymentserver
+      - name: server
         image: paymentservice
         ports:
         - containerPort: 50051
diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml
index 8309ff6..b175856 100644
--- a/kubernetes-manifests/productcatalogservice.yaml
+++ b/kubernetes-manifests/productcatalogservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: productcatalogserver
+      - name: server
         image: productcatalogservice
         ports:
         - containerPort: 3550
diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml
index 994f0db..1ccc4ab 100644
--- a/kubernetes-manifests/recommendationservice.yaml
+++ b/kubernetes-manifests/recommendationservice.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: recommendationserver
+      - name: server
         image: recommendationservice
         ports:
         - containerPort: 8080
diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml
index 4d2da82..d4049ad 100644
--- a/kubernetes-manifests/shippingservice.yaml
+++ b/kubernetes-manifests/shippingservice.yaml
@@ -26,7 +26,7 @@ spec:
         app: shippingservice
     spec:
       containers:
-      - name: shippingserver
+      - name: server
         image: shippingservice
         ports:
         - containerPort: 50051
diff --git a/src/frontend/main.go b/src/frontend/main.go
index f4873e0..5ba9577 100644
--- a/src/frontend/main.go
+++ b/src/frontend/main.go
@@ -145,21 +145,16 @@ func main() {
 
 func initJaegerTracing(log logrus.FieldLogger) {
 
-	svcHost := os.Getenv("JAEGER_SERVICE_HOST")
-	if svcHost == "" {
+	svcAddr := os.Getenv("JAEGER_SERVICE_ADDR")
+	if svcAddr == "" {
 		log.Info("jaeger initialization disabled.")
 		return
 	}
 
-	svcPort := os.Getenv("JAEGER_SERVICE_PORT")
-	svcPath := os.Getenv("JAEGER_SERVICE_PATH")
-        svcFull := fmt.Sprintf("http://%s:%s%s", svcHost, svcPort, svcPath)
-
 	// Register the Jaeger exporter to be able to retrieve
 	// the collected spans.
 	exporter, err := jaeger.NewExporter(jaeger.Options{
-		// Endpoint: fmt.Sprintf("http://%s:%s%s", svcHost, svcPort, svcPath),
-		Endpoint: svcFull,
+		Endpoint: fmt.Sprintf("http://%s", svcAddr),
 		Process: jaeger.Process{
 			ServiceName: "frontend",
 		},
@@ -168,7 +163,7 @@ func initJaegerTracing(log logrus.FieldLogger) {
 		log.Fatal(err)
 	}
 	trace.RegisterExporter(exporter)
-	log.Info("jaeger initialization completed. connected to ", svcFull)
+	log.Info("jaeger initialization completed.")
 }
 
 func initStats(log logrus.FieldLogger, exporter *stackdriver.Exporter) {