From 6d91630b6c78c6e488930aec5d205c1f211e1d9d Mon Sep 17 00:00:00 2001
From: marcel-dempers <aimvec@gmail.com>
Date: Wed, 19 May 2021 17:01:35 +1000
Subject: [PATCH] fix spans

---
 kubernetes/servicemesh/applications/playlists-api/app.go | 4 ++--
 kubernetes/servicemesh/applications/videos-api/app.go    | 2 +-
 kubernetes/servicemesh/docker-compose.yaml               | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/kubernetes/servicemesh/applications/playlists-api/app.go b/kubernetes/servicemesh/applications/playlists-api/app.go
index 08a56a6..5fa071c 100644
--- a/kubernetes/servicemesh/applications/playlists-api/app.go
+++ b/kubernetes/servicemesh/applications/playlists-api/app.go
@@ -74,7 +74,7 @@ func main() {
 			opentracing.HTTPHeadersCarrier(r.Header),
 		)
 
-		span := opentracing.StartSpan("/ GET", ext.RPCServerOption(spanCtx))
+		span := opentracing.StartSpan("playlists-api / GET", ext.RPCServerOption(spanCtx))
 		defer span.Finish()
 
 		cors(w)
@@ -103,7 +103,7 @@ func main() {
 					panic(err)
 				}
 
-				span.Tracer().Inject(
+				videoSpan.Tracer().Inject(
 					span.Context(),
 					opentracing.HTTPHeaders,
 					opentracing.HTTPHeadersCarrier(req.Header),
diff --git a/kubernetes/servicemesh/applications/videos-api/app.go b/kubernetes/servicemesh/applications/videos-api/app.go
index 0c1f62a..b47a637 100644
--- a/kubernetes/servicemesh/applications/videos-api/app.go
+++ b/kubernetes/servicemesh/applications/videos-api/app.go
@@ -77,7 +77,7 @@ func main() {
 			opentracing.HTTPHeadersCarrier(r.Header),
 		)
 
-		span := opentracing.StartSpan("/id GET", ext.RPCServerOption(spanCtx))
+		span := opentracing.StartSpan("videos-api /id GET", ext.RPCServerOption(spanCtx))
 		defer span.Finish()
 		
 		if flaky == "true"{
diff --git a/kubernetes/servicemesh/docker-compose.yaml b/kubernetes/servicemesh/docker-compose.yaml
index 6ed9d92..3de463e 100644
--- a/kubernetes/servicemesh/docker-compose.yaml
+++ b/kubernetes/servicemesh/docker-compose.yaml
@@ -13,6 +13,7 @@ services:
     build:
       context: ./applications/playlists-api
     environment:
+    - "JAEGER_REPORTER_LOG_SPANS=true"
     - "ENVIRONMENT=DEBUG"
     - "REDIS_HOST=playlists-db"
     - "REDIS_PORT=6379"
@@ -25,6 +26,7 @@ services:
     build:
       context: ./applications/videos-api
     environment:
+    - "JAEGER_REPORTER_LOG_SPANS=true"
     - "ENVIRONMENT=DEBUG"
     - "REDIS_HOST=videos-db"
     - "REDIS_PORT=6379"