improve info logging

This commit is contained in:
Megan O'Keefe 2020-02-15 17:16:50 -05:00
parent 41e2246964
commit f0704295d9
8 changed files with 68 additions and 22 deletions

View file

@ -51,6 +51,12 @@ spec:
value: "currencyservice:7000" value: "currencyservice:7000"
- name: CART_SERVICE_ADDR - name: CART_SERVICE_ADDR
value: "cartservice:7070" value: "cartservice:7070"
- name: OC_STATS
value: "False"
- name: OC_TRACE
value: "False"
- name: OC_PROFILING
value: "False"
# - name: JAEGER_SERVICE_ADDR # - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268" # value: "jaeger-collector:14268"
resources: resources:

View file

@ -65,6 +65,12 @@ spec:
value: "checkoutservice:5050" value: "checkoutservice:5050"
- name: AD_SERVICE_ADDR - name: AD_SERVICE_ADDR
value: "adservice:9555" value: "adservice:9555"
- name: OC_STATS
value: "False"
- name: OC_TRACE
value: "False"
- name: OC_PROFILING
value: "False"
# - name: JAEGER_SERVICE_ADDR # - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268" # value: "jaeger-collector:14268"
resources: resources:

View file

@ -34,6 +34,12 @@ spec:
env: env:
- name: PORT - name: PORT
value: "3550" value: "3550"
- name: OC_STATS
value: "False"
- name: OC_TRACE
value: "False"
- name: OC_PROFILING
value: "False"
readinessProbe: readinessProbe:
exec: exec:
command: ["/bin/grpc_health_probe", "-addr=:3550"] command: ["/bin/grpc_health_probe", "-addr=:3550"]

View file

@ -33,6 +33,12 @@ spec:
env: env:
- name: PORT - name: PORT
value: "50051" value: "50051"
- name: OC_STATS
value: "False"
- name: OC_TRACE
value: "False"
- name: OC_PROFILING
value: "False"
readinessProbe: readinessProbe:
periodSeconds: 5 periodSeconds: 5
exec: exec:

View file

@ -72,27 +72,31 @@ type checkoutService struct {
func main() { func main() {
ocStats, err := getenvBool("OC_STATS") ocStats, err := getenvBool("OC_STATS")
if err != nil { 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") ocTrace, err := getenvBool("OC_TRACE")
if err != nil { 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") ocProfiling, err := getenvBool("OC_PROFILING")
if err != nil { 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 { if ocTrace == true {
go initTracing() go initTracing()
} else {
log.Info("Tracing disabled.")
} }
if ocProfiling == true { if ocProfiling == true {
go initProfiling("checkoutservice", "1.0.0") go initProfiling("checkoutservice", "1.0.0")
} else {
log.Info("Profiling disabled.")
} }
port := listenPort port := listenPort
@ -117,8 +121,10 @@ func main() {
var srv *grpc.Server var srv *grpc.Server
if ocStats == true { if ocStats == true {
log.Info("Stats enabled.")
srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
} else { } else {
log.Info("Stats disabled.")
srv = grpc.NewServer() srv = grpc.NewServer()
} }
pb.RegisterCheckoutServiceServer(srv, svc) pb.RegisterCheckoutServiceServer(srv, svc)

View file

@ -97,21 +97,25 @@ func main() {
ocTrace, err := getenvBool("OC_TRACE") ocTrace, err := getenvBool("OC_TRACE")
if err != nil { 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") ocProfiling, err := getenvBool("OC_PROFILING")
if err != nil { 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 { if ocTrace == true {
go initTracing(log) go initTracing(log)
} else {
log.Info("Tracing disabled.")
} }
if ocProfiling == true { if ocProfiling == true {
go initProfiling(log, "frontend", "1.0.0") go initProfiling(log, "frontend", "1.0.0")
} else {
log.Info("Profiling disabled")
} }
srvPort := port srvPort := port

View file

@ -79,27 +79,31 @@ func main() {
var err error var err error
ocStats, err = getenvBool("OC_STATS") ocStats, err = getenvBool("OC_STATS")
if err != nil { 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") ocTrace, err := getenvBool("OC_TRACE")
if err != nil { 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") ocProfiling, err := getenvBool("OC_PROFILING")
if err != nil { 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 { if ocTrace == true {
go initTracing() go initTracing()
} else {
log.Info("Tracing disabled.")
} }
if ocProfiling == true { if ocProfiling == true {
go initProfiling("productcatalogservice", "1.0.0") go initProfiling("productcatalogservice", "1.0.0")
} else {
log.Info("Profiling disabled.")
} }
flag.Parse() flag.Parse()
@ -147,8 +151,10 @@ func run(port string) string {
} }
var srv *grpc.Server var srv *grpc.Server
if ocStats == true { if ocStats == true {
log.Info("Stats enabled.")
srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
} else { } else {
log.Info("Stats disabled.")
srv = grpc.NewServer() srv = grpc.NewServer()
} }

View file

@ -61,27 +61,31 @@ func init() {
func main() { func main() {
ocStats, err := getenvBool("OC_STATS") ocStats, err := getenvBool("OC_STATS")
if err != nil { 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") ocTrace, err := getenvBool("OC_TRACE")
if err != nil { 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") ocProfiling, err := getenvBool("OC_PROFILING")
if err != nil { 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 { if ocTrace == true {
go initTracing() go initTracing()
} else {
log.Info("Tracing disabled.")
} }
if ocProfiling == true { if ocProfiling == true {
go initProfiling("shippingservice", "1.0.0") go initProfiling("shippingservice", "1.0.0")
} else {
log.Info("Profiling disabled.")
} }
port := defaultPort port := defaultPort
@ -97,8 +101,10 @@ func main() {
var srv *grpc.Server var srv *grpc.Server
if ocStats == true { if ocStats == true {
log.Info("Stats enabled.")
srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
} else { } else {
log.Info("Stats disabled.")
srv = grpc.NewServer() srv = grpc.NewServer()
} }
svc := &server{} svc := &server{}