From 68a5385b704508b930ae1d6d31eccad744c8911f Mon Sep 17 00:00:00 2001 From: "Gary A. Stafford" Date: Sun, 17 Mar 2019 10:23:49 -0400 Subject: [PATCH] Trace to Greeting --- part1_build_srv_images.sh | 2 +- part2_push_images.sh | 2 +- resources/services/angular-ui.yaml | 12 +++++------ resources/services/service-a.yaml | 12 +++++------ resources/services/service-b.yaml | 12 +++++------ resources/services/service-c.yaml | 12 +++++------ resources/services/service-d.yaml | 12 +++++------ resources/services/service-e.yaml | 12 +++++------ resources/services/service-f.yaml | 12 +++++------ resources/services/service-g.yaml | 12 +++++------ resources/services/service-h.yaml | 12 +++++------ service-a/main.go | 24 +++++++++++----------- service-b/main.go | 24 +++++++++++----------- service-c/main.go | 26 ++++++++++++------------ service-d/main.go | 24 +++++++++++----------- service-e/main.go | 24 +++++++++++----------- service-f/main.go | 32 +++++++++++++++--------------- service-g/main.go | 26 ++++++++++++------------ service-h/main.go | 26 ++++++++++++------------ stack.yml | 18 ++++++++--------- 20 files changed, 168 insertions(+), 168 deletions(-) diff --git a/part1_build_srv_images.sh b/part1_build_srv_images.sh index dab2576..3ba44ba 100644 --- a/part1_build_srv_images.sh +++ b/part1_build_srv_images.sh @@ -7,7 +7,7 @@ readonly -a arr=(a b c a d e f g h) # readonly -a arr=(a) -readonly tag=1.2.0 +readonly tag=1.3.0 for i in "${arr[@]}" do diff --git a/part2_push_images.sh b/part2_push_images.sh index 06da707..f9c3a53 100644 --- a/part2_push_images.sh +++ b/part2_push_images.sh @@ -7,7 +7,7 @@ readonly -a arr=(a b c a d e f g h) # readonly -a arr=(a) -readonly tag=1.2.0 +readonly tag=1.3.0 for i in "${arr[@]}" do diff --git a/resources/services/angular-ui.yaml b/resources/services/angular-ui.yaml index 40ae16f..c448fbc 100644 --- a/resources/services/angular-ui.yaml +++ b/resources/services/angular-ui.yaml @@ -5,7 +5,7 @@ metadata: labels: app: angular-ui component: ui - version: "1.2.0" + version: "1.3.0" spec: ports: - name: http @@ -13,7 +13,7 @@ spec: selector: app: angular-ui component: ui - version: "1.2.0" + version: "1.3.0" --- apiVersion: extensions/v1beta1 kind: Deployment @@ -22,7 +22,7 @@ metadata: labels: app: angular-ui component: ui - version: "1.2.0" + version: "1.3.0" spec: replicas: 2 strategy: @@ -31,19 +31,19 @@ spec: matchLabels: app: angular-ui component: ui - version: "1.2.0" + version: "1.3.0" template: metadata: labels: app: angular-ui component: ui - version: "1.2.0" + version: "1.3.0" annotations: sidecar.istio.io/inject: "true" spec: containers: - name: angular-ui - image: registry.hub.docker.com/garystafford/angular-observe:1.2.0 + image: registry.hub.docker.com/garystafford/angular-observe:1.3.0 resources: # requests: # memory: 100M diff --git a/resources/services/service-a.yaml b/resources/services/service-a.yaml index 2b6d73b..d29dc4f 100644 --- a/resources/services/service-a.yaml +++ b/resources/services/service-a.yaml @@ -5,7 +5,7 @@ metadata: labels: app: service-a component: service - version: "1.2.0" + version: "1.3.0" spec: ports: - name: http @@ -13,7 +13,7 @@ spec: selector: app: service-a component: service - version: "1.2.0" + version: "1.3.0" --- apiVersion: extensions/v1beta1 kind: Deployment @@ -22,7 +22,7 @@ metadata: labels: app: service-a component: service - version: "1.2.0" + version: "1.3.0" spec: replicas: 2 strategy: @@ -31,19 +31,19 @@ spec: matchLabels: app: service-a component: service - version: "1.2.0" + version: "1.3.0" template: metadata: labels: app: service-a component: service - version: "1.2.0" + version: "1.3.0" annotations: sidecar.istio.io/inject: "true" spec: containers: - name: service-a - image: registry.hub.docker.com/garystafford/go-srv-a:1.2.0 + image: registry.hub.docker.com/garystafford/go-srv-a:1.3.0 resources: # requests: # memory: 100M diff --git a/resources/services/service-b.yaml b/resources/services/service-b.yaml index ebf288c..68b9f20 100644 --- a/resources/services/service-b.yaml +++ b/resources/services/service-b.yaml @@ -5,7 +5,7 @@ metadata: labels: app: service-b component: service - version: "1.2.0" + version: "1.3.0" spec: ports: - name: http @@ -13,7 +13,7 @@ spec: selector: app: service-b component: service - version: "1.2.0" + version: "1.3.0" --- apiVersion: extensions/v1beta1 kind: Deployment @@ -22,7 +22,7 @@ metadata: labels: app: service-b component: service - version: "1.2.0" + version: "1.3.0" spec: replicas: 2 strategy: @@ -31,19 +31,19 @@ spec: matchLabels: app: service-b component: service - version: "1.2.0" + version: "1.3.0" template: metadata: labels: app: service-b component: service - version: "1.2.0" + version: "1.3.0" annotations: sidecar.istio.io/inject: "true" spec: containers: - name: service-b - image: registry.hub.docker.com/garystafford/go-srv-b:1.2.0 + image: registry.hub.docker.com/garystafford/go-srv-b:1.3.0 resources: # requests: # memory: 100M diff --git a/resources/services/service-c.yaml b/resources/services/service-c.yaml index 39c8faf..d8277d7 100644 --- a/resources/services/service-c.yaml +++ b/resources/services/service-c.yaml @@ -5,7 +5,7 @@ metadata: labels: app: service-c component: service - version: "1.2.0" + version: "1.3.0" spec: ports: - name: http @@ -13,7 +13,7 @@ spec: selector: app: service-c component: service - version: "1.2.0" + version: "1.3.0" --- apiVersion: extensions/v1beta1 kind: Deployment @@ -22,7 +22,7 @@ metadata: labels: app: service-c component: service - version: "1.2.0" + version: "1.3.0" spec: replicas: 2 strategy: @@ -31,19 +31,19 @@ spec: matchLabels: app: service-c component: service - version: "1.2.0" + version: "1.3.0" template: metadata: labels: app: service-c component: service - version: "1.2.0" + version: "1.3.0" annotations: sidecar.istio.io/inject: "true" spec: containers: - name: service-c - image: registry.hub.docker.com/garystafford/go-srv-c:1.2.0 + image: registry.hub.docker.com/garystafford/go-srv-c:1.3.0 resources: # requests: # memory: 100M diff --git a/resources/services/service-d.yaml b/resources/services/service-d.yaml index 6411be5..6496f8c 100644 --- a/resources/services/service-d.yaml +++ b/resources/services/service-d.yaml @@ -5,7 +5,7 @@ metadata: labels: app: service-d component: service - version: "1.2.0" + version: "1.3.0" spec: ports: - name: http @@ -13,7 +13,7 @@ spec: selector: app: service-d component: service - version: "1.2.0" + version: "1.3.0" --- apiVersion: extensions/v1beta1 kind: Deployment @@ -22,7 +22,7 @@ metadata: labels: app: service-d component: service - version: "1.2.0" + version: "1.3.0" spec: replicas: 2 strategy: @@ -31,19 +31,19 @@ spec: matchLabels: app: service-d component: service - version: "1.2.0" + version: "1.3.0" template: metadata: labels: app: service-d component: service - version: "1.2.0" + version: "1.3.0" annotations: sidecar.istio.io/inject: "true" spec: containers: - name: service-d - image: registry.hub.docker.com/garystafford/go-srv-d:1.2.0 + image: registry.hub.docker.com/garystafford/go-srv-d:1.3.0 resources: # requests: # memory: 100M diff --git a/resources/services/service-e.yaml b/resources/services/service-e.yaml index 9bdba4e..dbe2bb5 100644 --- a/resources/services/service-e.yaml +++ b/resources/services/service-e.yaml @@ -5,7 +5,7 @@ metadata: labels: app: service-e component: service - version: "1.2.0" + version: "1.3.0" spec: ports: - name: http @@ -13,7 +13,7 @@ spec: selector: app: service-e component: service - version: "1.2.0" + version: "1.3.0" --- apiVersion: extensions/v1beta1 kind: Deployment @@ -22,7 +22,7 @@ metadata: labels: app: service-e component: service - version: "1.2.0" + version: "1.3.0" spec: replicas: 2 strategy: @@ -31,19 +31,19 @@ spec: matchLabels: app: service-e component: service - version: "1.2.0" + version: "1.3.0" template: metadata: labels: app: service-e component: service - version: "1.2.0" + version: "1.3.0" annotations: sidecar.istio.io/inject: "true" spec: containers: - name: service-e - image: registry.hub.docker.com/garystafford/go-srv-e:1.2.0 + image: registry.hub.docker.com/garystafford/go-srv-e:1.3.0 resources: # requests: # memory: 100M diff --git a/resources/services/service-f.yaml b/resources/services/service-f.yaml index ad8be73..81e0294 100644 --- a/resources/services/service-f.yaml +++ b/resources/services/service-f.yaml @@ -5,7 +5,7 @@ metadata: labels: app: service-f component: service - version: "1.2.0" + version: "1.3.0" spec: ports: - name: http @@ -13,7 +13,7 @@ spec: selector: app: service-f component: service - version: "1.2.0" + version: "1.3.0" --- apiVersion: extensions/v1beta1 kind: Deployment @@ -22,7 +22,7 @@ metadata: labels: app: service-f component: service - version: "1.2.0" + version: "1.3.0" spec: replicas: 2 strategy: @@ -31,19 +31,19 @@ spec: matchLabels: app: service-f component: service - version: "1.2.0" + version: "1.3.0" template: metadata: labels: app: service-f component: service - version: "1.2.0" + version: "1.3.0" annotations: sidecar.istio.io/inject: "true" spec: containers: - name: service-f - image: registry.hub.docker.com/garystafford/go-srv-f:1.2.0 + image: registry.hub.docker.com/garystafford/go-srv-f:1.3.0 resources: # requests: # memory: 100M diff --git a/resources/services/service-g.yaml b/resources/services/service-g.yaml index d4c9d8d..8ed6283 100644 --- a/resources/services/service-g.yaml +++ b/resources/services/service-g.yaml @@ -5,7 +5,7 @@ metadata: labels: app: service-g component: service - version: "1.2.0" + version: "1.3.0" spec: ports: - name: http @@ -13,7 +13,7 @@ spec: selector: app: service-g component: service - version: "1.2.0" + version: "1.3.0" --- apiVersion: extensions/v1beta1 kind: Deployment @@ -22,7 +22,7 @@ metadata: labels: app: service-g component: service - version: "1.2.0" + version: "1.3.0" spec: replicas: 2 strategy: @@ -31,19 +31,19 @@ spec: matchLabels: app: service-g component: service - version: "1.2.0" + version: "1.3.0" template: metadata: labels: app: service-g component: service - version: "1.2.0" + version: "1.3.0" annotations: sidecar.istio.io/inject: "true" spec: containers: - name: service-g - image: registry.hub.docker.com/garystafford/go-srv-g:1.2.0 + image: registry.hub.docker.com/garystafford/go-srv-g:1.3.0 resources: # requests: # memory: 100M diff --git a/resources/services/service-h.yaml b/resources/services/service-h.yaml index 81883ba..aa2d7df 100644 --- a/resources/services/service-h.yaml +++ b/resources/services/service-h.yaml @@ -5,7 +5,7 @@ metadata: labels: app: service-h component: service - version: "1.2.0" + version: "1.3.0" spec: ports: - name: http @@ -13,7 +13,7 @@ spec: selector: app: service-h component: service - version: "1.2.0" + version: "1.3.0" --- apiVersion: extensions/v1beta1 kind: Deployment @@ -22,7 +22,7 @@ metadata: labels: app: service-h component: service - version: "1.2.0" + version: "1.3.0" spec: replicas: 2 strategy: @@ -31,19 +31,19 @@ spec: matchLabels: app: service-h component: service - version: "1.2.0" + version: "1.3.0" template: metadata: labels: app: service-h component: service - version: "1.2.0" + version: "1.3.0" annotations: sidecar.istio.io/inject: "true" spec: containers: - name: service-h - image: registry.hub.docker.com/garystafford/go-srv-h:1.2.0 + image: registry.hub.docker.com/garystafford/go-srv-h:1.3.0 resources: # requests: # memory: 100M diff --git a/service-a/main.go b/service-a/main.go index b32981d..a6a7b20 100644 --- a/service-a/main.go +++ b/service-a/main.go @@ -20,34 +20,34 @@ import ( "time" ) -type Trace struct { +type Greeting struct { ID string `json:"id,omitempty"` ServiceName string `json:"service,omitempty"` - Greeting string `json:"greeting,omitempty"` + Message string `json:"message,omitempty"` CreatedAt time.Time `json:"created,omitempty"` } -var traces []Trace +var greetings []Greeting func PingHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") log.Info(r) - traces = nil + greetings = nil CallNextService("http://service-b/api/ping") CallNextService("http://service-c/api/ping") - tmpTrace := Trace{ + tmpGreeting := Greeting{ ID: uuid.New().String(), ServiceName: "Service-A", - Greeting: "Hello, from Service-A!", + Message: "Hello, from Service-A!", CreatedAt: time.Now().Local(), } - traces = append(traces, tmpTrace) + greetings = append(greetings, tmpGreeting) - err := json.NewEncoder(w).Encode(traces) + err := json.NewEncoder(w).Encode(greetings) if err != nil { log.Error(err) } @@ -73,19 +73,19 @@ func ResponseStatusHandler(w http.ResponseWriter, r *http.Request) { func CallNextService(url string) { log.Info(url) - var tmpTraces []Trace + var tmpGreetings []Greeting response, err := http.Get(url) if err != nil { log.Error(err) } else { data, _ := ioutil.ReadAll(response.Body) - err := json.Unmarshal(data, &tmpTraces) + err := json.Unmarshal(data, &tmpGreetings) if err != nil { log.Error(err) } - for _, r := range tmpTraces { - traces = append(traces, r) + for _, r := range tmpGreetings { + greetings = append(greetings, r) } } } diff --git a/service-b/main.go b/service-b/main.go index 3f2936a..99c5d0a 100644 --- a/service-b/main.go +++ b/service-b/main.go @@ -17,32 +17,32 @@ import ( "time" ) -type Trace struct { +type Greeting struct { ID string `json:"id,omitempty"` ServiceName string `json:"service,omitempty"` - Greeting string `json:"greeting,omitempty"` + Message string `json:"message,omitempty"` CreatedAt time.Time `json:"created,omitempty"` } -var traces []Trace +var greetings []Greeting func PingHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") - traces = nil + greetings = nil CallNextService("http://service-d/api/ping") CallNextService("http://service-e/api/ping") - tmpTrace := Trace{ + tmpGreeting := Greeting{ ID: uuid.New().String(), ServiceName: "Service-B", - Greeting: "Namaste, from Service-B!", + Message: "Namaste, from Service-B!", CreatedAt: time.Now().Local(), } - traces = append(traces, tmpTrace) + greetings = append(greetings, tmpGreeting) - err := json.NewEncoder(w).Encode(traces) + err := json.NewEncoder(w).Encode(greetings) if err != nil { log.Error(err) } @@ -58,19 +58,19 @@ func HealthCheckHandler(w http.ResponseWriter, r *http.Request) { func CallNextService(url string) { log.Info(url) - var tmpTraces []Trace + var tmpGreetings []Greeting response, err := http.Get(url) if err != nil { log.Error(err) } else { data, _ := ioutil.ReadAll(response.Body) - err := json.Unmarshal(data, &tmpTraces) + err := json.Unmarshal(data, &tmpGreetings) if err != nil { log.Error(err) } - for _, r := range tmpTraces { - traces = append(traces, r) + for _, r := range tmpGreetings { + greetings = append(greetings, r) } } } diff --git a/service-c/main.go b/service-c/main.go index 75ba14d..e57045f 100644 --- a/service-c/main.go +++ b/service-c/main.go @@ -19,32 +19,32 @@ import ( "time" ) -type Trace struct { +type Greeting struct { ID string `json:"id,omitempty"` ServiceName string `json:"service,omitempty"` - Greeting string `json:"greeting,omitempty"` + Message string `json:"message,omitempty"` CreatedAt time.Time `json:"created,omitempty"` } -var traces []Trace +var greetings []Greeting func PingHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") - traces = nil + greetings = nil - tmpTrace := Trace{ + tmpGreeting := Greeting{ ID: uuid.New().String(), ServiceName: "Service-C", - Greeting: "Konnichiwa, from Service-C!", + Message: "Konnichiwa, from Service-C!", CreatedAt: time.Now().Local(), } - traces = append(traces, tmpTrace) + greetings = append(greetings, tmpGreeting) - CallMongoDB(tmpTrace) + CallMongoDB(tmpGreeting) - err := json.NewEncoder(w).Encode(traces) + err := json.NewEncoder(w).Encode(greetings) if err != nil { log.Error(err) } @@ -58,8 +58,8 @@ func HealthCheckHandler(w http.ResponseWriter, r *http.Request) { } } -func CallMongoDB(trace Trace) { - log.Info(trace) +func CallMongoDB(greeting Greeting) { + log.Info(greeting) ctx, _ := context.WithTimeout(context.Background(), 10*time.Second) client, err := mongo.Connect(ctx, options.Client().ApplyURI(os.Getenv("MONGO_CONN"))) if err != nil { @@ -68,10 +68,10 @@ func CallMongoDB(trace Trace) { defer client.Disconnect(nil) - collection := client.Database("service-c").Collection("traces") + collection := client.Database("service-c").Collection("greetings") ctx, _ = context.WithTimeout(context.Background(), 5*time.Second) - _, err = collection.InsertOne(ctx, trace) + _, err = collection.InsertOne(ctx, greeting) if err != nil { log.Error(err) } diff --git a/service-d/main.go b/service-d/main.go index a0503fb..d0f03fb 100644 --- a/service-d/main.go +++ b/service-d/main.go @@ -17,35 +17,35 @@ import ( "time" ) -type Trace struct { +type Greeting struct { ID string `json:"id,omitempty"` ServiceName string `json:"service,omitempty"` - Greeting string `json:"greeting,omitempty"` + Message string `json:"message,omitempty"` CreatedAt time.Time `json:"created,omitempty"` } -var traces []Trace +var greetings []Greeting func PingHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") - traces = nil + greetings = nil - tmpTrace := Trace{ + tmpGreeting := Greeting{ ID: uuid.New().String(), ServiceName: "Service-D", - Greeting: "Shalom, from Service-D!", + Message: "Shalom, from Service-D!", CreatedAt: time.Now().Local(), } - traces = append(traces, tmpTrace) + greetings = append(greetings, tmpGreeting) - err := json.NewEncoder(w).Encode(traces) + err := json.NewEncoder(w).Encode(greetings) if err != nil { log.Error(err) } - b, err := json.Marshal(tmpTrace) + b, err := json.Marshal(tmpGreeting) SendMessage(b) if err != nil { log.Error(err) @@ -96,9 +96,9 @@ func SendMessage(b []byte) { ContentType: "application/json", Body: b, }) - if err != nil { - log.Error(err) - } + if err != nil { + log.Error(err) + } } func init() { diff --git a/service-e/main.go b/service-e/main.go index 48fc772..b422b07 100644 --- a/service-e/main.go +++ b/service-e/main.go @@ -17,32 +17,32 @@ import ( "time" ) -type Trace struct { +type Greeting struct { ID string `json:"id,omitempty"` ServiceName string `json:"service,omitempty"` - Greeting string `json:"greeting,omitempty"` + Message string `json:"message,omitempty"` CreatedAt time.Time `json:"created,omitempty"` } -var traces []Trace +var greetings []Greeting func PingHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") - traces = nil + greetings = nil CallNextService("http://service-g/api/ping") CallNextService("http://service-h/api/ping") - tmpTrace := Trace{ + tmpGreeting := Greeting{ ID: uuid.New().String(), ServiceName: "Service-E", - Greeting: "Bonjour, de Service-E!", + Message: "Bonjour, de Service-E!", CreatedAt: time.Now().Local(), } - traces = append(traces, tmpTrace) + greetings = append(greetings, tmpGreeting) - err := json.NewEncoder(w).Encode(traces) + err := json.NewEncoder(w).Encode(greetings) if err != nil { log.Error(err) } @@ -58,19 +58,19 @@ func HealthCheckHandler(w http.ResponseWriter, r *http.Request) { func CallNextService(url string) { log.Info(url) - var tmpTraces []Trace + var tmpGreetings []Greeting response, err := http.Get(url) if err != nil { log.Error(err) } else { data, _ := ioutil.ReadAll(response.Body) - err := json.Unmarshal(data, &tmpTraces) + err := json.Unmarshal(data, &tmpGreetings) if err != nil { log.Error(err) } - for _, r := range tmpTraces { - traces = append(traces, r) + for _, r := range tmpGreetings { + greetings = append(greetings, r) } } } diff --git a/service-f/main.go b/service-f/main.go index 757d799..cbcc67d 100644 --- a/service-f/main.go +++ b/service-f/main.go @@ -21,32 +21,32 @@ import ( "time" ) -type Trace struct { +type Greeting struct { ID string `json:"id,omitempty"` ServiceName string `json:"service,omitempty"` - Greeting string `json:"greeting,omitempty"` + Message string `json:"message,omitempty"` CreatedAt time.Time `json:"created,omitempty"` } -var traces []Trace +var greetings []Greeting func PingHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") - traces = nil + greetings = nil - tmpTrace := Trace{ + tmpGreeting := Greeting{ ID: uuid.New().String(), ServiceName: "Service-F", - Greeting: "Hola, from Service-F!", + Message: "Hola, from Service-F!", CreatedAt: time.Now().Local(), } - traces = append(traces, tmpTrace) + greetings = append(greetings, tmpGreeting) - CallMongoDB(tmpTrace) + CallMongoDB(tmpGreeting) - err := json.NewEncoder(w).Encode(traces) + err := json.NewEncoder(w).Encode(greetings) if err != nil { log.Error(err) } @@ -60,8 +60,8 @@ func HealthCheckHandler(w http.ResponseWriter, r *http.Request) { } } -func CallMongoDB(trace Trace) { - log.Info(trace) +func CallMongoDB(greeting Greeting) { + log.Info(greeting) ctx, _ := context.WithTimeout(context.Background(), 10*time.Second) client, err := mongo.Connect(ctx, options.Client().ApplyURI(os.Getenv("MONGO_CONN"))) if err != nil { @@ -73,7 +73,7 @@ func CallMongoDB(trace Trace) { collection := client.Database("service-f").Collection("messages") ctx, _ = context.WithTimeout(context.Background(), 5*time.Second) - _, err = collection.InsertOne(ctx, trace) + _, err = collection.InsertOne(ctx, greeting) if err != nil { log.Error(err) } @@ -129,16 +129,16 @@ func GetMessages() { <-forever } -func deserialize(b []byte) (t Trace) { +func deserialize(b []byte) (t Greeting) { log.Debug(b) - var tmpTrace Trace + var tmpGreeting Greeting buf := bytes.NewBuffer(b) decoder := json.NewDecoder(buf) - err := decoder.Decode(&tmpTrace) + err := decoder.Decode(&tmpGreeting) if err != nil { log.Error(err) } - return tmpTrace + return tmpGreeting } func init() { diff --git a/service-g/main.go b/service-g/main.go index edd9317..53fb02e 100644 --- a/service-g/main.go +++ b/service-g/main.go @@ -19,32 +19,32 @@ import ( "time" ) -type Trace struct { +type Greeting struct { ID string `json:"id,omitempty"` ServiceName string `json:"service,omitempty"` - Greeting string `json:"greeting,omitempty"` + Message string `json:"message,omitempty"` CreatedAt time.Time `json:"created,omitempty"` } -var traces []Trace +var greetings []Greeting func PingHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") - traces = nil + greetings = nil - tmpTrace := Trace{ + tmpGreeting := Greeting{ ID: uuid.New().String(), ServiceName: "Service-G", - Greeting: "Ahlan, from Service-G!", + Message: "Ahlan, from Service-G!", CreatedAt: time.Now().Local(), } - traces = append(traces, tmpTrace) + greetings = append(greetings, tmpGreeting) - CallMongoDB(tmpTrace) + CallMongoDB(tmpGreeting) - err := json.NewEncoder(w).Encode(traces) + err := json.NewEncoder(w).Encode(greetings) if err != nil { log.Error(err) } @@ -58,8 +58,8 @@ func HealthCheckHandler(w http.ResponseWriter, r *http.Request) { } } -func CallMongoDB(trace Trace) { - log.Info(trace) +func CallMongoDB(greeting Greeting) { + log.Info(greeting) ctx, _ := context.WithTimeout(context.Background(), 10*time.Second) client, err := mongo.Connect(ctx, options.Client().ApplyURI(os.Getenv("MONGO_CONN"))) if err != nil { @@ -68,10 +68,10 @@ func CallMongoDB(trace Trace) { defer client.Disconnect(nil) - collection := client.Database("service-g").Collection("traces") + collection := client.Database("service-g").Collection("greetings") ctx, _ = context.WithTimeout(context.Background(), 5*time.Second) - _, err = collection.InsertOne(ctx, trace) + _, err = collection.InsertOne(ctx, greeting) if err != nil { log.Error(err) } diff --git a/service-h/main.go b/service-h/main.go index 07e1956..c2abb89 100644 --- a/service-h/main.go +++ b/service-h/main.go @@ -19,32 +19,32 @@ import ( "time" ) -type Trace struct { +type Greeting struct { ID string `json:"id,omitempty"` ServiceName string `json:"service,omitempty"` - Greeting string `json:"greeting,omitempty"` + Message string `json:"message,omitempty"` CreatedAt time.Time `json:"created,omitempty"` } -var traces []Trace +var greetings []Greeting func PingHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") - traces = nil + greetings = nil - tmpTrace := Trace{ + tmpGreeting := Greeting{ ID: uuid.New().String(), ServiceName: "Service-H", - Greeting: "Ciao, from Service-H!", + Message: "Ciao, from Service-H!", CreatedAt: time.Now().Local(), } - traces = append(traces, tmpTrace) + greetings = append(greetings, tmpGreeting) - CallMongoDB(tmpTrace) + CallMongoDB(tmpGreeting) - err := json.NewEncoder(w).Encode(traces) + err := json.NewEncoder(w).Encode(greetings) if err != nil { log.Error(err) } @@ -58,8 +58,8 @@ func HealthCheckHandler(w http.ResponseWriter, r *http.Request) { } } -func CallMongoDB(trace Trace) { - log.Info(trace) +func CallMongoDB(greeting Greeting) { + log.Info(greeting) ctx, _ := context.WithTimeout(context.Background(), 10*time.Second) client, err := mongo.Connect(ctx, options.Client().ApplyURI(os.Getenv("MONGO_CONN"))) if err != nil { @@ -68,10 +68,10 @@ func CallMongoDB(trace Trace) { defer client.Disconnect(nil) - collection := client.Database("service-h").Collection("traces") + collection := client.Database("service-h").Collection("greetings") ctx, _ = context.WithTimeout(context.Background(), 5*time.Second) - _, err = collection.InsertOne(ctx, trace) + _, err = collection.InsertOne(ctx, greeting) if err != nil { log.Error(err) } diff --git a/stack.yml b/stack.yml index 8b94948..f29c393 100644 --- a/stack.yml +++ b/stack.yml @@ -2,52 +2,52 @@ version: '3.7' services: angular-ui: - image: garystafford/angular-observe:1.1.0 + image: garystafford/angular-observe:1.3.0 networks: - golang-demo ports: - 80:80 service-a: - image: garystafford/go-srv-a:1.2.0 + image: garystafford/go-srv-a:1.3.0 networks: - golang-demo ports: - 8000:80 service-b: - image: garystafford/go-srv-b:1.2.0 + image: garystafford/go-srv-b:1.3.0 networks: - golang-demo service-c: - image: garystafford/go-srv-c:1.2.0 + image: garystafford/go-srv-c:1.3.0 networks: - golang-demo environment: MONGO_CONN: 'mongodb://mongodb:27017/admin' service-d: - image: garystafford/go-srv-d:1.2.0 + image: garystafford/go-srv-d:1.3.0 networks: - golang-demo environment: RABBITMQ_CONN: 'amqp://guest:guest@rabbitmq:5672/' service-e: - image: garystafford/go-srv-e:1.2.0 + image: garystafford/go-srv-e:1.3.0 networks: - golang-demo service-f: - image: garystafford/go-srv-f:1.2.0 + image: garystafford/go-srv-f:1.3.0 networks: - golang-demo environment: RABBITMQ_CONN: 'amqp://guest:guest@rabbitmq:5672/' MONGO_CONN: 'mongodb://mongodb:27017/admin' service-g: - image: garystafford/go-srv-g:1.2.0 + image: garystafford/go-srv-g:1.3.0 networks: - golang-demo environment: MONGO_CONN: 'mongodb://mongodb:27017/admin' service-h: - image: garystafford/go-srv-h:1.2.0 + image: garystafford/go-srv-h:1.3.0 networks: - golang-demo environment: