Revert "Instana enablement for frontend"

This reverts commit ad5939d7f0.

kubernetes-manifests/adservice.yaml

@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: addserver
+      - name: server
         image: adservice
         ports:
         - containerPort: 9555

kubernetes-manifests/cartservice.yaml

@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: cartserver
+      - name: server
         image: cartservice
         ports:
         - containerPort: 7070

kubernetes-manifests/checkoutservice.yaml

@@ -26,7 +26,7 @@ spec:
         app: checkoutservice
     spec:
       containers:
-        - name: checkoutserver
+        - name: server
           image: checkoutservice
           ports:
           - containerPort: 5050

kubernetes-manifests/currencyservice.yaml

@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: currencyserver
+      - name: server
         image: currencyservice
         ports:
         - name: grpc

kubernetes-manifests/emailservice.yaml

@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: emailserver
+      - name: server
         image: emailservice
         ports:
         - containerPort: 8080

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
+          # - name: JAEGER_SERVICE_ADDR
-            valueFrom:
+          #   value: "jaeger-collector:14268"
-              fieldRef:
-                fieldPath: spec.nodeName
-          - name: JAEGER_SERVICE_PORT
-            value: "42699"
-          - name: JAEGER_SERVICE_PATH
-            value: "/com.instana.plugin.jaeger.trace"
           resources:
             requests:
               cpu: 100m

kubernetes-manifests/paymentservice.yaml

@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: paymentserver
+      - name: server
         image: paymentservice
         ports:
         - containerPort: 50051

kubernetes-manifests/productcatalogservice.yaml

@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: productcatalogserver
+      - name: server
         image: productcatalogservice
         ports:
         - containerPort: 3550

kubernetes-manifests/recommendationservice.yaml

@@ -27,7 +27,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: recommendationserver
+      - name: server
         image: recommendationservice
         ports:
         - containerPort: 8080

kubernetes-manifests/shippingservice.yaml

@@ -26,7 +26,7 @@ spec:
         app: shippingservice
     spec:
       containers:
-      - name: shippingserver
+      - name: server
         image: shippingservice
         ports:
         - containerPort: 50051

src/frontend/main.go

@@ -145,21 +145,16 @@ func main() {
 
 func initJaegerTracing(log logrus.FieldLogger) {
 
-	svcHost := os.Getenv("JAEGER_SERVICE_HOST")
+	svcAddr := os.Getenv("JAEGER_SERVICE_ADDR")
-	if svcHost == "" {
+	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: fmt.Sprintf("http://%s", svcAddr),
-		Endpoint: svcFull,
 		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) {