directly generate cws_instrumentatio binary with the expected name

DataDog · Feb 5, 2025 · ec8a0c4 · ec8a0c4
1 parent 062c3ca
commit ec8a0c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitlab/binary_build/cws_instrumentation.yml b/.gitlab/binary_build/cws_instrumentation.yml
@@ -4,8 +4,7 @@
   needs: ["go_mod_tidy_check"]
   script:
     - inv check-go-version
-    - inv -e cws-instrumentation.build
-    - mv $CI_PROJECT_DIR/$CWS_INSTRUMENTATION_BINARIES_DIR/cws-instrumentation $CI_PROJECT_DIR/$CWS_INSTRUMENTATION_BINARIES_DIR/cws-instrumentation.$ARCH
+    - inv -e cws-instrumentation.build --arch-suffix
   artifacts:
     paths:
       - $CWS_INSTRUMENTATION_BINARIES_DIR/cws-instrumentation.$ARCH

diff --git a/tasks/cws_instrumentation.py b/tasks/cws_instrumentation.py
@@ -34,6 +34,7 @@ def build(
     static=False,
     fips_mode=False,
     no_strip_binary=False,
+    arch_suffix=False,
 ):
     """
     Build cws-instrumentation
@@ -60,6 +61,9 @@ def build(
     build_type = "-a" if rebuild else ""
     go_build_tags = " ".join(build_tags)
     agent_bin = BIN_PATH
+    if arch_suffix:
+        arch = CONTAINER_PLATFORM_MAPPING.get(platform.machine().lower())
+        agent_bin = f'{agent_bin}.{arch}'
 
     strip_flags = "" if no_strip_binary else "-s -w"