Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
yurishkuro committed Oct 14, 2024
1 parent 2f8f101 commit 1af89f1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 13 deletions.
6 changes: 0 additions & 6 deletions Makefile.BuildBinaries.mk
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ build-jaeger: build-ui _build-a-binary-jaeger$(SUFFIX)-$(GOOS)-$(GOARCH)
build-all-in-one: BIN_NAME = all-in-one
build-all-in-one: build-ui _build-a-binary-all-in-one$(SUFFIX)-$(GOOS)-$(GOARCH)

.PHONY: build-agent
build-agent: BIN_NAME = agent
build-agent: _build-a-binary-agent$(SUFFIX)-$(GOOS)-$(GOARCH)

.PHONY: build-query
build-query: BIN_NAME = query
build-query: build-ui _build-a-binary-query$(SUFFIX)-$(GOOS)-$(GOARCH)
Expand Down Expand Up @@ -135,7 +131,6 @@ build-binaries-linux-ppc64le:
# build all binaries for one specific platform GOOS/GOARCH
.PHONY: _build-platform-binaries
_build-platform-binaries: \
build-agent \
build-all-in-one \
build-collector \
build-query \
Expand All @@ -155,7 +150,6 @@ _build-platform-binaries: \
.PHONY: _build-platform-binaries-debug
_build-platform-binaries-debug:
_build-platform-binaries-debug: \
build-agent \
build-collector \
build-query \
build-ingester \
Expand Down
1 change: 0 additions & 1 deletion Makefile.Windows.mk
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ _build-syso: $(GOVERSIONINFO)
$(eval SEMVER_MAJOR := $(word 2, $(SEMVER_ALL)))
$(eval SEMVER_MINOR := $(word 3, $(SEMVER_ALL)))
$(eval SEMVER_PATCH := $(word 4, $(SEMVER_ALL)))
$(call _build_syso_macro,Jaeger Agent,cmd/agent)
$(call _build_syso_macro,Jaeger Collector,cmd/collector)
$(call _build_syso_macro,Jaeger Query,cmd/query)
$(call _build_syso_macro,Jaeger Ingester,cmd/ingester)
Expand Down
4 changes: 2 additions & 2 deletions cmd/all-in-one/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ func main() {
v := viper.New()
command := &cobra.Command{
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
Short: "Jaeger all-in-one distribution with collector and query in one process.",
Long: `Jaeger all-in-one distribution with collector and query. Use with caution: this version
by default uses only in-memory database.`,
RunE: func(_ *cobra.Command, _ /* args */ []string) error {
if err := svc.Start(v); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/collector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ func main() {
v := viper.New()
command := &cobra.Command{
Use: "jaeger-collector",
Short: "Jaeger collector receives and processes traces from Jaeger agents and clients",
Long: `Jaeger collector receives traces from Jaeger agents and runs them through a processing pipeline.`,
Short: "Jaeger collector receives and stores traces",
Long: `Jaeger collector receives traces and runs them through a processing pipeline.`,
RunE: func(_ *cobra.Command, _ /* args */ []string) error {
if err := svc.Start(v); err != nil {
return err
Expand Down
3 changes: 1 addition & 2 deletions docker-compose/kafka/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ services:
jaeger-collector:
image: jaegertracing/jaeger-collector
command:
- "--collector.otlp.enabled=true"
- "--log-level=debug"
ports:
- 4318:4318
Expand Down Expand Up @@ -95,7 +94,7 @@ services:
- "--log-level=debug"
environment:
- SPAN_STORAGE_TYPE=grpc
- JAEGER_AGENT_HOST=jaeger-agent
- OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger-collector:4318
ports:
- "16686:16686"
- "16687"
Expand Down

0 comments on commit 1af89f1

Please sign in to comment.