Merge branch 'master' into beorn7/histogram

Author: beorn7

.circleci/config.yml

@@ -1,15 +1,13 @@
----
 version: 2.1
-
 orbs:
   go: circleci/[email protected]
-
+  prometheus: prometheus/[email protected]
 jobs:
   test:
     parameters:
       go_version:
         type: string
-      run_style:
+      run_style_and_unused:
         type: boolean
         default: false
       run_lint:
@@ -19,56 +17,52 @@ jobs:
         type: boolean
         default: true
     docker:
-    - image: circleci/golang:<< parameters.go_version >>
+      - image: circleci/golang:<< parameters.go_version >>
     working_directory: /go/src/github.com/prometheus/client_golang
     steps:
-    - checkout
-    - when:
-        condition: << parameters.use_gomod_cache >>
-        steps:
-        - go/load-cache:
-            key: v1-go<< parameters.go_version >>
-    - run: make check_license unused test
-    - when:
-        condition: << parameters.run_lint >>
-        steps:
-        - run: make lint
-    - when:
-        condition: << parameters.run_style >>
-        steps:
-        - run: make style
-    - when:
-        condition: << parameters.use_gomod_cache >>
-        steps:
-        - go/save-cache:
-            key: v1-go<< parameters.go_version >>
-    - store_test_results:
-        path: test-results
-
+      - checkout
+      - when:
+          condition: << parameters.use_gomod_cache >>
+          steps:
+            - go/load-cache:
+                key: v1-go<< parameters.go_version >>
+      - run: make check_license test
+      - when:
+          condition: << parameters.run_lint >>
+          steps:
+            - run: make lint
+      - when:
+          condition: << parameters.run_style_and_unused >>
+          steps:
+            - run: make style unused
+      - when:
+          condition: << parameters.use_gomod_cache >>
+          steps:
+            - go/save-cache:
+                key: v1-go<< parameters.go_version >>
+      - store_test_results:
+          path: test-results
 workflows:
   version: 2
   client_golang:
     jobs:
-    # Refer to README.md for the currently supported versions.
-    - test:
-        name: go-1-9
-        go_version: "1.9"
-        use_gomod_cache: false
-    - test:
-        name: go-1-10
-        go_version: "1.10"
-        use_gomod_cache: false
-    - test:
-        name: go-1-11
-        go_version: "1.11"
-        run_lint: true
-    - test:
-        name: go-1-12
-        go_version: "1.12"
-        run_lint: true
-    - test:
-        name: go-1-13
-        go_version: "1.13"
-        run_lint: true
-        # Style is only checked against the latest supported Go version.
-        run_style: true
+      # Refer to README.md for the currently supported versions.
+      - test:
+          name: go-1-13
+          go_version: "1.13"
+          run_lint: true
+      - test:
+          name: go-1-14
+          go_version: "1.14"
+          run_lint: true
+      - test:
+          name: go-1-15
+          go_version: "1.15"
+          run_lint: true
+      - test:
+          name: go-1-16
+          go_version: "1.16"
+          run_lint: true
+          # Style and unused/missing packages are only checked against
+          # the latest supported Go version.
+          run_style_and_unused: true

.travis.yml

@@ -1,3 +1,46 @@
+## 1.10.0 / 2021-03-18
+
+* [CHANGE] Minimum required Go version is now 1.13.
+* [CHANGE] API client: Add matchers to `LabelNames` and `LabesValues`. #828
+* [FEATURE] API client: Add buildinfo call. #841
+* [BUGFIX] Fix build on riscv64. #833
+
+## 1.9.0 / 2020-12-17
+
+* [FEATURE] `NewPidFileFn` helper to create process collectors for processes whose PID is read from a file. #804
+* [BUGFIX] promhttp: Prevent endless loop in `InstrumentHandler...` middlewares with invalid metric or label names. #823
+
+## 1.8.0 / 2020-10-15
+
+* [CHANGE] API client: Use `time.Time` rather than `string` for timestamps in `RuntimeinfoResult`. #777
+* [FEATURE] Export `MetricVec` to facilitate implementation of vectors of custom `Metric` types. #803
+* [FEATURE API client: Support `/status/tsdb` endpoint. #773
+* [ENHANCEMENT] API client: Enable GET fallback on status code 501. #802
+* [ENHANCEMENT] Remove `Metric` references after reslicing to free up more memory. #784
+
+## 1.7.1 / 2020-06-23
+
+* [BUGFIX] API client: Actually propagate start/end parameters of `LabelNames` and `LabelValues`. #771
+
+## 1.7.0 / 2020-06-17
+
+* [CHANGE] API client: Add start/end parameters to `LabelNames` and `LabelValues`. #767
+* [FEATURE] testutil: Add `GatherAndCount` and enable filtering in `CollectAndCount` #753
+* [FEATURE] API client: Add support for `status` and `runtimeinfo` endpoints. #755
+* [ENHANCEMENT] Wrapping `nil` with a `WrapRegistererWith...` function creates a no-op `Registerer`.  #764
+* [ENHANCEMENT] promlint: Allow Kelvin as a base unit for cases like color temperature. #761
+* [BUGFIX] push: Properly handle empty job and label values. #752
+
+## 1.6.0 / 2020-04-28
+
+* [FEATURE] testutil: Add lint checks for metrics, including a sub-package `promlint` to expose the linter engine for external usage. #739 #743
+* [ENHANCEMENT] API client: Improve error messages. #731
+* [BUGFIX] process collector: Fix `process_resident_memory_bytes` on 32bit MS Windows. #734
+
+## 1.5.1 / 2020-03-14
+
+* [BUGFIX] promhttp: Remove another superfluous `WriteHeader` call. #726
+
 ## 1.5.0 / 2020-03-03
 
 * [FEATURE] promauto: Add a factory to allow automatic registration with a local registry. #713

CHANGELOG.md

@@ -0,0 +1,3 @@
+## Prometheus Community Code of Conduct
+
+Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

CODE_OF_CONDUCT.md

@@ -13,13 +13,6 @@
 
 include Makefile.common
 
-# http.CloseNotifier is deprecated but we don't want to remove support
-# from client_golang to not break anybody still using it.
-STATICCHECK_IGNORE = \
-  github.com/prometheus/client_golang/prometheus/promhttp/delegator*.go:SA1019 \
-  github.com/prometheus/client_golang/prometheus/promhttp/instrument_server_test.go:SA1019 \
-  github.com/prometheus/client_golang/prometheus/http.go:SA1019
-
 .PHONY: test
 test: deps common-test
 

Makefile

@@ -78,12 +78,12 @@ ifneq ($(shell which gotestsum),)
 endif
 endif
 
-PROMU_VERSION ?= 0.5.0
+PROMU_VERSION ?= 0.11.1
 PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.18.0
+GOLANGCI_LINT_VERSION ?= v1.36.0
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
@@ -150,6 +150,17 @@ else
 	$(GO) get $(GOOPTS) -t ./...
 endif
 
+.PHONY: update-go-deps
+update-go-deps:
+	@echo ">> updating Go dependencies"
+	@for m in $$($(GO) list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
+		$(GO) get $$m; \
+	done
+	GO111MODULE=$(GO111MODULE) $(GO) mod tidy
+ifneq (,$(wildcard vendor))
+	GO111MODULE=$(GO111MODULE) $(GO) mod vendor
+endif
+
 .PHONY: common-test-short
 common-test-short: $(GOTEST_DIR)
 	@echo ">> running short tests"
@@ -234,10 +245,12 @@ common-docker-publish: $(PUBLISH_DOCKER_ARCHS)
 $(PUBLISH_DOCKER_ARCHS): common-docker-publish-%:
 	docker push "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)"
 
+DOCKER_MAJOR_VERSION_TAG = $(firstword $(subst ., ,$(shell cat VERSION)))
 .PHONY: common-docker-tag-latest $(TAG_DOCKER_ARCHS)
 common-docker-tag-latest: $(TAG_DOCKER_ARCHS)
 $(TAG_DOCKER_ARCHS): common-docker-tag-latest-%:
 	docker tag "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:latest"
+	docker tag "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(DOCKER_IMAGE_TAG)" "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:v$(DOCKER_MAJOR_VERSION_TAG)"
 
 .PHONY: common-docker-manifest
 common-docker-manifest:

Makefile.common

@@ -9,7 +9,7 @@ This is the [Go](http://golang.org) client library for
 instrumenting application code, and one for creating clients that talk to the
 Prometheus HTTP API.
 
-__This library requires Go1.9 or later.__ The minimum required patch releases for older Go versions are Go1.9.7 and Go1.10.3.
+__This library requires Go1.13 or later.__
 
 ## Important note about releases and stability
 

README.md

@@ -0,0 +1,6 @@
+# Reporting a security issue
+
+The Prometheus security policy, including how to report vulnerabilities, can be
+found here:
+
+https://prometheus.io/docs/operating/security/

SECURITY.md

@@ -1 +1 @@
-1.5.0
+1.10.0