log: change log format to JSON payload for better log in Stackdriver

change the log format in Go written service from text payload to
JSON payload using 3rd party logging library (logrus).

https://cloud.google.com/logging/docs/structured-logging
33a1e118e1/json_formatter.go (L40-L49)

Effected services are frontend, productcatalogservice, checkoutservice,
and shippinservice.

Also change target container registry and locust scenario for testing.
This commit is contained in:
Yoshi Yamaguchi 2018-09-24 21:04:36 +09:00
parent 1bab006af1
commit c6e7b80a32
25 changed files with 242 additions and 97 deletions

View file

@ -25,7 +25,7 @@ spec:
terminationGracePeriodSeconds: 5 terminationGracePeriodSeconds: 5
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/adservice image: gcr.io/yoshifumi-cloud-demo/adservice
ports: ports:
- containerPort: 9555 - containerPort: 9555
env: env:

View file

@ -25,7 +25,7 @@ spec:
terminationGracePeriodSeconds: 5 terminationGracePeriodSeconds: 5
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/cartservice image: gcr.io/yoshifumi-cloud-demo/cartservice
ports: ports:
- containerPort: 7070 - containerPort: 7070
env: env:

View file

@ -24,7 +24,7 @@ spec:
spec: spec:
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/checkoutservice image: gcr.io/yoshifumi-cloud-demo/checkoutservice
ports: ports:
- containerPort: 5050 - containerPort: 5050
readinessProbe: readinessProbe:

View file

@ -25,7 +25,7 @@ spec:
terminationGracePeriodSeconds: 5 terminationGracePeriodSeconds: 5
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/currencyservice image: gcr.io/yoshifumi-cloud-demo/currencyservice
ports: ports:
- name: grpc - name: grpc
containerPort: 7000 containerPort: 7000

View file

@ -25,7 +25,7 @@ spec:
terminationGracePeriodSeconds: 5 terminationGracePeriodSeconds: 5
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/emailservice image: gcr.io/yoshifumi-cloud-demo/emailservice
ports: ports:
- containerPort: 8080 - containerPort: 8080
readinessProbe: readinessProbe:

View file

@ -24,7 +24,7 @@ spec:
spec: spec:
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/frontend image: gcr.io/yoshifumi-cloud-demo/frontend
ports: ports:
- containerPort: 8080 - containerPort: 8080
readinessProbe: readinessProbe:

View file

@ -38,7 +38,7 @@ spec:
value: "frontend:80" value: "frontend:80"
containers: containers:
- name: main - name: main
image: gcr.io/microservices-demo-app/loadgenerator image: gcr.io/yoshifumi-cloud-demo/loadgenerator
env: env:
- name: FRONTEND_ADDR - name: FRONTEND_ADDR
value: "frontend:80" value: "frontend:80"

View file

@ -25,7 +25,7 @@ spec:
terminationGracePeriodSeconds: 5 terminationGracePeriodSeconds: 5
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/paymentservice image: gcr.io/yoshifumi-cloud-demo/paymentservice
ports: ports:
- containerPort: 50051 - containerPort: 50051
readinessProbe: readinessProbe:

View file

@ -25,7 +25,7 @@ spec:
terminationGracePeriodSeconds: 5 terminationGracePeriodSeconds: 5
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/productcatalogservice image: gcr.io/yoshifumi-cloud-demo/productcatalogservice
ports: ports:
- containerPort: 3550 - containerPort: 3550
readinessProbe: readinessProbe:

View file

@ -25,7 +25,7 @@ spec:
terminationGracePeriodSeconds: 5 terminationGracePeriodSeconds: 5
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/recommendationservice image: gcr.io/yoshifumi-cloud-demo/recommendationservice
ports: ports:
- containerPort: 8080 - containerPort: 8080
readinessProbe: readinessProbe:

View file

@ -24,7 +24,7 @@ spec:
spec: spec:
containers: containers:
- name: server - name: server
image: gcr.io/microservices-demo-app/shippingservice image: gcr.io/yoshifumi-cloud-demo/shippingservice
ports: ports:
- containerPort: 50051 - containerPort: 50051
readinessProbe: readinessProbe:

View file

@ -18,27 +18,27 @@ build:
tagPolicy: tagPolicy:
gitCommit: {} gitCommit: {}
artifacts: artifacts:
- imageName: gcr.io/microservices-demo-app/emailservice - imageName: gcr.io/yoshifumi-cloud-demo/emailservice
workspace: src/emailservice workspace: src/emailservice
- imageName: gcr.io/microservices-demo-app/productcatalogservice - imageName: gcr.io/yoshifumi-cloud-demo/productcatalogservice
workspace: src/productcatalogservice workspace: src/productcatalogservice
- imageName: gcr.io/microservices-demo-app/recommendationservice - imageName: gcr.io/yoshifumi-cloud-demo/recommendationservice
workspace: src/recommendationservice workspace: src/recommendationservice
- imageName: gcr.io/microservices-demo-app/shippingservice - imageName: gcr.io/yoshifumi-cloud-demo/shippingservice
workspace: src/shippingservice workspace: src/shippingservice
- imageName: gcr.io/microservices-demo-app/checkoutservice - imageName: gcr.io/yoshifumi-cloud-demo/checkoutservice
workspace: src/checkoutservice workspace: src/checkoutservice
- imageName: gcr.io/microservices-demo-app/paymentservice - imageName: gcr.io/yoshifumi-cloud-demo/paymentservice
workspace: src/paymentservice workspace: src/paymentservice
- imageName: gcr.io/microservices-demo-app/currencyservice - imageName: gcr.io/yoshifumi-cloud-demo/currencyservice
workspace: src/currencyservice workspace: src/currencyservice
- imageName: gcr.io/microservices-demo-app/cartservice - imageName: gcr.io/yoshifumi-cloud-demo/cartservice
workspace: src/cartservice workspace: src/cartservice
- imageName: gcr.io/microservices-demo-app/frontend - imageName: gcr.io/yoshifumi-cloud-demo/frontend
workspace: src/frontend workspace: src/frontend
- imageName: gcr.io/microservices-demo-app/loadgenerator - imageName: gcr.io/yoshifumi-cloud-demo/loadgenerator
workspace: src/loadgenerator workspace: src/loadgenerator
- imageName: gcr.io/microservices-demo-app/adservice - imageName: gcr.io/yoshifumi-cloud-demo/adservice
workspace: src/adservice workspace: src/adservice
deploy: deploy:
kubectl: kubectl:

View file

@ -56,6 +56,14 @@
revision = "317e0006254c44a0ac427cc52a0e083ff0b9622f" revision = "317e0006254c44a0ac427cc52a0e083ff0b9622f"
version = "v2.0.0" version = "v2.0.0"
[[projects]]
digest = "1:d867dfa6751c8d7a435821ad3b736310c2ed68945d05b50fb9d23aee0540c8cc"
name = "github.com/sirupsen/logrus"
packages = ["."]
pruneopts = "UT"
revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
version = "v1.0.6"
[[projects]] [[projects]]
name = "go.opencensus.io" name = "go.opencensus.io"
packages = [ packages = [
@ -77,6 +85,14 @@
revision = "b11f239c032624b045c4c2bfd3d1287b4012ce89" revision = "b11f239c032624b045c4c2bfd3d1287b4012ce89"
version = "v0.16.0" version = "v0.16.0"
[[projects]]
branch = "master"
digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8"
name = "golang.org/x/crypto"
packages = ["ssh/terminal"]
pruneopts = "UT"
revision = "0e37d006457bf46f9e6692014ba72ef82c33022c"
[[projects]] [[projects]]
branch = "master" branch = "master"
name = "golang.org/x/net" name = "golang.org/x/net"

View file

@ -41,6 +41,10 @@
name = "github.com/google/uuid" name = "github.com/google/uuid"
version = "1.0.0" version = "1.0.0"
[[constraint]]
name = "github.com/sirupsen/logrus"
version = "1.0.6"
[[constraint]] [[constraint]]
name = "go.opencensus.io" name = "go.opencensus.io"
version = "0.16.0" version = "0.16.0"

View file

@ -17,7 +17,6 @@ package main
import ( import (
"context" "context"
"fmt" "fmt"
"log"
"net" "net"
"os" "os"
"time" "time"
@ -25,6 +24,7 @@ import (
"cloud.google.com/go/profiler" "cloud.google.com/go/profiler"
"contrib.go.opencensus.io/exporter/stackdriver" "contrib.go.opencensus.io/exporter/stackdriver"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/sirupsen/logrus"
"go.opencensus.io/plugin/ocgrpc" "go.opencensus.io/plugin/ocgrpc"
"go.opencensus.io/stats/view" "go.opencensus.io/stats/view"
"go.opencensus.io/trace" "go.opencensus.io/trace"
@ -42,6 +42,22 @@ const (
usdCurrency = "USD" usdCurrency = "USD"
) )
var log *logrus.Logger
func init() {
log = logrus.New()
log.Level = logrus.DebugLevel
log.Formatter = &logrus.JSONFormatter{
FieldMap: logrus.FieldMap{
logrus.FieldKeyTime: "timestamp",
logrus.FieldKeyLevel: "severity",
logrus.FieldKeyMsg: "message",
},
TimestampFormat: time.RFC3339Nano,
}
log.Out = os.Stdout
}
type checkoutService struct { type checkoutService struct {
productCatalogSvcAddr string productCatalogSvcAddr string
cartSvcAddr string cartSvcAddr string
@ -68,7 +84,7 @@ func main() {
mustMapEnv(&svc.emailSvcAddr, "EMAIL_SERVICE_ADDR") mustMapEnv(&svc.emailSvcAddr, "EMAIL_SERVICE_ADDR")
mustMapEnv(&svc.paymentSvcAddr, "PAYMENT_SERVICE_ADDR") mustMapEnv(&svc.paymentSvcAddr, "PAYMENT_SERVICE_ADDR")
log.Printf("service config: %+v", svc) log.Infof("service config: %+v", svc)
lis, err := net.Listen("tcp", fmt.Sprintf(":%s", port)) lis, err := net.Listen("tcp", fmt.Sprintf(":%s", port))
if err != nil { if err != nil {
@ -77,16 +93,17 @@ func main() {
srv := grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{})) srv := grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
pb.RegisterCheckoutServiceServer(srv, svc) pb.RegisterCheckoutServiceServer(srv, svc)
healthpb.RegisterHealthServer(srv, svc) healthpb.RegisterHealthServer(srv, svc)
log.Printf("starting to listen on tcp: %q", lis.Addr().String()) log.Infof("starting to listen on tcp: %q", lis.Addr().String())
log.Fatal(srv.Serve(lis)) err = srv.Serve(lis)
log.Fatal(err)
} }
func initStats(exporter *stackdriver.Exporter) { func initStats(exporter *stackdriver.Exporter) {
view.RegisterExporter(exporter) view.RegisterExporter(exporter)
if err := view.Register(ocgrpc.DefaultServerViews...); err != nil { if err := view.Register(ocgrpc.DefaultServerViews...); err != nil {
log.Printf("Error registering default server views") log.Warn("Error registering default server views")
} else { } else {
log.Printf("Registered default server views") log.Info("Registered default server views")
} }
} }
@ -96,21 +113,21 @@ func initTracing() {
for i := 1; i <= 3; i++ { for i := 1; i <= 3; i++ {
exporter, err := stackdriver.NewExporter(stackdriver.Options{}) exporter, err := stackdriver.NewExporter(stackdriver.Options{})
if err != nil { if err != nil {
log.Printf("info: failed to initialize stackdriver exporter: %+v", err) log.Infof("failed to initialize stackdriver exporter: %+v", err)
} else { } else {
trace.RegisterExporter(exporter) trace.RegisterExporter(exporter)
trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()}) trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()})
log.Print("registered stackdriver tracing") log.Info("registered stackdriver tracing")
// Register the views to collect server stats. // Register the views to collect server stats.
initStats(exporter) initStats(exporter)
return return
} }
d := time.Second * 10 * time.Duration(i) d := time.Second * 10 * time.Duration(i)
log.Printf("sleeping %v to retry initializing stackdriver exporter", d) log.Infof("sleeping %v to retry initializing stackdriver exporter", d)
time.Sleep(d) time.Sleep(d)
} }
log.Printf("warning: could not initialize stackdriver exporter after retrying, giving up") log.Warn("could not initialize stackdriver exporter after retrying, giving up")
} }
func initProfiling(service, version string) { func initProfiling(service, version string) {
@ -123,16 +140,16 @@ func initProfiling(service, version string) {
// ProjectID must be set if not running on GCP. // ProjectID must be set if not running on GCP.
// ProjectID: "my-project", // ProjectID: "my-project",
}); err != nil { }); err != nil {
log.Printf("warn: failed to start profiler: %+v", err) log.Warnf("failed to start profiler: %+v", err)
} else { } else {
log.Print("started stackdriver profiler") log.Info("started stackdriver profiler")
return return
} }
d := time.Second * 10 * time.Duration(i) d := time.Second * 10 * time.Duration(i)
log.Printf("sleeping %v to retry initializing stackdriver profiler", d) log.Infof("sleeping %v to retry initializing stackdriver profiler", d)
time.Sleep(d) time.Sleep(d)
} }
log.Printf("warning: could not initialize stackdriver profiler after retrying, giving up") log.Warn("could not initialize stackdriver profiler after retrying, giving up")
} }
func mustMapEnv(target *string, envKey string) { func mustMapEnv(target *string, envKey string) {
@ -148,7 +165,7 @@ func (cs *checkoutService) Check(ctx context.Context, req *healthpb.HealthCheckR
} }
func (cs *checkoutService) PlaceOrder(ctx context.Context, req *pb.PlaceOrderRequest) (*pb.PlaceOrderResponse, error) { func (cs *checkoutService) PlaceOrder(ctx context.Context, req *pb.PlaceOrderRequest) (*pb.PlaceOrderResponse, error) {
log.Printf("[PlaceOrder] user_id=%q user_currency=%q", req.UserId, req.UserCurrency) log.Infof("[PlaceOrder] user_id=%q user_currency=%q", req.UserId, req.UserCurrency)
orderID, err := uuid.NewUUID() orderID, err := uuid.NewUUID()
if err != nil { if err != nil {
@ -172,7 +189,7 @@ func (cs *checkoutService) PlaceOrder(ctx context.Context, req *pb.PlaceOrderReq
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to charge card: %+v", err) return nil, status.Errorf(codes.Internal, "failed to charge card: %+v", err)
} }
log.Printf("payment went through (transaction_id: %s)", txID) log.Infof("payment went through (transaction_id: %s)", txID)
shippingTrackingID, err := cs.shipOrder(ctx, req.Address, prep.cartItems) shippingTrackingID, err := cs.shipOrder(ctx, req.Address, prep.cartItems)
if err != nil { if err != nil {
@ -190,9 +207,9 @@ func (cs *checkoutService) PlaceOrder(ctx context.Context, req *pb.PlaceOrderReq
} }
if err := cs.sendOrderConfirmation(ctx, req.Email, orderResult); err != nil { if err := cs.sendOrderConfirmation(ctx, req.Email, orderResult); err != nil {
log.Printf("failed to send order confirmation to %q: %+v", req.Email, err) log.Warnf("failed to send order confirmation to %q: %+v", req.Email, err)
} else { } else {
log.Printf("order confirmation email sent to %q", req.Email) log.Infof("order confirmation email sent to %q", req.Email)
} }
resp := &pb.PlaceOrderResponse{Order: orderResult} resp := &pb.PlaceOrderResponse{Order: orderResult}
return resp, nil return resp, nil

View file

@ -83,7 +83,15 @@ func main() {
ctx := context.Background() ctx := context.Background()
log := logrus.New() log := logrus.New()
log.Level = logrus.DebugLevel log.Level = logrus.DebugLevel
log.Formatter = &logrus.TextFormatter{} log.Formatter = &logrus.JSONFormatter{
FieldMap: logrus.FieldMap{
logrus.FieldKeyTime: "timestamp",
logrus.FieldKeyLevel: "severity",
logrus.FieldKeyMsg: "message",
},
TimestampFormat: time.RFC3339Nano,
}
log.Out = os.Stdout
go initProfiling(log, "frontend", "1.0.0") go initProfiling(log, "frontend", "1.0.0")
go initTracing(log) go initTracing(log)

View file

@ -16,17 +16,7 @@
import random import random
from locust import HttpLocust, TaskSet from locust import HttpLocust, TaskSet
import setting
products = [
'0PUK6V6EV0',
'1YMWWN1N4O',
'2ZYFJ3GM2N',
'66VCHSJNUP',
'6E92ZMYYFZ',
'9SIQT8TOJO',
'L9ECAV7KIM',
'LS4PSXUNUM',
'OLJCESPC7Z']
def index(l): def index(l):
l.client.get("/") l.client.get("/")
@ -37,13 +27,13 @@ def setCurrency(l):
{'currency_code': random.choice(currencies)}) {'currency_code': random.choice(currencies)})
def browseProduct(l): def browseProduct(l):
l.client.get("/product/" + random.choice(products)) l.client.get("/product/" + random.choice(setting.products))
def viewCart(l): def viewCart(l):
l.client.get("/cart") l.client.get("/cart")
def addToCart(l): def addToCart(l):
product = random.choice(products) product = random.choice(setting.products)
l.client.get("/product/" + product) l.client.get("/product/" + product)
l.client.post("/cart", { l.client.post("/cart", {
'product_id': product, 'product_id': product,
@ -51,18 +41,7 @@ def addToCart(l):
def checkout(l): def checkout(l):
addToCart(l) addToCart(l)
l.client.post("/cart/checkout", { l.client.post("/cart/checkout", random.choice(setting.orders))
'email': 'someone@example.com',
'street_address': '1600 Amphitheatre Parkway',
'zip_code': '94043',
'city': 'Mountain View',
'state': 'CA',
'country': 'United States',
'credit_card_number': '4432-8015-6152-0454',
'credit_card_expiration_month': '1',
'credit_card_expiration_year': '2019',
'credit_card_cvv': '672',
})
class UserBehavior(TaskSet): class UserBehavior(TaskSet):

View file

@ -0,0 +1,53 @@
#!/usr/bin/python
#
# Copyright 2018 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
products = [
'0PUK6V6EV0',
'1YMWWN1N4O',
'2ZYFJ3GM2N',
'66VCHSJNUP',
'6E92ZMYYFZ',
'9SIQT8TOJO',
'L9ECAV7KIM',
'LS4PSXUNUM',
'OLJCESPC7Z']
orders = [
{
'email': 'someone@example.com',
'street_address': '1600 Amphitheatre Parkway',
'zip_code': '94043',
'city': 'Mountain View',
'state': 'CA',
'country': 'United States',
'credit_card_number': '4432-8015-6152-0454',
'credit_card_expiration_month': '1',
'credit_card_expiration_year': '2019',
'credit_card_cvv': '672',
},
{
'email': 'anyone@example.com',
'street_address': '6-10-1 Roppongi, Roppongi Hills 44F',
'zip_code': '1066126',
'city': 'Minato-ku',
'state': 'Tokyo',
'country': 'Japapn',
'credit_card_number': '4429-3499-0001-7938',
'credit_card_expiration_month': '4',
'credit_card_expiration_year': '2021',
'credit_card_cvv': '124',
}
]

View file

@ -62,6 +62,14 @@
revision = "317e0006254c44a0ac427cc52a0e083ff0b9622f" revision = "317e0006254c44a0ac427cc52a0e083ff0b9622f"
version = "v2.0.0" version = "v2.0.0"
[[projects]]
digest = "1:d867dfa6751c8d7a435821ad3b736310c2ed68945d05b50fb9d23aee0540c8cc"
name = "github.com/sirupsen/logrus"
packages = ["."]
pruneopts = "UT"
revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
version = "v1.0.6"
[[projects]] [[projects]]
name = "go.opencensus.io" name = "go.opencensus.io"
packages = [ packages = [
@ -83,6 +91,14 @@
revision = "b11f239c032624b045c4c2bfd3d1287b4012ce89" revision = "b11f239c032624b045c4c2bfd3d1287b4012ce89"
version = "v0.16.0" version = "v0.16.0"
[[projects]]
branch = "master"
digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8"
name = "golang.org/x/crypto"
packages = ["ssh/terminal"]
pruneopts = "UT"
revision = "0e37d006457bf46f9e6692014ba72ef82c33022c"
[[projects]] [[projects]]
branch = "master" branch = "master"
name = "golang.org/x/net" name = "golang.org/x/net"

View file

@ -41,6 +41,10 @@
name = "github.com/google/go-cmp" name = "github.com/google/go-cmp"
version = "0.2.0" version = "0.2.0"
[[constraint]]
name = "github.com/sirupsen/logrus"
version = "1.0.6"
[[constraint]] [[constraint]]
name = "go.opencensus.io" name = "go.opencensus.io"
version = "0.16.0" version = "0.16.0"

View file

@ -20,8 +20,8 @@ import (
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log"
"net" "net"
"os"
"strings" "strings"
"time" "time"
@ -31,6 +31,7 @@ import (
"cloud.google.com/go/profiler" "cloud.google.com/go/profiler"
"contrib.go.opencensus.io/exporter/stackdriver" "contrib.go.opencensus.io/exporter/stackdriver"
"github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/jsonpb"
"github.com/sirupsen/logrus"
"go.opencensus.io/plugin/ocgrpc" "go.opencensus.io/plugin/ocgrpc"
"go.opencensus.io/stats/view" "go.opencensus.io/stats/view"
"go.opencensus.io/trace" "go.opencensus.io/trace"
@ -41,6 +42,7 @@ import (
var ( var (
catalogJSON []byte catalogJSON []byte
log *logrus.Logger
port = flag.Int("port", 3550, "port to listen at") port = flag.Int("port", 3550, "port to listen at")
) )
@ -51,7 +53,17 @@ func init() {
log.Fatalf("failed to open product catalog json file: %v", err) log.Fatalf("failed to open product catalog json file: %v", err)
} }
catalogJSON = c catalogJSON = c
log.Printf("successfully parsed product catalog json") log = logrus.New()
log.Formatter = &logrus.JSONFormatter{
FieldMap: logrus.FieldMap{
logrus.FieldKeyTime: "timestamp",
logrus.FieldKeyLevel: "severity",
logrus.FieldKeyMsg: "message",
},
TimestampFormat: time.RFC3339Nano,
}
log.Out = os.Stdout
log.Info("successfully parsed product catalog json")
} }
func main() { func main() {
@ -59,7 +71,7 @@ func main() {
go initProfiling("productcatalogservice", "1.0.0") go initProfiling("productcatalogservice", "1.0.0")
flag.Parse() flag.Parse()
log.Printf("starting grpc server at :%d", *port) log.Infof("starting grpc server at :%d", *port)
run(*port) run(*port)
select {} select {}
} }
@ -80,9 +92,9 @@ func run(port int) string {
func initStats(exporter *stackdriver.Exporter) { func initStats(exporter *stackdriver.Exporter) {
view.RegisterExporter(exporter) view.RegisterExporter(exporter)
if err := view.Register(ocgrpc.DefaultServerViews...); err != nil { if err := view.Register(ocgrpc.DefaultServerViews...); err != nil {
log.Printf("Error registering default server views") log.Info("Error registering default server views")
} else { } else {
log.Printf("Registered default server views") log.Info("Registered default server views")
} }
} }
@ -92,21 +104,21 @@ func initTracing() {
for i := 1; i <= 3; i++ { for i := 1; i <= 3; i++ {
exporter, err := stackdriver.NewExporter(stackdriver.Options{}) exporter, err := stackdriver.NewExporter(stackdriver.Options{})
if err != nil { if err != nil {
log.Printf("info: failed to initialize stackdriver exporter: %+v", err) log.Warnf("failed to initialize stackdriver exporter: %+v", err)
} else { } else {
trace.RegisterExporter(exporter) trace.RegisterExporter(exporter)
trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()}) trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()})
log.Print("registered stackdriver tracing") log.Info("registered stackdriver tracing")
// Register the views to collect server stats. // Register the views to collect server stats.
initStats(exporter) initStats(exporter)
return return
} }
d := time.Second * 10 * time.Duration(i) d := time.Second * 10 * time.Duration(i)
log.Printf("sleeping %v to retry initializing stackdriver exporter", d) log.Infof("sleeping %v to retry initializing stackdriver exporter", d)
time.Sleep(d) time.Sleep(d)
} }
log.Printf("warning: could not initialize stackdriver exporter after retrying, giving up") log.Warn("could not initialize stackdriver exporter after retrying, giving up")
} }
func initProfiling(service, version string) { func initProfiling(service, version string) {
@ -119,16 +131,16 @@ func initProfiling(service, version string) {
// ProjectID must be set if not running on GCP. // ProjectID must be set if not running on GCP.
// ProjectID: "my-project", // ProjectID: "my-project",
}); err != nil { }); err != nil {
log.Printf("warn: failed to start profiler: %+v", err) log.Warnf("failed to start profiler: %+v", err)
} else { } else {
log.Print("started stackdriver profiler") log.Info("started stackdriver profiler")
return return
} }
d := time.Second * 10 * time.Duration(i) d := time.Second * 10 * time.Duration(i)
log.Printf("sleeping %v to retry initializing stackdriver profiler", d) log.Infof("sleeping %v to retry initializing stackdriver profiler", d)
time.Sleep(d) time.Sleep(d)
} }
log.Printf("warning: could not initialize stackdriver profiler after retrying, giving up") log.Warn("could not initialize stackdriver profiler after retrying, giving up")
} }
type productCatalog struct{} type productCatalog struct{}
@ -137,7 +149,7 @@ func parseCatalog() []*pb.Product {
var cat pb.ListProductsResponse var cat pb.ListProductsResponse
if err := jsonpb.Unmarshal(bytes.NewReader(catalogJSON), &cat); err != nil { if err := jsonpb.Unmarshal(bytes.NewReader(catalogJSON), &cat); err != nil {
log.Printf("warning: failed to parse the catalog JSON: %v", err) log.Warnf("failed to parse the catalog JSON: %v", err)
return nil return nil
} }
return cat.Products return cat.Products

View file

@ -50,6 +50,14 @@
revision = "317e0006254c44a0ac427cc52a0e083ff0b9622f" revision = "317e0006254c44a0ac427cc52a0e083ff0b9622f"
version = "v2.0.0" version = "v2.0.0"
[[projects]]
digest = "1:d867dfa6751c8d7a435821ad3b736310c2ed68945d05b50fb9d23aee0540c8cc"
name = "github.com/sirupsen/logrus"
packages = ["."]
pruneopts = "UT"
revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
version = "v1.0.6"
[[projects]] [[projects]]
name = "go.opencensus.io" name = "go.opencensus.io"
packages = [ packages = [
@ -71,6 +79,14 @@
revision = "b11f239c032624b045c4c2bfd3d1287b4012ce89" revision = "b11f239c032624b045c4c2bfd3d1287b4012ce89"
version = "v0.16.0" version = "v0.16.0"
[[projects]]
branch = "master"
digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8"
name = "golang.org/x/crypto"
packages = ["ssh/terminal"]
pruneopts = "UT"
revision = "0e37d006457bf46f9e6692014ba72ef82c33022c"
[[projects]] [[projects]]
branch = "master" branch = "master"
name = "golang.org/x/net" name = "golang.org/x/net"

View file

@ -37,6 +37,10 @@
name = "github.com/golang/protobuf" name = "github.com/golang/protobuf"
version = "1.2.0" version = "1.2.0"
[[constraint]]
name = "github.com/sirupsen/logrus"
version = "1.0.6"
[[constraint]] [[constraint]]
name = "go.opencensus.io" name = "go.opencensus.io"
version = "0.16.0" version = "0.16.0"

View file

@ -16,13 +16,13 @@ package main
import ( import (
"fmt" "fmt"
"log"
"net" "net"
"os" "os"
"time" "time"
"cloud.google.com/go/profiler" "cloud.google.com/go/profiler"
"contrib.go.opencensus.io/exporter/stackdriver" "contrib.go.opencensus.io/exporter/stackdriver"
"github.com/sirupsen/logrus"
"go.opencensus.io/plugin/ocgrpc" "go.opencensus.io/plugin/ocgrpc"
"go.opencensus.io/stats/view" "go.opencensus.io/stats/view"
"go.opencensus.io/trace" "go.opencensus.io/trace"
@ -38,6 +38,22 @@ const (
defaultPort = "50051" defaultPort = "50051"
) )
var log *logrus.Logger
func init() {
log = logrus.New()
log.Level = logrus.DebugLevel
log.Formatter = &logrus.JSONFormatter{
FieldMap: logrus.FieldMap{
logrus.FieldKeyTime: "timestamp",
logrus.FieldKeyLevel: "severity",
logrus.FieldKeyMsg: "message",
},
TimestampFormat: time.RFC3339Nano,
}
log.Out = os.Stdout
}
func main() { func main() {
go initTracing() go initTracing()
go initProfiling("shippingservice", "1.0.0") go initProfiling("shippingservice", "1.0.0")
@ -56,7 +72,7 @@ func main() {
svc := &server{} svc := &server{}
pb.RegisterShippingServiceServer(srv, svc) pb.RegisterShippingServiceServer(srv, svc)
healthpb.RegisterHealthServer(srv, svc) healthpb.RegisterHealthServer(srv, svc)
log.Printf("Shipping Service listening on port %s", port) log.Infof("Shipping Service listening on port %s", port)
// Register reflection service on gRPC server. // Register reflection service on gRPC server.
reflection.Register(srv) reflection.Register(srv)
@ -75,8 +91,8 @@ func (s *server) Check(ctx context.Context, req *healthpb.HealthCheckRequest) (*
// GetQuote produces a shipping quote (cost) in USD. // GetQuote produces a shipping quote (cost) in USD.
func (s *server) GetQuote(ctx context.Context, in *pb.GetQuoteRequest) (*pb.GetQuoteResponse, error) { func (s *server) GetQuote(ctx context.Context, in *pb.GetQuoteRequest) (*pb.GetQuoteResponse, error) {
log.Printf("[GetQuote] received request") log.Info("[GetQuote] received request")
defer log.Printf("[GetQuote] completed request") defer log.Info("[GetQuote] completed request")
// 1. Our quote system requires the total number of items to be shipped. // 1. Our quote system requires the total number of items to be shipped.
count := 0 count := 0
@ -100,8 +116,8 @@ func (s *server) GetQuote(ctx context.Context, in *pb.GetQuoteRequest) (*pb.GetQ
// ShipOrder mocks that the requested items will be shipped. // ShipOrder mocks that the requested items will be shipped.
// It supplies a tracking ID for notional lookup of shipment delivery status. // It supplies a tracking ID for notional lookup of shipment delivery status.
func (s *server) ShipOrder(ctx context.Context, in *pb.ShipOrderRequest) (*pb.ShipOrderResponse, error) { func (s *server) ShipOrder(ctx context.Context, in *pb.ShipOrderRequest) (*pb.ShipOrderResponse, error) {
log.Printf("[ShipOrder] received request") log.Info("[ShipOrder] received request")
defer log.Printf("[ShipOrder] completed request") defer log.Info("[ShipOrder] completed request")
// 1. Create a Tracking ID // 1. Create a Tracking ID
baseAddress := fmt.Sprintf("%s, %s, %s", in.Address.StreetAddress, in.Address.City, in.Address.State) baseAddress := fmt.Sprintf("%s, %s, %s", in.Address.StreetAddress, in.Address.City, in.Address.State)
id := CreateTrackingId(baseAddress) id := CreateTrackingId(baseAddress)
@ -115,9 +131,9 @@ func (s *server) ShipOrder(ctx context.Context, in *pb.ShipOrderRequest) (*pb.Sh
func initStats(exporter *stackdriver.Exporter) { func initStats(exporter *stackdriver.Exporter) {
view.RegisterExporter(exporter) view.RegisterExporter(exporter)
if err := view.Register(ocgrpc.DefaultServerViews...); err != nil { if err := view.Register(ocgrpc.DefaultServerViews...); err != nil {
log.Printf("Error registering default server views") log.Warn("Error registering default server views")
} else { } else {
log.Printf("Registered default server views") log.Info("Registered default server views")
} }
} }
@ -127,21 +143,21 @@ func initTracing() {
for i := 1; i <= 3; i++ { for i := 1; i <= 3; i++ {
exporter, err := stackdriver.NewExporter(stackdriver.Options{}) exporter, err := stackdriver.NewExporter(stackdriver.Options{})
if err != nil { if err != nil {
log.Printf("info: failed to initialize stackdriver exporter: %+v", err) log.Warnf("failed to initialize stackdriver exporter: %+v", err)
} else { } else {
trace.RegisterExporter(exporter) trace.RegisterExporter(exporter)
trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()}) trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()})
log.Print("registered stackdriver tracing") log.Info("registered stackdriver tracing")
// Register the views to collect server stats. // Register the views to collect server stats.
initStats(exporter) initStats(exporter)
return return
} }
d := time.Second * 10 * time.Duration(i) d := time.Second * 10 * time.Duration(i)
log.Printf("sleeping %v to retry initializing stackdriver exporter", d) log.Infof("sleeping %v to retry initializing stackdriver exporter", d)
time.Sleep(d) time.Sleep(d)
} }
log.Printf("warning: could not initialize stackdriver exporter after retrying, giving up") log.Warn("could not initialize stackdriver exporter after retrying, giving up")
} }
func initProfiling(service, version string) { func initProfiling(service, version string) {
@ -154,14 +170,14 @@ func initProfiling(service, version string) {
// ProjectID must be set if not running on GCP. // ProjectID must be set if not running on GCP.
// ProjectID: "my-project", // ProjectID: "my-project",
}); err != nil { }); err != nil {
log.Printf("warn: failed to start profiler: %+v", err) log.Warnf("failed to start profiler: %+v", err)
} else { } else {
log.Print("started stackdriver profiler") log.Info("started stackdriver profiler")
return return
} }
d := time.Second * 10 * time.Duration(i) d := time.Second * 10 * time.Duration(i)
log.Printf("sleeping %v to retry initializing stackdriver profiler", d) log.Infof("sleeping %v to retry initializing stackdriver profiler", d)
time.Sleep(d) time.Sleep(d)
} }
log.Printf("warning: could not initialize stackdriver profiler after retrying, giving up") log.Warn("could not initialize stackdriver profiler after retrying, giving up")
} }

View file

@ -50,6 +50,6 @@ func quoteByCountFloat(count int) float64 {
return 0 return 0
} }
count64 := float64(count) count64 := float64(count)
var p float64 = 1 + (count64 * 0.2) var p = 1 + (count64 * 0.2)
return count64 + math.Pow(3, p) return count64 + math.Pow(3, p)
} }