Merge branch 'master' into influx

* master: (38 commits)
  Preparing release 1.5.0 (jaegertracing#847)
  Add bounds to memory storage (jaegertracing#845)
  Add metric for debug traces (jaegertracing#796)
  Change metrics naming scheme (jaegertracing#776)
  Bump gocql version (jaegertracing#829)
  Remove ParentSpanID from domain model (jaegertracing#831)
  Make gas run quiet (jaegertracing#838)
  Revert "Make gas run quite"
  Revert "Install gas from install-ci"
  Install gas from install-ci
  Make gas run quite
  Add 'gas' for security problems scanning (jaegertracing#830)
  Add ability to adjust static sampling probabilities per operation (jaegertracing#827)
  Support log-level flag on agent (jaegertracing#828)
  Remove unused function (jaegertracing#822)
  Add healthcheck to standalone (jaegertracing#784)
  Do not use KeyValue fields directly and use KeyValues as decorator only (jaegertracing#810)
  Add ContaAzul to the adopters list (jaegertracing#806)
  Add ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE (jaegertracing#805)
  Upgrade to  go 1.10 (jaegertracing#792)
  ...

# Conflicts:
#	cmd/agent/app/builder.go
#	cmd/collector/main.go
#	cmd/query/main.go
#	cmd/standalone/main.go

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+<!--
+Welcome to the Jaeger project! 👋🎉
+
+- Please search for existing issues to avoid creating duplicate bugs/feature requests.
+- Please be respectful and considerate of others when commenting on issues.
+- Please provide as much information as possible so we all understand the issue.
+- If you only have a question, you may get a faster response by asking in
+    - our chat room https://gitter.im/jaegertracing/Lobby, or
+    - the forum https://groups.google.com/d/forum/jaeger-tracing
+    (but please don't double post)
+-->
+
+## Requirement - what kind of business use case are you trying to solve?
+
+<!-- required section -->
+
+## Problem - what in Jaeger blocks you from solving the requirement?
+
+<!-- required section -->
+<!-- If possible, describe the impact of the problem. -->
+
+## Proposal - what do you suggest to solve the problem or improve the existing situation?
+
+<!-- It's ok if you don't have one. -->
+
+## Any open questions to address
+
+<!-- Questions that should be answered before proceeding with implementation. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+<!--
+We appreciate your contribution to the Jaeger project! 👋🎉
+
+Before creating a pull request, please make sure:
+- Your PR is solving one problem
+- You have read the guide for contributing
+  - See https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING.md
+- You signed all your commits (otherwise we won't be able to merge the PR)
+  - See https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING.md#sign-your-work
+- You added unit tests for the new functionality
+- You mention in the PR description which issue it is addressing, e.g. "Resolves #123"
+-->
+
+## Which problem is this PR solving?
+- 
+
+## Short description of the changes
+- 

.travis.yml

@@ -7,23 +7,24 @@ dist: trusty
 
 matrix:
   include:
-  - go: 1.9
+  - go: "1.10"
     env:
     - TESTS=true
     - COVERAGE=true
-  - go: 1.9
+  - go: "1.10"
     env:
     - ALL_IN_ONE=true
-  - go: 1.9
+  - go: "1.10"
     env:
     - CROSSDOCK=true
-  - go: 1.9
+  - go: "1.10"
     env:
     - DOCKER=true
-  - go: 1.9
+    - DEPLOY=true
+  - go: "1.10"
     env:
     - ES_INTEGRATION_TEST=true
-  - go: 1.9
+  - go: "1.10"
     env:
     - HOTROD=true
 
@@ -54,9 +55,26 @@ script:
   - if [ "$DOCKER" == true ]; then bash ./scripts/travis/build-docker-images.sh ; else echo 'skipping docker images'; fi
   - if [ "$ES_INTEGRATION_TEST" == true ]; then bash ./scripts/travis/es-integration-test.sh ; else echo 'skipping elastic search integration test'; fi
   - if [ "$HOTROD" == true ]; then bash ./scripts/travis/hotrod-integration-test.sh ; else echo 'skipping hotrod example'; fi
+  - if [ "$DEPLOY" == true ]; then make build-binaries-linux build-binaries-windows build-binaries-darwin ; else echo 'skipping linux'; fi
 
 after_success:
   - if [ "$COVERAGE" == true ]; then travis_retry goveralls -coverprofile=cover.out -service=travis-ci || true ; else echo 'skipping coverage'; fi
 
 after_failure:
   - if [ "$CROSSDOCK" == true ]; then make crossdock-logs ; else echo 'skipping crossdock'; fi
+
+before_deploy:
+  - bash ./scripts/travis/package-deploy.sh
+
+deploy:
+  provider: releases
+  api_key:
+    secure: P3+TKR3y4S51jjMp4l9kRm5cjr7Mg2m5rlPcRCjjVp/mVgkkhsMx9K8Rj/Cv/pJe33jbkwRy020gq4lYpa+Yh+Q3A11z3EKXyqizwqsvJtufoIXxXCxt0kLXn8aIh7aLrqVT2wxtkv3RvkRODmLZqvWG4kAfNBuzpcFhstw1RU3WNyahStOgwVJ9tYRdpsJ0ztMmGgQFpT6bppselzEXY7hS7L+l/bLcH9aGON4YECupAE6EilWwGxPs4oLJPmGsWQNogb3SE/oeFDqEJzciWcObk264fwIBf28HtmszQSmVbOuOfg/OhcVg13OvPXmRGk9hvU2kyzehMLZ0zeEE1mKsGmoObziNVuYPPY3KbRlsYARX41M1QKAI1YFe9NIXC5yhemOy4Xv0g82jyZmYWrf6QydLBZWkztUL7mJ6DkrG+5EohVVC2oprBS32/w736f8AWwHJSfL/JrFMTDctdYzUaf0yZMdfKdLdRyP/Q5KTfhUJl8zHAOih8f23WJVCSlwyJBYDzkq5OmNGf7BxJYkJExUOUwXcJE9jYgXq0y291N9BtG2cUVKhZZsSSrvR32bMtYtTT2a3ZlTHJpzVI+lZStYDpE/wyJRqnjqf9p8bDxc1l2mQGSxgyY8Yv8u9c+RCCj4tRwZTrJ4LIBWecDPS5hobV3Q1Dg3sW2UGRXA=
+  file_glob: true
+  file:
+    - deploy/*.tar.gz
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: jaegertracing/jaeger
+    branch: master

ADOPTERS.md

@@ -1,5 +1,6 @@
 * [Base CRM](https://getbase.com/)
 * [Circonus](https://www.circonus.com/)
+* [ContaAzul](https://contaazul.com/)
 * [FarmersEdge](https://www.farmersedge.ca/)
 * [GrafanaLabs](https://grafana.com/)
 * [Kausal](https://kausal.co)

CHANGELOG.md

@@ -1,6 +1,55 @@
 Changes by Version
 ==================
 
+1.5.0 (2018-05-28)
+------------------
+
+#### Backend Changes
+
+- Add bounds to memory storage (#845) by Juraci Paixão Kröhling (@jpkrohling)
+- Add metric for debug traces (#796) by Won Jun Jang (@black-adder)
+- Change metrics naming scheme (#776) by Juraci Paixão Kröhling (@jpkrohling)
+- Remove ParentSpanID from domain model (#831) by Yuri Shkuro (@yurishkuro)
+- Add ability to adjust static sampling probabilities per operation (#827) by Won Jun Jang (@black-adder)
+- Support log-level flag on agent (#828) by Won Jun Jang (@black-adder)
+- Add healthcheck to standalone (#784) by Eundoo Song (@eundoosong)
+- Do not use KeyValue fields directly and use KeyValues as decorator only (#810) by Yuri Shkuro (@yurishkuro)
+- Upgrade to go 1.10 (#792) by Prithvi Raj (@vprithvi)
+- Do not create Cassandra index if it already exists (#782) by Greg Swift (@gregswift)
+
+#### UI Changes
+
+- None
+
+1.4.1 (2018-04-21)
+------------------
+
+#### Backend Changes
+
+- Publish binaries for Linux, Darwin, and Windows (#765) - thanks to @grounded042
+
+#### UI Changes
+
+##### New Features
+
+- View Trace JSON buttons return formatted JSON (fixes [#199](https://github.com/jaegertracing/jaeger-ui/issues/199))
+
+
+1.4.0 (2018-04-20)
+------------------
+
+#### Backend Changes
+
+##### New Features
+
+- Support traces with >10k spans in Elasticsearch (#668) - thanks to @sramakr
+
+##### Fixes
+
+- Allow slash '/' in service names (#586)
+- Log errors from HotROD services (#769)
+
+
 1.3.0 (2018-03-26)
 ------------------
 

CONTRIBUTING.md

@@ -121,8 +121,14 @@ pull request is most likely to be accepted if it:
 * Follows the guidelines in [Effective
   Go](https://golang.org/doc/effective_go.html) and the [Go team's common code
   review comments](https://github.com/golang/go/wiki/CodeReviewComments).
-* Has a [good commit
-  message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* Has a [good commit message](https://chris.beams.io/posts/git-commit/):
+  * Separate subject from body with a blank line
+  * Limit the subject line to 50 characters
+  * Capitalize the subject line
+  * Do not end the subject line with a period
+  * Use the imperative mood in the subject line
+  * Wrap the body at 72 characters
+  * Use the body to explain _what_ and _why_ instead of _how_
 * Each commit must be signed by the author ([see below](#sign-your-work)).
 
 ## License

Makefile

@@ -1,5 +1,6 @@
 PROJECT_ROOT=github.com/jaegertracing/jaeger
 TOP_PKGS := $(shell glide novendor | grep -v -e ./thrift-gen/... -e swagger-gen... -e ./examples/... -e ./scripts/...)
+STORAGE_PKGS = ./plugin/storage/integration/...
 
 # all .go files that don't exist in hidden directories
 ALL_SRC := $(shell find . -name "*.go" | grep -v -e vendor -e thrift-gen -e swagger-gen -e examples -e doc.go \
@@ -16,6 +17,7 @@ GOTEST=go test -v $(RACE)
 GOLINT=golint
 GOVET=go vet
 GOFMT=gofmt
+GAS=gas -quiet -exclude=G104
 FMT_LOG=fmt.log
 LINT_LOG=lint.log
 IMPORT_LOG=import.log
@@ -77,7 +79,7 @@ integration-test: go-gen
 
 .PHONY: storage-integration-test
 storage-integration-test: go-gen
-	$(GOTEST) ./plugin/storage/integration/...
+	bash -c "set -e; set -o pipefail; $(GOTEST) $(STORAGE_PKGS) | $(COLORIZE)"
 
 all-pkgs:
 	@echo $(ALL_PKGS) | tr ' ' '\n' | sort
@@ -103,8 +105,12 @@ fmt:
 	$(GOFMT) -e -s -l -w $(ALL_SRC)
 	./scripts/updateLicenses.sh
 
+.PHONY: lint-gas
+lint-gas:
+	$(GAS) $(TOP_PKGS)
+
 .PHONY: lint
-lint:
+lint: lint-gas
 	$(GOVET) $(TOP_PKGS)
 	@cat /dev/null > $(LINT_LOG)
 	@$(foreach pkg, $(TOP_PKGS), $(GOLINT) $(pkg) | grep -v -e pkg/es/wrapper.go -e /mocks/ -e thrift-gen -e thrift-0.9.2 >> $(LINT_LOG) || true;)
@@ -145,28 +151,44 @@ build_ui:
 
 .PHONY: build-all-in-one-linux
 build-all-in-one-linux: build_ui
-	CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./cmd/standalone/standalone-linux $(BUILD_INFO) ./cmd/standalone/main.go
+	GOOS=linux $(MAKE) build-all-in-one
+
+.PHONY: build-all-in-one
+build-all-in-one:
+	CGO_ENABLED=0 installsuffix=cgo go build -o ./cmd/standalone/standalone-$(GOOS) $(BUILD_INFO) ./cmd/standalone/main.go
 
-.PHONY: build-agent-linux
-build-agent-linux:
-	CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./cmd/agent/agent-linux $(BUILD_INFO) ./cmd/agent/main.go
+.PHONY: build-agent
+build-agent:
+	CGO_ENABLED=0 installsuffix=cgo go build -o ./cmd/agent/agent-$(GOOS) $(BUILD_INFO) ./cmd/agent/main.go
 
-.PHONY: build-query-linux
-build-query-linux:
-	CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./cmd/query/query-linux $(BUILD_INFO) ./cmd/query/main.go
+.PHONY: build-query
+build-query:
+	CGO_ENABLED=0 installsuffix=cgo go build -o ./cmd/query/query-$(GOOS) $(BUILD_INFO) ./cmd/query/main.go
 
-.PHONY: build-collector-linux
-build-collector-linux:
-	CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./cmd/collector/collector-linux $(BUILD_INFO) ./cmd/collector/main.go
+.PHONY: build-collector
+build-collector:
+	CGO_ENABLED=0 installsuffix=cgo go build -o ./cmd/collector/collector-$(GOOS) $(BUILD_INFO) ./cmd/collector/main.go
 
 .PHONY: docker-no-ui
-docker-no-ui: build-agent-linux build-collector-linux build-query-linux build-crossdock-linux
+docker-no-ui: build-binaries-linux build-crossdock-linux
 	mkdir -p jaeger-ui-build/build/
 	make docker-images-only
 
 .PHONY: docker
 docker: build_ui docker-no-ui
 
+.PHONY: build-binaries-linux
+build-binaries-linux:
+	GOOS=linux $(MAKE) build-agent build-collector build-query build-all-in-one
+
+.PHONY: build-binaries-windows
+build-binaries-windows:
+	GOOS=windows $(MAKE) build-agent build-collector build-query build-all-in-one
+
+.PHONY: build-binaries-darwin
+build-binaries-darwin:
+	GOOS=darwin $(MAKE) build-agent build-collector build-query build-all-in-one
+
 .PHONY: docker-images-only
 docker-images-only:
 	cp -r jaeger-ui-build/build/ cmd/query/jaeger-ui-build
@@ -208,13 +230,17 @@ build-crossdock: docker-no-ui
 build-crossdock-fresh: build-crossdock-linux
 	make crossdock-fresh
 
-.PHONY: install-ci
-install-ci: install
+.PHONY: install-tools
+install-tools:
 	go get github.com/wadey/gocovmerge
 	go get github.com/mattn/goveralls
 	go get golang.org/x/tools/cmd/cover
 	go get github.com/golang/lint/golint
 	go get github.com/sectioneight/md-to-godoc
+	go get github.com/GoASTScanner/gas/cmd/gas/...
+
+.PHONY: install-ci
+install-ci: install install-tools
 
 .PHONY: test-ci
 test-ci: build-examples lint cover
@@ -262,3 +288,7 @@ install-mockery:
 .PHONY: generate-mocks
 generate-mocks: install-mockery
 	$(MOCKERY) -all -dir ./pkg/es/ -output ./pkg/es/mocks && rm pkg/es/mocks/ClientBuilder.go
+
+.PHONY: echo-version
+echo-version:
+	@echo $(GIT_CLOSEST_TAG)

README.md

@@ -74,7 +74,7 @@ of routing the traffic from Zipkin libraries to the Jaeger backend.
 
 ### Documentation
 
-  * Published: http://jaeger.readthedocs.io/en/latest/
+  * Published: https://www.jaegertracing.io/docs/
   * Source: https://github.com/jaegertracing/documentation
 
 ### Instrumentation Libraries
@@ -83,7 +83,8 @@ of routing the traffic from Zipkin libraries to the Jaeger backend.
  * [Java client](https://github.com/jaegertracing/jaeger-client-java)
  * [Python client](https://github.com/jaegertracing/jaeger-client-python)
  * [Node.js client](https://github.com/jaegertracing/jaeger-client-node)
- * [C++ client](https://github.com/jaegertracing/cpp-client)
+ * [C++ client](https://github.com/jaegertracing/jaeger-client-cpp)
+ * [C# client](https://github.com/jaegertracing/jaeger-client-csharp)
 
 ### Deployment
 
@@ -111,7 +112,7 @@ The Jaeger contributors meet bi-weekly, and everyone is welcome to join.
 
 ## Roadmap
 
-See http://jaeger.readthedocs.io/en/latest/roadmap/
+See https://www.jaegertracing.io/docs/roadmap/
 
 ## Questions, Discussions, Bug Reports
 
@@ -135,7 +136,7 @@ If you would like to add your organization to the list, please comment on our
 
 [Apache 2.0 License](./LICENSE).
 
-[doc]: https://jaegertracing.netlify.com/docs/
+[doc]: https://jaegertracing.io/docs/
 [godoc-img]: https://godoc.org/github.com/jaegertracing/jaeger?status.svg
 [godoc]: https://godoc.org/github.com/jaegertracing/jaeger
 [ci-img]: https://travis-ci.org/jaegertracing/jaeger.svg?branch=master

cmd/agent/app/builder.go

@@ -117,7 +117,13 @@ func (b *Builder) getMetricsFactory(logger *zap.Logger) (metrics.Factory, error)
 	if b.metricsFactory != nil {
 		return b.metricsFactory, nil
 	}
-	return b.Metrics.CreateMetricsFactory("jaeger_agent", logger)
+
+	baseFactory, err := b.Metrics.CreateMetricsFactory("jaeger", logger)
+	if err != nil {
+		return nil, err
+	}
+
+	return baseFactory.Namespace("agent", nil), nil
 }
 
 // CreateAgent creates the Agent

cmd/agent/main.go

@@ -73,6 +73,7 @@ func main() {
 		v,
 		command,
 		flags.AddConfigFileFlag,
+		flags.AddLoggingFlag,
 		app.AddFlags,
 		metrics.AddFlags,
 	)