Merge branch 'master' into bump-go-immutable-radix

sean- · web-flow · commit 70e93f895f9a · 2024-07-31T12:42:27.000-07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MIT
+
 version: 2.1
 
 orbs:
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MIT
+
 language: go
 
 go:
diff --git a/circonus/circonus.go b/circonus/circonus.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 // Circonus Metrics Sink
 
 package circonus
diff --git a/circonus/circonus_test.go b/circonus/circonus_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package circonus
 
 import (
diff --git a/const_js.go b/const_js.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 const (
diff --git a/const_unix.go b/const_unix.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 //go:build !windows && !js
 // +build !windows,!js
 
diff --git a/const_windows.go b/const_windows.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 // +build windows
 
 package metrics
diff --git a/datadog/dogstatsd.go b/datadog/dogstatsd.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package datadog
 
 import (
diff --git a/datadog/dogstatsd_test.go b/datadog/dogstatsd_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package datadog
 
 import (
diff --git a/go.mod b/go.mod
@@ -6,13 +6,13 @@ require (
 	github.com/DataDog/datadog-go v3.2.0+incompatible
 	github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible
 	github.com/circonus-labs/circonusllhist v0.1.3 // indirect
-	github.com/golang/protobuf v1.3.2
+	github.com/golang/protobuf v1.4.3
 	github.com/hashicorp/go-immutable-radix v1.3.1
 	github.com/hashicorp/go-retryablehttp v0.5.3 // indirect
 	github.com/pascaldekloe/goe v0.1.0
-	github.com/prometheus/client_golang v1.4.0
+	github.com/prometheus/client_golang v1.11.1
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.9.1
+	github.com/prometheus/common v0.26.0
 	github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect
 )
 
diff --git a/go.sum b/go.sum
diff --git a/inmem.go b/inmem.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/inmem_endpoint.go b/inmem_endpoint.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/inmem_endpoint_test.go b/inmem_endpoint_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/inmem_signal.go b/inmem_signal.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/inmem_signal_test.go b/inmem_signal_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/inmem_test.go b/inmem_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/metrics.go b/metrics.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/metrics_test.go b/metrics_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/prometheus/prometheus.go b/prometheus/prometheus.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 //go:build go1.9
 // +build go1.9
 
diff --git a/prometheus/prometheus_test.go b/prometheus/prometheus_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package prometheus
 
 import (
diff --git a/sink.go b/sink.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/sink_test.go b/sink_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/start.go b/start.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/start_test.go b/start_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/statsd.go b/statsd.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/statsd_test.go b/statsd_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/statsite.go b/statsite.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
diff --git a/statsite_test.go b/statsite_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MIT
+
 package metrics
 
 import (
