vbatts/microservices-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

improve info logging

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
kubernetes-manifests/checkoutservice.yaml
View file

@ -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:

6
kubernetes-manifests/frontend.yaml
View file

@ -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:

6
kubernetes-manifests/productcatalogservice.yaml
View file

@ -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"]

6
kubernetes-manifests/shippingservice.yaml
View file

@ -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:

18
src/checkoutservice/main.go
View file

@ -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)

12
src/frontend/main.go
View file

@ -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

18
src/productcatalogservice/server.go
View file

@ -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()
}

18
src/shippingservice/main.go
View file

@ -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{}