Merge pull request #45 from microservices-demo/refactor/weave-common

Reuse middleware from weaveworks/common.

.travis.yml

@@ -1,5 +1,5 @@
 language: go
-go: 1.6
+go: 1.7
 sudo: required
 env:
 - GROUP=weaveworksdemos COMMIT=$TRAVIS_COMMIT TAG=$TRAVIS_TAG

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.6-alpine
+FROM golang:1.7-alpine
 ENV sourcesdir /go/src/github.com/microservices-demo/user/
 ENV MONGO_HOST mytestdb:27017
 ENV HATEAOS user

Dockerfile-test

@@ -6,7 +6,7 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 
 RUN apt-get update && apt-get install -yq git curl
 
-RUN curl -sSL https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz -o go.tar.gz && \
+RUN curl -sSL https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz -o go.tar.gz && \
  tar -C /usr/local -xvf go.tar.gz
 RUN go get -v github.com/Masterminds/glide
 

glide.yaml

@@ -27,3 +27,6 @@ import:
  subpackages:
  - hystrix
 - package: github.com/felixge/httpsnoop
+- package: github.com/weaveworks/common
+ subpackages:
+ - middleware

main.go

@@ -15,26 +15,32 @@ import (
  "github.com/microservices-demo/user/api"
  "github.com/microservices-demo/user/db"
  "github.com/microservices-demo/user/db/mongodb"
- "github.com/microservices-demo/user/middleware"
  stdopentracing "github.com/opentracing/opentracing-go"
  zipkin "github.com/openzipkin/zipkin-go-opentracing"
  stdprometheus "github.com/prometheus/client_golang/prometheus"
+ commonMiddleware "github.com/weaveworks/common/middleware"
  "golang.org/x/net/context"
 )
 
 var (
- dev bool
  port string
- acc string
  zip string
 )
 
+var (
+ HTTPLatency = stdprometheus.NewHistogramVec(stdprometheus.HistogramOpts{
+ Name: "request_duration_seconds",
+ Help: "Time (in seconds) spent serving HTTP requests.",
+ Buckets: stdprometheus.DefBuckets,
+ }, []string{"method", "route", "status_code", "isWS"})
+)
+
 const (
  ServiceName = "user"
 )
 
 func init() {
-
+ stdprometheus.MustRegister(HTTPLatency)
  flag.StringVar(&zip, "zipkin", os.Getenv("ZIPKIN"), "Zipkin address")
  flag.StringVar(&port, "port", "8084", "Port on which to run")
  db.Register("mongodb", &mongodb.Mongo{})
@@ -124,16 +130,15 @@ func main() {
  // HTTP router
  router := api.MakeHTTPHandler(ctx, endpoints, logger, tracer)
 
- httpMiddleware := []middleware.Interface{
- middleware.Instrument{
- Duration: middleware.HTTPLatency,
+ httpMiddleware := []commonMiddleware.Interface{
+ commonMiddleware.Instrument{
+ Duration: HTTPLatency,
  RouteMatcher: router,
- Service: ServiceName,
  },
  }
 
  // Handler
- handler := middleware.Merge(httpMiddleware...).Wrap(router)
+ handler := commonMiddleware.Merge(httpMiddleware...).Wrap(router)
 
  // Create and launch the HTTP server.
  go func() {