Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename standalone #1062

Merged
merged 3 commits into from
Sep 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cover.html
.mkdocs-virtual-env/
vendor/
examples/hotrod/hotrod
cmd/standalone/standalone-linux
cmd/all-in-one/all-in-one-*
cmd/agent/agent
cmd/agent/agent-linux
cmd/collector/collector
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ make test
The `jaeger-ui` submodule contains the source code for the UI assets (requires Node.js 6+). The assets must be compiled first with `make build_ui`, which runs Node.js build and then packages the assets into a Go file that is `.gitignore`-ed. The packaged assets can be enabled by providing a build tag `ui`, e.g.:

```
$ go run -tags ui ./cmd/standalone/main.go
$ go run -tags ui ./cmd/all-in-one/main.go
```

Alternatively, the path to the built UI assets can be provided via `--query.static-files` flag:

```
$ go run ./cmd/standalone/main.go --query.static-files jaeger-ui/build
$ go run ./cmd/all-in-one/main.go --query.static-files jaeger-ui/build
```

## Project Structure
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ test: go-gen

.PHONY: integration-test
integration-test: go-gen
$(GOTEST) -tags=integration ./cmd/standalone/...
$(GOTEST) -tags=integration ./cmd/all-in-one/...

.PHONY: storage-integration-test
storage-integration-test: go-gen
Expand Down Expand Up @@ -184,7 +184,7 @@ build-all-in-one-linux: build_ui

.PHONY: build-all-in-one
build-all-in-one:
CGO_ENABLED=0 installsuffix=cgo go build -tags ui -o ./cmd/standalone/standalone-$(GOOS) $(BUILD_INFO) ./cmd/standalone/main.go
CGO_ENABLED=0 installsuffix=cgo go build -tags ui -o ./cmd/all-in-one/all-in-one-$(GOOS) $(BUILD_INFO) ./cmd/all-in-one/main.go

.PHONY: build-agent
build-agent:
Expand Down
6 changes: 3 additions & 3 deletions cmd/standalone/Dockerfile → cmd/all-in-one/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ EXPOSE 14268
# Web HTTP
EXPOSE 16686

COPY ./cmd/standalone/standalone-linux /go/bin/
COPY ./cmd/standalone/sampling_strategies.json /etc/jaeger/
COPY ./cmd/all-in-one/all-in-one-linux /go/bin/
COPY ./cmd/all-in-one/sampling_strategies.json /etc/jaeger/

ENTRYPOINT ["/go/bin/standalone-linux"]
ENTRYPOINT ["/go/bin/all-in-one-linux"]
CMD ["--sampling.strategies-file=/etc/jaeger/sampling_strategies.json"]
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var (
}
)

func TestStandalone(t *testing.T) {
func TestAllInOne(t *testing.T) {
// Check if the query service is available
if err := healthCheck(); err != nil {
t.Fatal(err)
Expand Down
4 changes: 2 additions & 2 deletions cmd/standalone/main.go → cmd/all-in-one/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import (
zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
)

// standalone/main is a standalone full-stack jaeger backend, backed by a memory store
// all-in-one/main is a standalone full-stack jaeger backend, backed by a memory store
func main() {
var signalsChannel = make(chan os.Signal)
signal.Notify(signalsChannel, os.Interrupt, syscall.SIGTERM)
Expand All @@ -78,7 +78,7 @@ func main() {
}
v := viper.New()
command := &cobra.Command{
Use: "jaeger-standalone",
Use: "jaeger-all-in-one",
Short: "Jaeger all-in-one distribution with agent, collector and query in one process.",
Long: `Jaeger all-in-one distribution with agent, collector and query. Use with caution this version
uses only in-memory database.`,
Expand Down
Binary file added cmd/all-in-one/standalone-linux
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/travis/build-all-in-one-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ make build-all-in-one-linux

export REPO=jaegertracing/all-in-one

docker build -f cmd/standalone/Dockerfile -t $REPO:latest .
docker build -f cmd/all-in-one/Dockerfile -t $REPO:latest .
export CID=$(docker run -d -p 16686:16686 -p 5778:5778 $REPO:latest)
make integration-test
docker kill $CID
Expand Down
2 changes: 1 addition & 1 deletion scripts/travis/package-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function stage-platform-files {
local PACKAGE_STAGING_DIR=$2
local FILE_EXTENSION=$3

stage-file ./cmd/standalone/standalone-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-standalone$FILE_EXTENSION
stage-file ./cmd/all-in-one/all-in-one-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-all-in-one$FILE_EXTENSION
stage-file ./cmd/agent/agent-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-agent$FILE_EXTENSION
stage-file ./cmd/query/query-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-query$FILE_EXTENSION
stage-file ./cmd/collector/collector-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-collector$FILE_EXTENSION
Expand Down