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: env:
- name: PORT - name: PORT
value: "9555" value: "9555"
- name: SD_STATS # - name: STATS
value: "False" # value: "False"
- name: SD_TRACE # - name: TRACE
value: "False" # value: "False"
# - name: PROFILER
# value: "False"
# - name: DEBUGGER
# value: "False"
#- name: JAEGER_SERVICE_ADDR #- name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268" # value: "jaeger-collector:14268"
resources: resources:

14
kubernetes-manifests/checkoutservice.yaml
View file

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

8
kubernetes-manifests/currencyservice.yaml
View file

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

10
kubernetes-manifests/emailservice.yaml
View file

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

14
kubernetes-manifests/frontend.yaml
View file

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

19
kubernetes-manifests/productcatalogservice.yaml
View file

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

18
kubernetes-manifests/recommendationservice.yaml
View file

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

19
kubernetes-manifests/shippingservice.yaml
View file

@ -33,12 +33,16 @@ spec:
env: env:
- name: PORT - name: PORT
value: "50051" value: "50051"
- name: SD_STATS # - name: STATS
value: "False" # value: "False"
- name: SD_TRACE # - name: TRACE
value: "False" # value: "False"
- name: SD_PROFILER # - name: PROFILER
value: "False" # value: "False"
# - name: DEBUGGER
# value: "False"
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
readinessProbe: readinessProbe:
periodSeconds: 5 periodSeconds: 5
exec: exec:
@ -46,9 +50,6 @@ spec:
livenessProbe: livenessProbe:
exec: exec:
command: ["/bin/grpc_health_probe", "-addr=:50051"] command: ["/bin/grpc_health_probe", "-addr=:50051"]
# env:
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources: resources:
requests: requests:
cpu: 100m 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() { private static void initStats() {
boolean sdStats = Boolean.parseBoolean(System.getenv("SD_STATS")); boolean stats = Boolean.parseBoolean(System.getenv("STATS"));
if (!sdStats) { if (!stats) {
logger.info("Stats disabled."); logger.info("Stats disabled.");
return; return;
} }
@ -252,8 +252,8 @@ public final class AdService {
} }
private static void initTracing() { private static void initTracing() {
boolean sdTrace = Boolean.parseBoolean(System.getenv("SD_TRACE")); boolean trace = Boolean.parseBoolean(System.getenv("TRACE"));
if (!sdTrace) { if (!trace) {
logger.info("Tracing disabled."); logger.info("Tracing disabled.");
return; return;
} }

24
src/checkoutservice/main.go
View file

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

49
src/currencyservice/server.js
View file

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

5
src/emailservice/email_server.py
View file

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

16
src/frontend/main.go
View file

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

26
src/productcatalogservice/server.go
View file

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

12
src/recommendationservice/recommendation_server.py
View file

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

24
src/shippingservice/main.go
View file

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