Merge branch 'main' into update_prom_common

dashpole · Jan 23, 2025 · 1fcabce · 1fcabce
2 parents c6e20bb + b0d0bb9
commit 1fcabce
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -9,9 +9,9 @@ require (
 	github.com/jcchavezs/porto v0.6.0
 	github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad
 	go.opentelemetry.io/build-tools/crosslink v0.17.0
-	go.opentelemetry.io/build-tools/gotmpl v0.16.0
-	go.opentelemetry.io/build-tools/multimod v0.16.0
-	go.opentelemetry.io/build-tools/semconvgen v0.16.0
+	go.opentelemetry.io/build-tools/gotmpl v0.17.0
+	go.opentelemetry.io/build-tools/multimod v0.17.0
+	go.opentelemetry.io/build-tools/semconvgen v0.17.0
 	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
 	golang.org/x/tools v0.29.0
 	golang.org/x/vuln v1.1.4

diff --git a/internal/tools/go.sum b/internal/tools/go.sum
@@ -495,12 +495,12 @@ go.opentelemetry.io/build-tools v0.17.0 h1:mCOZ3YQswjcetUeoMTijn2QPVzwx02Gk1WD20
 go.opentelemetry.io/build-tools v0.17.0/go.mod h1:ZhuNyO/aAkGEFTfNhH7Nhv7fIWpxIOp8t7XshpPWiOU=
 go.opentelemetry.io/build-tools/crosslink v0.17.0 h1:Ivjwh4qp4L+ivRccBOMPIXAVESBMbhbJFEJUGwKsiCM=
 go.opentelemetry.io/build-tools/crosslink v0.17.0/go.mod h1:rZRgZZ9uBe2IvR4fJY1kGIWIwiSLm+IvjFsSiPXGq4Q=
-go.opentelemetry.io/build-tools/gotmpl v0.16.0 h1:SQf17HOV0jvh7q6b6ByAfRXulJoGBpcfg4PQQmRITdc=
-go.opentelemetry.io/build-tools/gotmpl v0.16.0/go.mod h1:b/hwkIlDGCisnYnkgMR4dTcx84v7267atd9onDCW4tE=
-go.opentelemetry.io/build-tools/multimod v0.16.0 h1:o205mGH61VXebXeiIPXwxeHRCm332TZqRb8gmypI6po=
-go.opentelemetry.io/build-tools/multimod v0.16.0/go.mod h1:dDZzMmgPYCVJOHbWDZP29DH/aLFiKdPclisVLylTIH0=
-go.opentelemetry.io/build-tools/semconvgen v0.16.0 h1:6ow53MkS63h99CqXPlXOZ3XhFsg8t2dqclwRdEKGHM4=
-go.opentelemetry.io/build-tools/semconvgen v0.16.0/go.mod h1:gqVlv0wP6WmnqEcxKgTTNdblgxWJojmr+jvGTRZ0DcE=
+go.opentelemetry.io/build-tools/gotmpl v0.17.0 h1:KikAGvCbH1F6ur8cNaqHsCGEI8JUYn5mgUJUBro82w8=
+go.opentelemetry.io/build-tools/gotmpl v0.17.0/go.mod h1:b/hwkIlDGCisnYnkgMR4dTcx84v7267atd9onDCW4tE=
+go.opentelemetry.io/build-tools/multimod v0.17.0 h1:z0TWbNLcKu1eLx0Pgour/WFA0m+trsRkJ0llM5MsTug=
+go.opentelemetry.io/build-tools/multimod v0.17.0/go.mod h1:ImevmVCDyVInTn7L9lN+qVtGs/6cOMQA/Cf3jX1miQA=
+go.opentelemetry.io/build-tools/semconvgen v0.17.0 h1:vQk8RJPj9yOCe0cITb+WKMit1Mq9lK72Ws5tuq/KqzU=
+go.opentelemetry.io/build-tools/semconvgen v0.17.0/go.mod h1:xkneSVamzk5HpHLB7870NyveeaxpA3Z9BwoMqGxYOBE=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
 go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=

diff --git a/renovate.json b/renovate.json
@@ -14,6 +14,10 @@
       "matchDepTypes": ["indirect"],
       "enabled": true
     },
+    {
+      "matchPackageNames": ["go.opentelemetry.io/build-tools/**"],
+      "groupName": "build-tools"
+    },
     {
       "matchPackageNames": ["google.golang.org/genproto/googleapis/**"],
       "groupName": "googleapis"