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

restore manifests

Browse source
This commit is contained in:
Megan O'Keefe 2020-02-15 19:29:06 -05:00
parent 95ae2ffb5b
commit 3edc4db9ed
16 changed files with 163 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kubernetes-manifests/adservice.yaml
View file

@ -34,10 +34,14 @@ spec:
env:
- name: PORT
value: "9555"
- name: SD_STATS
value: "False"
- name: SD_TRACE
value: "False"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
#- name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:

14
kubernetes-manifests/checkoutservice.yaml
View file

@ -51,12 +51,14 @@ spec:
value: "currencyservice:7000"
- name: CART_SERVICE_ADDR
value: "cartservice:7070"
- name: SD_STATS
value: "False"
- name: SD_TRACE
value: "False"
- name: SD_PROFILER
value: "False"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:

8
kubernetes-manifests/currencyservice.yaml
View file

@ -35,6 +35,14 @@ spec:
env:
- name: PORT
value: "7000"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:7000"]

10
kubernetes-manifests/emailservice.yaml
View file

@ -34,8 +34,14 @@ spec:
env:
- name: PORT
value: "8080"
- name: ENABLE_PROFILER
value: "0"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
readinessProbe:
periodSeconds: 5
exec:

14
kubernetes-manifests/frontend.yaml
View file

@ -65,12 +65,14 @@ spec:
value: "checkoutservice:5050"
- name: AD_SERVICE_ADDR
value: "adservice:9555"
- name: SD_STATS
value: "False"
- name: SD_TRACE
value: "False"
- name: SD_PROFILER
value: "False"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:

19
kubernetes-manifests/productcatalogservice.yaml
View file

@ -34,21 +34,22 @@ spec:
env:
- name: PORT
value: "3550"
- name: SD_STATS
value: "False"
- name: SD_TRACE
value: "False"
- name: SD_PROFILER
value: "False"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:3550"]
livenessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:3550"]
# env:
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:
requests:
cpu: 100m

18
kubernetes-manifests/recommendationservice.yaml
View file

@ -44,14 +44,16 @@ spec:
value: "8080"
- name: PRODUCT_CATALOG_SERVICE_ADDR
value: "productcatalogservice:3550"
- name: SD_PROFILER
value: "False"
- name: SD_STATS
value: "False"
- name: SD_TRACE
value: "False"
- name: SD_DEBUGGER
value: "False"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:
requests:
cpu: 100m

19
kubernetes-manifests/shippingservice.yaml
View file

@ -33,12 +33,16 @@ spec:
env:
- name: PORT
value: "50051"
- name: SD_STATS
value: "False"
- name: SD_TRACE
value: "False"
- name: SD_PROFILER
value: "False"
# - name: STATS
# value: "False"
# - name: TRACE
# value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
readinessProbe:
periodSeconds: 5
exec:
@ -46,9 +50,6 @@ spec:
livenessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:50051"]
# env:
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:
requests:
cpu: 100m

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

@ -214,8 +214,8 @@ public final class AdService {
}
private static void initStats() {
boolean sdStats = Boolean.parseBoolean(System.getenv("SD_STATS"));
if (!sdStats) {
boolean stats = Boolean.parseBoolean(System.getenv("STATS"));
if (!stats) {
logger.info("Stats disabled.");
return;
}
@ -252,8 +252,8 @@ public final class AdService {
}
private static void initTracing() {
boolean sdTrace = Boolean.parseBoolean(System.getenv("SD_TRACE"));
if (!sdTrace) {
boolean trace = Boolean.parseBoolean(System.getenv("TRACE"));
if (!trace) {
logger.info("Tracing disabled.");
return;
}

24
src/checkoutservice/main.go
View file

@ -70,30 +70,30 @@ type checkoutService struct {
}
func main() {
sdStats, err := getenvBool("SD_STATS")
stats, err := getenvBool("STATS")
if err != nil {
log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err)
sdStats = true
log.Errorf("Could not get STATS var: %v, defaulting to True", err)
stats = true
}
sdTrace, err := getenvBool("SD_TRACE")
trace, err := getenvBool("TRACE")
if err != nil {
log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err)
sdTrace = true
log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
trace = true
}
sdProfiler, err := getenvBool("SD_PROFILER")
profiler, err := getenvBool("PROFILER")
if err != nil {
log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err)
sdProfiler = true
log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
profiler = true
}
if sdTrace == true {
if trace == true {
go initTracing()
} else {
log.Info("Tracing disabled.")
}
if sdProfiler == true {
if profiler == true {
go initProfiling("checkoutservice", "1.0.0")
} else {
log.Info("Profiling disabled.")
@ -120,7 +120,7 @@ func main() {
}
var srv *grpc.Server
if sdStats == true {
if stats == true {
log.Info("Stats enabled.")
srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
} else {

49
src/currencyservice/server.js
View file

@ -14,19 +14,42 @@
* limitations under the License.
*/
require('@google-cloud/profiler').start({
serviceContext: {
service: 'currencyservice',
version: '1.0.0'
}
});
require('@google-cloud/trace-agent').start();
require('@google-cloud/debug-agent').start({
serviceContext: {
service: 'currencyservice',
version: 'VERSION'
}
});
var profiler = process.env.PROFILER || "true";
profiler = profiler.toLowerCase();
if (profiler == "true") {
console.log("Profiler enabled.")
require('@google-cloud/profiler').start({
serviceContext: {
service: 'currencyservice',
version: '1.0.0'
}
});
} else {
console.log("Profiler disabled.")
}
var trace = process.env.TRACE || "true";
trace = trace.toLowerCase();
if (trace == "true") {
console.log("Trace enabled.")
require('@google-cloud/trace-agent').start();
} else {
console.log("Trace disabled.")
}
var debug = process.env.DEBUGGER || "true";
debug = debug.toLowerCase();
if (debug == "true") {
console.log("Debugger enabled.")
require('@google-cloud/debug-agent').start({
serviceContext: {
service: 'currencyservice',
version: 'VERSION'
}
});
} else {
console.log("Debugger disabled.")
}
const path = require('path');
const grpc = require('grpc');

5
src/emailservice/email_server.py
View file

@ -39,10 +39,9 @@ from logger import getJSONLogger
logger = getJSONLogger('emailservice-server')
sdTrace = os.getenv('SD_TRACE', True)
sdStats = os.getenv('SD_STATS', True)
trace = os.getenv('TRACE', True)
if sdTrace != False:
if trace != False:
logger.info("Tracing enabled.")
try:
sampler = always_on.AlwaysOnSampler()

16
src/frontend/main.go
View file

@ -95,24 +95,24 @@ func main() {
}
log.Out = os.Stdout
sdTrace, err := getenvBool("SD_TRACE")
trace, err := getenvBool("TRACE")
if err != nil {
log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err)
sdTrace = true
log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
trace = true
}
sdProfiler, err := getenvBool("SD_PROFILER")
profiler, err := getenvBool("PROFILER")
if err != nil {
log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err)
sdProfiler = true
log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
profiler = true
}
if sdTrace == true {
if trace == true {
go initTracing(log)
} else {
log.Info("Tracing disabled.")
}
if sdProfiler == true {
if profiler == true {
go initProfiling(log, "frontend", "1.0.0")
} else {
log.Info("Profiling disabled")

26
src/productcatalogservice/server.go
View file

@ -54,7 +54,7 @@ var (
port = "3550"
reloadCatalog bool
sdStats bool
stats bool
)
func init() {
@ -77,30 +77,30 @@ func init() {
func main() {
var err error
sdStats, err = getenvBool("SD_STATS")
stats, err = getenvBool("STATS")
if err != nil {
log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err)
sdStats = true
log.Errorf("Could not get STATS var: %v, defaulting to True", err)
stats = true
}
sdTrace, err := getenvBool("SD_TRACE")
trace, err := getenvBool("TRACE")
if err != nil {
log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err)
sdTrace = true
log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
trace = true
}
sdProfiler, err := getenvBool("SD_PROFILER")
profiler, err := getenvBool("PROFILER")
if err != nil {
log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err)
sdProfiler = true
log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
profiler = true
}
if sdTrace == true {
if trace == true {
go initTracing()
} else {
log.Info("Tracing disabled.")
}
if sdProfiler == true {
if profiler == 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 sdStats == true {
if stats == true {
log.Info("Stats enabled.")
srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
} else {

12
src/recommendationservice/recommendation_server.py
View file

@ -90,8 +90,8 @@ if __name__ == "__main__":
# Profiler
try:
sdProfiler = os.getenv('SD_PROFILER', True)
if sdProfiler != "True":
profiler = os.getenv('PROFILER', True)
if profiler != "True":
raise KeyError()
else:
logger.inf("Profiler enabled.")
@ -100,8 +100,8 @@ if __name__ == "__main__":
logger.info("Profiler disabled.")
# Trace
sdTrace = os.getenv('SD_TRACE', True)
if sdTrace != True:
trace = os.getenv('TRACE', True)
if trace != True:
logger.info("Tracing disabled.")
tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
else:
@ -116,8 +116,8 @@ if __name__ == "__main__":
tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
# Debugger
sdDebugger = os.getenv('SD_DEBUGGER', True)
if sdDebugger != True:
debugger = os.getenv('DEBUGGER', True)
if debugger != True:
logger.info("Debugger disabled.")
tracer_interceptor = server_interceptor.OpenCensusServerInterceptor()
else:

24
src/shippingservice/main.go
View file

@ -59,30 +59,30 @@ func init() {
}
func main() {
sdStats, err := getenvBool("SD_STATS")
stats, err := getenvBool("STATS")
if err != nil {
log.Errorf("Could not get SD_STATS var: %v, defaulting to True", err)
sdStats = true
log.Errorf("Could not get STATS var: %v, defaulting to True", err)
stats = true
}
sdTrace, err := getenvBool("SD_TRACE")
trace, err := getenvBool("TRACE")
if err != nil {
log.Errorf("Could not get SD_TRACE var: %v, defaulting to True", err)
sdTrace = true
log.Errorf("Could not get TRACE var: %v, defaulting to True", err)
trace = true
}
sdProfiler, err := getenvBool("SD_PROFILER")
profiler, err := getenvBool("PROFILER")
if err != nil {
log.Errorf("Could not get SD_PROFILER var: %v, defaulting to True", err)
sdProfiler = true
log.Errorf("Could not get PROFILER var: %v, defaulting to True", err)
profiler = true
}
if sdTrace == true {
if trace == true {
go initTracing()
} else {
log.Info("Tracing disabled.")
}
if sdProfiler == true {
if profiler == true {
go initProfiling("shippingservice", "1.0.0")
} else {
log.Info("Profiling disabled.")
@ -100,7 +100,7 @@ func main() {
}
var srv *grpc.Server
if sdStats == true {
if stats == true {
log.Info("Stats enabled.")
srv = grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
} else {