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.

Sign up for GitHub

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

Introduce OpenTelemetry collector #2086

Merged
merged 4 commits into from
Mar 23, 2020
Merged

Introduce OpenTelemetry collector #2086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35974f9
Introduce OTEL collector as go submodule
pavolloffay Mar 19, 2020
86ea558
Remove binary
pavolloffay Mar 23, 2020
d8d9f99
Remove otel job from travis
pavolloffay Mar 23, 2020
b36d39c
Fix typo
pavolloffay Mar 23, 2020
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module github.com/jaegertracing/jaeger/cmd/opentelemetry-collector
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yurishkuro this is an example fo go submodule.

By default Jaeger version would be resolved from OTEL collector, but with replace we are able to point it to the current master/head. If we do a breaking change we can pin the version to a version prior the change and collaborate with OTEL to update the code there.


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