email and recommendations - python

kubernetes-manifests/adservice.yaml

@@ -34,10 +34,10 @@ spec:
         env:
         - name: PORT
           value: "9555"
-        - name: OC_STATS
+        - name: SD_STATS
-          value: "True"
+          value: "False"
-        - name: OC_TRACE
+        - name: SD_TRACE
-          value: "True"
+          value: "False"
         #- name: JAEGER_SERVICE_ADDR
         #  value: "jaeger-collector:14268"
         resources:

kubernetes-manifests/checkoutservice.yaml

@@ -51,11 +51,11 @@ spec:
             value: "currencyservice:7000"
           - name: CART_SERVICE_ADDR
             value: "cartservice:7070"
-          - name: OC_STATS
+          - name: SD_STATS
             value: "False"
-          - name: OC_TRACE
+          - name: SD_TRACE
             value: "False"
-          - name: OC_PROFILING
+          - name: SD_PROFILER
             value: "False"
           # - name: JAEGER_SERVICE_ADDR
           #   value: "jaeger-collector:14268"

kubernetes-manifests/frontend.yaml

@@ -65,11 +65,11 @@ spec:
             value: "checkoutservice:5050"
           - name: AD_SERVICE_ADDR
             value: "adservice:9555"
-          - name: OC_STATS
+          - name: SD_STATS
             value: "False"
-          - name: OC_TRACE
+          - name: SD_TRACE
             value: "False"
-          - name: OC_PROFILING
+          - name: SD_PROFILER
             value: "False"
           # - name: JAEGER_SERVICE_ADDR
           #   value: "jaeger-collector:14268"

kubernetes-manifests/productcatalogservice.yaml

@@ -34,11 +34,11 @@ spec:
         env:
         - name: PORT
           value: "3550"
-        - name: OC_STATS
+        - name: SD_STATS
           value: "False"
-        - name: OC_TRACE
+        - name: SD_TRACE
           value: "False"
-        - name: OC_PROFILING
+        - name: SD_PROFILER
           value: "False"
         readinessProbe:
           exec:

kubernetes-manifests/recommendationservice.yaml

@@ -44,8 +44,14 @@ spec:
           value: "8080"
         - name: PRODUCT_CATALOG_SERVICE_ADDR
           value: "productcatalogservice:3550"
-        - name: ENABLE_PROFILER
+        - name: SD_PROFILER
-          value: "0"
+          value: "False"
+        - name: SD_STATS
+          value: "False"
+        - name: SD_TRACE
+          value: "False"
+        - name: SD_DEBUGGER
+          value: "False"
         resources:
           requests:
             cpu: 100m

kubernetes-manifests/shippingservice.yaml

@@ -33,11 +33,11 @@ spec:
         env:
         - name: PORT
           value: "50051"
-        - name: OC_STATS
+        - name: SD_STATS
           value: "False"
-        - name: OC_TRACE
+        - name: SD_TRACE
           value: "False"
-        - name: OC_PROFILING
+        - name: SD_PROFILER
           value: "False"
         readinessProbe:
           periodSeconds: 5

src/adservice/src/main/java/hipstershop/AdService.java

@@ -214,8 +214,8 @@ public final class AdService {
   }
 
   private static void initStats() {
-    boolean ocStats = Boolean.parseBoolean(System.getenv("OC_STATS"));
+    boolean sdStats = Boolean.parseBoolean(System.getenv("SD_STATS"));
-    if (!ocStats) {
+    if (!sdStats) {
       logger.info("Stats disabled.");
       return;
     }
@@ -252,8 +252,8 @@ public final class AdService {
   }
 
   private static void initTracing() {
-    boolean ocTrace = Boolean.parseBoolean(System.getenv("OC_TRACE"));
+    boolean sdTrace = Boolean.parseBoolean(System.getenv("SD_TRACE"));
-    if (!ocTrace) {
+    if (!sdTrace) {
       logger.info("Tracing disabled.");
       return;
     }

src/checkoutservice/main.go

@@ -70,30 +70,30 @@ type checkoutService struct {
 }
 
 func main() {
-	ocStats, err := getenvBool("OC_STATS")
+	sdStats, err := getenvBool("SD_STATS")
 	if err != nil {
-		log.Errorf("Could not get OC_STATS var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err)
-		ocStats = true
+		sdStats = true
 	}
 
-	ocTrace, err := getenvBool("OC_TRACE")
+	sdTrace, err := getenvBool("SD_TRACE")
 	if err != nil {
-		log.Errorf("Could not get OC_TRACE var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err)
-		ocTrace = true
+		sdTrace = true
 	}
 
-	ocProfiling, err := getenvBool("OC_PROFILING")
+	sdProfiler, err := getenvBool("SD_PROFILER")
 	if err != nil {
-		log.Errorf("Could not get OC_PROFILING var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err)
-		ocProfiling = true
+		sdProfiler = true
 	}
 
-	if ocTrace == true {
+	if sdTrace == true {
 		go initTracing()
 	} else {
 		log.Info("Tracing disabled.")
 	}
-	if ocProfiling == true {
+	if sdProfiler == true {
 		go initProfiling("checkoutservice", "1.0.0")
 	} else {
 		log.Info("Profiling disabled.")
@@ -120,7 +120,7 @@ func main() {
 	}
 
 	var srv *grpc.Server
-	if ocStats == true {
+	if sdStats == true {
 		log.Info("Stats enabled.")
 		srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
 	} else {

src/emailservice/email_server.py

@@ -35,6 +35,15 @@ from opencensus.trace.samplers import always_on
 # import googleclouddebugger
 import googlecloudprofiler
 
+from logger import getJSONLogger
+logger = getJSONLogger('emailservice-server')
+
+
+sdTrace = os.getenv('SD_TRACE', True)
+sdStats = os.getenv('SD_STATS', True)
+
+if sdTrace != False:
+  logger.info("Tracing enabled.")
   try:
       sampler = always_on.AlwaysOnSampler()
       exporter = stackdriver_exporter.StackdriverExporter(
@@ -43,6 +52,11 @@ try:
       tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter)
   except:
       tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
+else:
+    logger.info("Tracing disabled.")
+    tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
+
+
 
 # try:
 #     googleclouddebugger.enable(
@@ -52,9 +66,6 @@ except:
 # except:
 #     pass
 
-from logger import getJSONLogger
-logger = getJSONLogger('emailservice-server')
-
 # Loads confirmation email template from file
 env = Environment(
     loader=FileSystemLoader('templates'),

src/frontend/main.go

@@ -95,24 +95,24 @@ func main() {
 	}
 	log.Out = os.Stdout
 
-	ocTrace, err := getenvBool("OC_TRACE")
+	sdTrace, err := getenvBool("SD_TRACE")
 	if err != nil {
-		log.Errorf("Could not get OC_TRACE var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err)
-		ocTrace = true
+		sdTrace = true
 	}
 
-	ocProfiling, err := getenvBool("OC_PROFILING")
+	sdProfiler, err := getenvBool("SD_PROFILER")
 	if err != nil {
-		log.Errorf("Could not get OC_PROFILING var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err)
-		ocProfiling = true
+		sdProfiler = true
 	}
 
-	if ocTrace == true {
+	if sdTrace == true {
 		go initTracing(log)
 	} else {
 		log.Info("Tracing disabled.")
 	}
-	if ocProfiling == true {
+	if sdProfiler == true {
 		go initProfiling(log, "frontend", "1.0.0")
 	} else {
 		log.Info("Profiling disabled")

src/productcatalogservice/server.go

@@ -54,7 +54,7 @@ var (
 	port = "3550"
 
 	reloadCatalog bool
-	ocStats       bool
+	sdStats       bool
 )
 
 func init() {
@@ -77,30 +77,30 @@ func init() {
 
 func main() {
 	var err error
-	ocStats, err = getenvBool("OC_STATS")
+	sdStats, err = getenvBool("SD_STATS")
 	if err != nil {
-		log.Errorf("Could not get OC_STATS var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err)
-		ocStats = true
+		sdStats = true
 	}
 
-	ocTrace, err := getenvBool("OC_TRACE")
+	sdTrace, err := getenvBool("SD_TRACE")
 	if err != nil {
-		log.Errorf("Could not get OC_TRACE var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err)
-		ocTrace = true
+		sdTrace = true
 	}
 
-	ocProfiling, err := getenvBool("OC_PROFILING")
+	sdProfiler, err := getenvBool("SD_PROFILER")
 	if err != nil {
-		log.Errorf("Could not get OC_PROFILING var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err)
-		ocProfiling = true
+		sdProfiler = true
 	}
 
-	if ocTrace == true {
+	if sdTrace == true {
 		go initTracing()
 	} else {
 		log.Info("Tracing disabled.")
 	}
-	if ocProfiling == true {
+	if sdProfiler == true {
 		go initProfiling("productcatalogservice", "1.0.0")
 	} else {
 		log.Info("Profiling disabled.")
@@ -150,7 +150,7 @@ func run(port string) string {
 		log.Fatal(err)
 	}
 	var srv *grpc.Server
-	if ocStats == true {
+	if sdStats == true {
 		log.Info("Stats enabled.")
 		srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
 	} else {

src/recommendationservice/recommendation_server.py

@@ -88,15 +88,24 @@ class RecommendationService(demo_pb2_grpc.RecommendationServiceServicer):
 if __name__ == "__main__":
     logger.info("initializing recommendationservice")
 
+    # Profiler
     try:
-      enable_profiler = os.environ["ENABLE_PROFILER"]
+      sdProfiler = os.getenv('SD_PROFILER', True)
-      if enable_profiler != "1":
+      if sdProfiler != "True":
         raise KeyError()
       else:
+        logger.inf("Profiler enabled.")
         initStackdriverProfiling()
     except KeyError:
-      logger.info("Skipping Stackdriver Profiler Python agent initialization. Set environment variable ENABLE_PROFILER=1 to enable.")
+      logger.info("Profiler disabled.")
 
+    # Trace
+    sdTrace = os.getenv('SD_TRACE', True)
+    if sdTrace != True:
+      logger.info("Tracing disabled.")
+      tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
+    else:
+      logger.info("Tracing enabled.")
       try:
           sampler = always_on.AlwaysOnSampler()
           exporter = stackdriver_exporter.StackdriverExporter(
@@ -106,6 +115,13 @@ if __name__ == "__main__":
       except:
           tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
 
+    # Debugger
+    sdDebugger = os.getenv('SD_DEBUGGER', True)
+    if sdDebugger != True:
+      logger.info("Debugger disabled.")
+      tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
+    else:
+      logger.info("Debugger enabled.")
       try:
           googleclouddebugger.enable(
               module='recommendationserver',

src/shippingservice/main.go

@@ -59,30 +59,30 @@ func init() {
 }
 
 func main() {
-	ocStats, err := getenvBool("OC_STATS")
+	sdStats, err := getenvBool("SD_STATS")
 	if err != nil {
-		log.Errorf("Could not get OC_STATS var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err)
-		ocStats = true
+		sdStats = true
 	}
 
-	ocTrace, err := getenvBool("OC_TRACE")
+	sdTrace, err := getenvBool("SD_TRACE")
 	if err != nil {
-		log.Errorf("Could not get OC_TRACE var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err)
-		ocTrace = true
+		sdTrace = true
 	}
 
-	ocProfiling, err := getenvBool("OC_PROFILING")
+	sdProfiler, err := getenvBool("SD_PROFILER")
 	if err != nil {
-		log.Errorf("Could not get OC_PROFILING var: %v, defaulting to True", err)
+		log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err)
-		ocProfiling = true
+		sdProfiler = true
 	}
 
-	if ocTrace == true {
+	if sdTrace == true {
 		go initTracing()
 	} else {
 		log.Info("Tracing disabled.")
 	}
-	if ocProfiling == true {
+	if sdProfiler == true {
 		go initProfiling("shippingservice", "1.0.0")
 	} else {
 		log.Info("Profiling disabled.")
@@ -100,7 +100,7 @@ func main() {
 	}
 
 	var srv *grpc.Server
-	if ocStats == true {
+	if sdStats == true {
 		log.Info("Stats enabled.")
 		srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
 	} else {