From a11212e83a1ff4559e08525e65374eb04a98213b Mon Sep 17 00:00:00 2001 From: Florian Veaux <florian.veaux@datadoghq.com> Date: Tue, 2 Jul 2024 10:14:03 +0200 Subject: [PATCH 1/5] NDM: Upgrade pro-bing to fix a windows only bug --- go.mod | 6 ++++++ go.sum | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 39a854ab930f1..ffef6fffbfca3 100644 --- a/go.mod +++ b/go.mod @@ -718,6 +718,12 @@ require ( k8s.io/kubectl v0.29.0 ) +replace ( + // NDM: Temporary fork until pro-bing merges the PR + github.com/prometheus-community/pro-bing => github.com/ken-schneider/pro-bing v0.0.0-20240702002736-76fe9e144a90 +) + + require ( bitbucket.org/atlassian/go-asap/v2 v2.8.0 // indirect cloud.google.com/go/auth v0.5.1 // indirect diff --git a/go.sum b/go.sum index e4e8a69fcaee3..2452628bf0153 100644 --- a/go.sum +++ b/go.sum @@ -2116,6 +2116,8 @@ github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwS github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= +github.com/ken-schneider/pro-bing v0.0.0-20240702002736-76fe9e144a90 h1:5BKXndS8e7bpJGGNtDXyYU3p8S/2jaB/T3Gc5BmRchk= +github.com/ken-schneider/pro-bing v0.0.0-20240702002736-76fe9e144a90/go.mod h1:2S6OC9H+JSEDb2st9eFlPDH74LNsvoLssXwGSjJI2fc= github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o= github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= @@ -2986,8 +2988,6 @@ github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8 github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus-community/pro-bing v0.3.0 h1:SFT6gHqXwbItEDJhTkzPWVqU6CLEtqEfNAPp47RUON4= -github.com/prometheus-community/pro-bing v0.3.0/go.mod h1:p9dLb9zdmv+eLxWfCT6jESWuDrS+YzpPkQBgysQF8a0= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= From 3919931d13015e2224440cfbb74d9b709356bf60 Mon Sep 17 00:00:00 2001 From: Florian Veaux <florian.veaux@datadoghq.com> Date: Tue, 2 Jul 2024 10:40:29 +0200 Subject: [PATCH 2/5] tidy --- go.mod | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index ffef6fffbfca3..4cd2c02388a0a 100644 --- a/go.mod +++ b/go.mod @@ -718,11 +718,8 @@ require ( k8s.io/kubectl v0.29.0 ) -replace ( - // NDM: Temporary fork until pro-bing merges the PR - github.com/prometheus-community/pro-bing => github.com/ken-schneider/pro-bing v0.0.0-20240702002736-76fe9e144a90 -) - +// NDM: Temporary fork until pro-bing merges the PR +replace github.com/prometheus-community/pro-bing => github.com/ken-schneider/pro-bing v0.0.0-20240702002736-76fe9e144a90 require ( bitbucket.org/atlassian/go-asap/v2 v2.8.0 // indirect From e47ccbe0318f420e46532613dabd30d7445f7fb7 Mon Sep 17 00:00:00 2001 From: Florian Veaux <florian.veaux@datadoghq.com> Date: Tue, 2 Jul 2024 10:42:20 +0200 Subject: [PATCH 3/5] reno --- .../NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 releasenotes/notes/NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml diff --git a/releasenotes/notes/NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml b/releasenotes/notes/NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml new file mode 100644 index 0000000000000..9fd2d71d5630f --- /dev/null +++ b/releasenotes/notes/NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml @@ -0,0 +1,11 @@ +# Each section from every release note are combined when the +# CHANGELOG.rst is rendered. So the text needs to be worded so that +# it does not depend on any information only available in another +# section. This may mean repeating some details, but each section +# must be readable independently of the other. +# +# Each section note must be formatted as reStructuredText. +--- +fixes: + - | + Upgrades the pro-bing library to fix a windows-only bug with too-long ICMP packets being received From c6a4d36d073ec0da45a6cef8025ac560d5d61bff Mon Sep 17 00:00:00 2001 From: Ken Schneider <ken.schneider@datadoghq.com> Date: Wed, 3 Jul 2024 09:49:12 -0400 Subject: [PATCH 4/5] update pro-bing dependency --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4cd2c02388a0a..ec29ac8a0fae6 100644 --- a/go.mod +++ b/go.mod @@ -719,7 +719,7 @@ require ( ) // NDM: Temporary fork until pro-bing merges the PR -replace github.com/prometheus-community/pro-bing => github.com/ken-schneider/pro-bing v0.0.0-20240702002736-76fe9e144a90 +replace github.com/prometheus-community/pro-bing => github.com/ken-schneider/pro-bing v0.0.0-20240702202240-4cb73c5b2d22 require ( bitbucket.org/atlassian/go-asap/v2 v2.8.0 // indirect diff --git a/go.sum b/go.sum index 2452628bf0153..a23bbcc803799 100644 --- a/go.sum +++ b/go.sum @@ -2116,8 +2116,8 @@ github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwS github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -github.com/ken-schneider/pro-bing v0.0.0-20240702002736-76fe9e144a90 h1:5BKXndS8e7bpJGGNtDXyYU3p8S/2jaB/T3Gc5BmRchk= -github.com/ken-schneider/pro-bing v0.0.0-20240702002736-76fe9e144a90/go.mod h1:2S6OC9H+JSEDb2st9eFlPDH74LNsvoLssXwGSjJI2fc= +github.com/ken-schneider/pro-bing v0.0.0-20240702202240-4cb73c5b2d22 h1:DgkktDAnqyoAPf8Xnzs73Bia3VuZiUrgwI8l9eaMoa4= +github.com/ken-schneider/pro-bing v0.0.0-20240702202240-4cb73c5b2d22/go.mod h1:2S6OC9H+JSEDb2st9eFlPDH74LNsvoLssXwGSjJI2fc= github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o= github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= From 3e3c1e4f6f5d81c1c2d2f9623117a64a325f033b Mon Sep 17 00:00:00 2001 From: Ken Schneider <103530259+ken-schneider@users.noreply.github.com> Date: Wed, 3 Jul 2024 09:50:03 -0400 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: Heston Hoffman <hestonhoffman@gmail.com> --- releasenotes/notes/NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes/notes/NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml b/releasenotes/notes/NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml index 9fd2d71d5630f..3bd59c1d225b0 100644 --- a/releasenotes/notes/NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml +++ b/releasenotes/notes/NDM---Upgrade-pro-bing-9ba8f128c58f93be.yaml @@ -8,4 +8,4 @@ --- fixes: - | - Upgrades the pro-bing library to fix a windows-only bug with too-long ICMP packets being received + Upgrades the pro-bing library to fix a Windows-only bug with too-long ICMP packets being received