use archive instead of submodule (#4263)

* remove opentelemetry-proto submodule

* ensure opentelemetry-proto files are not checked in

* cleanup comment

.gitignore

@@ -25,3 +25,6 @@ coverage.html
 # Wix
 *.wixobj
 *.wixpdb
+
+# OpenTelemetry proto files which are normally cleaned up
+model/internal/opentelemetry-proto

.gitmodules

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

Makefile

@@ -307,6 +307,9 @@ gendependabot: $(eval SHELL:=/bin/bash)
 # The source directory for OTLP ProtoBufs.
 OPENTELEMETRY_PROTO_SRC_DIR=model/internal/opentelemetry-proto
 
+# The SHA matching the current version of the proto to use
+OPENTELEMETRY_PROTO_VERSION=v0.11.0
+
 # Find all .proto files.
 OPENTELEMETRY_PROTO_FILES := $(subst $(OPENTELEMETRY_PROTO_SRC_DIR)/,,$(wildcard $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1/*.proto))
 
@@ -323,13 +326,18 @@ DOCKER_PROTOBUF ?= otel/build-protobuf:0.4.1
 PROTOC := docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD}/$(PROTO_INTERMEDIATE_DIR) ${DOCKER_PROTOBUF} --proto_path=${PWD}
 PROTO_INCLUDES := -I/usr/include/github.com/gogo/protobuf -I./
 
+# Cleanup temporary directory
+genproto-cleanup:
+ rm -Rf ${OPENTELEMETRY_PROTO_SRC_DIR}
+
 # Generate OTLP Protobuf Go files. This will place generated files in PROTO_TARGET_GEN_DIR.
-genproto:
- git submodule update --init
- # Call a sub-make to ensure OPENTELEMETRY_PROTO_FILES is populated after the submodule
- # files are present.
+genproto: genproto-cleanup
+ mkdir -p ${OPENTELEMETRY_PROTO_SRC_DIR}
+ curl -sSL https://api.github.com/repos/open-telemetry/opentelemetry-proto/tarball/${OPENTELEMETRY_PROTO_VERSION} | tar xz --strip 1 -C ${OPENTELEMETRY_PROTO_SRC_DIR}
+ # Call a sub-make to ensure OPENTELEMETRY_PROTO_FILES is populated
  $(MAKE) genproto_sub
  $(MAKE) fmt
+ $(MAKE) genproto-cleanup
 
 genproto_sub:
  @echo Generating code for the following files: