Worked out crazy proto scheme

Signed-off-by: Joe Elliott <[email protected]>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "opentelemetry-proto"]
+	path = opentelemetry-proto
+	url = https://github.com/open-telemetry/opentelemetry-proto

Makefile

@@ -76,14 +76,24 @@ endif
 
 .PHONY: gen-proto
 gen-proto:
-	vend -package
-	protoc -I vendor/github.com/open-telemetry/opentelemetry-proto -I pkg/tempopb/ pkg/tempopb/tempo.proto --go_out=plugins=grpc:pkg/tempopb
-	$(MAKE) vendor-dependencies
+	git submodule init
+	rm -rf ./vendor/github.com/open-telemetry/opentelemetry-proto
+	protoc -I opentelemetry-proto/ opentelemetry-proto/opentelemetry/proto/common/v1/common.proto --gogofast_out=plugins=grpc:./vendor
+	protoc -I opentelemetry-proto/ opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto --gogofast_out=plugins=grpc:./vendor
+	protoc -I opentelemetry-proto/ opentelemetry-proto/opentelemetry/proto/logs/v1/logs.proto --gogofast_out=plugins=grpc:./vendor
+	protoc -I opentelemetry-proto/ opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto --gogofast_out=plugins=grpc:./vendor
+	protoc -I opentelemetry-proto/ opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto --gogofast_out=plugins=grpc:./vendor
+	protoc -I opentelemetry-proto/ opentelemetry-proto/opentelemetry/proto/collector/logs/v1/logs_service.proto --gogofast_out=plugins=grpc:./vendor
+	protoc -I opentelemetry-proto/ opentelemetry-proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto --gogofast_out=plugins=grpc:./vendor
+	protoc -I opentelemetry-proto/ opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto --gogofast_out=plugins=grpc:./vendor
+	protoc -I opentelemetry-proto/ -I pkg/tempopb/ pkg/tempopb/tempo.proto --gogofast_out=plugins=grpc:pkg/tempopb
 
 .PHONY: vendor-dependencies
 vendor-dependencies:
 	go mod tidy
 	go mod vendor
+	find | grep 'vendor/go.opentelemetry.io.*go$\' | xargs -L 1 sed -i 's+go.opentelemetry.io/collector/internal/data/opentelemetry-proto-gen/+github.com/open-telemetry/opentelemetry-proto/gen/go/+g'
+
 
 .PHONY: install-tools
 install-tools:

go.mod

@@ -4,7 +4,6 @@ go 1.15
 
 require (
 	cloud.google.com/go/storage v1.6.0
-	github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
 	github.com/cortexproject/cortex v0.7.0
 	github.com/go-kit/kit v0.10.0
 	github.com/gogo/protobuf v1.3.1
@@ -33,7 +32,6 @@ require (
 	go.uber.org/atomic v1.6.0
 	go.uber.org/ratelimit v0.1.0
 	go.uber.org/zap v1.15.0
-	golang.org/x/net v0.0.0-20200625001655-4c5254603344
 	google.golang.org/api v0.29.0
 	google.golang.org/grpc v1.29.1
 	gopkg.in/yaml.v2 v2.3.0