discovery: update CGO bindings for static libdd_discovery

- Rename build tag dd_discovery_cgo -> dd_discovery_rust
- Link against static library (add -lpthread -ldl -lm linker flags)
- Remove libdd_discovery.so copy step from omnibus (no longer needed)
- Add --config=release to bazelisk build command
- Fix test build tags to avoid duplicate definitions with !dd_discovery_rust

Author: martavicentenavarro

omnibus/config/software/datadog-agent.rb

@@ -188,10 +188,6 @@
       copy 'bin/system-probe/system-probe.exe', "#{install_dir}/bin/agent"
     else
       copy "bin/system-probe/system-probe", "#{install_dir}/embedded/bin"
-      if linux_target?
-        mkdir "#{install_dir}/embedded/lib"
-        copy 'pkg/discovery/module/rust/libdd_discovery.so', "#{install_dir}/embedded/lib"
-      end
     end
 
     # Add SELinux policy for system-probe

pkg/discovery/module/impl_linux.go

@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2024-present Datadog, Inc.
 
-//go:build !dd_discovery_cgo
+//go:build !dd_discovery_rust
 
 package module
 

pkg/discovery/module/impl_linux_test.go

@@ -5,7 +5,7 @@
 
 // This doesn't need BPF, but it's built with this tag to only run with
 // system-probe tests.
-//go:build test && linux_bpf && !dd_discovery_cgo
+//go:build test && linux_bpf && !dd_discovery_rust
 
 package module
 
@@ -309,7 +309,6 @@ func newDiscovery() *discovery {
 	return mod.(*discovery)
 }
 
-
 // addSockets adds only listening sockets to a map to be used for later looksups.
 func addSockets[P procfs.NetTCP | procfs.NetUDP](sockMap map[uint64]socketInfo, sockets P,
 	family network.ConnectionFamily, ctype network.ConnectionType, state uint64,
@@ -402,6 +401,21 @@ func BenchmarkGetNSInfoOld(b *testing.B) {
 	}
 }
 
+func createTracerMemfd(t *testing.T, data []byte) int {
+	t.Helper()
+	fd, err := unix.MemfdCreate("datadog-tracer-info-xxx", 0)
+	require.NoError(t, err)
+	t.Cleanup(func() { unix.Close(fd) })
+	err = unix.Ftruncate(fd, int64(len(data)))
+	require.NoError(t, err)
+	mappedData, err := unix.Mmap(fd, 0, len(data), unix.PROT_READ|unix.PROT_WRITE, unix.MAP_SHARED)
+	require.NoError(t, err)
+	copy(mappedData, data)
+	err = unix.Munmap(mappedData)
+	require.NoError(t, err)
+	return fd
+}
+
 func TestValidInvalidTracerMetadata(t *testing.T) {
 	discovery := newDiscovery()
 	require.NotEmpty(t, discovery)

pkg/discovery/module/impl_services_cgo_linux.go

@@ -5,7 +5,7 @@
 
 // CGO-backed getServices implementation using the Rust libdd_discovery static library.
 
-//go:build dd_discovery_cgo
+//go:build dd_discovery_rust
 
 package module
 
@@ -22,7 +22,6 @@ import (
 
 	"github.com/DataDog/datadog-agent/pkg/discovery/core"
 	"github.com/DataDog/datadog-agent/pkg/discovery/model"
-	"github.com/DataDog/datadog-agent/pkg/discovery/servicetype"
 	"github.com/DataDog/datadog-agent/pkg/discovery/tracermetadata"
 	"github.com/DataDog/datadog-agent/pkg/system-probe/api/module"
 	sysconfigtypes "github.com/DataDog/datadog-agent/pkg/system-probe/config/types"
@@ -111,9 +110,6 @@ func (s *discovery) convertNativeResult(result *C.struct_dd_discovery_result, hb
 			if !isHeartbeat && s.shouldIgnoreComm(int32(svc.PID)) {
 				continue
 			}
-			if !isHeartbeat {
-				svc.Type = string(servicetype.Detect(svc.TCPPorts, svc.UDPPorts))
-			}
 			response.Services = append(response.Services, svc)
 		}
 	}

pkg/discovery/module/impl_services_cgo_linux_test.go

@@ -5,7 +5,7 @@
 
 // This doesn't need BPF, but it's built with this tag to only run with
 // system-probe tests.
-//go:build test && linux_bpf && dd_discovery_cgo
+//go:build test && linux_bpf && dd_discovery_rust
 
 package module
 

pkg/discovery/module/impl_services_test.go

@@ -5,7 +5,7 @@
 
 // This doesn't need BPF, but it's built with this tag to only run with
 // system-probe tests.
-//go:build test && linux_bpf && !dd_discovery_cgo
+//go:build test && linux_bpf && !dd_discovery_rust
 
 package module
 
@@ -51,7 +51,6 @@ func getServices(t require.TestingT, discovery *testDiscoveryModule) *model.Serv
 	return makeRequest[model.ServicesResponse](t, discovery.client, location, params)
 }
 
-
 // Check that we get (only) listening processes for all expected protocols using the services endpoint.
 func (s *discoveryTestSuite) TestServicesBasic() {
 	t := s.T()

pkg/discovery/module/impl_test_helpers_linux_test.go

@@ -5,7 +5,7 @@
 
 // This doesn't need BPF, but it's built with this tag to only run with
 // system-probe tests.
-//go:build test && linux_bpf && dd_discovery_cgo
+//go:build test && linux_bpf && dd_discovery_rust
 
 package module
 
@@ -25,7 +25,6 @@ import (
 	gorillamux "github.com/gorilla/mux"
 	"github.com/shirou/gopsutil/v4/process"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/sys/unix"
 
 	"github.com/DataDog/datadog-agent/pkg/discovery/core"
 	"github.com/DataDog/datadog-agent/pkg/discovery/model"
@@ -224,18 +223,3 @@ func startProcessWithFile(t *testing.T, f *os.File) *exec.Cmd {
 
 	return cmd
 }
-
-func createTracerMemfd(t *testing.T, data []byte) int {
-	t.Helper()
-	fd, err := unix.MemfdCreate("datadog-tracer-info-xxx", 0)
-	require.NoError(t, err)
-	t.Cleanup(func() { unix.Close(fd) })
-	err = unix.Ftruncate(fd, int64(len(data)))
-	require.NoError(t, err)
-	mappedData, err := unix.Mmap(fd, 0, len(data), unix.PROT_READ|unix.PROT_WRITE, unix.MAP_SHARED)
-	require.NoError(t, err)
-	copy(mappedData, data)
-	err = unix.Munmap(mappedData)
-	require.NoError(t, err)
-	return fd
-}

tasks/build_tags.py

@@ -41,6 +41,7 @@
     "crio",
     # Opt out of the ASM build requirements of dd-trace-go
     "datadog.no_waf",
+    "dd_discovery_rust",  # used to enable the Rust-backed libdd_discovery implementation in system-probe
     "docker",
     "ec2",
     "etcd",
@@ -78,7 +79,6 @@
     "zstd",
     "cel",
     "cws_instrumentation_injector_only",  # used for building cws-instrumentation with only the injector code
-    "dd_discovery_cgo",  # used to enable the CGO-backed libdd_discovery implementation in system-probe
 }.union(COMMON_TAGS)
 
 ### Tag inclusion lists

tasks/system_probe.py

@@ -842,7 +842,7 @@ def build_sysprobe_binary(
 
     if not is_windows and not is_macos and not static:
         build_rust_cgo_libs(ctx, arch=arch_obj)
-        build_tags.append("dd_discovery_cgo")
+        build_tags.append("dd_discovery_rust")
 
     if os.path.exists(binary):
         os.remove(binary)
@@ -1660,7 +1660,9 @@ def build_rust_cgo_libs(ctx: Context, arch: Arch):
         platform_flag = f"--platforms={platform_map[arch.kmt_arch]}"
 
     for source_path in RUST_BINARIES:
-        ctx.run(f"bazelisk run {platform_flag} -- @//{source_path}:install_cgo_libs --destdir={Path(source_path)}")
+        ctx.run(
+            f"bazelisk run --config=release {platform_flag} -- @//{source_path}:install_cgo_libs --destdir={Path(source_path)}"
+        )
 
 
 def build_cws_object_files(