From 0eb72f0c65cb25a1a311f7d4576449be39dd052c Mon Sep 17 00:00:00 2001 From: Khushi Jain Date: Tue, 12 Aug 2025 12:02:32 +0530 Subject: [PATCH] Match prometheus version with upstream prometheusreceivers' (#45886) (cherry picked from commit 2e0b894269e8726a59eabd6092bcd979ff639f4b) # Conflicts: # NOTICE.txt # go.mod # go.sum --- NOTICE.txt | 8 ++++++++ go.mod | 4 ++++ go.sum | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/NOTICE.txt b/NOTICE.txt index a862e4fbee37..3d9038a31694 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -22387,11 +22387,19 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.16 -------------------------------------------------------------------------------- Dependency : github.com/prometheus/prometheus +<<<<<<< HEAD Version: v0.304.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/prometheus/prometheus@v0.304.1/LICENSE: +======= +Version: v0.304.3-0.20250703114031-419d436a447a +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/prometheus/prometheus@v0.304.3-0.20250703114031-419d436a447a/LICENSE: +>>>>>>> 2e0b89426 (Match prometheus version with upstream prometheusreceivers' (#45886)) Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 7000014b9246..705242d41a68 100644 --- a/go.mod +++ b/go.mod @@ -207,7 +207,11 @@ require ( github.com/otiai10/copy v1.12.0 github.com/pierrec/lz4/v4 v4.1.22 github.com/pkg/xattr v0.4.9 +<<<<<<< HEAD github.com/prometheus/prometheus v0.304.1 +======= + github.com/prometheus/prometheus v0.304.3-0.20250703114031-419d436a447a +>>>>>>> 2e0b89426 (Match prometheus version with upstream prometheusreceivers' (#45886)) github.com/shirou/gopsutil/v4 v4.25.6 github.com/teambition/rrule-go v1.8.2 github.com/tklauser/go-sysconf v0.3.12 diff --git a/go.sum b/go.sum index f6f91c606fbe..3a6db5509a6f 100644 --- a/go.sum +++ b/go.sum @@ -897,10 +897,17 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= +<<<<<<< HEAD github.com/prometheus/prometheus v0.304.1 h1:e4kpJMb2Vh/PcR6LInake+ofcvFYHT+bCfmBvOkaZbY= github.com/prometheus/prometheus v0.304.1/go.mod h1:ioGx2SGKTY+fLnJSQCdTHqARVldGNS8OlIe3kvp98so= github.com/prometheus/sigv4 v0.1.2 h1:R7570f8AoM5YnTUPFm3mjZH5q2k4D+I/phCWvZ4PXG8= github.com/prometheus/sigv4 v0.1.2/go.mod h1:GF9fwrvLgkQwDdQ5BXeV9XUSCH/IPNqzvAoaohfjqMU= +======= +github.com/prometheus/prometheus v0.304.3-0.20250703114031-419d436a447a h1:g/nRTrO18wB/VeyJfU2DMAbwWh7Pt/wJ/FcbDlMZb+A= +github.com/prometheus/prometheus v0.304.3-0.20250703114031-419d436a447a/go.mod h1:L4c564sBwcHLfk60S2IRO2QjLKxPCdy/vxT9tw/T2Jk= +github.com/prometheus/sigv4 v0.2.0 h1:qDFKnHYFswJxdzGeRP63c4HlH3Vbn1Yf/Ao2zabtVXk= +github.com/prometheus/sigv4 v0.2.0/go.mod h1:D04rqmAaPPEUkjRQxGqjoxdyJuyCh6E0M18fZr0zBiE= +>>>>>>> 2e0b89426 (Match prometheus version with upstream prometheusreceivers' (#45886)) 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/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=