diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml index befd3d8..df1862c 100644 --- a/kubernetes-manifests/adservice.yaml +++ b/kubernetes-manifests/adservice.yaml @@ -34,10 +34,10 @@ spec: env: - name: PORT value: "9555" - - name: OC_STATS - value: "True" - - name: OC_TRACE - value: "True" + - name: SD_STATS + value: "False" + - name: SD_TRACE + value: "False" #- name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" resources: diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index 12fd4d0..a94e473 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/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" diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index 5ecc015..850eaad 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/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" diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index 542010d..a5c9e87 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/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: diff --git a/kubernetes-manifests/recommendationservice.yaml b/kubernetes-manifests/recommendationservice.yaml index 1ccc4ab..acc9dae 100644 --- a/kubernetes-manifests/recommendationservice.yaml +++ b/kubernetes-manifests/recommendationservice.yaml @@ -44,8 +44,14 @@ spec: value: "8080" - name: PRODUCT_CATALOG_SERVICE_ADDR value: "productcatalogservice:3550" - - name: ENABLE_PROFILER - value: "0" + - name: SD_PROFILER + value: "False" + - name: SD_STATS + value: "False" + - name: SD_TRACE + value: "False" + - name: SD_DEBUGGER + value: "False" resources: requests: cpu: 100m diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index 9590173..2977270 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/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 diff --git a/src/adservice/src/main/java/hipstershop/AdService.java b/src/adservice/src/main/java/hipstershop/AdService.java index d9ec137..d662e97 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 ocStats = Boolean.parseBoolean(System.getenv("OC_STATS")); - if (!ocStats) { + boolean sdStats = Boolean.parseBoolean(System.getenv("SD_STATS")); + 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")); - if (!ocTrace) { + boolean sdTrace = Boolean.parseBoolean(System.getenv("SD_TRACE")); + if (!sdTrace) { logger.info("Tracing disabled."); return; } diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index 0669b56..b61a336 100644 --- a/src/checkoutservice/main.go +++ b/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) - ocStats = true + log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err) + 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) - ocTrace = true + log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err) + 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) - ocProfiling = true + log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err) + 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 { diff --git a/src/emailservice/email_server.py b/src/emailservice/email_server.py index 9563b7a..6aa5bd4 100644 --- a/src/emailservice/email_server.py +++ b/src/emailservice/email_server.py @@ -35,15 +35,29 @@ from opencensus.trace.samplers import always_on # import googleclouddebugger import googlecloudprofiler -try: - sampler = always_on.AlwaysOnSampler() - exporter = stackdriver_exporter.StackdriverExporter( - project_id=os.environ.get('GCP_PROJECT_ID'), - transport=AsyncTransport) - tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter) -except: +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( + project_id=os.environ.get('GCP_PROJECT_ID'), + transport=AsyncTransport) + 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( # module='emailserver', @@ -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'), diff --git a/src/frontend/main.go b/src/frontend/main.go index fa9afa5..ec4e434 100644 --- a/src/frontend/main.go +++ b/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) - ocTrace = true + log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err) + 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) - ocProfiling = true + log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err) + 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") diff --git a/src/productcatalogservice/server.go b/src/productcatalogservice/server.go index f624122..850639f 100644 --- a/src/productcatalogservice/server.go +++ b/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) - ocStats = true + log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err) + 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) - ocTrace = true + log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err) + 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) - ocProfiling = true + log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err) + 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 { diff --git a/src/recommendationservice/recommendation_server.py b/src/recommendationservice/recommendation_server.py index c4e8fe6..f12301b 100644 --- a/src/recommendationservice/recommendation_server.py +++ b/src/recommendationservice/recommendation_server.py @@ -88,33 +88,49 @@ class RecommendationService(demo_pb2_grpc.RecommendationServiceServicer): if __name__ == "__main__": logger.info("initializing recommendationservice") + # Profiler try: - enable_profiler = os.environ["ENABLE_PROFILER"] - if enable_profiler != "1": + sdProfiler = os.getenv('SD_PROFILER', True) + 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.") - try: - sampler = always_on.AlwaysOnSampler() - exporter = stackdriver_exporter.StackdriverExporter( - project_id=os.environ.get('GCP_PROJECT_ID'), - transport=AsyncTransport) - tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter) - except: - tracer_interceptor = server_interceptor.OpenCensusServerInterceptor() + # 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( + project_id=os.environ.get('GCP_PROJECT_ID'), + transport=AsyncTransport) + tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter) + except: + tracer_interceptor = server_interceptor.OpenCensusServerInterceptor() - try: - googleclouddebugger.enable( - module='recommendationserver', - version='1.0.0' - ) - except Exception, err: - logger.error("could not enable debugger") - logger.error(traceback.print_exc()) - pass + # 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', + version='1.0.0' + ) + except Exception, err: + logger.error("could not enable debugger") + logger.error(traceback.print_exc()) + pass 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 7633087..e3d8158 100644 --- a/src/shippingservice/main.go +++ b/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) - ocStats = true + log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err) + 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) - ocTrace = true + log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err) + 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) - ocProfiling = true + log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err) + 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 {