-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
exp: Rename jaeger-v2 binary to just jaeger (#4918)
## Which problem is this PR solving? - Part of #4843 ## Description of the changes - Per discussion with maintainers, rename `jaeger-v2` binary to just `jaeger`. - Motivation: - In the long run it's not going to be convenient for users to refer to `jaeger-v2`, projects typically don't do that - The name `jaeger` is currently unused (e.g. in Docker Hub) - Since we're combining all deployment units into one binary, `jaeger` name is quite appropriate ## How was this change tested? ``` $ go run -tags=ui ./cmd/jaeger ``` `grep -ri jaeger-v2 .` does not find any references (except in the changelog) --------- Signed-off-by: Yuri Shkuro <[email protected]>
- Loading branch information
1 parent
5e91855
commit 080b77f
Showing
33 changed files
with
35 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -263,10 +263,10 @@ BIN_PATH = ./cmd/$(BIN_NAME) | |
_build-a-binary-%: | ||
$(GOBUILD) $(DISABLE_OPTIMIZATIONS) $(GO_TAGS) -o $(BIN_PATH)/$(BIN_NAME)$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) $(BIN_PATH) | ||
|
||
.PHONY: build-jaeger-v2 | ||
build-jaeger-v2: BIN_NAME = jaeger-v2 | ||
build-jaeger-v2: GO_TAGS = -tags ui | ||
build-jaeger-v2: build-ui _build-a-binary-jaeger-v2$(SUFFIX)-$(GOOS)-$(GOARCH) | ||
.PHONY: build-jaeger | ||
build-jaeger: BIN_NAME = jaeger | ||
build-jaeger: GO_TAGS = -tags ui | ||
build-jaeger: build-ui _build-a-binary-jaeger$(SUFFIX)-$(GOOS)-$(GOARCH) | ||
|
||
.PHONY: build-all-in-one | ||
build-all-in-one: BIN_NAME = all-in-one | ||
|
@@ -346,7 +346,7 @@ _prepare-winres: | |
$(MAKE) _prepare-winres-helper NAME="Jaeger Ingester" PKGPATH="cmd/ingester" | ||
$(MAKE) _prepare-winres-helper NAME="Jaeger Remote Storage" PKGPATH="cmd/remote-storage" | ||
$(MAKE) _prepare-winres-helper NAME="Jaeger All-In-One" PKGPATH="cmd/all-in-one" | ||
$(MAKE) _prepare-winres-helper NAME="Jaeger V2" PKGPATH="cmd/jaeger-v2" | ||
$(MAKE) _prepare-winres-helper NAME="Jaeger V2" PKGPATH="cmd/jaeger" | ||
$(MAKE) _prepare-winres-helper NAME="Jaeger Tracegen" PKGPATH="cmd/tracegen" | ||
$(MAKE) _prepare-winres-helper NAME="Jaeger Anonymizer" PKGPATH="cmd/anonymizer" | ||
$(MAKE) _prepare-winres-helper NAME="Jaeger ES-Index-Cleaner" PKGPATH="cmd/es-index-cleaner" | ||
|
@@ -392,7 +392,7 @@ _build-platform-binaries: build-agent \ | |
build-collector \ | ||
build-query \ | ||
build-ingester \ | ||
build-jaeger-v2 \ | ||
build-jaeger \ | ||
build-remote-storage \ | ||
build-examples \ | ||
build-tracegen \ | ||
|
@@ -500,7 +500,7 @@ changelog: | |
draft-release: | ||
./scripts/draft-release.py | ||
|
||
.PHONY: install-test-tools | ||
.PHONY: install-test-tools | ||
install-test-tools: | ||
$(GO) install github.com/golangci/golangci-lint/cmd/[email protected] | ||
$(GO) install mvdan.cc/gofumpt@latest | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
jaeger-*-* | ||
jaeger |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# jaeger | ||
|
||
This is experimental Jaeger V2 based on OpenTelemetry collector. | ||
See https://github.com/jaegertracing/jaeger/issues/4843. |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters