Calling frontend service...- - - diff --git a/example/browser/nginx.conf b/example/browser/nginx.conf deleted file mode 100644 index 9659bbfe..00000000 --- a/example/browser/nginx.conf +++ /dev/null @@ -1,37 +0,0 @@ -load_module modules/ngx_http_opentracing_module.so; -load_module modules/ngx_http_zipkin_module.so; - -events {} - -http { - zipkin_collector_host $ZIPKIN_PORT_9411_TCP_ADDR; - zipkin_collector_port $ZIPKIN_PORT_9411_TCP_PORT; - zipkin_service_name nginx; - opentracing on; - - upstream frontend { - server localhost:8081; - } - - upstream backend { - server localhost:9000; - } - - server { - listen 80; - server_name localhost; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - location /time { - proxy_pass http://frontend; - } - - location /api { - proxy_pass http://backend; - } - } -} diff --git a/example/browser/node/backend.js b/example/browser/node/backend.js deleted file mode 100644 index 15034656..00000000 --- a/example/browser/node/backend.js +++ /dev/null @@ -1,22 +0,0 @@ -/* eslint-disable import/newline-after-import */ -// initialize tracer -const express = require('express'); -const CLSContext = require('zipkin-context-cls'); -const {Tracer} = require('zipkin'); -const {recorder} = require('./recorder'); - -const ctxImpl = new CLSContext('zipkin'); -const localServiceName = 'backend'; -const tracer = new Tracer({ctxImpl, recorder, localServiceName}); - -const app = express(); - -// instrument the server -const zipkinMiddleware = require('zipkin-instrumentation-express').expressMiddleware; -app.use(zipkinMiddleware({tracer})); - -app.get('/api', (req, res) => res.send(new Date().toString())); - -app.listen(9000, () => { - console.log('Backend listening on port 9000!'); -}); diff --git a/example/browser/node/browser.js b/example/browser/node/browser.js deleted file mode 100644 index bd5763df..00000000 --- a/example/browser/node/browser.js +++ /dev/null @@ -1,37 +0,0 @@ -/* eslint-env browser */ -/* eslint-disable import/newline-after-import */ -// use higher-precision time than milliseconds -process.hrtime = require('browser-process-hrtime'); - -// setup tracer -const { - BatchRecorder, - jsonEncoder: {JSON_V2} -} = require('zipkin'); -const {HttpLogger} = require('zipkin-transport-http'); - -const recorder = new BatchRecorder({ - logger: new HttpLogger({ - endpoint: 'http://localhost:9411/api/v2/spans', - jsonEncoder: JSON_V2 - }) -}); - -const {Tracer, ExplicitContext} = require('zipkin'); - -const ctxImpl = new ExplicitContext(); -const localServiceName = 'browser'; -const tracer = new Tracer({ctxImpl, recorder, localServiceName}); - -// instrument fetch -const wrapFetch = require('zipkin-instrumentation-fetch'); -const zipkinFetch = wrapFetch(fetch, {tracer}); - -const logEl = document.getElementById('log'); -const log = text => logEl.innerHTML = `${logEl.innerHTML}\n${text}`; - -// wrap fetch call so that it is traced -zipkinFetch('http://localhost:8080/time') - .then(response => (response.text())) - .then(text => log(text)) - .catch(err => log(`Failed:\n${err.stack}`)); diff --git a/example/browser/node/frontend.js b/example/browser/node/frontend.js deleted file mode 100644 index 75a2a389..00000000 --- a/example/browser/node/frontend.js +++ /dev/null @@ -1,43 +0,0 @@ -/* eslint-disable import/newline-after-import */ -// initialize tracer -const rest = require('rest'); -const express = require('express'); -const CLSContext = require('zipkin-context-cls'); -const {Tracer} = require('zipkin'); -const {recorder} = require('./recorder'); - -const ctxImpl = new CLSContext('zipkin'); -const localServiceName = 'frontend'; -const tracer = new Tracer({ctxImpl, recorder, localServiceName}); - -const app = express(); - -// instrument the server -const zipkinMiddleware = require('zipkin-instrumentation-express').expressMiddleware; -app.use(zipkinMiddleware({tracer})); - -// instrument the client -const {restInterceptor} = require('zipkin-instrumentation-cujojs-rest'); -const zipkinRest = rest.wrap(restInterceptor, {tracer}); - -// Allow cross-origin, traced requests. See http://enable-cors.org/server_expressjs.html -app.use((req, res, next) => { - res.header('Access-Control-Allow-Origin', '*'); - res.header('Access-Control-Allow-Headers', [ - 'Origin', 'Accept', 'X-Requested-With', 'X-B3-TraceId', - 'X-B3-ParentSpanId', 'X-B3-SpanId', 'X-B3-Sampled' - ].join(', ')); - next(); -}); - -app.get('/time', (req, res) => { - tracer.local('pay-me', () => - zipkinRest('http://localhost/api') - .then(response => res.send(response.entity)) - .catch(err => console.error('Error', err.stack)) - ); -}); - -app.listen(8081, () => { - console.log('Frontend listening on port 8081!'); -}); diff --git a/example/browser/node/recorder.js b/example/browser/node/recorder.js deleted file mode 100644 index 5db304ed..00000000 --- a/example/browser/node/recorder.js +++ /dev/null @@ -1,22 +0,0 @@ -/* eslint-env browser */ -const { - BatchRecorder, - jsonEncoder: {JSON_V2} -} = require('zipkin'); -const {HttpLogger} = require('zipkin-transport-http'); - -// Send spans to Zipkin asynchronously over HTTP -if (!process.env.ZIPKIN_HOST || !process.env.ZIPKIN_PORT) { - console.log("ZIPKIN_HOST and ZIPKIN_PORT must be set!"); - process.exit(1); -} -const zipkinBaseUrl = 'http://' + process.env.ZIPKIN_HOST + ':' + - process.env.ZIPKIN_PORT -const recorder = new BatchRecorder({ - logger: new HttpLogger({ - endpoint: `${zipkinBaseUrl}/api/v2/spans`, - jsonEncoder: JSON_V2 - }) -}); - -module.exports.recorder = recorder; diff --git a/example/browser/node/servers.js b/example/browser/node/servers.js deleted file mode 100644 index 9c1afe62..00000000 --- a/example/browser/node/servers.js +++ /dev/null @@ -1,5 +0,0 @@ -const path = require('path'); -const childProc = require('child_process'); - -childProc.fork(path.join(__dirname, 'frontend.js')); -childProc.fork(path.join(__dirname, 'backend.js')); diff --git a/example/browser/package.json b/example/browser/package.json deleted file mode 100644 index b5d73811..00000000 --- a/example/browser/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "zipkin-nginx-js-example", - "version": "0.0.1", - "description": "Example project that shows how to use zipkin with javascript", - "repository": "https://github.com/openzipkin/zipkin-js", - "scripts": { - "lint": "eslint .", - "start": "node node/servers.js", - "browserify": "browserify node/browser.js -o bundle.js" - }, - "dependencies": { - "browser-process-hrtime": "^0.1.2", - "express": "^4.14.0", - "rest": "^1.3.2", - "zipkin": "^0.11.1", - "zipkin-context-cls": "^0.11.0", - "zipkin-instrumentation-cujojs-rest": "^0.11.1", - "zipkin-instrumentation-express": "^0.11.1", - "zipkin-instrumentation-fetch": "^0.11.1", - "zipkin-transport-http": "^0.11.1" - }, - "devDependencies": { - "browserify": "^14.1.0", - "eslint": "^3.4.0", - "eslint-config-airbnb": "^14.1.0", - "eslint-plugin-import": "^2.2.0", - "eslint-plugin-jsx-a11y": "^4.0.0", - "eslint-plugin-react": "^6.2.0" - } -} diff --git a/example/browser/start.sh b/example/browser/start.sh deleted file mode 100755 index a9eec50e..00000000 --- a/example/browser/start.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -export ZIPKIN_HOST=$ZIPKIN_PORT_9411_TCP_ADDR -export ZIPKIN_PORT=$ZIPKIN_PORT_9411_TCP_PORT -envsubst '\$ZIPKIN_PORT_9411_TCP_ADDR \$ZIPKIN_PORT_9411_TCP_PORT' < /app/nginx.conf > /etc/nginx/nginx.conf - -npm start & -nginx -while /bin/true; do - sleep 50 -done diff --git a/example/hotrod/Dockerfile b/example/hotrod/Dockerfile deleted file mode 100644 index aa7ebe78..00000000 --- a/example/hotrod/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -FROM rnburn/nginx-opentracing - -WORKDIR /app -ADD . /app -RUN set -x \ -# new directory for storing sources and .deb files - && tempDir="$(mktemp -d)" \ - && chmod 777 "$tempDir" \ - \ -# save list of currently-installed packages so build dependencies can be cleanly removed later - && savedAptMark="$(apt-mark showmanual)" \ - \ -# set up go - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - git \ - ca-certificates \ - software-properties-common \ - wget \ - curl \ - && wget https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz \ - && tar -xvf go1.8.3.linux-amd64.tar.gz \ - && mv go $tempDir \ - && export GOROOT=$tempDir/go \ - && export GOPATH=$tempDir/gopath \ - && mkdir -p $GOPATH/bin \ - && export PATH=$GOPATH/bin:$GOROOT/bin:$PATH \ -# install glide - && curl https://glide.sh/get | sh \ -# build the hotrod demo - && mkdir -p $GOPATH/src/github.com/rnburn/ \ - && mv /app/hotrod $GOPATH/src/github.com/rnburn/hotrod-docker \ - && cd $GOPATH/src/github.com/rnburn/hotrod-docker \ - && glide install \ - && go build -o hotrod \ - && mv hotrod /app/hotrod \ - && mkdir -p /app/services/frontend/web_assets \ - && cp services/frontend/web_assets/index.html /app/services/frontend/web_assets/index.html \ -# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies -# (which is done after we install the built packages so we don't have to redownload any overlapping dependencies) - && apt-mark showmanual | xargs apt-mark auto > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \ - \ -# purge leftovers from building them (including extra, unnecessary build deps) - && apt-get purge -y --auto-remove \ - && rm -rf "$tempDir" - -EXPOSE 8080 - -STOPSIGNAL SIGTERM - -CMD ["/app/start.sh"] diff --git a/example/hotrod/README.md b/example/hotrod/README.md deleted file mode 100644 index 2e108f61..00000000 --- a/example/hotrod/README.md +++ /dev/null @@ -1,14 +0,0 @@ -An OpenTracing example demonstrating usage of the nginx-opentracing docker -image with jaeger. It builds on Jaeger's HotROD example (see blog post -[Take OpenTracing for a HotROD ride](https://medium.com/opentracing/take-opentracing-for-a-hotrod-ride-f6e3141f7941)), -but inserts nginx as a load balancer for the HotROD services. - -Use these commands to run: -```bash -docker build -t nginx-example-hotrod . -docker run -d -e COLLECTOR_ZIPKIN_HTTP_PORT=9411 -p5775:5775/udp -p6831:6831/udp -p6832:6832/udp \ - -p5778:5778 -p16686:16686 -p14268:14268 -p9411:9411 --name jaeger jaegertracing/all-in-one:latest -docker run -d -p 8080:80 --link jaeger:jaeger nginx-example-hotrod -``` -Visit http://localhost:8080 to interact with the demo and http://localhost:16686 -to view the traces in Jaeger. diff --git a/example/hotrod/hotrod/cmd/all.go b/example/hotrod/hotrod/cmd/all.go deleted file mode 100644 index 5016fd27..00000000 --- a/example/hotrod/hotrod/cmd/all.go +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package cmd - -import "github.com/spf13/cobra" - -// allCmd represents the all command -var allCmd = &cobra.Command{ - Use: "all", - Short: "Starts all services", - Long: `Starts all services.`, - Run: func(cmd *cobra.Command, args []string) { - logger.Info("Starting all services") - go customerCmd.RunE(customerCmd, args) - go driverCmd.RunE(driverCmd, args) - go routeCmd.RunE(routeCmd, args) - frontendCmd.RunE(frontendCmd, args) - }, -} - -func init() { - RootCmd.AddCommand(allCmd) -} diff --git a/example/hotrod/hotrod/cmd/customer.go b/example/hotrod/hotrod/cmd/customer.go deleted file mode 100644 index 7ddf6d4f..00000000 --- a/example/hotrod/hotrod/cmd/customer.go +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package cmd - -import ( - "net" - "strconv" - - "github.com/spf13/cobra" - "go.uber.org/zap" - - "github.com/rnburn/hotrod-docker/pkg/log" - "github.com/rnburn/hotrod-docker/pkg/tracing" - "github.com/rnburn/hotrod-docker/services/customer" -) - -// customerCmd represents the customer command -var customerCmd = &cobra.Command{ - Use: "customer", - Short: "Starts Customer service", - Long: `Starts Customer service.`, - RunE: func(cmd *cobra.Command, args []string) error { - logger := log.NewFactory(logger.With(zap.String("service", "customer"))) - server := customer.NewServer( - net.JoinHostPort(customerOptions.serverInterface, strconv.Itoa(customerOptions.serverPort)), - tracing.Init("customer", metricsFactory.Namespace("customer", nil), logger), - metricsFactory, - logger, - ) - return server.Run() - }, -} - -var ( - customerOptions struct { - serverInterface string - serverPort int - } -) - -func init() { - RootCmd.AddCommand(customerCmd) - - customerCmd.Flags().StringVarP(&customerOptions.serverInterface, "bind", "", "127.0.0.1", "interface to which the Customer server will bind") - customerCmd.Flags().IntVarP(&customerOptions.serverPort, "port", "p", 8081, "port on which the Customer server will listen") -} diff --git a/example/hotrod/hotrod/cmd/driver.go b/example/hotrod/hotrod/cmd/driver.go deleted file mode 100644 index 0c401095..00000000 --- a/example/hotrod/hotrod/cmd/driver.go +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package cmd - -import ( - "net" - "strconv" - - "github.com/spf13/cobra" - "go.uber.org/zap" - - "github.com/rnburn/hotrod-docker/pkg/log" - "github.com/rnburn/hotrod-docker/pkg/tracing" - "github.com/rnburn/hotrod-docker/services/driver" -) - -// driverCmd represents the driver command -var driverCmd = &cobra.Command{ - Use: "driver", - Short: "Starts Driver service", - Long: `Starts Driver service.`, - RunE: func(cmd *cobra.Command, args []string) error { - logger := log.NewFactory(logger.With(zap.String("service", "driver"))) - server := driver.NewServer( - net.JoinHostPort(driverOptions.serverInterface, strconv.Itoa(driverOptions.serverPort)), - tracing.Init("driver", metricsFactory.Namespace("driver", nil), logger), - metricsFactory, - logger, - ) - return server.Run() - }, -} - -var ( - driverOptions struct { - serverInterface string - serverPort int - } -) - -func init() { - RootCmd.AddCommand(driverCmd) - - driverCmd.Flags().StringVarP(&driverOptions.serverInterface, "bind", "", "127.0.0.1", "interface to which the driver server will bind") - driverCmd.Flags().IntVarP(&driverOptions.serverPort, "port", "p", 8082, "port on which the driver server will listen") -} diff --git a/example/hotrod/hotrod/cmd/frontend.go b/example/hotrod/hotrod/cmd/frontend.go deleted file mode 100644 index 6841edec..00000000 --- a/example/hotrod/hotrod/cmd/frontend.go +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package cmd - -import ( - "net" - "strconv" - - "github.com/spf13/cobra" - "go.uber.org/zap" - - "github.com/rnburn/hotrod-docker/pkg/log" - "github.com/rnburn/hotrod-docker/pkg/tracing" - "github.com/rnburn/hotrod-docker/services/frontend" -) - -// frontendCmd represents the frontend command -var frontendCmd = &cobra.Command{ - Use: "frontend", - Short: "Starts Frontend service", - Long: `Starts Frontend service.`, - RunE: func(cmd *cobra.Command, args []string) error { - logger := log.NewFactory(logger.With(zap.String("service", "frontend"))) - server := frontend.NewServer( - net.JoinHostPort(frontendOptions.serverInterface, strconv.Itoa(frontendOptions.serverPort)), - tracing.Init("frontend", metricsFactory.Namespace("frontend", nil), logger), - logger, - ) - return server.Run() - }, -} - -var ( - frontendOptions struct { - serverInterface string - serverPort int - } -) - -func init() { - RootCmd.AddCommand(frontendCmd) - - frontendCmd.Flags().StringVarP(&frontendOptions.serverInterface, "bind", "", "", "interface to which the frontend server will bind") - frontendCmd.Flags().IntVarP(&frontendOptions.serverPort, "port", "p", 8080, "port on which the frontend server will listen") -} diff --git a/example/hotrod/hotrod/cmd/root.go b/example/hotrod/hotrod/cmd/root.go deleted file mode 100644 index 0b16e7c9..00000000 --- a/example/hotrod/hotrod/cmd/root.go +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package cmd - -import ( - "fmt" - "math/rand" - "os" - "time" - - "github.com/spf13/cobra" - "github.com/spf13/viper" - "github.com/uber/jaeger-lib/metrics" - "github.com/uber/jaeger-lib/metrics/go-kit" - "github.com/uber/jaeger-lib/metrics/go-kit/expvar" - "go.uber.org/zap" -) - -var ( - cfgFile string - logger *zap.Logger - metricsFactory metrics.Factory -) - -// RootCmd represents the base command when called without any subcommands -var RootCmd = &cobra.Command{ - Use: "jaeger-demo", - Short: "HotR.O.D. - A tracing demo application", - Long: `HotR.O.D. - A tracing demo application.`, -} - -// Execute adds all child commands to the root command sets flags appropriately. -// This is called by main.main(). It only needs to happen once to the rootCmd. -func Execute() { - if err := RootCmd.Execute(); err != nil { - logger.Fatal("We bowled a googly", zap.Error(err)) - os.Exit(-1) - } -} - -func init() { - cobra.OnInitialize(initConfig) - logger, _ = zap.NewDevelopment() - metricsFactory = xkit.Wrap("", expvar.NewFactory(10)) // 10 buckets for histograms -} - -// initConfig reads in config file and ENV variables if set. -func initConfig() { - if cfgFile != "" { // enable ability to specify config file via flag - viper.SetConfigFile(cfgFile) - } - - viper.SetConfigName(".jaeger-demo") // name of config file (without extension) - viper.AddConfigPath("$HOME") // adding home directory as first search path - viper.AutomaticEnv() // read in environment variables that match - - // If a config file is found, read it in. - if err := viper.ReadInConfig(); err == nil { - fmt.Println("Using config file:", viper.ConfigFileUsed()) - } - - rand.Seed(int64(time.Now().Nanosecond())) -} diff --git a/example/hotrod/hotrod/cmd/route.go b/example/hotrod/hotrod/cmd/route.go deleted file mode 100644 index c4d5a51c..00000000 --- a/example/hotrod/hotrod/cmd/route.go +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package cmd - -import ( - "net" - "strconv" - - "github.com/spf13/cobra" - "go.uber.org/zap" - - "github.com/rnburn/hotrod-docker/pkg/log" - "github.com/rnburn/hotrod-docker/pkg/tracing" - "github.com/rnburn/hotrod-docker/services/route" -) - -// routeCmd represents the route command -var routeCmd = &cobra.Command{ - Use: "route", - Short: "Starts Route service", - Long: `Starts Route service.`, - RunE: func(cmd *cobra.Command, args []string) error { - logger := log.NewFactory(logger.With(zap.String("service", "route"))) - server := route.NewServer( - net.JoinHostPort(routeOptions.serverInterface, strconv.Itoa(routeOptions.serverPort)), - tracing.Init("route", metricsFactory.Namespace("route", nil), logger), - logger, - ) - return server.Run() - }, -} - -var ( - routeOptions struct { - serverInterface string - serverPort int - } -) - -func init() { - RootCmd.AddCommand(routeCmd) - - routeCmd.Flags().StringVarP(&routeOptions.serverInterface, "bind", "", "127.0.0.1", "interface to which the Route server will bind") - routeCmd.Flags().IntVarP(&routeOptions.serverPort, "port", "p", 8083, "port on which the Route server will listen") -} diff --git a/example/hotrod/hotrod/glide.lock b/example/hotrod/hotrod/glide.lock deleted file mode 100644 index b829ce60..00000000 --- a/example/hotrod/hotrod/glide.lock +++ /dev/null @@ -1,126 +0,0 @@ -hash: 5afb055333607d4ef6fdd4023a87611599776f05195058dd4bf7a8381dad0bec -updated: 2017-10-20T13:24:51.186338625-07:00 -imports: -- name: github.com/apache/thrift - version: b2a4d4ae21c789b689dd162deb819665567f481c - subpackages: - - lib/go/thrift -- name: github.com/codahale/hdrhistogram - version: 3a0bb77429bd3a61596f5e8a3172445844342120 -- name: github.com/fsnotify/fsnotify - version: 4da3e2cfbabc9f751898f250b49f2439785783a1 -- name: github.com/go-kit/kit - version: a9ca6725cbbea455e61c6bc8a1ed28e81eb3493b - subpackages: - - metrics - - metrics/expvar - - metrics/generic - - metrics/internal/lv -- name: github.com/hashicorp/hcl - version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8 - subpackages: - - hcl/ast - - hcl/parser - - hcl/scanner - - hcl/strconv - - hcl/token - - json/parser - - json/scanner - - json/token -- name: github.com/inconshreveable/mousetrap - version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -- name: github.com/magiconair/properties - version: 8d7837e64d3c1ee4e54a880c5a920ab4316fc90a -- name: github.com/mitchellh/mapstructure - version: 06020f85339e21b2478f756a78e295255ffa4d6a -- name: github.com/opentracing-contrib/go-stdlib - version: 48e4d763b2fbcd10e666e6a1742acdf8cc2286ef - subpackages: - - nethttp -- name: github.com/opentracing/opentracing-go - version: 1949ddbfd147afd4d964a9f00b24eb291e0e7c38 - subpackages: - - ext - - log -- name: github.com/pelletier/go-toml - version: 2009e44b6f182e34d8ce081ac2767622937ea3d4 -- name: github.com/spf13/afero - version: e67d870304c4bca21331b02f414f970df13aa694 - subpackages: - - mem -- name: github.com/spf13/cast - version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4 -- name: github.com/spf13/cobra - version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b -- name: github.com/spf13/jwalterweatherman - version: 12bd96e66386c1960ab0f74ced1362f66f552f7b -- name: github.com/spf13/pflag - version: 97afa5e7ca8a08a383cb259e06636b5e2cc7897f -- name: github.com/spf13/viper - version: 25b30aa063fc18e48662b86996252eabdcf2f0c7 -- name: github.com/uber-go/atomic - version: 4e336646b2ef9fc6e47be8e21594178f98e5ebcf -- name: github.com/uber/jaeger-client-go - version: 3e3870040def0ebdaf65a003863fa64f5cb26139 - subpackages: - - config - - internal/spanlog - - log - - rpcmetrics - - thrift-gen/agent - - thrift-gen/jaeger - - thrift-gen/sampling - - thrift-gen/zipkincore - - utils -- name: github.com/uber/jaeger-lib - version: 3b2a9ad2a045881ab7a0f81d465be54c8292ee4f - subpackages: - - metrics - - metrics/go-kit - - metrics/go-kit/expvar -- name: github.com/uber/tchannel-go - version: a7ad9ecb640b5f10a0395b38d6319175172b3ab2 - subpackages: - - internal/argreader - - relay - - thrift - - thrift/gen-go/meta - - tnet - - tos - - trand - - typed -- name: github.com/VividCortex/gohistogram - version: 51564d9861991fb0ad0f531c99ef602d0f9866e6 -- name: go.uber.org/atomic - version: 4e336646b2ef9fc6e47be8e21594178f98e5ebcf -- name: go.uber.org/multierr - version: 3c4937480c32f4c13a875a1829af76c98ca3d40a -- name: go.uber.org/zap - version: 35aad584952c3e7020db7b839f6b102de6271f89 - subpackages: - - buffer - - internal/bufferpool - - internal/color - - internal/exit - - zapcore -- name: golang.org/x/net - version: aabf50738bcdd9b207582cbe796b59ed65d56680 - subpackages: - - bpf - - context - - internal/iana - - internal/socket - - ipv4 - - ipv6 -- name: golang.org/x/sys - version: 8dbc5d05d6edcc104950cc299a1ce6641235bc86 - subpackages: - - unix -- name: golang.org/x/text - version: c01e4764d870b77f8abe5096ee19ad20d80e8075 - subpackages: - - transform - - unicode/norm -- name: gopkg.in/yaml.v2 - version: eb3733d160e74a9c7e442f435eb3bea458e1d19f -testImports: [] diff --git a/example/hotrod/hotrod/glide.yaml b/example/hotrod/hotrod/glide.yaml deleted file mode 100644 index 519d0f67..00000000 --- a/example/hotrod/hotrod/glide.yaml +++ /dev/null @@ -1,36 +0,0 @@ -package: github.com/rnburn/hotrod-docker -import: -- package: github.com/apache/thrift - version: ~0.10.0 - subpackages: - - lib/go/thrift -- package: github.com/opentracing-contrib/go-stdlib - subpackages: - - nethttp -- package: github.com/opentracing/opentracing-go - version: ~1.0.2 - subpackages: - - ext - - log -- package: github.com/spf13/cobra -- package: github.com/spf13/viper - version: ~1.0.0 -- package: github.com/uber/jaeger-client-go - version: ~2.9.0 - subpackages: - - config - - rpcmetrics -- package: github.com/uber/jaeger-lib - version: ~1.1.0 - subpackages: - - metrics - - metrics/go-kit - - metrics/go-kit/expvar -- package: github.com/uber/tchannel-go - version: ~1.7.0 - subpackages: - - thrift -- package: go.uber.org/zap - version: ~1.7.1 - subpackages: - - zapcore diff --git a/example/hotrod/hotrod/main.go b/example/hotrod/hotrod/main.go deleted file mode 100644 index b352952c..00000000 --- a/example/hotrod/hotrod/main.go +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. - -package main - -import ( - "runtime" - - "github.com/rnburn/hotrod-docker/cmd" -) - -func main() { - runtime.GOMAXPROCS(runtime.NumCPU()) - cmd.Execute() -} diff --git a/example/hotrod/hotrod/pkg/delay/delay.go b/example/hotrod/hotrod/pkg/delay/delay.go deleted file mode 100644 index d644eed5..00000000 --- a/example/hotrod/hotrod/pkg/delay/delay.go +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package delay - -import ( - "math" - "math/rand" - "time" -) - -// Sleep generates a normally distributed random delay with given mean and stdDev -// and blocks for that duration. -func Sleep(mean time.Duration, stdDev time.Duration) { - fMean := float64(mean) - fStdDev := float64(stdDev) - delay := time.Duration(math.Max(1, rand.NormFloat64()*fStdDev+fMean)) - time.Sleep(delay) -} diff --git a/example/hotrod/hotrod/pkg/httperr/httperr.go b/example/hotrod/hotrod/pkg/httperr/httperr.go deleted file mode 100644 index 9351eea7..00000000 --- a/example/hotrod/hotrod/pkg/httperr/httperr.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package httperr - -import "net/http" - -// HandleError checks if the error is not nil, writes it to the output -// with the specified status code, and returns true. If error is nil it returns false. -func HandleError(w http.ResponseWriter, err error, statusCode int) bool { - if err == nil { - return false - } - http.Error(w, string(err.Error()), statusCode) - return true -} diff --git a/example/hotrod/hotrod/pkg/httpexpvar/handler.go b/example/hotrod/hotrod/pkg/httpexpvar/handler.go deleted file mode 100644 index 13046eeb..00000000 --- a/example/hotrod/hotrod/pkg/httpexpvar/handler.go +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package httpexpvar - -import ( - "expvar" - "fmt" - "net/http" -) - -// Handler is a copy of expvar.expvarHandler private method. -// TODO this won't be needed in Go 1.8 -func Handler(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "application/json; charset=utf-8") - fmt.Fprintf(w, "{\n") - first := true - expvar.Do(func(kv expvar.KeyValue) { - if !first { - fmt.Fprintf(w, ",\n") - } - first = false - fmt.Fprintf(w, "%q: %s", kv.Key, kv.Value) - }) - fmt.Fprintf(w, "\n}\n") -} diff --git a/example/hotrod/hotrod/pkg/log/factory.go b/example/hotrod/hotrod/pkg/log/factory.go deleted file mode 100644 index 88cc4bb2..00000000 --- a/example/hotrod/hotrod/pkg/log/factory.go +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package log - -import ( - "context" - - "github.com/opentracing/opentracing-go" - "go.uber.org/zap" - "go.uber.org/zap/zapcore" -) - -// Factory is the default logging wrapper that can create -// logger instances either for a given Context or context-less. -type Factory struct { - logger *zap.Logger -} - -// NewFactory creates a new Factory. -func NewFactory(logger *zap.Logger) Factory { - return Factory{logger: logger} -} - -// Bg creates a context-unaware logger. -func (b Factory) Bg() Logger { - return logger{logger: b.logger} -} - -// For returns a context-aware Logger. If the context -// contains an OpenTracing span, all logging calls are also -// echo-ed into the span. -func (b Factory) For(ctx context.Context) Logger { - if span := opentracing.SpanFromContext(ctx); span != nil { - // TODO for Jaeger span extract trace/span IDs as fields - return spanLogger{span: span, logger: b.logger} - } - return b.Bg() -} - -// With creates a child logger, and optionally adds some context fields to that logger. -func (b Factory) With(fields ...zapcore.Field) Factory { - return Factory{logger: b.logger.With(fields...)} -} diff --git a/example/hotrod/hotrod/pkg/log/logger.go b/example/hotrod/hotrod/pkg/log/logger.go deleted file mode 100644 index a2e1b594..00000000 --- a/example/hotrod/hotrod/pkg/log/logger.go +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package log - -import ( - "go.uber.org/zap" - "go.uber.org/zap/zapcore" -) - -// Logger is a simplified abstraction of the zap.Logger -type Logger interface { - Info(msg string, fields ...zapcore.Field) - Error(msg string, fields ...zapcore.Field) - Fatal(msg string, fields ...zapcore.Field) - With(fields ...zapcore.Field) Logger -} - -// logger delegates all calls to the underlying zap.Logger -type logger struct { - logger *zap.Logger -} - -// Info logs an info msg with fields -func (l logger) Info(msg string, fields ...zapcore.Field) { - l.logger.Info(msg, fields...) -} - -// Error logs an error msg with fields -func (l logger) Error(msg string, fields ...zapcore.Field) { - l.logger.Error(msg, fields...) -} - -// Fatal logs a fatal error msg with fields -func (l logger) Fatal(msg string, fields ...zapcore.Field) { - l.logger.Fatal(msg, fields...) -} - -// With creates a child logger, and optionally adds some context fields to that logger. -func (l logger) With(fields ...zapcore.Field) Logger { - return logger{logger: l.logger.With(fields...)} -} diff --git a/example/hotrod/hotrod/pkg/log/spanlogger.go b/example/hotrod/hotrod/pkg/log/spanlogger.go deleted file mode 100644 index 2d0580ac..00000000 --- a/example/hotrod/hotrod/pkg/log/spanlogger.go +++ /dev/null @@ -1,148 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package log - -import ( - "time" - - "github.com/opentracing/opentracing-go" - tag "github.com/opentracing/opentracing-go/ext" - "github.com/opentracing/opentracing-go/log" - "go.uber.org/zap" - "go.uber.org/zap/zapcore" -) - -type spanLogger struct { - logger *zap.Logger - span opentracing.Span -} - -func (sl spanLogger) Info(msg string, fields ...zapcore.Field) { - sl.logToSpan("info", msg, fields...) - sl.logger.Info(msg, fields...) -} - -func (sl spanLogger) Error(msg string, fields ...zapcore.Field) { - sl.logToSpan("error", msg, fields...) - sl.logger.Error(msg, fields...) -} - -func (sl spanLogger) Fatal(msg string, fields ...zapcore.Field) { - sl.logToSpan("fatal", msg, fields...) - tag.Error.Set(sl.span, true) - sl.logger.Fatal(msg, fields...) -} - -// With creates a child logger, and optionally adds some context fields to that logger. -func (sl spanLogger) With(fields ...zapcore.Field) Logger { - return spanLogger{logger: sl.logger.With(fields...), span: sl.span} -} - -func (sl spanLogger) logToSpan(level string, msg string, fields ...zapcore.Field) { - // TODO rather than always converting the fields, we could wrap them into a lazy logger - fa := fieldAdapter(make([]log.Field, 0, 2+len(fields))) - fa = append(fa, log.String("event", msg)) - fa = append(fa, log.String("level", level)) - for _, field := range fields { - field.AddTo(&fa) - } - sl.span.LogFields(fa...) -} - -type fieldAdapter []log.Field - -func (fa *fieldAdapter) AddBool(key string, value bool) { - *fa = append(*fa, log.Bool(key, value)) -} - -func (fa *fieldAdapter) AddFloat64(key string, value float64) { - *fa = append(*fa, log.Float64(key, value)) -} - -func (fa *fieldAdapter) AddFloat32(key string, value float32) { - *fa = append(*fa, log.Float64(key, float64(value))) -} - -func (fa *fieldAdapter) AddInt(key string, value int) { - *fa = append(*fa, log.Int(key, value)) -} - -func (fa *fieldAdapter) AddInt64(key string, value int64) { - *fa = append(*fa, log.Int64(key, value)) -} - -func (fa *fieldAdapter) AddInt32(key string, value int32) { - *fa = append(*fa, log.Int64(key, int64(value))) -} - -func (fa *fieldAdapter) AddInt16(key string, value int16) { - *fa = append(*fa, log.Int64(key, int64(value))) -} - -func (fa *fieldAdapter) AddInt8(key string, value int8) { - *fa = append(*fa, log.Int64(key, int64(value))) -} - -func (fa *fieldAdapter) AddUint(key string, value uint) { - *fa = append(*fa, log.Uint64(key, uint64(value))) -} - -func (fa *fieldAdapter) AddUint64(key string, value uint64) { - *fa = append(*fa, log.Uint64(key, value)) -} - -func (fa *fieldAdapter) AddUint32(key string, value uint32) { - *fa = append(*fa, log.Uint64(key, uint64(value))) -} - -func (fa *fieldAdapter) AddUint16(key string, value uint16) { - *fa = append(*fa, log.Uint64(key, uint64(value))) -} - -func (fa *fieldAdapter) AddUint8(key string, value uint8) { - *fa = append(*fa, log.Uint64(key, uint64(value))) -} - -func (fa *fieldAdapter) AddUintptr(key string, value uintptr) {} -func (fa *fieldAdapter) AddArray(key string, marshaler zapcore.ArrayMarshaler) error { return nil } -func (fa *fieldAdapter) AddComplex128(key string, value complex128) {} -func (fa *fieldAdapter) AddComplex64(key string, value complex64) {} -func (fa *fieldAdapter) AddObject(key string, value zapcore.ObjectMarshaler) error { return nil } -func (fa *fieldAdapter) AddReflected(key string, value interface{}) error { return nil } -func (fa *fieldAdapter) OpenNamespace(key string) {} - -func (fa *fieldAdapter) AddDuration(key string, value time.Duration) { - // TODO inefficient - *fa = append(*fa, log.String(key, value.String())) -} - -func (fa *fieldAdapter) AddTime(key string, value time.Time) { - // TODO inefficient - *fa = append(*fa, log.String(key, value.String())) -} - -func (fa *fieldAdapter) AddBinary(key string, value []byte) { - *fa = append(*fa, log.Object(key, value)) -} - -func (fa *fieldAdapter) AddByteString(key string, value []byte) { - *fa = append(*fa, log.Object(key, value)) -} - -func (fa *fieldAdapter) AddString(key, value string) { - if key != "" && value != "" { - *fa = append(*fa, log.String(key, value)) - } -} diff --git a/example/hotrod/hotrod/pkg/pool/pool.go b/example/hotrod/hotrod/pkg/pool/pool.go deleted file mode 100644 index 172064e7..00000000 --- a/example/hotrod/hotrod/pkg/pool/pool.go +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package pool - -// Pool is a simple worker pool -type Pool struct { - jobs chan func() - stop chan struct{} -} - -// New creates a new pool with the given number of workers -func New(workers int) *Pool { - jobs := make(chan func()) - stop := make(chan struct{}) - for i := 0; i < workers; i++ { - go func() { - for { - select { - case job := <-jobs: - job() - case <-stop: - return - } - } - }() - } - return &Pool{ - jobs: jobs, - stop: stop, - } -} - -// Execute enqueues the job to be executed by one of the workers in the pool -func (p *Pool) Execute(job func()) { - p.jobs <- job -} - -// Stop halts all the workers -func (p *Pool) Stop() { - p.stop <- struct{}{} -} diff --git a/example/hotrod/hotrod/pkg/tracing/http.go b/example/hotrod/hotrod/pkg/tracing/http.go deleted file mode 100644 index 6707602b..00000000 --- a/example/hotrod/hotrod/pkg/tracing/http.go +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package tracing - -import ( - "context" - "encoding/json" - "errors" - "io/ioutil" - "net/http" - - "github.com/opentracing-contrib/go-stdlib/nethttp" - "github.com/opentracing/opentracing-go" -) - -// HTTPClient wraps an http.Client with tracing instrumentation. -type HTTPClient struct { - Tracer opentracing.Tracer - Client *http.Client -} - -// GetJSON executes HTTP GET against specified url and tried to parse -// the response into out object. -func (c *HTTPClient) GetJSON(ctx context.Context, endpoint string, url string, out interface{}) error { - req, err := http.NewRequest("GET", url, nil) - if err != nil { - return err - } - req = req.WithContext(ctx) - req, ht := nethttp.TraceRequest(c.Tracer, req, nethttp.OperationName("HTTP GET: "+endpoint)) - defer ht.Finish() - - res, err := c.Client.Do(req) - if err != nil { - return err - } - - defer res.Body.Close() - - if res.StatusCode >= 400 { - body, err := ioutil.ReadAll(res.Body) - if err != nil { - return err - } - return errors.New(string(body)) - } - decoder := json.NewDecoder(res.Body) - return decoder.Decode(out) -} diff --git a/example/hotrod/hotrod/pkg/tracing/init.go b/example/hotrod/hotrod/pkg/tracing/init.go deleted file mode 100644 index 482b320e..00000000 --- a/example/hotrod/hotrod/pkg/tracing/init.go +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package tracing - -import ( - "fmt" - "time" - "os" - - "github.com/opentracing/opentracing-go" - "github.com/uber/jaeger-client-go/config" - "github.com/uber/jaeger-client-go/rpcmetrics" - "github.com/uber/jaeger-lib/metrics" - "go.uber.org/zap" - - "github.com/rnburn/hotrod-docker/pkg/log" -) - -// Init creates a new instance of Jaeger tracer. -func Init(serviceName string, metricsFactory metrics.Factory, logger log.Factory) opentracing.Tracer { - localAgentHost := os.Getenv("JAEGER_AGENT_HOST") - if localAgentHost == "" { - localAgentHost = "localhost" - } - localAgentPort := os.Getenv("JAEGER_AGENT_PORT") - if localAgentPort == "" { - localAgentPort = "6831" - } - cfg := config.Configuration{ - Sampler: &config.SamplerConfig{ - Type: "const", - Param: 1, - }, - Reporter: &config.ReporterConfig{ - LogSpans: false, - BufferFlushInterval: 1 * time.Second, - LocalAgentHostPort: fmt.Sprintf("%s:%s", localAgentHost, localAgentPort), - }, - } - tracer, _, err := cfg.New( - serviceName, - config.Logger(jaegerLoggerAdapter{logger.Bg()}), - config.Observer(rpcmetrics.NewObserver(metricsFactory, rpcmetrics.DefaultNameNormalizer)), - ) - if err != nil { - logger.Bg().Fatal("cannot initialize Jaeger Tracer", zap.Error(err)) - } - return tracer -} - -type jaegerLoggerAdapter struct { - logger log.Logger -} - -func (l jaegerLoggerAdapter) Error(msg string) { - l.logger.Error(msg) -} - -func (l jaegerLoggerAdapter) Infof(msg string, args ...interface{}) { - l.logger.Info(fmt.Sprintf(msg, args...)) -} diff --git a/example/hotrod/hotrod/pkg/tracing/mutex.go b/example/hotrod/hotrod/pkg/tracing/mutex.go deleted file mode 100644 index b7da3fdc..00000000 --- a/example/hotrod/hotrod/pkg/tracing/mutex.go +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package tracing - -import ( - "context" - "fmt" - "sync" - - "github.com/opentracing/opentracing-go" - "github.com/opentracing/opentracing-go/log" -) - -// Mutex is just like the standard sync.Mutex, except that it is aware of the Context -// and logs some diagnostic information into the current span. -type Mutex struct { - SessionBaggageKey string - - realLock sync.Mutex - holder string - - waiters []string - waitersLock sync.Mutex -} - -// Lock acquires an exclusive lock. -func (sm *Mutex) Lock(ctx context.Context) { - var session string - activeSpan := opentracing.SpanFromContext(ctx) - if activeSpan != nil { - session = activeSpan.BaggageItem(sm.SessionBaggageKey) - activeSpan.SetTag(sm.SessionBaggageKey, session) - } - - sm.waitersLock.Lock() - if waiting := len(sm.waiters); waiting > 0 && activeSpan != nil { - activeSpan.LogFields( - log.String("event", fmt.Sprintf("Waiting for lock behind %d transactions", waiting)), - log.String("blockers", fmt.Sprintf("%v", sm.waiters))) // avoid deferred slice.String() - fmt.Printf("%s Waiting for lock behind %d transactions: %v\n", session, waiting, sm.waiters) - } - sm.waiters = append(sm.waiters, session) - sm.waitersLock.Unlock() - - sm.realLock.Lock() - sm.holder = session - - sm.waitersLock.Lock() - behindLen := len(sm.waiters) - 1 - sm.waitersLock.Unlock() - - if activeSpan != nil { - activeSpan.LogEvent( - fmt.Sprintf("Acquired lock with %d transactions waiting behind", behindLen)) - } -} - -// Unlock releases the lock. -func (sm *Mutex) Unlock() { - sm.waitersLock.Lock() - for i, v := range sm.waiters { - if v == sm.holder { - sm.waiters = append(sm.waiters[0:i], sm.waiters[i+1:]...) - break - } - } - sm.waitersLock.Unlock() - - sm.realLock.Unlock() -} diff --git a/example/hotrod/hotrod/pkg/tracing/mux.go b/example/hotrod/hotrod/pkg/tracing/mux.go deleted file mode 100644 index ac309f0d..00000000 --- a/example/hotrod/hotrod/pkg/tracing/mux.go +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package tracing - -import ( - "net/http" - - "github.com/opentracing-contrib/go-stdlib/nethttp" - "github.com/opentracing/opentracing-go" -) - -// NewServeMux creates a new TracedServeMux. -func NewServeMux(tracer opentracing.Tracer) *TracedServeMux { - return &TracedServeMux{ - mux: http.NewServeMux(), - tracer: tracer, - } -} - -// TracedServeMux is a wrapper around http.ServeMux that instruments handlers for tracing. -type TracedServeMux struct { - mux *http.ServeMux - tracer opentracing.Tracer -} - -// Handle implements http.ServeMux#Handle -func (tm *TracedServeMux) Handle(pattern string, handler http.Handler) { - middleware := nethttp.Middleware( - tm.tracer, - handler, - nethttp.OperationNameFunc(func(r *http.Request) string { - return "HTTP " + r.Method + " " + pattern - })) - tm.mux.Handle(pattern, middleware) -} - -// ServeHTTP implements http.ServeMux#ServeHTTP -func (tm *TracedServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { - tm.mux.ServeHTTP(w, r) -} diff --git a/example/hotrod/hotrod/services/config/config.go b/example/hotrod/hotrod/services/config/config.go deleted file mode 100644 index 28cccd74..00000000 --- a/example/hotrod/hotrod/services/config/config.go +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package config - -import ( - "time" -) - -var ( - // 'frontend' service - - // WorkerPoolSize is the size of goroutine pool used to query for routes - WorkerPoolSize = 3 - - // 'customer' service - - // MySQLGetDelay is how long retrieving a customer record takes. - // Using large value mostly because I cannot click the button fast enough to cause a queue. - MySQLGetDelay = 300 * time.Millisecond - - // MySQLGetDelayStdDev is standard deviation - MySQLGetDelayStdDev = MySQLGetDelay / 10 - - // RouteWorkerPoolSize is the size of the worker pool used to query `route` service - RouteWorkerPoolSize = 3 - - // 'driver' service - - // RedisFindDelay is how long finding closest drivers takes - RedisFindDelay = 20 * time.Millisecond - - // RedisFindDelayStdDev is standard deviation - RedisFindDelayStdDev = RedisFindDelay / 4 - - // RedisGetDelay is how long retrieving a driver record takes - RedisGetDelay = 10 * time.Millisecond - - // RedisGetDelayStdDev is standard deviation - RedisGetDelayStdDev = RedisGetDelay / 4 - - // 'route' service - - // RouteCalcDelay is how long a route calculation takes - RouteCalcDelay = 50 * time.Millisecond - - // RouteCalcDelayStdDev is standard deviation - RouteCalcDelayStdDev = RouteCalcDelay / 4 -) diff --git a/example/hotrod/hotrod/services/customer/client.go b/example/hotrod/hotrod/services/customer/client.go deleted file mode 100644 index 95316f33..00000000 --- a/example/hotrod/hotrod/services/customer/client.go +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package customer - -import ( - "context" - "fmt" - "net/http" - - "github.com/opentracing-contrib/go-stdlib/nethttp" - "github.com/opentracing/opentracing-go" - "go.uber.org/zap" - - "github.com/rnburn/hotrod-docker/pkg/log" - "github.com/rnburn/hotrod-docker/pkg/tracing" -) - -// Client is a remote client that implements customer.Interface -type Client struct { - tracer opentracing.Tracer - logger log.Factory - client *tracing.HTTPClient -} - -// NewClient creates a new customer.Client -func NewClient(tracer opentracing.Tracer, logger log.Factory) *Client { - return &Client{ - tracer: tracer, - logger: logger, - client: &tracing.HTTPClient{ - Client: &http.Client{Transport: &nethttp.Transport{}}, - Tracer: tracer, - }, - } -} - -// Get implements customer.Interface#Get as an RPC -func (c *Client) Get(ctx context.Context, customerID string) (*Customer, error) { - c.logger.For(ctx).Info("Getting customer", zap.String("customer_id", customerID)) - - url := fmt.Sprintf("http://127.0.0.1/customer?customer=%s", customerID) - var customer Customer - if err := c.client.GetJSON(ctx, "/customer", url, &customer); err != nil { - return nil, err - } - return &customer, nil -} diff --git a/example/hotrod/hotrod/services/customer/database.go b/example/hotrod/hotrod/services/customer/database.go deleted file mode 100644 index 41078bbf..00000000 --- a/example/hotrod/hotrod/services/customer/database.go +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package customer - -import ( - "context" - "errors" - - "go.uber.org/zap" - - "github.com/opentracing/opentracing-go" - tags "github.com/opentracing/opentracing-go/ext" - - "github.com/rnburn/hotrod-docker/pkg/delay" - "github.com/rnburn/hotrod-docker/pkg/log" - "github.com/rnburn/hotrod-docker/pkg/tracing" - "github.com/rnburn/hotrod-docker/services/config" -) - -// database simulates Customer repository implemented on top of an SQL database -type database struct { - tracer opentracing.Tracer - logger log.Factory - customers map[string]*Customer - lock *tracing.Mutex -} - -func newDatabase(tracer opentracing.Tracer, logger log.Factory) *database { - return &database{ - tracer: tracer, - logger: logger, - lock: &tracing.Mutex{ - SessionBaggageKey: "request", - }, - customers: map[string]*Customer{ - "123": { - ID: "123", - Name: "Rachel's Floral Designs", - Location: "115,277", - }, - "567": { - ID: "567", - Name: "Amazing Coffee Roasters", - Location: "211,653", - }, - "392": { - ID: "392", - Name: "Trom Chocolatier", - Location: "577,322", - }, - "731": { - ID: "731", - Name: "Japanese Deserts", - Location: "728,326", - }, - }, - } -} - -func (d *database) Get(ctx context.Context, customerID string) (*Customer, error) { - d.logger.For(ctx).Info("Loading customer", zap.String("customer_id", customerID)) - - // simulate opentracing instrumentation of an SQL query - if span := opentracing.SpanFromContext(ctx); span != nil { - span := d.tracer.StartSpan("SQL SELECT", opentracing.ChildOf(span.Context())) - tags.SpanKindRPCClient.Set(span) - tags.PeerService.Set(span, "mysql") - span.SetTag("sql.query", "SELECT * FROM customer WHERE customer_id="+customerID) - defer span.Finish() - ctx = opentracing.ContextWithSpan(ctx, span) - } - - // simulate misconfigured connection pool that only gives one connection at a time - d.lock.Lock(ctx) - defer d.lock.Unlock() - - // simulate RPC delay - delay.Sleep(config.MySQLGetDelay, config.MySQLGetDelayStdDev) - - if customer, ok := d.customers[customerID]; ok { - return customer, nil - } - return nil, errors.New("invalid customer ID") -} diff --git a/example/hotrod/hotrod/services/customer/interface.go b/example/hotrod/hotrod/services/customer/interface.go deleted file mode 100644 index 976adc9a..00000000 --- a/example/hotrod/hotrod/services/customer/interface.go +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package customer - -import "context" - -// Customer contains data about a customer. -type Customer struct { - ID string - Name string - Location string -} - -// Interface exposed by the Customer service. -type Interface interface { - Get(ctx context.Context, customerID string) (*Customer, error) -} diff --git a/example/hotrod/hotrod/services/customer/server.go b/example/hotrod/hotrod/services/customer/server.go deleted file mode 100644 index c3f44a2a..00000000 --- a/example/hotrod/hotrod/services/customer/server.go +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package customer - -import ( - "encoding/json" - "net/http" - - "github.com/opentracing/opentracing-go" - "github.com/uber/jaeger-lib/metrics" - "go.uber.org/zap" - - "github.com/rnburn/hotrod-docker/pkg/httperr" - "github.com/rnburn/hotrod-docker/pkg/log" - "github.com/rnburn/hotrod-docker/pkg/tracing" -) - -// Server implements Customer service -type Server struct { - hostPort string - tracer opentracing.Tracer - logger log.Factory - database *database -} - -// NewServer creates a new customer.Server -func NewServer(hostPort string, tracer opentracing.Tracer, metricsFactory metrics.Factory, logger log.Factory) *Server { - return &Server{ - hostPort: hostPort, - tracer: tracer, - logger: logger, - database: newDatabase( - tracing.Init("mysql", metricsFactory.Namespace("mysql", nil), logger), - logger.With(zap.String("component", "mysql")), - ), - } -} - -// Run starts the Customer server -func (s *Server) Run() error { - mux := s.createServeMux() - s.logger.Bg().Info("Starting", zap.String("address", "http://"+s.hostPort)) - return http.ListenAndServe(s.hostPort, mux) -} - -func (s *Server) createServeMux() http.Handler { - mux := tracing.NewServeMux(s.tracer) - mux.Handle("/customer", http.HandlerFunc(s.customer)) - return mux -} - -func (s *Server) customer(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() - s.logger.For(ctx).Info("HTTP request received", zap.String("method", r.Method), zap.Stringer("url", r.URL)) - if err := r.ParseForm(); httperr.HandleError(w, err, http.StatusBadRequest) { - s.logger.For(ctx).Error("bad request", zap.Error(err)) - return - } - - customerID := r.Form.Get("customer") - if customerID == "" { - http.Error(w, "Missing required 'customer' parameter", http.StatusBadRequest) - return - } - - response, err := s.database.Get(ctx, customerID) - if httperr.HandleError(w, err, http.StatusInternalServerError) { - s.logger.For(ctx).Error("request failed", zap.Error(err)) - return - } - - data, err := json.Marshal(response) - if httperr.HandleError(w, err, http.StatusInternalServerError) { - s.logger.For(ctx).Error("cannot marshal response", zap.Error(err)) - return - } - - w.Header().Set("Content-Type", "application/json") - w.Write(data) -} diff --git a/example/hotrod/hotrod/services/driver/client.go b/example/hotrod/hotrod/services/driver/client.go deleted file mode 100644 index 9a8d3f75..00000000 --- a/example/hotrod/hotrod/services/driver/client.go +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// 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. - -package driver - -import ( - "context" - "time" - - "github.com/opentracing/opentracing-go" - "github.com/uber/tchannel-go" - "github.com/uber/tchannel-go/thrift" - "go.uber.org/zap" - - "github.com/rnburn/hotrod-docker/pkg/log" - "github.com/rnburn/hotrod-docker/services/driver/thrift-gen/driver" -) - -// Client is a remote client that implements driver.Interface -type Client struct { - tracer opentracing.Tracer - logger log.Factory - ch *tchannel.Channel - client driver.TChanDriver -} - -// NewClient creates a new driver.Client -func NewClient(tracer opentracing.Tracer, logger log.Factory) *Client { - channelOpts := &tchannel.ChannelOptions{ - //Logger: logger, - //StatsReporter: statsReporter, - Tracer: tracer, - } - ch, err := tchannel.NewChannel("driver-client", channelOpts) - if err != nil { - logger.Bg().Fatal("Cannot create TChannel", zap.Error(err)) - } - clientOpts := &thrift.ClientOptions{ - HostPort: "127.0.0.1:8082", - } - thriftClient := thrift.NewClient(ch, "driver", clientOpts) - client := driver.NewTChanDriverClient(thriftClient) - - return &Client{ - tracer: tracer, - logger: logger, - ch: ch, - client: client, - } -} - -// FindNearest implements driver.Interface#FindNearest as an RPC -func (c *Client) FindNearest(ctx context.Context, location string) ([]Driver, error) { - c.logger.For(ctx).Info("Finding nearest drivers", zap.String("location", location)) - ctx, cancel := context.WithTimeout(ctx, 1*time.Second) - defer cancel() - results, err := c.client.FindNearest(thrift.Wrap(ctx), location) - if err != nil { - return nil, err - } - return fromThrift(results), nil -} - -func fromThrift(results []*driver.DriverLocation) []Driver { - retMe := make([]Driver, len(results)) - for i, result := range results { - retMe[i] = Driver{ - DriverID: result.DriverID, - Location: result.Location, - } - } - return retMe -} diff --git a/example/hotrod/hotrod/services/driver/driver.thrift b/example/hotrod/hotrod/services/driver/driver.thrift deleted file mode 100644 index 0b6778f3..00000000 --- a/example/hotrod/hotrod/services/driver/driver.thrift +++ /dev/null @@ -1,9 +0,0 @@ - -struct DriverLocation { - 1: required string driver_id - 2: required string location -} - -service Driver { - list