Merge branch 'master' into grpc-archive-storage

jaegertracing · Jun 29, 2020 · ecd9b5c · ecd9b5c
2 parents dd374cf + 5ad8e0a
commit ecd9b5c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -251,7 +251,8 @@ build-otel-ingester:
 
 .PHONY: build-otel-all-in-one
 build-otel-all-in-one:
-	cd ${OTEL_COLLECTOR_DIR}/cmd/all-in-one && $(GOBUILD) -tags ui -o ./opentelemetry-all-in-one-$(GOOS)-$(GOARCH) $(BUILD_INFO) main.go
+	# TODO add -tags ui once Jaeger OTEL module depends on master Jaeger version https://github.com/jaegertracing/jaeger/issues/2319
+	cd ${OTEL_COLLECTOR_DIR}/cmd/all-in-one && $(GOBUILD) -o ./opentelemetry-all-in-one-$(GOOS)-$(GOARCH) $(BUILD_INFO) main.go
 
 .PHONY: build-ingester
 build-ingester: