From c750cdad36379a467fbeeaed760858686b0e9a2d Mon Sep 17 00:00:00 2001 From: Radek Ryckowski Date: Fri, 10 May 2024 12:03:45 +0100 Subject: [PATCH] Bazel updates to 0.49.0 --- expfmt/BUILD.bazel | 5 ++-- go_repositories.bzl | 71 +++++++++++++++++++++++---------------------- model/BUILD.bazel | 11 +++++++ 3 files changed, 50 insertions(+), 37 deletions(-) diff --git a/expfmt/BUILD.bazel b/expfmt/BUILD.bazel index 22dd6141..3e07010f 100644 --- a/expfmt/BUILD.bazel +++ b/expfmt/BUILD.bazel @@ -15,10 +15,11 @@ go_library( deps = [ "//internal/bitbucket.org/ww/goautoneg", "//model", - "@com_github_matttproud_golang_protobuf_extensions//pbutil", "@com_github_prometheus_client_model//go", + "@org_golang_google_protobuf//encoding/protodelim", "@org_golang_google_protobuf//encoding/prototext", "@org_golang_google_protobuf//proto", + "@org_golang_google_protobuf//types/known/timestamppb", ], ) @@ -42,8 +43,8 @@ go_test( embed = [":expfmt"], deps = [ "//model", - "@com_github_matttproud_golang_protobuf_extensions//pbutil", "@com_github_prometheus_client_model//go", + "@org_golang_google_protobuf//encoding/protodelim", "@org_golang_google_protobuf//proto", "@org_golang_google_protobuf//types/known/timestamppb", ], diff --git a/go_repositories.bzl b/go_repositories.bzl index e40bb217..6b01b664 100644 --- a/go_repositories.bzl +++ b/go_repositories.bzl @@ -6,8 +6,8 @@ def go_dependencies(): name = "com_github_alecthomas_kingpin_v2", build_file_proto_mode = "disable", importpath = "github.com/alecthomas/kingpin/v2", - sum = "h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU=", - version = "v2.3.2", + sum = "h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=", + version = "v2.4.0", ) go_repository( @@ -68,8 +68,8 @@ def go_dependencies(): name = "com_github_google_go_cmp", build_file_proto_mode = "disable", importpath = "github.com/google/go-cmp", - sum = "h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=", - version = "v0.5.9", + sum = "h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=", + version = "v0.6.0", ) go_repository( @@ -116,13 +116,7 @@ def go_dependencies(): sum = "h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=", version = "v0.1.0", ) - go_repository( - name = "com_github_matttproud_golang_protobuf_extensions", - build_file_proto_mode = "disable", - importpath = "github.com/matttproud/golang_protobuf_extensions", - sum = "h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=", - version = "v1.0.4", - ) + go_repository( name = "com_github_modern_go_concurrent", build_file_proto_mode = "disable", @@ -156,22 +150,22 @@ def go_dependencies(): name = "com_github_prometheus_client_golang", build_file_proto_mode = "disable", importpath = "github.com/prometheus/client_golang", - sum = "h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=", - version = "v1.15.1", + sum = "h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=", + version = "v1.19.0", ) go_repository( name = "com_github_prometheus_client_model", build_file_proto_mode = "disable", importpath = "github.com/prometheus/client_model", - sum = "h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=", - version = "v0.4.0", + sum = "h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=", + version = "v0.6.0", ) go_repository( name = "com_github_prometheus_procfs", build_file_proto_mode = "disable", importpath = "github.com/prometheus/procfs", - sum = "h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=", - version = "v0.9.0", + sum = "h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=", + version = "v0.12.0", ) go_repository( name = "com_github_rogpeppe_go_internal", @@ -202,13 +196,20 @@ def go_dependencies(): sum = "h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=", version = "v2.1.0", ) + go_repository( + name = "com_google_cloud_go_compute", + build_file_proto_mode = "disable", + importpath = "cloud.google.com/go/compute", + sum = "h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg=", + version = "v1.20.1", + ) go_repository( name = "com_google_cloud_go_compute_metadata", build_file_proto_mode = "disable", importpath = "cloud.google.com/go/compute/metadata", - sum = "h1:nBbNSZyDpkNlo3DepaaLKVuO7ClyifSAmNloSCZrHnQ=", - version = "v0.2.0", + sum = "h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=", + version = "v0.2.3", ) go_repository( @@ -246,15 +247,15 @@ def go_dependencies(): name = "org_golang_google_protobuf", build_file_proto_mode = "disable", importpath = "google.golang.org/protobuf", - sum = "h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=", - version = "v1.30.0", + sum = "h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=", + version = "v1.32.0", ) go_repository( name = "org_golang_x_crypto", build_file_proto_mode = "disable", importpath = "golang.org/x/crypto", - sum = "h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=", - version = "v0.0.0-20190308221718-c2843e01d9a2", + sum = "h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=", + version = "v0.19.0", ) go_repository( @@ -268,43 +269,43 @@ def go_dependencies(): name = "org_golang_x_net", build_file_proto_mode = "disable", importpath = "golang.org/x/net", - sum = "h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=", - version = "v0.10.0", + sum = "h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=", + version = "v0.21.0", ) go_repository( name = "org_golang_x_oauth2", build_file_proto_mode = "disable", importpath = "golang.org/x/oauth2", - sum = "h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=", - version = "v0.8.0", + sum = "h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=", + version = "v0.17.0", ) go_repository( name = "org_golang_x_sync", build_file_proto_mode = "disable", importpath = "golang.org/x/sync", - sum = "h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=", - version = "v0.1.0", + sum = "h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=", + version = "v0.3.0", ) go_repository( name = "org_golang_x_sys", build_file_proto_mode = "disable", importpath = "golang.org/x/sys", - sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=", - version = "v0.8.0", + sum = "h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=", + version = "v0.17.0", ) go_repository( name = "org_golang_x_term", build_file_proto_mode = "disable", importpath = "golang.org/x/term", - sum = "h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=", - version = "v0.8.0", + sum = "h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=", + version = "v0.17.0", ) go_repository( name = "org_golang_x_text", build_file_proto_mode = "disable", importpath = "golang.org/x/text", - sum = "h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=", - version = "v0.9.0", + sum = "h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=", + version = "v0.14.0", ) go_repository( diff --git a/model/BUILD.bazel b/model/BUILD.bazel index 58576929..25909bd6 100644 --- a/model/BUILD.bazel +++ b/model/BUILD.bazel @@ -8,6 +8,7 @@ go_library( "fnv.go", "labels.go", "labelset.go", + "metadata.go", "metric.go", "model.go", "signature.go", @@ -20,6 +21,10 @@ go_library( ], importpath = "github.com/prometheus/common/model", visibility = ["//visibility:public"], + deps = [ + "@com_github_prometheus_client_model//go", + "@org_golang_google_protobuf//proto", + ], ) alias( @@ -44,4 +49,10 @@ go_test( "value_test.go", ], embed = [":model"], + deps = [ + "@com_github_google_go_cmp//cmp", + "@com_github_google_go_cmp//cmp/cmpopts", + "@com_github_prometheus_client_model//go", + "@org_golang_google_protobuf//proto", + ], )