Merge branch 'master' into sparsehistogram

Author: beorn7

.gitignore

@@ -1 +1,2 @@
 target/
+tmp/

Makefile

@@ -11,18 +11,71 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-KEY_ID ?= _DEFINE_ME_
+all:
+	$(MAKE) go
+	$(MAKE) build
 
-all: go
+GO_FILE := go/metrics.pb.go
+PROTO_FILE := io/prometheus/client/metrics.proto
 
-SUFFIXES:
+# Need to be on a previous version that doesn't cause the updated WKT go_package values to be added.
+PROTOC_VERSION := 3.13.0
+# This has been around for a while.
+PROTOC_GEN_GO_VERSION := v1.3.5
 
-go: go/metrics.pb.go
+# There are no protobuf releases for Darwin ARM so for
+# now we always use the x86_64 release through Rosetta.
+UNAME_OS := $(shell uname -s)
+UNAME_ARCH := $(shell uname -m)
+ifeq ($(UNAME_OS),Darwin)
+PROTOC_OS := osx
+PROTOC_ARCH := x86_64
+endif
+ifeq ($(UNAME_OS),Linux)
+PROTOC_OS = linux
+PROTOC_ARCH := $(UNAME_ARCH)
+endif
+PROTOC := tmp/versions/protoc/$(PROTOC_VERSION)
+PROTOC_BIN := tmp/bin/protoc
+PROTOC_INCLUDE := tmp/include/google
+$(PROTOC):
+	@if ! command -v curl >/dev/null 2>/dev/null; then echo "error: curl must be installed"  >&2; exit 1; fi
+	@if ! command -v unzip >/dev/null 2>/dev/null; then echo "error: unzip must be installed"  >&2; exit 1; fi
+	@rm -f $(PROTOC_BIN)
+	@rm -rf $(PROTOC_INCLUDE)
+	@mkdir -p $(dir $(PROTOC_BIN)) $(dir $(PROTOC_INCLUDE))
+	$(eval PROTOC_TMP := $(shell mktemp -d))
+	cd $(PROTOC_TMP); curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VERSION)/protoc-$(PROTOC_VERSION)-$(PROTOC_OS)-$(PROTOC_ARCH).zip -o protoc.zip
+	cd $(PROTOC_TMP); unzip protoc.zip && mv bin/protoc $(PWD)/$(PROTOC_BIN) && mv include/google $(PWD)/$(PROTOC_INCLUDE)
+	@rm -rf $(PROTOC_TMP)
+	@rm -rf $(dir $(PROTOC))
+	@mkdir -p $(dir $(PROTOC))
+	@touch $(PROTOC)
 
-go/metrics.pb.go: metrics.proto
-	protoc $< --go_out=import_path=github.com/prometheus/client_model/,paths=source_relative:go/
+PROTOC_GEN_GO := tmp/versions/protoc-gen-go/$(PROTOC_GEN_GO_VERSION)
+PROTOC_GEN_GO_BIN := tmp/bin/protoc-gen-go
+$(PROTOC_GEN_GO):
+	@rm -f $(PROTOC_GEN_GO_BIN)
+	@mkdir -p $(dir $(PROTOC_GEN_GO_BIN))
+	$(eval PROTOC_GEN_GO_TMP := $(shell mktemp -d))
+	cd $(PROTOC_GEN_GO_TMP); GOBIN=$(PWD)/$(dir $(PROTOC_GEN_GO_BIN)) go get github.com/golang/protobuf/protoc-gen-go@$(PROTOC_GEN_GO_VERSION)
+	@rm -rf $(PROTOC_GEN_GO_TMP)
+	@rm -rf $(dir $(PROTOC_GEN_GO))
+	@mkdir -p $(dir $(PROTOC_GEN_GO))
+	@touch $(PROTOC_GEN_GO)
+
+go: $(GO_FILE)
+
+$(GO_FILE): $(PROTO_FILE) $(PROTOC_GEN_GO) $(PROTOC)
+	@rm -rf $(dir $(GO_FILE)) tmp/go
+	@mkdir -p $(dir $(GO_FILE)) tmp/go
+	PATH=$(PWD)/tmp/bin:$$PATH protoc -I tmp/include -I . --go_out=paths=source_relative:tmp/go $(PROTO_FILE)
+	@mv tmp/go/$(patsubst %.proto,%.pb.go,$(PROTO_FILE)) $(GO_FILE)
+
+build: $(GO_FILE)
+	go build ./go
 
 clean:
-	-rm -rf go/*
+	-rm -rf go tmp
 
-.PHONY: all clean go
+.PHONY: all clean go build

go.mod

@@ -2,7 +2,4 @@ module github.com/prometheus/client_model
 
 go 1.9
 
-require (
-	github.com/golang/protobuf v1.2.0
-	golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
-)
+require github.com/golang/protobuf v1.3.5

go.sum

@@ -1,4 +1,2 @@
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=