From 3edc4db9edf50f2957fb587d8822a2c016d88885 Mon Sep 17 00:00:00 2001 From: Megan O'Keefe Date: Sat, 15 Feb 2020 19:29:06 -0500 Subject: [PATCH] restore manifests --- kubernetes-manifests/adservice.yaml | 12 +++-- kubernetes-manifests/checkoutservice.yaml | 14 +++--- kubernetes-manifests/currencyservice.yaml | 8 +++ kubernetes-manifests/emailservice.yaml | 10 +++- kubernetes-manifests/frontend.yaml | 14 +++--- .../productcatalogservice.yaml | 19 +++---- .../recommendationservice.yaml | 18 ++++--- kubernetes-manifests/shippingservice.yaml | 19 +++---- .../src/main/java/hipstershop/AdService.java | 8 +-- src/checkoutservice/main.go | 24 ++++----- src/currencyservice/server.js | 49 ++++++++++++++----- src/emailservice/email_server.py | 5 +- src/frontend/main.go | 16 +++--- src/productcatalogservice/server.go | 26 +++++----- .../recommendation_server.py | 12 ++--- src/shippingservice/main.go | 24 ++++----- 16 files changed, 163 insertions(+), 115 deletions(-) diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml index df1862c..e7b7238 100644 --- a/kubernetes-manifests/adservice.yaml +++ b/kubernetes-manifests/adservice.yaml @@ -34,10 +34,14 @@ spec: env: - name: PORT value: "9555" - - name: SD_STATS - value: "False" - - name: SD_TRACE - value: "False" + # - name: STATS + # value: "False" + # - name: TRACE + # value: "False" + # - name: PROFILER + # value: "False" + # - name: DEBUGGER + # value: "False" #- name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" resources: diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index a94e473..fe7395f 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/kubernetes-manifests/checkoutservice.yaml @@ -51,12 +51,14 @@ spec: value: "currencyservice:7000" - name: CART_SERVICE_ADDR value: "cartservice:7070" - - name: SD_STATS - value: "False" - - name: SD_TRACE - value: "False" - - name: SD_PROFILER - value: "False" + # - name: STATS + # value: "False" + # - name: TRACE + # value: "False" + # - name: PROFILER + # value: "False" + # - name: DEBUGGER + # value: "False" # - name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" resources: diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml index 6d1b21a..5d13cef 100644 --- a/kubernetes-manifests/currencyservice.yaml +++ b/kubernetes-manifests/currencyservice.yaml @@ -35,6 +35,14 @@ spec: env: - name: PORT value: "7000" + # - name: STATS + # value: "False" + # - name: TRACE + # value: "False" + # - name: PROFILER + # value: "False" + # - name: DEBUGGER + # value: "False" readinessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:7000"] diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml index 14d293b..6ca187f 100644 --- a/kubernetes-manifests/emailservice.yaml +++ b/kubernetes-manifests/emailservice.yaml @@ -34,8 +34,14 @@ spec: env: - name: PORT value: "8080" - - name: ENABLE_PROFILER - value: "0" + # - name: STATS + # value: "False" + # - name: TRACE + # value: "False" + # - name: PROFILER + # value: "False" + # - name: DEBUGGER + # value: "False" readinessProbe: periodSeconds: 5 exec: diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index 850eaad..ef93616 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -65,12 +65,14 @@ spec: value: "checkoutservice:5050" - name: AD_SERVICE_ADDR value: "adservice:9555" - - name: SD_STATS - value: "False" - - name: SD_TRACE - value: "False" - - name: SD_PROFILER - value: "False" + # - name: STATS + # value: "False" + # - name: TRACE + # value: "False" + # - name: PROFILER + # value: "False" + # - name: DEBUGGER + # value: "False" # - name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" resources: diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index a5c9e87..da674a3 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/kubernetes-manifests/productcatalogservice.yaml @@ -34,21 +34,22 @@ spec: env: - name: PORT value: "3550" - - name: SD_STATS - value: "False" - - name: SD_TRACE - value: "False" - - name: SD_PROFILER - value: "False" + # - name: STATS + # value: "False" + # - name: TRACE + # value: "False" + # - name: PROFILER + # value: "False" + # - name: DEBUGGER + # value: "False" + # - name: JAEGER_SERVICE_ADDR + # value: "jaeger-collector:14268" readinessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:3550"] livenessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:3550"] -# env: -# - name: JAEGER_SERVICE_ADDR -# value: "jaeger-collector:14268" resources: requests: cpu: 100m diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml index acc9dae..d926d05 100644 --- a/kubernetes-manifests/recommendationservice.yaml +++ b/kubernetes-manifests/recommendationservice.yaml @@ -44,14 +44,16 @@ spec: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: "productcatalogservice:3550" - - name: SD_PROFILER - value: "False" - - name: SD_STATS - value: "False" - - name: SD_TRACE - value: "False" - - name: SD_DEBUGGER - value: "False" + # - name: STATS + # value: "False" + # - name: TRACE + # value: "False" + # - name: PROFILER + # value: "False" + # - name: DEBUGGER + # value: "False" + # - name: JAEGER_SERVICE_ADDR + # value: "jaeger-collector:14268" resources: requests: cpu: 100m diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index 2977270..8809861 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/kubernetes-manifests/shippingservice.yaml @@ -33,12 +33,16 @@ spec: env: - name: PORT value: "50051" - - name: SD_STATS - value: "False" - - name: SD_TRACE - value: "False" - - name: SD_PROFILER - value: "False" + # - name: STATS + # value: "False" + # - name: TRACE + # value: "False" + # - name: PROFILER + # value: "False" + # - name: DEBUGGER + # value: "False" + # - name: JAEGER_SERVICE_ADDR + # value: "jaeger-collector:14268" readinessProbe: periodSeconds: 5 exec: @@ -46,9 +50,6 @@ spec: livenessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:50051"] -# env: -# - name: JAEGER_SERVICE_ADDR -# value: "jaeger-collector:14268" resources: requests: cpu: 100m diff --git a/src/adservice/src/main/java/hipstershop/AdService.java b/src/adservice/src/main/java/hipstershop/AdService.java index d662e97..fab4535 100644 --- a/src/adservice/src/main/java/hipstershop/AdService.java +++ b/src/adservice/src/main/java/hipstershop/AdService.java @@ -214,8 +214,8 @@ public final class AdService { } private static void initStats() { - boolean sdStats = Boolean.parseBoolean(System.getenv("SD_STATS")); - if (!sdStats) { + boolean stats = Boolean.parseBoolean(System.getenv("STATS")); + if (!stats) { logger.info("Stats disabled."); return; } @@ -252,8 +252,8 @@ public final class AdService { } private static void initTracing() { - boolean sdTrace = Boolean.parseBoolean(System.getenv("SD_TRACE")); - if (!sdTrace) { + boolean trace = Boolean.parseBoolean(System.getenv("TRACE")); + if (!trace) { logger.info("Tracing disabled."); return; } diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index b61a336..28f17e7 100644 --- a/src/checkoutservice/main.go +++ b/src/checkoutservice/main.go @@ -70,30 +70,30 @@ type checkoutService struct { } func main() { - sdStats, err := getenvBool("SD_STATS") + stats, err := getenvBool("STATS") if err != nil { - log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err) - sdStats = true + log.Errorf("Could not get STATS var: %v, defaulting to True", err) + stats = true } - sdTrace, err := getenvBool("SD_TRACE") + trace, err := getenvBool("TRACE") if err != nil { - log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err) - sdTrace = true + log.Errorf("Could not get TRACE var: %v, defaulting to True", err) + trace = true } - sdProfiler, err := getenvBool("SD_PROFILER") + profiler, err := getenvBool("PROFILER") if err != nil { - log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err) - sdProfiler = true + log.Errorf("Could not get PROFILER var: %v, defaulting to True", err) + profiler = true } - if sdTrace == true { + if trace == true { go initTracing() } else { log.Info("Tracing disabled.") } - if sdProfiler == true { + if profiler == true { go initProfiling("checkoutservice", "1.0.0") } else { log.Info("Profiling disabled.") @@ -120,7 +120,7 @@ func main() { } var srv *grpc.Server - if sdStats == true { + if stats == true { 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 d3e9ad1..7e652b3 100644 --- a/src/currencyservice/server.js +++ b/src/currencyservice/server.js @@ -14,19 +14,42 @@ * limitations under the License. */ -require('@google-cloud/profiler').start({ - serviceContext: { - service: 'currencyservice', - version: '1.0.0' - } -}); -require('@google-cloud/trace-agent').start(); -require('@google-cloud/debug-agent').start({ - serviceContext: { - service: 'currencyservice', - version: 'VERSION' - } -}); +var profiler = process.env.PROFILER || "true"; +profiler = profiler.toLowerCase(); +if (profiler == "true") { + console.log("Profiler enabled.") + require('@google-cloud/profiler').start({ + serviceContext: { + service: 'currencyservice', + version: '1.0.0' + } + }); +} else { + console.log("Profiler disabled.") +} + +var trace = process.env.TRACE || "true"; +trace = trace.toLowerCase(); +if (trace == "true") { + console.log("Trace enabled.") + require('@google-cloud/trace-agent').start(); +} else { + console.log("Trace disabled.") +} + +var debug = process.env.DEBUGGER || "true"; +debug = debug.toLowerCase(); +if (debug == "true") { + console.log("Debugger enabled.") + require('@google-cloud/debug-agent').start({ + serviceContext: { + service: 'currencyservice', + version: 'VERSION' + } + }); +} else { + console.log("Debugger disabled.") +} const path = require('path'); const grpc = require('grpc'); diff --git a/src/emailservice/email_server.py b/src/emailservice/email_server.py index 6aa5bd4..d8b6d9c 100644 --- a/src/emailservice/email_server.py +++ b/src/emailservice/email_server.py @@ -39,10 +39,9 @@ from logger import getJSONLogger logger = getJSONLogger('emailservice-server') -sdTrace = os.getenv('SD_TRACE', True) -sdStats = os.getenv('SD_STATS', True) +trace = os.getenv('TRACE', True) -if sdTrace != False: +if trace != False: logger.info("Tracing enabled.") try: sampler = always_on.AlwaysOnSampler() diff --git a/src/frontend/main.go b/src/frontend/main.go index ec4e434..ff714c6 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -95,24 +95,24 @@ func main() { } log.Out = os.Stdout - sdTrace, err := getenvBool("SD_TRACE") + trace, err := getenvBool("TRACE") if err != nil { - log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err) - sdTrace = true + log.Errorf("Could not get TRACE var: %v, defaulting to True", err) + trace = true } - sdProfiler, err := getenvBool("SD_PROFILER") + profiler, err := getenvBool("PROFILER") if err != nil { - log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err) - sdProfiler = true + log.Errorf("Could not get PROFILER var: %v, defaulting to True", err) + profiler = true } - if sdTrace == true { + if trace == true { go initTracing(log) } else { log.Info("Tracing disabled.") } - if sdProfiler == true { + if profiler == true { go initProfiling(log, "frontend", "1.0.0") } else { log.Info("Profiling disabled") diff --git a/src/productcatalogservice/server.go b/src/productcatalogservice/server.go index 850639f..2bce62d 100644 --- a/src/productcatalogservice/server.go +++ b/src/productcatalogservice/server.go @@ -54,7 +54,7 @@ var ( port = "3550" reloadCatalog bool - sdStats bool + stats bool ) func init() { @@ -77,30 +77,30 @@ func init() { func main() { var err error - sdStats, err = getenvBool("SD_STATS") + stats, err = getenvBool("STATS") if err != nil { - log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err) - sdStats = true + log.Errorf("Could not get STATS var: %v, defaulting to True", err) + stats = true } - sdTrace, err := getenvBool("SD_TRACE") + trace, err := getenvBool("TRACE") if err != nil { - log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err) - sdTrace = true + log.Errorf("Could not get TRACE var: %v, defaulting to True", err) + trace = true } - sdProfiler, err := getenvBool("SD_PROFILER") + profiler, err := getenvBool("PROFILER") if err != nil { - log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err) - sdProfiler = true + log.Errorf("Could not get PROFILER var: %v, defaulting to True", err) + profiler = true } - if sdTrace == true { + if trace == true { go initTracing() } else { log.Info("Tracing disabled.") } - if sdProfiler == true { + if profiler == 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 sdStats == true { + if stats == true { 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 f12301b..dbcddcb 100644 --- a/src/recommendationservice/recommendation_server.py +++ b/src/recommendationservice/recommendation_server.py @@ -90,8 +90,8 @@ if __name__ == "__main__": # Profiler try: - sdProfiler = os.getenv('SD_PROFILER', True) - if sdProfiler != "True": + profiler = os.getenv('PROFILER', True) + if profiler != "True": raise KeyError() else: logger.inf("Profiler enabled.") @@ -100,8 +100,8 @@ if __name__ == "__main__": logger.info("Profiler disabled.") # Trace - sdTrace = os.getenv('SD_TRACE', True) - if sdTrace != True: + trace = os.getenv('TRACE', True) + if trace != True: logger.info("Tracing disabled.") tracer_interceptor = server_interceptor.OpenCensusServerInterceptor() else: @@ -116,8 +116,8 @@ if __name__ == "__main__": tracer_interceptor = server_interceptor.OpenCensusServerInterceptor() # Debugger - sdDebugger = os.getenv('SD_DEBUGGER', True) - if sdDebugger != True: + debugger = os.getenv('DEBUGGER', True) + if debugger != True: logger.info("Debugger disabled.") tracer_interceptor = server_interceptor.OpenCensusServerInterceptor() else: diff --git a/src/shippingservice/main.go b/src/shippingservice/main.go index e3d8158..47807ee 100644 --- a/src/shippingservice/main.go +++ b/src/shippingservice/main.go @@ -59,30 +59,30 @@ func init() { } func main() { - sdStats, err := getenvBool("SD_STATS") + stats, err := getenvBool("STATS") if err != nil { - log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err) - sdStats = true + log.Errorf("Could not get STATS var: %v, defaulting to True", err) + stats = true } - sdTrace, err := getenvBool("SD_TRACE") + trace, err := getenvBool("TRACE") if err != nil { - log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err) - sdTrace = true + log.Errorf("Could not get TRACE var: %v, defaulting to True", err) + trace = true } - sdProfiler, err := getenvBool("SD_PROFILER") + profiler, err := getenvBool("PROFILER") if err != nil { - log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err) - sdProfiler = true + log.Errorf("Could not get PROFILER var: %v, defaulting to True", err) + profiler = true } - if sdTrace == true { + if trace == true { go initTracing() } else { log.Info("Tracing disabled.") } - if sdProfiler == true { + if profiler == true { go initProfiling("shippingservice", "1.0.0") } else { log.Info("Profiling disabled.") @@ -100,7 +100,7 @@ func main() { } var srv *grpc.Server - if sdStats == true { + if stats == true { log.Info("Stats enabled.") srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) } else {