From d97d9f69941e22b4856afc17bbd71b54d1c1cd50 Mon Sep 17 00:00:00 2001
From: Pranshu Srivastava <rexagod@gmail.com>
Date: Tue, 11 Feb 2025 17:43:06 +0530
Subject: [PATCH] fix: Use go123 for NetBSD

Use go123 for NetBSD from upstream release channel rather than the
package manager as that doesn't exist.
* https://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/x86_64/10.0_2024Q4/All/

Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
---
 .github/workflows/bsd.yml                  | 12 +++++++-----
 collector/fixtures/e2e-64k-page-output.txt |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml
index 1156a3b4..09aa1b5c 100644
--- a/.github/workflows/bsd.yml
+++ b/.github/workflows/bsd.yml
@@ -15,7 +15,7 @@ env:
   GNU_TAR_VERSION: "1.35"
   GO_VERSION_DRAGONFLY: "1.23.3"
   GO_VERSION_FREEBSD: "123"
-  GO_VERSION_NETBSD: "123"
+  GO_VERSION_NETBSD: "1.23.3"
   GO_VERSION_OPENBSD: "1.23.1"
   GO_VERSION_SOLARIS: "1.23.3"
 
@@ -131,7 +131,6 @@ jobs:
             /usr/sbin/pkg_add \
               git \
               gmake \
-              go${GO_VERSION_NETBSD} \
               grep \
               gsed \
               gtar-base-${GNU_TAR_VERSION}\
@@ -141,7 +140,10 @@ jobs:
             echo "::group::Setup prerequisites"
             set -eu
             mkdir bin
-            ln -s $(which go${GO_VERSION_NETBSD}) $(pwd)/bin/go
+            GOGZ="go${GO_VERSION_NETBSD}.netbsd-amd64.tar.gz"
+            wget https://go.dev/dl/${GOGZ}
+            gtar xzf ${GOGZ}
+            ln -s $(pwd)/go/bin/go $(pwd)/bin/go
             ln -s $(which ggrep) $(pwd)/bin/grep
             ln -s $(which gmake) $(pwd)/bin/make
             ln -s $(which gsed) $(pwd)/bin/sed
@@ -187,7 +189,6 @@ jobs:
             echo "::group::Setup prerequisites"
             set -eu
             mkdir bin
-            export PATH=$(pwd)/bin:$PATH
             GOGZ="go${GO_VERSION_DRAGONFLY}.dragonfly-amd64.tar.gz"
             wget https://go.dev/dl/${GOGZ}
             gtar xzf ${GOGZ}
@@ -197,6 +198,7 @@ jobs:
             ln -s $(which gsed) $(pwd)/bin/sed
             ln -s $(which gtar) $(pwd)/bin/tar
             ln -s $(which python3) $(pwd)/bin/python
+            export PATH=$(pwd)/bin:$PATH
             echo "::endgroup::"
 
             echo "::group::Print environment information"
@@ -237,7 +239,6 @@ jobs:
             echo "::group::Setup prerequisites"
             set -eu
             mkdir bin
-            export PATH=$(pwd)/bin:$PATH
             GOGZ="go${GO_VERSION_SOLARIS}.solaris-amd64.tar.gz"
             wget https://go.dev/dl/${GOGZ}
             gtar xzf ${GOGZ}
@@ -246,6 +247,7 @@ jobs:
             ln -s $(which gmake) $(pwd)/bin/make
             ln -s $(which gsed) $(pwd)/bin/sed
             ln -s $(which gtar) $(pwd)/bin/tar
+            export PATH=$(pwd)/bin:$PATH
             
             echo ">> building promu as it is not shipped for Solaris"
             git clone https://github.com/prometheus/promu.git
diff --git a/collector/fixtures/e2e-64k-page-output.txt b/collector/fixtures/e2e-64k-page-output.txt
index 6f42f4e0..030fa88e 100644
--- a/collector/fixtures/e2e-64k-page-output.txt
+++ b/collector/fixtures/e2e-64k-page-output.txt
@@ -2484,6 +2484,8 @@ node_network_net_dev_group{device="eth0"} 0
 # TYPE node_network_protocol_type gauge
 node_network_protocol_type{device="bond0"} 1
 node_network_protocol_type{device="eth0"} 1
+# HELP node_network_receive_bytes_total Network device statistic receive_bytes.
+# TYPE node_network_receive_bytes_total counter
 # HELP node_network_receive_compressed_total Network device statistic receive_compressed.
 # TYPE node_network_receive_compressed_total counter
 node_network_receive_compressed_total{device="lo"} 0