Skip to content

Commit

Permalink
Introduce OpenTelemetry collector (#2086)
Browse files Browse the repository at this point in the history
* Introduce OTEL collector as go submodule

Signed-off-by: Pavol Loffay <[email protected]>

* Remove binary

Signed-off-by: Pavol Loffay <[email protected]>

* Remove otel job from travis

Signed-off-by: Pavol Loffay <[email protected]>

* Fix typo

Signed-off-by: Pavol Loffay <[email protected]>
  • Loading branch information
pavolloffay authored Mar 23, 2020
1 parent 7304d86 commit 87c466d
Show file tree
Hide file tree
Showing 5 changed files with 1,082 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ cmd/docs/*.1
cmd/docs/*.yaml
crossdock/crossdock-*
run-crossdock.log

cmd/opentelemetry-collector/opentelemetry-collector-*
__pycache__
11 changes: 10 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,15 @@ else
$(GOBUILD) -o ./cmd/collector/collector-$(GOOS) $(BUILD_INFO) ./cmd/collector/main.go
endif

OTEL_COLLECTOR_DIR = ./cmd/opentelemetry-collector
.PHONY: build-otel-collector
build-otel-collector:
ifeq ($(GOARCH), s390x)
cd ${OTEL_COLLECTOR_DIR} && $(GOBUILD) -o ./opentelemetry-collector-$(GOOS)-$(GOARCH) $(BUILD_INFO) main.go
else
cd ${OTEL_COLLECTOR_DIR} && $(GOBUILD) -o ./opentelemetry-collector-$(GOOS) $(BUILD_INFO) main.go
endif

.PHONY: build-ingester
build-ingester:
ifeq ($(GOARCH), s390x)
Expand Down Expand Up @@ -274,7 +283,7 @@ build-binaries-s390x:
GOOS=linux GOARCH=s390x $(MAKE) build-platform-binaries

.PHONY: build-platform-binaries
build-platform-binaries: build-agent build-collector build-query build-ingester build-all-in-one build-examples build-tracegen
build-platform-binaries: build-agent build-collector build-query build-ingester build-all-in-one build-examples build-tracegen build-otel-collector

.PHONY: build-all-platforms
build-all-platforms: build-binaries-linux build-binaries-windows build-binaries-darwin build-binaries-s390x
Expand Down
9 changes: 9 additions & 0 deletions cmd/opentelemetry-collector/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module github.com/jaegertracing/jaeger/cmd/opentelemetry-collector

go 1.13

replace k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab

replace github.com/jaegertracing/jaeger => ./../../

require github.com/open-telemetry/opentelemetry-collector v0.2.8-0.20200318211436-c7a11d6181c1 // indirect
Loading

0 comments on commit 87c466d

Please sign in to comment.