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

Remove all bool parsing - check if env exists

Browse source
This commit is contained in:
Megan O'Keefe 2020-02-19 08:54:26 -05:00
parent 5d0b758f15
commit abb3c4fbb9
16 changed files with 104 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kubernetes-manifests/adservice.yaml
View file

@ -34,10 +34,10 @@ spec:
env:
- name: PORT
value: "9555"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: DISABLE_STATS
# value: 1
# - name: DISABLE_TRACING
# value: 1
#- name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:

12
kubernetes-manifests/checkoutservice.yaml
View file

@ -51,12 +51,12 @@ spec:
value: "currencyservice:7000"
- name: CART_SERVICE_ADDR
value: "cartservice:7070"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DISABLE_STATS
# value: 1
# - name: DISABLE_TRACING
# value: 1
# - name: DISABLE_PROFILER
# value: 1
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:

12
kubernetes-manifests/currencyservice.yaml
View file

@ -35,12 +35,12 @@ spec:
env:
- name: PORT
value: "7000"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
# - name: DISABLE_TRACING
# value: 1
# - name: DISABLE_PROFILER
# value: 1
# - name: DISABLE_DEBUGGER
# value: 1
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:7000"]

8
kubernetes-manifests/emailservice.yaml
View file

@ -34,10 +34,10 @@ spec:
env:
- name: PORT
value: "8080"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DISABLE_TRACING
# value: 1
# - name: DISABLE_PROFILER
# value: 1
readinessProbe:
periodSeconds: 5
exec:

8
kubernetes-manifests/frontend.yaml
View file

@ -65,10 +65,10 @@ spec:
value: "checkoutservice:5050"
- name: AD_SERVICE_ADDR
value: "adservice:9555"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DISABLE_TRACING
# value: 1
# - name: DISABLE_PROFILER
# value: 1
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:

12
kubernetes-manifests/productcatalogservice.yaml
View file

@ -34,12 +34,12 @@ spec:
env:
- name: PORT
value: "3550"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DISABLE_STATS
# value: 1
# - name: DISABLE_TRACING
# value: 1
# - name: DISABLE_PROFILER
# value: 1
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
readinessProbe:

12
kubernetes-manifests/recommendationservice.yaml
View file

@ -44,12 +44,12 @@ spec:
value: "8080"
- name: PRODUCT_CATALOG_SERVICE_ADDR
value: "productcatalogservice:3550"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
# - name: DISABLE_TRACING
# value: 1
# - name: DISABLE_PROFILER
# value: 1
# - name: DISABLE_DEBUGGER
# value: 1
resources:
requests:
cpu: 100m

12
kubernetes-manifests/shippingservice.yaml
View file

@ -33,12 +33,12 @@ spec:
env:
- name: PORT
value: "50051"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DISABLE_STATS
# value: 1
# - name: DISABLE_TRACING
# value: 1
# - name: DISABLE_PROFILER
# value: 1
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
readinessProbe:

18
src/adservice/src/main/java/hipstershop/AdService.java
View file

@ -214,15 +214,12 @@ public final class AdService {
}
private static void initStats() {
String statsEnv = System.getenv("STATS");
if (statsEnv == null) {
statsEnv = "true";
}
boolean stats = Boolean.parseBoolean(statsEnv);
if (!stats) {
if (System.getenv("DISABLE_STATS") != null) {
logger.info("Stats disabled.");
return;
}
logger.info("Stats enabled");
long sleepTime = 10; /* seconds */
int maxAttempts = 5;
boolean statsExporterRegistered = false;
@ -256,15 +253,12 @@ public final class AdService {
}
private static void initTracing() {
String traceEnv = System.getenv("TRACE");
if (traceEnv == null) {
traceEnv = "true";
}
boolean trace = Boolean.parseBoolean(traceEnv);
if (!trace) {
if (System.getenv("DISABLE_TRACING") != null) {
logger.info("Tracing disabled.");
return;
}
logger.info("Tracing enabled");
long sleepTime = 10; /* seconds */
int maxAttempts = 5;
boolean traceExporterRegistered = false;

24
src/checkoutservice/main.go
View file

@ -70,30 +70,18 @@ type checkoutService struct {
}
func main() {
stats, err := getenvBool("STATS")
if err != nil {
log.Infof("Could not get STATS var: %v, defaulting to True", err)
stats = true
}
statsEnabled := os.Getenv("DISABLE_STATS") == ""
traceEnabled := os.Getenv("DISABLE_TRACING") == ""
profilerEnabled := os.Getenv("DISABLE_PROFILER") == ""
trace, err := getenvBool("TRACE")
if err != nil {
log.Infof("Could not get TRACE var: %v, defaulting to True", err)
trace = true
}
if trace == true {
if traceEnabled {
log.Info("Tracing enabled.")
go initTracing()
} else {
log.Info("Tracing disabled.")
}
profiler, err := getenvBool("PROFILER")
if err != nil {
log.Infof("Could not get PROFILER var: %v, defaulting to True", err)
profiler = true
}
if profiler == true {
if profilerEnabled {
log.Info("Profiling enabled.")
go initProfiling("checkoutservice", "1.0.0")
} else {
@ -121,7 +109,7 @@ func main() {
}
var srv *grpc.Server
if stats == true {
if statsEnabled {
log.Info("Stats enabled.")
srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
} else {

30
src/currencyservice/server.js
View file

@ -14,9 +14,10 @@
* limitations under the License.
*/
var profiler = process.env.PROFILER || "true";
profiler = profiler.toLowerCase();
if (profiler == "true") {
if(process.env.DISABLE_PROFILER) {
console.log("Profiler disabled.")
}
else {
console.log("Profiler enabled.")
require('@google-cloud/profiler').start({
serviceContext: {
@ -24,22 +25,21 @@ if (profiler == "true") {
version: '1.0.0'
}
});
} else {
console.log("Profiler disabled.")
}
var trace = process.env.TRACE || "true";
trace = trace.toLowerCase();
if (trace == "true") {
console.log("Tracing enabled.")
require('@google-cloud/trace-agent').start();
} else {
if(process.env.DISABLE_TRACING) {
console.log("Tracing disabled.")
}
else {
console.log("Tracing enabled.")
require('@google-cloud/trace-agent').start();
}
var debug = process.env.DEBUGGER || "true";
debug = debug.toLowerCase();
if (debug == "true") {
if(process.env.DISABLE_DEBUGGER) {
console.log("Debugger disabled.")
}
else {
console.log("Debugger enabled.")
require('@google-cloud/debug-agent').start({
serviceContext: {
@ -47,8 +47,6 @@ if (debug == "true") {
version: 'VERSION'
}
});
} else {
console.log("Debugger disabled.")
}
const path = require('path');

17
src/emailservice/email_server.py
View file

@ -166,23 +166,21 @@ def initStackdriverProfiling():
if __name__ == '__main__':
logger.info('starting the email service in dummy mode.')
# Profiler
try:
profiler = os.getenv('PROFILER', "true")
profiler = profiler.lower()
if profiler != "true":
if "DISABLE_PROFILER" in os.environ:
raise KeyError()
else:
logger.info("Profiler enabled.")
initStackdriverProfiling()
except KeyError:
logger.info("Profiler disabled.")
logger.info("Profiler disabled.")
# Tracing
try:
trace = os.getenv('TRACE', "true")
trace = trace.lower()
if trace != "true":
if "DISABLE_TRACING" in os.environ:
raise KeyError()
else:
logger.info("Tracing enabled.")
@ -192,8 +190,7 @@ if __name__ == '__main__':
transport=AsyncTransport)
tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter)
except KeyError:
logger.info("Tracing disabled.")
tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
logger.info("Tracing disabled.")
tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
start(dummy_mode = True)

20
src/frontend/main.go
View file

@ -95,29 +95,21 @@ func main() {
}
log.Out = os.Stdout
trace, err := getenvBool("TRACE")
if err != nil {
log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
trace = true
}
traceEnabled := os.Getenv("DISABLE_TRACING") == ""
profilerEnabled := os.Getenv("DISABLE_PROFILER") == ""
profiler, err := getenvBool("PROFILER")
if err != nil {
log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
profiler = true
}
if trace == true {
if traceEnabled {
log.Info("Tracing enabled.")
go initTracing(log)
} else {
log.Info("Tracing disabled.")
}
if profiler == true {
if profilerEnabled {
log.Info("Profiling enabled.")
go initProfiling(log, "frontend", "1.0.0")
} else {
log.Info("Profiling disabled")
log.Info("Profiling disabled.")
}
srvPort := port

30
src/productcatalogservice/server.go
View file

@ -54,7 +54,7 @@ var (
port = "3550"
reloadCatalog bool
stats bool
statsEnabled bool
)
func init() {
@ -76,32 +76,18 @@ func init() {
}
func main() {
var err error
stats, err = getenvBool("STATS")
if err != nil {
log.Errorf("Could not get STATS var: %v, defaulting to True", err)
stats = true
}
statsEnabled = os.Getenv("DISABLE_STATS") == ""
traceEnabled := os.Getenv("DISABLE_TRACING") == ""
profilerEnabled := os.Getenv("DISABLE_PROFILER") == ""
trace, err := getenvBool("TRACE")
if err != nil {
log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
trace = true
}
profiler, err := getenvBool("PROFILER")
if err != nil {
log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
profiler = true
}
if trace == true {
if traceEnabled {
log.Info("Tracing enabled.")
go initTracing()
} else {
log.Info("Tracing disabled.")
}
if profiler == true {
if profilerEnabled {
log.Info("Profiling enabled.")
go initProfiling("productcatalogservice", "1.0.0")
} else {
@ -152,7 +138,7 @@ func run(port string) string {
log.Fatal(err)
}
var srv *grpc.Server
if stats == true {
if statsEnabled {
log.Info("Stats enabled.")
srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
} else {

24
src/recommendationservice/recommendation_server.py
View file

@ -89,23 +89,17 @@ class RecommendationService(demo_pb2_grpc.RecommendationServiceServicer):
if __name__ == "__main__":
logger.info("initializing recommendationservice")
# Profiler
try:
profiler = os.getenv('PROFILER', "true")
profiler = profiler.lower()
if profiler != "true":
if "DISABLE_PROFILER" in os.environ:
raise KeyError()
else:
logger.info("Profiler enabled.")
initStackdriverProfiling()
except KeyError:
logger.info("Profiler disabled.")
logger.info("Profiler disabled.")
# Tracing
try:
trace = os.getenv('TRACE', "true")
trace = trace.lower()
if trace != "true":
if "DISABLE_TRACING" in os.environ:
raise KeyError()
else:
logger.info("Tracing enabled.")
@ -115,14 +109,12 @@ if __name__ == "__main__":
transport=AsyncTransport)
tracer_interceptor = server_interceptor.OpenCensusServerInterceptor(sampler, exporter)
except KeyError:
logger.info("Tracing disabled.")
tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
logger.info("Tracing disabled.")
tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
# Debugger
try:
debugger = os.getenv('DEBUGGER', "true")
debugger = debugger.lower()
if debugger != "true":
if "DISABLE_DEBUGGER" in os.environ:
raise KeyError()
else:
logger.info("Debugger enabled.")
@ -136,7 +128,7 @@ if __name__ == "__main__":
logger.error(traceback.print_exc())
pass
except KeyError:
logger.info("Debugger disabled.")
logger.info("Debugger disabled.")
port = os.environ.get('PORT', "8080")
catalog_addr = os.environ.get('PRODUCT_CATALOG_SERVICE_ADDR', '')

27
src/shippingservice/main.go
View file

@ -59,31 +59,18 @@ func init() {
}
func main() {
stats, err := getenvBool("STATS")
if err != nil {
log.Errorf("Could not get STATS var: %v, defaulting to True", err)
stats = true
}
statsEnabled := os.Getenv("DISABLE_STATS") == ""
traceEnabled := os.Getenv("DISABLE_TRACING") == ""
profilerEnabled := os.Getenv("DISABLE_PROFILER") == ""
trace, err := getenvBool("TRACE")
if err != nil {
log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
trace = true
}
profiler, err := getenvBool("PROFILER")
if err != nil {
log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
profiler = true
}
if trace == true {
if traceEnabled {
log.Info("Tracing enabled.")
go initTracing()
} else {
log.Info("Tracing disabled.")
}
if profiler == true {
if profilerEnabled {
log.Info("Profiling enabled.")
go initProfiling("shippingservice", "1.0.0")
} else {
@ -102,7 +89,7 @@ func main() {
}
var srv *grpc.Server
if stats == true {
if statsEnabled {
log.Info("Stats enabled.")
srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
} else {