From abb3c4fbb9be9316f86613e3c6ad5cee7b30aaf2 Mon Sep 17 00:00:00 2001 From: Megan O'Keefe Date: Wed, 19 Feb 2020 08:54:26 -0500 Subject: [PATCH] Remove all bool parsing - check if env exists --- kubernetes-manifests/adservice.yaml | 8 ++--- kubernetes-manifests/checkoutservice.yaml | 12 ++++---- kubernetes-manifests/currencyservice.yaml | 12 ++++---- kubernetes-manifests/emailservice.yaml | 8 ++--- kubernetes-manifests/frontend.yaml | 8 ++--- .../productcatalogservice.yaml | 12 ++++---- .../recommendationservice.yaml | 12 ++++---- kubernetes-manifests/shippingservice.yaml | 12 ++++---- .../src/main/java/hipstershop/AdService.java | 18 ++++------- src/checkoutservice/main.go | 24 ++++----------- src/currencyservice/server.js | 30 +++++++++---------- src/emailservice/email_server.py | 17 +++++------ src/frontend/main.go | 20 ++++--------- src/productcatalogservice/server.go | 30 +++++-------------- .../recommendation_server.py | 24 +++++---------- src/shippingservice/main.go | 27 +++++------------ 16 files changed, 104 insertions(+), 170 deletions(-) diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml index dd2fe48..bc68e3c 100644 --- a/kubernetes-manifests/adservice.yaml +++ b/kubernetes-manifests/adservice.yaml @@ -34,10 +34,10 @@ spec: env: - name: PORT value: "9555" - # - name: STATS - # value: "False" - # - name: TRACE - # value: "False" + # - name: DISABLE_STATS + # value: 1 + # - name: DISABLE_TRACING + # value: 1 #- name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" resources: diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index 5dd515d..de504d4 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/kubernetes-manifests/checkoutservice.yaml @@ -51,12 +51,12 @@ spec: value: "currencyservice:7000" - name: CART_SERVICE_ADDR value: "cartservice:7070" - # - name: STATS - # value: "False" - # - name: TRACE - # value: "False" - # - name: PROFILER - # value: "False" + # - name: DISABLE_STATS + # value: 1 + # - name: DISABLE_TRACING + # value: 1 + # - name: DISABLE_PROFILER + # value: 1 # - name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" resources: diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml index 9db3d41..0dfbd0d 100644 --- a/kubernetes-manifests/currencyservice.yaml +++ b/kubernetes-manifests/currencyservice.yaml @@ -35,12 +35,12 @@ spec: env: - name: PORT value: "7000" - # - name: TRACE - # value: "False" - # - name: PROFILER - # value: "False" - # - name: DEBUGGER - # value: "False" + # - name: DISABLE_TRACING + # value: 1 + # - name: DISABLE_PROFILER + # value: 1 + # - name: DISABLE_DEBUGGER + # value: 1 readinessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:7000"] diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml index 101ce49..ae07b05 100644 --- a/kubernetes-manifests/emailservice.yaml +++ b/kubernetes-manifests/emailservice.yaml @@ -34,10 +34,10 @@ spec: env: - name: PORT value: "8080" - # - name: TRACE - # value: "False" - # - name: PROFILER - # value: "False" + # - name: DISABLE_TRACING + # value: 1 + # - name: DISABLE_PROFILER + # value: 1 readinessProbe: periodSeconds: 5 exec: diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index 6536247..d7df91b 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -65,10 +65,10 @@ spec: value: "checkoutservice:5050" - name: AD_SERVICE_ADDR value: "adservice:9555" - # - name: TRACE - # value: "False" - # - name: PROFILER - # value: "False" + # - name: DISABLE_TRACING + # value: 1 + # - name: DISABLE_PROFILER + # value: 1 # - name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" resources: diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index a7ca340..3d77a30 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/kubernetes-manifests/productcatalogservice.yaml @@ -34,12 +34,12 @@ spec: env: - name: PORT value: "3550" - # - name: STATS - # value: "False" - # - name: TRACE - # value: "False" - # - name: PROFILER - # value: "False" + # - name: DISABLE_STATS + # value: 1 + # - name: DISABLE_TRACING + # value: 1 + # - name: DISABLE_PROFILER + # value: 1 # - name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" readinessProbe: diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml index 7bf2aca..68a39e4 100644 --- a/kubernetes-manifests/recommendationservice.yaml +++ b/kubernetes-manifests/recommendationservice.yaml @@ -44,12 +44,12 @@ spec: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: "productcatalogservice:3550" - # - name: TRACE - # value: "False" - # - name: PROFILER - # value: "False" - # - name: DEBUGGER - # value: "False" + # - name: DISABLE_TRACING + # value: 1 + # - name: DISABLE_PROFILER + # value: 1 + # - name: DISABLE_DEBUGGER + # value: 1 resources: requests: cpu: 100m diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index eec097d..d74aa1b 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/kubernetes-manifests/shippingservice.yaml @@ -33,12 +33,12 @@ spec: env: - name: PORT value: "50051" - # - name: STATS - # value: "False" - # - name: TRACE - # value: "False" - # - name: PROFILER - # value: "False" + # - name: DISABLE_STATS + # value: 1 + # - name: DISABLE_TRACING + # value: 1 + # - name: DISABLE_PROFILER + # value: 1 # - name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" readinessProbe: diff --git a/src/adservice/src/main/java/hipstershop/AdService.java b/src/adservice/src/main/java/hipstershop/AdService.java index c23c4ea..116821c 100644 --- a/src/adservice/src/main/java/hipstershop/AdService.java +++ b/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 (statsEnv == null) { - statsEnv = "true"; - } - boolean stats = Boolean.parseBoolean(statsEnv); - if (!stats) { + if (System.getenv("DISABLE_STATS") != null) { 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 (traceEnv == null) { - traceEnv = "true"; - } - boolean trace = Boolean.parseBoolean(traceEnv); - if (!trace) { + if (System.getenv("DISABLE_TRACING") != null) { logger.info("Tracing disabled."); return; } + logger.info("Tracing enabled"); + long sleepTime = 10; /* seconds */ int maxAttempts = 5; boolean traceExporterRegistered = false; diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index 2b15b3e..882c5ee 100644 --- a/src/checkoutservice/main.go +++ b/src/checkoutservice/main.go @@ -70,30 +70,18 @@ type checkoutService struct { } func main() { - stats, err := getenvBool("STATS") - if err != nil { - log.Infof("Could not get STATS var: %v, defaulting to True", err) - stats = true - } + statsEnabled := os.Getenv("DISABLE_STATS") == "" + traceEnabled := os.Getenv("DISABLE_TRACING") == "" + profilerEnabled := os.Getenv("DISABLE_PROFILER") == "" - trace, err := getenvBool("TRACE") - if err != nil { - log.Infof("Could not get TRACE var: %v, defaulting to True", err) - trace = true - } - if trace == true { + if traceEnabled { log.Info("Tracing enabled.") go initTracing() } else { log.Info("Tracing disabled.") } - profiler, err := getenvBool("PROFILER") - if err != nil { - log.Infof("Could not get PROFILER var: %v, defaulting to True", err) - profiler = true - } - if profiler == true { + if profilerEnabled { 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 { diff --git a/src/currencyservice/server.js b/src/currencyservice/server.js index 818262f..52ea639 100644 --- a/src/currencyservice/server.js +++ b/src/currencyservice/server.js @@ -14,9 +14,10 @@ * limitations under the License. */ -var profiler = process.env.PROFILER || "true"; -profiler = profiler.toLowerCase(); -if (profiler == "true") { +if(process.env.DISABLE_PROFILER) { + console.log("Profiler disabled.") +} +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 (trace == "true") { - console.log("Tracing enabled.") - require('@google-cloud/trace-agent').start(); -} else { + +if(process.env.DISABLE_TRACING) { console.log("Tracing disabled.") } +else { + console.log("Tracing enabled.") + require('@google-cloud/trace-agent').start(); +} -var debug = process.env.DEBUGGER || "true"; -debug = debug.toLowerCase(); -if (debug == "true") { +if(process.env.DISABLE_DEBUGGER) { + console.log("Debugger disabled.") +} +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'); diff --git a/src/emailservice/email_server.py b/src/emailservice/email_server.py index beaffdd..e283ca4 100644 --- a/src/emailservice/email_server.py +++ b/src/emailservice/email_server.py @@ -166,23 +166,21 @@ def initStackdriverProfiling(): if __name__ == '__main__': + logger.info('starting the email service in dummy mode.') + # Profiler try: - profiler = os.getenv('PROFILER', "true") - profiler = profiler.lower() - if profiler != "true": + if "DISABLE_PROFILER" in os.environ: raise KeyError() else: logger.info("Profiler enabled.") initStackdriverProfiling() except KeyError: - logger.info("Profiler disabled.") + logger.info("Profiler disabled.") # Tracing try: - trace = os.getenv('TRACE', "true") - trace = trace.lower() - if trace != "true": + if "DISABLE_TRACING" in os.environ: raise KeyError() else: logger.info("Tracing enabled.") @@ -192,8 +190,7 @@ if __name__ == '__main__': transport=AsyncTransport) tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter) except KeyError: - logger.info("Tracing disabled.") - tracer_interceptor = server_interceptor.OpenCensusServerInterceptor() - + logger.info("Tracing disabled.") + tracer_interceptor = server_interceptor.OpenCensusServerInterceptor() start(dummy_mode = True) diff --git a/src/frontend/main.go b/src/frontend/main.go index c1390ed..7259a93 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -95,29 +95,21 @@ func main() { } log.Out = os.Stdout - trace, err := getenvBool("TRACE") - if err != nil { - log.Errorf("Could not get TRACE var: %v, defaulting to True", err) - trace = true - } + traceEnabled := os.Getenv("DISABLE_TRACING") == "" + profilerEnabled := os.Getenv("DISABLE_PROFILER") == "" - profiler, err := getenvBool("PROFILER") - if err != nil { - log.Errorf("Could not get PROFILER var: %v, defaulting to True", err) - profiler = true - } - - if trace == true { + if traceEnabled { 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 diff --git a/src/productcatalogservice/server.go b/src/productcatalogservice/server.go index e22067c..75394e1 100644 --- a/src/productcatalogservice/server.go +++ b/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 - stats, err = getenvBool("STATS") - if err != nil { - log.Errorf("Could not get STATS var: %v, defaulting to True", err) - stats = true - } + statsEnabled = os.Getenv("DISABLE_STATS") == "" + traceEnabled := os.Getenv("DISABLE_TRACING") == "" + profilerEnabled := os.Getenv("DISABLE_PROFILER") == "" - trace, err := getenvBool("TRACE") - 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 { + if traceEnabled { 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 { diff --git a/src/recommendationservice/recommendation_server.py b/src/recommendationservice/recommendation_server.py index cb136c0..ac4cda9 100644 --- a/src/recommendationservice/recommendation_server.py +++ b/src/recommendationservice/recommendation_server.py @@ -89,23 +89,17 @@ class RecommendationService(demo_pb2_grpc.RecommendationServiceServicer): if __name__ == "__main__": logger.info("initializing recommendationservice") - # Profiler try: - profiler = os.getenv('PROFILER', "true") - profiler = profiler.lower() - if profiler != "true": + if "DISABLE_PROFILER" in os.environ: raise KeyError() else: logger.info("Profiler enabled.") initStackdriverProfiling() except KeyError: - logger.info("Profiler disabled.") + logger.info("Profiler disabled.") - # Tracing try: - trace = os.getenv('TRACE', "true") - trace = trace.lower() - if trace != "true": + if "DISABLE_TRACING" in os.environ: raise KeyError() else: logger.info("Tracing enabled.") @@ -115,14 +109,12 @@ if __name__ == "__main__": transport=AsyncTransport) tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter) except KeyError: - logger.info("Tracing disabled.") - tracer_interceptor = server_interceptor.OpenCensusServerInterceptor() + logger.info("Tracing disabled.") + tracer_interceptor = server_interceptor.OpenCensusServerInterceptor() + - # Debugger try: - debugger = os.getenv('DEBUGGER', "true") - debugger = debugger.lower() - if debugger != "true": + if "DISABLE_DEBUGGER" in os.environ: raise KeyError() else: logger.info("Debugger enabled.") @@ -136,7 +128,7 @@ if __name__ == "__main__": logger.error(traceback.print_exc()) pass except KeyError: - logger.info("Debugger disabled.") + logger.info("Debugger disabled.") port = os.environ.get('PORT', "8080") catalog_addr = os.environ.get('PRODUCT_CATALOG_SERVICE_ADDR', '') diff --git a/src/shippingservice/main.go b/src/shippingservice/main.go index 4840511..dde1f0b 100644 --- a/src/shippingservice/main.go +++ b/src/shippingservice/main.go @@ -59,31 +59,18 @@ func init() { } func main() { - stats, err := getenvBool("STATS") - if err != nil { - log.Errorf("Could not get STATS var: %v, defaulting to True", err) - stats = true - } + statsEnabled := os.Getenv("DISABLE_STATS") == "" + traceEnabled := os.Getenv("DISABLE_TRACING") == "" + profilerEnabled := os.Getenv("DISABLE_PROFILER") == "" - trace, err := getenvBool("TRACE") - 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 { + if traceEnabled { 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 {