Remove all bool parsing - check if env exists

kubernetes-manifests/adservice.yaml

@@ -34,10 +34,10 @@ spec:
         env:
         - name: PORT
           value: "9555"
-        # - name: STATS
+        # - name: DISABLE_STATS
-        #   value: "False"
+        #   value: 1
-        # - name: TRACE
+        # - name: DISABLE_TRACING
-        #   value: "False"
+        #   value: 1
         #- name: JAEGER_SERVICE_ADDR
         #  value: "jaeger-collector:14268"
         resources:

kubernetes-manifests/checkoutservice.yaml

@@ -51,12 +51,12 @@ spec:
             value: "currencyservice:7000"
           - name: CART_SERVICE_ADDR
             value: "cartservice:7070"
-          # - name: STATS
+          # - name: DISABLE_STATS
-          #   value: "False"
+          #   value: 1
-          # - name: TRACE
+          # - name: DISABLE_TRACING
-          #   value: "False"
+          #   value: 1
-          # - name: PROFILER
+          # - name: DISABLE_PROFILER
-          #   value: "False"
+          #   value: 1
           # - name: JAEGER_SERVICE_ADDR
           #   value: "jaeger-collector:14268"
           resources:

kubernetes-manifests/currencyservice.yaml

@@ -35,12 +35,12 @@ spec:
         env:
         - name: PORT
           value: "7000"
-        # - name: TRACE
+        # - name: DISABLE_TRACING
-        #   value: "False"
+        #   value: 1
-        # - name: PROFILER
+        # - name: DISABLE_PROFILER
-        #   value: "False"
+        #   value: 1
-        # - name: DEBUGGER
+        # - name: DISABLE_DEBUGGER
-        #   value: "False"
+        #   value: 1
         readinessProbe:
           exec:
             command: ["/bin/grpc_health_probe", "-addr=:7000"]

kubernetes-manifests/emailservice.yaml

@@ -34,10 +34,10 @@ spec:
         env:
         - name: PORT
           value: "8080"
-        # - name: TRACE
+        # - name: DISABLE_TRACING
-        #   value: "False"
+        #   value: 1
-        # - name: PROFILER
+        # - name: DISABLE_PROFILER
-        #   value: "False"
+        #   value: 1
         readinessProbe:
           periodSeconds: 5
           exec:

kubernetes-manifests/frontend.yaml

@@ -65,10 +65,10 @@ spec:
             value: "checkoutservice:5050"
           - name: AD_SERVICE_ADDR
             value: "adservice:9555"
-          # - name: TRACE
+          # - name: DISABLE_TRACING
-          #   value: "False"
+          #   value: 1
-          # - name: PROFILER
+          # - name: DISABLE_PROFILER
-          #   value: "False"
+          #   value: 1
           # - name: JAEGER_SERVICE_ADDR
           #   value: "jaeger-collector:14268"
           resources:

kubernetes-manifests/productcatalogservice.yaml

@@ -34,12 +34,12 @@ spec:
         env:
         - name: PORT
           value: "3550"
-        # - name: STATS
+        # - name: DISABLE_STATS
-        #   value: "False"
+        #   value: 1
-        # - name: TRACE
+        # - name: DISABLE_TRACING
-        #   value: "False"
+        #   value: 1
-        # - name: PROFILER
+        # - name: DISABLE_PROFILER
-        #   value: "False"
+        #   value: 1
         # - name: JAEGER_SERVICE_ADDR
         #   value: "jaeger-collector:14268"
         readinessProbe:

kubernetes-manifests/recommendationservice.yaml

@@ -44,12 +44,12 @@ spec:
           value: "8080"
         - name: PRODUCT_CATALOG_SERVICE_ADDR
           value: "productcatalogservice:3550"
-        # - name: TRACE
+        # - name: DISABLE_TRACING
-        #   value: "False"
+        #   value: 1
-        # - name: PROFILER
+        # - name: DISABLE_PROFILER
-        #   value: "False"
+        #   value: 1
-        # - name: DEBUGGER
+        # - name: DISABLE_DEBUGGER
-        #   value: "False"
+        #   value: 1
         resources:
           requests:
             cpu: 100m

kubernetes-manifests/shippingservice.yaml

@@ -33,12 +33,12 @@ spec:
         env:
         - name: PORT
           value: "50051"
-        # - name: STATS
+        # - name: DISABLE_STATS
-        #   value: "False"
+        #   value: 1
-        # - name: TRACE
+        # - name: DISABLE_TRACING
-        #   value: "False"
+        #   value: 1
-        # - name: PROFILER
+        # - name: DISABLE_PROFILER
-        #   value: "False"
+        #   value: 1
         # - name: JAEGER_SERVICE_ADDR
         #   value: "jaeger-collector:14268"
         readinessProbe:

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

@@ -214,15 +214,12 @@ public final class AdService {
   }
 
   private static void initStats() {
-    String statsEnv = System.getenv("STATS");
+    if (System.getenv("DISABLE_STATS") != null) {
-    if (statsEnv == null) {
-      statsEnv = "true";
-    }
-    boolean stats = Boolean.parseBoolean(statsEnv);
-    if (!stats) {
       logger.info("Stats disabled.");
       return;
     }
+    logger.info("Stats enabled");
+
     long sleepTime = 10; /* seconds */
     int maxAttempts = 5;
     boolean statsExporterRegistered = false;
@@ -256,15 +253,12 @@ public final class AdService {
   }
 
   private static void initTracing() {
-    String traceEnv = System.getenv("TRACE");
+    if (System.getenv("DISABLE_TRACING") != null) {
-    if (traceEnv == null) {
-      traceEnv = "true";
-    }
-    boolean trace = Boolean.parseBoolean(traceEnv);
-    if (!trace) {
       logger.info("Tracing disabled.");
       return;
     }
+    logger.info("Tracing enabled");
+
     long sleepTime = 10; /* seconds */
     int maxAttempts = 5;
     boolean traceExporterRegistered = false;

src/checkoutservice/main.go

@@ -70,30 +70,18 @@ type checkoutService struct {
 }
 
 func main() {
-	stats, err := getenvBool("STATS")
+	statsEnabled := os.Getenv("DISABLE_STATS") == ""
-	if err != nil {
+	traceEnabled := os.Getenv("DISABLE_TRACING") == ""
-		log.Infof("Could not get STATS var: %v, defaulting to True", err)
+	profilerEnabled := os.Getenv("DISABLE_PROFILER") == ""
-		stats = true
-	}
 
-	trace, err := getenvBool("TRACE")
+	if traceEnabled {
-	if err != nil {
-		log.Infof("Could not get TRACE var: %v, defaulting to True", err)
-		trace = true
-	}
-	if trace == true {
 		log.Info("Tracing enabled.")
 		go initTracing()
 	} else {
 		log.Info("Tracing disabled.")
 	}
 
-	profiler, err := getenvBool("PROFILER")
+	if profilerEnabled {
-	if err != nil {
-		log.Infof("Could not get PROFILER var: %v, defaulting to True", err)
-		profiler = true
-	}
-	if profiler == true {
 		log.Info("Profiling enabled.")
 		go initProfiling("checkoutservice", "1.0.0")
 	} else {
@@ -121,7 +109,7 @@ func main() {
 	}
 
 	var srv *grpc.Server
-	if stats == true {
+	if statsEnabled {
 		log.Info("Stats enabled.")
 		srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
 	} else {

src/currencyservice/server.js

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-var profiler = process.env.PROFILER || "true";
+if(process.env.DISABLE_PROFILER) {
-profiler = profiler.toLowerCase();
+  console.log("Profiler disabled.")
-if (profiler == "true") {
+}
+else {
   console.log("Profiler enabled.")
   require('@google-cloud/profiler').start({
     serviceContext: {
@@ -24,22 +25,21 @@ if (profiler == "true") {
       version: '1.0.0'
     }
   });
-} else {
-  console.log("Profiler disabled.")
 }
 
-var trace = process.env.TRACE || "true";
+
-trace = trace.toLowerCase();
+if(process.env.DISABLE_TRACING) {
-if (trace == "true") {
-  console.log("Tracing enabled.")
-  require('@google-cloud/trace-agent').start();
-} else {
   console.log("Tracing disabled.")
 }
+else {
+  console.log("Tracing enabled.")
+  require('@google-cloud/trace-agent').start();
+}
 
-var debug = process.env.DEBUGGER || "true";
+if(process.env.DISABLE_DEBUGGER) {
-debug = debug.toLowerCase();
+  console.log("Debugger disabled.")
-if (debug == "true") {
+}
+else {
   console.log("Debugger enabled.")
   require('@google-cloud/debug-agent').start({
     serviceContext: {
@@ -47,8 +47,6 @@ if (debug == "true") {
       version: 'VERSION'
     }
   });
-} else {
-  console.log("Debugger disabled.")
 }
 
 const path = require('path');

src/emailservice/email_server.py

@@ -166,11 +166,11 @@ def initStackdriverProfiling():
 
 
 if __name__ == '__main__':
+  logger.info('starting the email service in dummy mode.')
+
   # Profiler
   try:
-    profiler = os.getenv('PROFILER', "true")
+    if "DISABLE_PROFILER" in os.environ:
-    profiler = profiler.lower()
-    if profiler != "true":
       raise KeyError()
     else:
       logger.info("Profiler enabled.")
@@ -180,9 +180,7 @@ if __name__ == '__main__':
 
   # Tracing
   try:
-    trace = os.getenv('TRACE', "true")
+    if "DISABLE_TRACING" in os.environ:
-    trace = trace.lower()
-    if trace != "true":
       raise KeyError()
     else:
       logger.info("Tracing enabled.")
@@ -195,5 +193,4 @@ if __name__ == '__main__':
       logger.info("Tracing disabled.")
       tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
 
-
   start(dummy_mode = True)

src/frontend/main.go

@@ -95,29 +95,21 @@ func main() {
 	}
 	log.Out = os.Stdout
 
-	trace, err := getenvBool("TRACE")
+	traceEnabled := os.Getenv("DISABLE_TRACING") == ""
-	if err != nil {
+	profilerEnabled := os.Getenv("DISABLE_PROFILER") == ""
-		log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
-		trace = true
-	}
 
-	profiler, err := getenvBool("PROFILER")
+	if traceEnabled {
-	if err != nil {
-		log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
-		profiler = true
-	}
-
-	if trace == true {
 		log.Info("Tracing enabled.")
 		go initTracing(log)
 	} else {
 		log.Info("Tracing disabled.")
 	}
-	if profiler == true {
+
+	if profilerEnabled {
 		log.Info("Profiling enabled.")
 		go initProfiling(log, "frontend", "1.0.0")
 	} else {
-		log.Info("Profiling disabled")
+		log.Info("Profiling disabled.")
 	}
 
 	srvPort := port

src/productcatalogservice/server.go

@@ -54,7 +54,7 @@ var (
 	port = "3550"
 
 	reloadCatalog bool
-	stats         bool
+	statsEnabled  bool
 )
 
 func init() {
@@ -76,32 +76,18 @@ func init() {
 }
 
 func main() {
-	var err error
+	statsEnabled = os.Getenv("DISABLE_STATS") == ""
-	stats, err = getenvBool("STATS")
+	traceEnabled := os.Getenv("DISABLE_TRACING") == ""
-	if err != nil {
+	profilerEnabled := os.Getenv("DISABLE_PROFILER") == ""
-		log.Errorf("Could not get STATS var: %v, defaulting to True", err)
-		stats = true
-	}
 
-	trace, err := getenvBool("TRACE")
+	if traceEnabled {
-	if err != nil {
-		log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
-		trace = true
-	}
-
-	profiler, err := getenvBool("PROFILER")
-	if err != nil {
-		log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
-		profiler = true
-	}
-
-	if trace == true {
 		log.Info("Tracing enabled.")
 		go initTracing()
 	} else {
 		log.Info("Tracing disabled.")
 	}
-	if profiler == true {
+
+	if profilerEnabled {
 		log.Info("Profiling enabled.")
 		go initProfiling("productcatalogservice", "1.0.0")
 	} else {
@@ -152,7 +138,7 @@ func run(port string) string {
 		log.Fatal(err)
 	}
 	var srv *grpc.Server
-	if stats == true {
+	if statsEnabled {
 		log.Info("Stats enabled.")
 		srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
 	} else {

src/recommendationservice/recommendation_server.py

@@ -89,11 +89,8 @@ class RecommendationService(demo_pb2_grpc.RecommendationServiceServicer):
 if __name__ == "__main__":
     logger.info("initializing recommendationservice")
 
-    # Profiler
     try:
-      profiler = os.getenv('PROFILER', "true")
+      if "DISABLE_PROFILER" in os.environ:
-      profiler = profiler.lower()
-      if profiler != "true":
         raise KeyError()
       else:
         logger.info("Profiler enabled.")
@@ -101,11 +98,8 @@ if __name__ == "__main__":
     except KeyError:
         logger.info("Profiler disabled.")
 
-    # Tracing
     try:
-      trace = os.getenv('TRACE', "true")
+      if "DISABLE_TRACING" in os.environ:
-      trace = trace.lower()
-      if trace != "true":
         raise KeyError()
       else:
         logger.info("Tracing enabled.")
@@ -118,11 +112,9 @@ if __name__ == "__main__":
         logger.info("Tracing disabled.")
         tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
 
-    # Debugger
+
     try:
-      debugger = os.getenv('DEBUGGER', "true")
+      if "DISABLE_DEBUGGER" in os.environ:
-      debugger = debugger.lower()
-      if debugger != "true":
         raise KeyError()
       else:
         logger.info("Debugger enabled.")

src/shippingservice/main.go

@@ -59,31 +59,18 @@ func init() {
 }
 
 func main() {
-	stats, err := getenvBool("STATS")
+	statsEnabled := os.Getenv("DISABLE_STATS") == ""
-	if err != nil {
+	traceEnabled := os.Getenv("DISABLE_TRACING") == ""
-		log.Errorf("Could not get STATS var: %v, defaulting to True", err)
+	profilerEnabled := os.Getenv("DISABLE_PROFILER") == ""
-		stats = true
-	}
 
-	trace, err := getenvBool("TRACE")
+	if traceEnabled {
-	if err != nil {
-		log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
-		trace = true
-	}
-
-	profiler, err := getenvBool("PROFILER")
-	if err != nil {
-		log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
-		profiler = true
-	}
-
-	if trace == true {
 		log.Info("Tracing enabled.")
 		go initTracing()
 	} else {
 		log.Info("Tracing disabled.")
 	}
-	if profiler == true {
+
+	if profilerEnabled {
 		log.Info("Profiling enabled.")
 		go initProfiling("shippingservice", "1.0.0")
 	} else {
@@ -102,7 +89,7 @@ func main() {
 	}
 
 	var srv *grpc.Server
-	if stats == true {
+	if statsEnabled {
 		log.Info("Stats enabled.")
 		srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
 	} else {