From f0704295d92fe239251826ac56fe4a9bba71c6c7 Mon Sep 17 00:00:00 2001 From: Megan O'Keefe Date: Sat, 15 Feb 2020 17:16:50 -0500 Subject: [PATCH] improve info logging --- kubernetes-manifests/checkoutservice.yaml | 6 ++++++ kubernetes-manifests/frontend.yaml | 6 ++++++ .../productcatalogservice.yaml | 6 ++++++ kubernetes-manifests/shippingservice.yaml | 6 ++++++ src/checkoutservice/main.go | 18 ++++++++++++------ src/frontend/main.go | 12 ++++++++---- src/productcatalogservice/server.go | 18 ++++++++++++------ src/shippingservice/main.go | 18 ++++++++++++------ 8 files changed, 68 insertions(+), 22 deletions(-) diff --git a/kubernetes-manifests/checkoutservice.yaml b/kubernetes-manifests/checkoutservice.yaml index 501210a..12fd4d0 100644 --- a/kubernetes-manifests/checkoutservice.yaml +++ b/kubernetes-manifests/checkoutservice.yaml @@ -51,6 +51,12 @@ spec: value: "currencyservice:7000" - name: CART_SERVICE_ADDR value: "cartservice:7070" + - name: OC_STATS + value: "False" + - name: OC_TRACE + value: "False" + - name: OC_PROFILING + value: "False" # - name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" resources: diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml index e6a0607..5ecc015 100644 --- a/kubernetes-manifests/frontend.yaml +++ b/kubernetes-manifests/frontend.yaml @@ -65,6 +65,12 @@ spec: value: "checkoutservice:5050" - name: AD_SERVICE_ADDR value: "adservice:9555" + - name: OC_STATS + value: "False" + - name: OC_TRACE + value: "False" + - name: OC_PROFILING + value: "False" # - name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" resources: diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml index b175856..542010d 100644 --- a/kubernetes-manifests/productcatalogservice.yaml +++ b/kubernetes-manifests/productcatalogservice.yaml @@ -34,6 +34,12 @@ spec: env: - name: PORT value: "3550" + - name: OC_STATS + value: "False" + - name: OC_TRACE + value: "False" + - name: OC_PROFILING + value: "False" readinessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:3550"] diff --git a/kubernetes-manifests/shippingservice.yaml b/kubernetes-manifests/shippingservice.yaml index d4049ad..9590173 100644 --- a/kubernetes-manifests/shippingservice.yaml +++ b/kubernetes-manifests/shippingservice.yaml @@ -33,6 +33,12 @@ spec: env: - name: PORT value: "50051" + - name: OC_STATS + value: "False" + - name: OC_TRACE + value: "False" + - name: OC_PROFILING + value: "False" readinessProbe: periodSeconds: 5 exec: diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index e02866e..0669b56 100644 --- a/src/checkoutservice/main.go +++ b/src/checkoutservice/main.go @@ -72,27 +72,31 @@ type checkoutService struct { func main() { ocStats, err := getenvBool("OC_STATS") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_STATS var: %v, defaulting to True", err) + ocStats = true } - ocStats = false ocTrace, err := getenvBool("OC_TRACE") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_TRACE var: %v, defaulting to True", err) + ocTrace = true } - ocTrace = false ocProfiling, err := getenvBool("OC_PROFILING") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_PROFILING var: %v, defaulting to True", err) + ocProfiling = true } - ocProfiling = false if ocTrace == true { go initTracing() + } else { + log.Info("Tracing disabled.") } if ocProfiling == true { go initProfiling("checkoutservice", "1.0.0") + } else { + log.Info("Profiling disabled.") } port := listenPort @@ -117,8 +121,10 @@ func main() { var srv *grpc.Server if ocStats == true { + log.Info("Stats enabled.") srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) } else { + log.Info("Stats disabled.") srv = grpc.NewServer() } pb.RegisterCheckoutServiceServer(srv, svc) diff --git a/src/frontend/main.go b/src/frontend/main.go index 429da9a..fa9afa5 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -97,21 +97,25 @@ func main() { ocTrace, err := getenvBool("OC_TRACE") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_TRACE var: %v, defaulting to True", err) + ocTrace = true } - ocTrace = false ocProfiling, err := getenvBool("OC_PROFILING") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_PROFILING var: %v, defaulting to True", err) + ocProfiling = true } - ocProfiling = false if ocTrace == true { go initTracing(log) + } else { + log.Info("Tracing disabled.") } if ocProfiling == true { go initProfiling(log, "frontend", "1.0.0") + } else { + log.Info("Profiling disabled") } srvPort := port diff --git a/src/productcatalogservice/server.go b/src/productcatalogservice/server.go index a7206a5..f624122 100644 --- a/src/productcatalogservice/server.go +++ b/src/productcatalogservice/server.go @@ -79,27 +79,31 @@ func main() { var err error ocStats, err = getenvBool("OC_STATS") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_STATS var: %v, defaulting to True", err) + ocStats = true } - ocStats = false ocTrace, err := getenvBool("OC_TRACE") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_TRACE var: %v, defaulting to True", err) + ocTrace = true } - ocTrace = false ocProfiling, err := getenvBool("OC_PROFILING") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_PROFILING var: %v, defaulting to True", err) + ocProfiling = true } - ocProfiling = false if ocTrace == true { go initTracing() + } else { + log.Info("Tracing disabled.") } if ocProfiling == true { go initProfiling("productcatalogservice", "1.0.0") + } else { + log.Info("Profiling disabled.") } flag.Parse() @@ -147,8 +151,10 @@ func run(port string) string { } var srv *grpc.Server if ocStats == true { + log.Info("Stats enabled.") srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) } else { + log.Info("Stats disabled.") srv = grpc.NewServer() } diff --git a/src/shippingservice/main.go b/src/shippingservice/main.go index 0440229..7633087 100644 --- a/src/shippingservice/main.go +++ b/src/shippingservice/main.go @@ -61,27 +61,31 @@ func init() { func main() { ocStats, err := getenvBool("OC_STATS") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_STATS var: %v, defaulting to True", err) + ocStats = true } - ocStats = false ocTrace, err := getenvBool("OC_TRACE") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_TRACE var: %v, defaulting to True", err) + ocTrace = true } - ocTrace = false ocProfiling, err := getenvBool("OC_PROFILING") if err != nil { - log.Error(err) + log.Errorf("Could not get OC_PROFILING var: %v, defaulting to True", err) + ocProfiling = true } - ocProfiling = false if ocTrace == true { go initTracing() + } else { + log.Info("Tracing disabled.") } if ocProfiling == true { go initProfiling("shippingservice", "1.0.0") + } else { + log.Info("Profiling disabled.") } port := defaultPort @@ -97,8 +101,10 @@ func main() { var srv *grpc.Server if ocStats == true { + log.Info("Stats enabled.") srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) } else { + log.Info("Stats disabled.") srv = grpc.NewServer() } svc := &server{}