Fix review comments

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
jaegertracing · Feb 28, 2020 · b4ccef6 · b4ccef6
1 parent 5ce41ca
commit b4ccef6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -60,7 +60,6 @@ github.com/jaegertracing/jaeger
       app/                  - The actual code for the binary
       main.go
   crossdock/                - Cross-repo integration test configuration
-  docs/                     - Documentation
   examples/
       hotrod/               - Demo application that uses OpenTracing API
   idl/                      - (submodule) https://github.com/jaegertracing/jaeger-idl
@@ -85,7 +84,6 @@ github.com/jaegertracing/jaeger
     sampling/
     zipkincore/
   go.mod                    - Go module file to track dependencies
-  mkdocs.yml                - MkDocs builds the documentation in docs/
 ```
 
 - Note 1: `pkg` is a collection of utility packages used by the Jaeger components

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PROJECT_ROOT=./
+JAEGER_IMPORT_PATH=github.com/jaegertracing/jaeger
 STORAGE_PKGS = ./plugin/storage/integration/...
 
 # all .go files that are not auto-generated and should be auto-formatted and linted.
@@ -40,7 +40,7 @@ IMPORT_LOG=.import.log
 GIT_SHA=$(shell git rev-parse HEAD)
 GIT_CLOSEST_TAG=$(shell git describe --abbrev=0 --tags)
 DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
-BUILD_INFO_IMPORT_PATH=$(PROJECT_ROOT)/pkg/version
+BUILD_INFO_IMPORT_PATH=./pkg/version
 BUILD_INFO=-ldflags "-X $(BUILD_INFO_IMPORT_PATH).commitSHA=$(GIT_SHA) -X $(BUILD_INFO_IMPORT_PATH).latestVersion=$(GIT_CLOSEST_TAG) -X $(BUILD_INFO_IMPORT_PATH).date=$(DATE)"
 
 SED=sed
@@ -53,7 +53,7 @@ THRIFT_GEN_DIR=thrift-gen
 
 SWAGGER_VER=0.12.0
 SWAGGER_IMAGE=quay.io/goswagger/swagger:$(SWAGGER_VER)
-SWAGGER=docker run --rm -it -u ${shell id -u} -v "${PWD}:/go/src/${PROJECT_ROOT}" -w /go/src/${PROJECT_ROOT} $(SWAGGER_IMAGE)
+SWAGGER=docker run --rm -it -u ${shell id -u} -v "${PWD}:/go/src/" -w /go/src/ $(SWAGGER_IMAGE)
 SWAGGER_GEN_DIR=swagger-gen
 
 COLOR_PASS=$(shell printf "\033[32mPASS\033[0m")
@@ -145,7 +145,7 @@ fmt:
 
 .PHONY: lint-gosec
 lint-gosec:
-	time gosec -quiet -exclude=G104,G107 $(PROJECT_ROOT)/...
+	time gosec -quiet -exclude=G104,G107 ./...
 
 .PHONY: lint-staticcheck
 lint-staticcheck:
@@ -367,8 +367,8 @@ thrift: idl/thrift/jaeger.thrift thrift-image
 	[ -d $(THRIFT_GEN_DIR) ] || mkdir $(THRIFT_GEN_DIR)
 	$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/agent.thrift
 #	TODO sed is GNU and BSD compatible
-	sed -i.bak 's|"zipkincore"|"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"|g' $(THRIFT_GEN_DIR)/agent/*.go
-	sed -i.bak 's|"jaeger"|"github.com/jaegertracing/jaeger/thrift-gen/jaeger"|g' $(THRIFT_GEN_DIR)/agent/*.go
+	sed -i.bak 's|"zipkincore"|"$(JAEGER_IMPORT_PATH)/thrift-gen/zipkincore"|g' $(THRIFT_GEN_DIR)/agent/*.go
+	sed -i.bak 's|"jaeger"|"$(JAEGER_IMPORT_PATH)/thrift-gen/jaeger"|g' $(THRIFT_GEN_DIR)/agent/*.go
 	$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/jaeger.thrift
 	$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/sampling.thrift
 	$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) --out /data/$(THRIFT_GEN_DIR) /data/idl/thrift/baggage.thrift

diff --git a/examples/hotrod/README.md b/examples/hotrod/README.md
@@ -46,9 +46,8 @@ Jaeger UI can be accessed at http://localhost:16686.
 ### Run HotROD from source
 
 ```bash
-go get github.com/jaegertracing/jaeger
-cd $GOPATH/src/github.com/jaegertracing/jaeger
-cd examples/hotrod
+git clone git@github.com:jaegertracing/jaeger.git jaeger
+cd jaeger/examples/hotrod
 go run ./main.go all
 ```
 

diff --git a/examples/hotrod/services/frontend/gen_assets.go b/examples/hotrod/services/frontend/gen_assets.go