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

Revert "Instana enablement for frontend"

Browse source 
This reverts commit ad5939d7f0.
This commit is contained in:
LutzLange 2020-04-17 10:30:16 +02:00
parent ad5939d7f0
commit 13db5982f7
11 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kubernetes-manifests/adservice.yaml
View file

@ -27,7 +27,7 @@ spec:
spec:
terminationGracePeriodSeconds: 5
containers:
- name: addserver
- name: server
image: adservice
ports:
- containerPort: 9555

2
kubernetes-manifests/cartservice.yaml
View file

@ -27,7 +27,7 @@ spec:
spec:
terminationGracePeriodSeconds: 5
containers:
- name: cartserver
- name: server
image: cartservice
ports:
- containerPort: 7070

2
kubernetes-manifests/checkoutservice.yaml
View file

@ -26,7 +26,7 @@ spec:
app: checkoutservice
spec:
containers:
- name: checkoutserver
- name: server
image: checkoutservice
ports:
- containerPort: 5050

2
kubernetes-manifests/currencyservice.yaml
View file

@ -27,7 +27,7 @@ spec:
spec:
terminationGracePeriodSeconds: 5
containers:
- name: currencyserver
- name: server
image: currencyservice
ports:
- name: grpc

2
kubernetes-manifests/emailservice.yaml
View file

@ -27,7 +27,7 @@ spec:
spec:
terminationGracePeriodSeconds: 5
containers:
- name: emailserver
- name: server
image: emailservice
ports:
- containerPort: 8080

12
kubernetes-manifests/frontend.yaml
View file

@ -26,7 +26,7 @@ spec:
app: frontend
spec:
containers:
- name: frontendserver
- name: server
image: frontend
ports:
- containerPort: 8080
@ -63,14 +63,8 @@ spec:
value: "checkoutservice:5050"
- name: AD_SERVICE_ADDR
value: "adservice:9555"
- name: JAEGER_SERVICE_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: JAEGER_SERVICE_PORT
value: "42699"
- name: JAEGER_SERVICE_PATH
value: "/com.instana.plugin.jaeger.trace"
# - name: JAEGER_SERVICE_ADDR
# value: "jaeger-collector:14268"
resources:
requests:
cpu: 100m

2
kubernetes-manifests/paymentservice.yaml
View file

@ -27,7 +27,7 @@ spec:
spec:
terminationGracePeriodSeconds: 5
containers:
- name: paymentserver
- name: server
image: paymentservice
ports:
- containerPort: 50051

2
kubernetes-manifests/productcatalogservice.yaml
View file

@ -27,7 +27,7 @@ spec:
spec:
terminationGracePeriodSeconds: 5
containers:
- name: productcatalogserver
- name: server
image: productcatalogservice
ports:
- containerPort: 3550

2
kubernetes-manifests/recommendationservice.yaml
View file

@ -27,7 +27,7 @@ spec:
spec:
terminationGracePeriodSeconds: 5
containers:
- name: recommendationserver
- name: server
image: recommendationservice
ports:
- containerPort: 8080

2
kubernetes-manifests/shippingservice.yaml
View file

@ -26,7 +26,7 @@ spec:
app: shippingservice
spec:
containers:
- name: shippingserver
- name: server
image: shippingservice
ports:
- containerPort: 50051

13
src/frontend/main.go
View file

@ -145,21 +145,16 @@ func main() {
func initJaegerTracing(log logrus.FieldLogger) {
svcHost := os.Getenv("JAEGER_SERVICE_HOST")
if svcHost == "" {
svcAddr := os.Getenv("JAEGER_SERVICE_ADDR")
if svcAddr == "" {
log.Info("jaeger initialization disabled.")
return
}
svcPort := os.Getenv("JAEGER_SERVICE_PORT")
svcPath := os.Getenv("JAEGER_SERVICE_PATH")
svcFull := fmt.Sprintf("http://%s:%s%s", svcHost, svcPort, svcPath)
// Register the Jaeger exporter to be able to retrieve
// the collected spans.
exporter, err := jaeger.NewExporter(jaeger.Options{
// Endpoint: fmt.Sprintf("http://%s:%s%s", svcHost, svcPort, svcPath),
Endpoint: svcFull,
Endpoint: fmt.Sprintf("http://%s", svcAddr),
Process: jaeger.Process{
ServiceName: "frontend",
},
@ -168,7 +163,7 @@ func initJaegerTracing(log logrus.FieldLogger) {
log.Fatal(err)
}
trace.RegisterExporter(exporter)
log.Info("jaeger initialization completed. connected to ", svcFull)
log.Info("jaeger initialization completed.")
}
func initStats(log logrus.FieldLogger, exporter *stackdriver.Exporter) {