include vendored module version in file path

elastic · Mar 3, 2025 · 8b50469 · 8b50469
1 parent 4219a1e
commit 8b50469
Show file tree

Hide file tree

Showing 45 changed files with 32 additions and 35 deletions.
diff --git a/....com/prometheus/prometheus/0.54.1/LICENSE → ...com/prometheus/prometheus@v0.54.1/LICENSE b/....com/prometheus/prometheus/0.54.1/LICENSE → ...com/prometheus/prometheus@v0.54.1/LICENSE
diff --git a/...b.com/prometheus/prometheus/0.54.1/NOTICE → ....com/prometheus/prometheus@v0.54.1/NOTICE b/...b.com/prometheus/prometheus/0.54.1/NOTICE → ....com/prometheus/prometheus@v0.54.1/NOTICE
diff --git a/...b.com/prometheus/prometheus/0.54.1/go.mod → ....com/prometheus/prometheus@v0.54.1/go.mod b/...b.com/prometheus/prometheus/0.54.1/go.mod → ....com/prometheus/prometheus@v0.54.1/go.mod
diff --git a/...b.com/prometheus/prometheus/0.54.1/go.sum → ....com/prometheus/prometheus@v0.54.1/go.sum b/...b.com/prometheus/prometheus/0.54.1/go.sum → ....com/prometheus/prometheus@v0.54.1/go.sum
diff --git a/...metheus/0.54.1/model/exemplar/exemplar.go → ...etheus@v0.54.1/model/exemplar/exemplar.go b/...metheus/0.54.1/model/exemplar/exemplar.go → ...etheus@v0.54.1/model/exemplar/exemplar.go
diff --git a/...0.54.1/model/histogram/float_histogram.go → ...0.54.1/model/histogram/float_histogram.go b/...0.54.1/model/histogram/float_histogram.go → ...0.54.1/model/histogram/float_histogram.go
diff --git a/...metheus/0.54.1/model/histogram/generic.go → ...etheus@v0.54.1/model/histogram/generic.go b/...metheus/0.54.1/model/histogram/generic.go → ...etheus@v0.54.1/model/histogram/generic.go
diff --git a/...theus/0.54.1/model/histogram/histogram.go → ...heus@v0.54.1/model/histogram/histogram.go b/...theus/0.54.1/model/histogram/histogram.go → ...heus@v0.54.1/model/histogram/histogram.go
diff --git a/...heus/0.54.1/model/histogram/test_utils.go → ...eus@v0.54.1/model/histogram/test_utils.go b/...heus/0.54.1/model/histogram/test_utils.go → ...eus@v0.54.1/model/histogram/test_utils.go
diff --git a/.../prometheus/0.54.1/model/labels/labels.go → ...prometheus@v0.54.1/model/labels/labels.go b/.../prometheus/0.54.1/model/labels/labels.go → ...prometheus@v0.54.1/model/labels/labels.go
diff --git a/...heus/0.54.1/model/labels/labels_common.go → ...eus@v0.54.1/model/labels/labels_common.go b/...heus/0.54.1/model/labels/labels_common.go → ...eus@v0.54.1/model/labels/labels_common.go
diff --git a/....54.1/model/labels/labels_dedupelabels.go → ....54.1/model/labels/labels_dedupelabels.go b/....54.1/model/labels/labels_dedupelabels.go → ....54.1/model/labels/labels_dedupelabels.go
diff --git a/....54.1/model/labels/labels_stringlabels.go → ....54.1/model/labels/labels_stringlabels.go b/....54.1/model/labels/labels_stringlabels.go → ....54.1/model/labels/labels_stringlabels.go
diff --git a/...prometheus/0.54.1/model/labels/matcher.go → ...rometheus@v0.54.1/model/labels/matcher.go b/...prometheus/0.54.1/model/labels/matcher.go → ...rometheus@v0.54.1/model/labels/matcher.go
diff --git a/.../prometheus/0.54.1/model/labels/regexp.go → ...prometheus@v0.54.1/model/labels/regexp.go b/.../prometheus/0.54.1/model/labels/regexp.go → ...prometheus@v0.54.1/model/labels/regexp.go
diff --git a/...rometheus/0.54.1/model/labels/sharding.go → ...ometheus@v0.54.1/model/labels/sharding.go b/...rometheus/0.54.1/model/labels/sharding.go → ...ometheus@v0.54.1/model/labels/sharding.go
diff --git a/...4.1/model/labels/sharding_dedupelabels.go → ...4.1/model/labels/sharding_dedupelabels.go b/...4.1/model/labels/sharding_dedupelabels.go → ...4.1/model/labels/sharding_dedupelabels.go
diff --git a/...4.1/model/labels/sharding_stringlabels.go → ...4.1/model/labels/sharding_stringlabels.go b/...4.1/model/labels/sharding_stringlabels.go → ...4.1/model/labels/sharding_stringlabels.go
diff --git a/...metheus/0.54.1/model/labels/test_utils.go → ...etheus@v0.54.1/model/labels/test_utils.go b/...metheus/0.54.1/model/labels/test_utils.go → ...etheus@v0.54.1/model/labels/test_utils.go
diff --git a/...ometheus/0.54.1/model/textparse/README.md → ...metheus@v0.54.1/model/textparse/README.md b/...ometheus/0.54.1/model/textparse/README.md → ...metheus@v0.54.1/model/textparse/README.md
diff --git a/...theus/0.54.1/model/textparse/interface.go → ...heus@v0.54.1/model/textparse/interface.go b/...theus/0.54.1/model/textparse/interface.go → ...heus@v0.54.1/model/textparse/interface.go
diff --git a/...s/0.54.1/model/textparse/openmetricslex.l → ...@v0.54.1/model/textparse/openmetricslex.l b/...s/0.54.1/model/textparse/openmetricslex.l → ...@v0.54.1/model/textparse/openmetricslex.l
diff --git a/....54.1/model/textparse/openmetricslex.l.go → ....54.1/model/textparse/openmetricslex.l.go b/....54.1/model/textparse/openmetricslex.l.go → ....54.1/model/textparse/openmetricslex.l.go
diff --git a/....54.1/model/textparse/openmetricsparse.go → ....54.1/model/textparse/openmetricsparse.go b/....54.1/model/textparse/openmetricsparse.go → ....54.1/model/textparse/openmetricsparse.go
diff --git a/...ometheus/0.54.1/model/textparse/promlex.l → ...metheus@v0.54.1/model/textparse/promlex.l b/...ometheus/0.54.1/model/textparse/promlex.l → ...metheus@v0.54.1/model/textparse/promlex.l
diff --git a/...theus/0.54.1/model/textparse/promlex.l.go → ...heus@v0.54.1/model/textparse/promlex.l.go b/...theus/0.54.1/model/textparse/promlex.l.go → ...heus@v0.54.1/model/textparse/promlex.l.go
diff --git a/...theus/0.54.1/model/textparse/promparse.go → ...heus@v0.54.1/model/textparse/promparse.go b/...theus/0.54.1/model/textparse/promparse.go → ...heus@v0.54.1/model/textparse/promparse.go
diff --git a/...1/model/textparse/promtestdata.nometa.txt → ...1/model/textparse/promtestdata.nometa.txt b/...1/model/textparse/promtestdata.nometa.txt → ...1/model/textparse/promtestdata.nometa.txt
diff --git a/...s/0.54.1/model/textparse/promtestdata.txt → ...@v0.54.1/model/textparse/promtestdata.txt b/...s/0.54.1/model/textparse/promtestdata.txt → ...@v0.54.1/model/textparse/promtestdata.txt
diff --git a/...s/0.54.1/model/textparse/protobufparse.go → ...@v0.54.1/model/textparse/protobufparse.go b/...s/0.54.1/model/textparse/protobufparse.go → ...@v0.54.1/model/textparse/protobufparse.go
diff --git a/...theus/0.54.1/model/timestamp/timestamp.go → ...heus@v0.54.1/model/timestamp/timestamp.go b/...theus/0.54.1/model/timestamp/timestamp.go → ...heus@v0.54.1/model/timestamp/timestamp.go
diff --git a/...us/prometheus/0.54.1/model/value/value.go → ...s/prometheus@v0.54.1/model/value/value.go b/...us/prometheus/0.54.1/model/value/value.go → ...s/prometheus@v0.54.1/model/value/value.go
diff --git a/...etheus/prometheus/0.54.1/prompb/README.md → ...theus/prometheus@v0.54.1/prompb/README.md b/...etheus/prometheus/0.54.1/prompb/README.md → ...theus/prometheus@v0.54.1/prompb/README.md
diff --git a/...metheus/prometheus/0.54.1/prompb/buf.lock → ...etheus/prometheus@v0.54.1/prompb/buf.lock b/...metheus/prometheus/0.54.1/prompb/buf.lock → ...etheus/prometheus@v0.54.1/prompb/buf.lock
diff --git a/...metheus/prometheus/0.54.1/prompb/buf.yaml → ...etheus/prometheus@v0.54.1/prompb/buf.yaml b/...metheus/prometheus/0.54.1/prompb/buf.yaml → ...etheus/prometheus@v0.54.1/prompb/buf.yaml
diff --git a/...metheus/prometheus/0.54.1/prompb/codec.go → ...etheus/prometheus@v0.54.1/prompb/codec.go b/...metheus/prometheus/0.54.1/prompb/codec.go → ...etheus/prometheus@v0.54.1/prompb/codec.go
diff --git a/...etheus/prometheus/0.54.1/prompb/custom.go → ...theus/prometheus@v0.54.1/prompb/custom.go b/...etheus/prometheus/0.54.1/prompb/custom.go → ...theus/prometheus@v0.54.1/prompb/custom.go
diff --git a/...prompb/io/prometheus/client/metrics.pb.go → ...prompb/io/prometheus/client/metrics.pb.go b/...prompb/io/prometheus/client/metrics.pb.go → ...prompb/io/prometheus/client/metrics.pb.go
diff --git a/...prompb/io/prometheus/client/metrics.proto → ...prompb/io/prometheus/client/metrics.proto b/...prompb/io/prometheus/client/metrics.proto → ...prompb/io/prometheus/client/metrics.proto
diff --git a/...eus/prometheus/0.54.1/prompb/remote.pb.go → ...us/prometheus@v0.54.1/prompb/remote.pb.go b/...eus/prometheus/0.54.1/prompb/remote.pb.go → ...us/prometheus@v0.54.1/prompb/remote.pb.go
diff --git a/...eus/prometheus/0.54.1/prompb/remote.proto → ...us/prometheus@v0.54.1/prompb/remote.proto b/...eus/prometheus/0.54.1/prompb/remote.proto → ...us/prometheus@v0.54.1/prompb/remote.proto
diff --git a/...heus/prometheus/0.54.1/prompb/types.pb.go → ...eus/prometheus@v0.54.1/prompb/types.pb.go b/...heus/prometheus/0.54.1/prompb/types.pb.go → ...eus/prometheus@v0.54.1/prompb/types.pb.go
diff --git a/...heus/prometheus/0.54.1/prompb/types.proto → ...eus/prometheus@v0.54.1/prompb/types.proto b/...heus/prometheus/0.54.1/prompb/types.proto → ...eus/prometheus@v0.54.1/prompb/types.proto
diff --git a/go.mod b/go.mod
@@ -110,7 +110,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.62.0
+	github.com/prometheus/common v0.60.1
 	github.com/prometheus/procfs v0.15.1
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
 	github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e // indirect
@@ -138,7 +138,7 @@ require (
 	google.golang.org/api v0.214.0
 	google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
 	google.golang.org/grpc v1.67.3
-	google.golang.org/protobuf v1.36.4
+	google.golang.org/protobuf v1.35.2
 	gopkg.in/inf.v0 v0.9.1
 	gopkg.in/yaml.v2 v2.4.0
 	gotest.tools/gotestsum v1.7.0
@@ -493,6 +493,5 @@ replace (
 	github.com/google/gopacket => github.com/elastic/gopacket v1.1.20-0.20241002174017-e8c5fda595e6
 	github.com/insomniacslk/dhcp => github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 // indirect
 	github.com/meraki/dashboard-api-go/v3 => github.com/tommyers-elastic/dashboard-api-go/v3 v3.0.0-20240913150833-a945473a8f25
-
-	github.com/prometheus/prometheus/v2 => ./_vendor/github.com/prometheus/prometheus/0.54.1
+	github.com/prometheus/prometheus/v2 => ./_vendor/github.com/prometheus/prometheus@v0.54.1
 )
diff --git a/go.sum b/go.sum
@@ -440,6 +440,8 @@ github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkPro
 github.com/go-faker/faker/v4 v4.2.0 h1:dGebOupKwssrODV51E0zbMrv5e2gO9VWSLNC1WDCpWg=
 github.com/go-faker/faker/v4 v4.2.0/go.mod h1:F/bBy8GH9NxOxMInug5Gx4WYeG6fHJZ8Ol/dhcpRub4=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
+github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A=
 github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -776,6 +778,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc=
 github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
@@ -839,13 +842,15 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
-github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
-github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
+github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/prometheus/prometheus v0.54.1 h1:vKuwQNjnYN2/mDoWfHXDhAsz/68q/dQDb+YbcEqU7MQ=
+github.com/prometheus/prometheus v0.54.1/go.mod h1:xlLByHhk2g3ycakQGrMaU8K7OySZx98BzeCR99991NY=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
@@ -1115,8 +1120,9 @@ go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQD
 go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
 go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
 go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
@@ -1342,8 +1348,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
-google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=