fix: add exe metadata

Author: vjripoll

.github/workflows/component_packages.yml

@@ -38,11 +38,11 @@ jobs:
     runs-on: ubuntu-latest
     name: Build and upload
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'build/embedded/go.mod'
           check-latest: true
@@ -65,19 +65,30 @@ jobs:
           save-cache: false
 
       - name: Install Zig
-        uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
+        uses: mlugg/setup-zig@v2
 
-      - uses: taiki-e/install-action@288875dd3d64326724fa6d9593062d9f8ba0b131 # v2.67.30
+      - uses: taiki-e/install-action@v2
         with:
           tool: cargo-zigbuild@0.20.1
 
       - name: Install Windows cross-compilation dependencies
         run: |
-          sudo apt-get install -y llvm
+          sudo apt-get update && sudo apt-get install -y llvm mingw-w64 nasm
+          sudo ln -sf /usr/bin/llvm-ar /usr/bin/llvm-lib
 
-      - name: Install cargo-xwin
+      - name: Install and Pre-cache cargo-xwin
         run: |
-          cargo install --locked cargo-xwin --force
+          cargo install --locked cargo-xwin
+          
+          rm -rf /home/runner/.cache/cargo-xwin
+          
+          cd /tmp
+          cargo new pre_cache_dummy
+          cd pre_cache_dummy
+          
+          cargo xwin build --target x86_64-pc-windows-msvc
+          
+          cd $GITHUB_WORKSPACE
 
       - name: If pre-release, set tag and verify it matches Cargo.toml version
         if: ${{ inputs.pre-release}}
@@ -101,22 +112,22 @@ jobs:
           echo SKIP_WINDOWS_SIGN="true" >> $GITHUB_ENV
 
       - name: Release packages with GoReleaser
-        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6
+        uses: goreleaser/goreleaser-action@v6
         with:
           args: release ${{ env.SKIP_UPLOAD_RELEASE }} ${{ env.SKIP_SIGN }} --clean --verbose --timeout 2h
         env:
           GITHUB_TOKEN: ${{ secrets.gh_token }}
-          GPG_PRIVATE_KEY_BASE64: ${{ secrets.gpg_private_key_base64 }} # base64 encoded
+          GPG_PRIVATE_KEY_BASE64: ${{ secrets.gpg_private_key_base64 }}
           GPG_PASSPHRASE: ${{ secrets.gpg_passphrase }}
-          PFX_CERTIFICATE_BASE64: ${{ secrets.pfx_certificate_base64 }} # base64 encoded
+          PFX_CERTIFICATE_BASE64: ${{ secrets.pfx_certificate_base64 }}
           PFX_PASSPHRASE: ${{ secrets.pfx_passphrase }}
           GPG_MAIL: 'infrastructure-eng@newrelic.com'
           NR_RELEASE_TAG: ${{ inputs.tag_name }}
           GORELEASER_CURRENT_TAG: ${{ inputs.tag_name }}
           SKIP_WINDOWS_SIGN: ${{ env.SKIP_WINDOWS_SIGN }}
 
       - name: Upload assets to pipeline
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        uses: actions/upload-artifact@v4
         with:
           retention-days: 1
           name: built-binaries-${{ inputs.tag_name }}
@@ -130,10 +141,10 @@ jobs:
     needs: build
     if: ${{ ! inputs.skip_sign }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@v4
 
       - name: Download built binaries
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        uses: actions/download-artifact@v4
         with:
           name: built-binaries-${{ inputs.tag_name }}
           path: ./artifacts
@@ -144,4 +155,4 @@ jobs:
           ./build/scripts/windows-exec-sign/verify-signature.ps1 -Executables @(
             "./artifacts/dist/newrelic-agent-control-windows_x86_64-pc-windows-msvc/newrelic-agent-control.exe",
             "./artifacts/dist/newrelic-agent-control-cli-windows_x86_64-pc-windows-msvc/newrelic-agent-control-cli.exe"
-          )
+          )

.goreleaser.yml

@@ -86,10 +86,10 @@ builds:
     env:
       - AGENT_CONTROL_VERSION={{ .Version }}
     hooks:
-      pre:
-        # Wait for newrelic-agent-control to be ready (parallel executions of cargo-xwin can be problematic)
-        - cmd: sh -c 'while [ ! -f target/x86_64-pc-windows-msvc/release/newrelic-agent-control.exe ]; do echo "Waiting for newrelic-agent-control-windows build to complete..."; sleep 5; done'
-          output: true
+      #      pre:
+      #        # Wait for newrelic-agent-control to be ready (parallel executions of cargo-xwin can be problematic)
+      #        - cmd: sh -c 'while [ ! -f target/x86_64-pc-windows-msvc/release/newrelic-agent-control.exe ]; do echo "Waiting for newrelic-agent-control-windows build to complete..."; sleep 5; done'
+      #          output: true
       post:
         # This step cannot be done inside the 'signs' section because that happens after packaging.
         - cmd: ./build/scripts/windows-exec-sign/sign.sh

Cargo.lock

@@ -3045,6 +3045,12 @@ Distributed under the following license(s):
 
 * MIT
 
+## winres <https://crates.io/crates/winres>
+
+Distributed under the following license(s):
+
+* MIT
+
 ## wit-bindgen <https://crates.io/crates/wit-bindgen>
 
 Distributed under the following license(s):

THIRD_PARTY_NOTICES.md

@@ -118,6 +118,7 @@ tokio-stream = { version = "0.1.18", features = ["net"] }
 
 [build-dependencies]
 glob = "0.3.3"
+winres = "0.1"
 
 [[bin]]
 name = "newrelic-agent-control-k8s"

agent-control/Cargo.toml

@@ -12,10 +12,24 @@ const GENERATED_REGISTRY_FILE: &str = "generated_agent_type_registry.rs";
 
 fn main() {
     generate_agent_type_registry();
-    // setup the env variable for the generated registry path
+
     println!("cargo:rustc-env=GENERATED_REGISTRY_FILE={GENERATED_REGISTRY_FILE}");
-    // re-run only if the registry has changed
-    println!("cargo:rerun-if-changed={REGISTRY_PATH}")
+    println!("cargo:rerun-if-changed={REGISTRY_PATH}");
+
+    let target = env::var("TARGET").unwrap_or_default();
+    let host = env::var("HOST").unwrap_or_default();
+
+    println!("cargo:warning=Build.rs Diagnostic: Host is {}", host);
+    println!("cargo:warning=Build.rs Diagnostic: Target is {}", target);
+
+    println!("cargo:rerun-if-env-changed=AGENT_CONTROL_VERSION");
+
+    if target.contains("windows") {
+        println!("cargo:warning=Build.rs: Target is Windows, applying resources...");
+        set_windows_resources();
+    } else {
+        println!("cargo:warning=Build.rs: Target is NOT Windows. Skipping resources.");
+    }
 }
 
 fn generate_agent_type_registry() {
@@ -42,3 +56,72 @@ fn generate_agent_type_registry() {
     let dest_path = Path::new(&out_dir).join(GENERATED_REGISTRY_FILE);
     fs::write(dest_path, contents).expect("Could not write the filesystem registry file");
 }
+
+fn set_windows_resources() {
+    let original_target = std::env::var("TARGET").unwrap_or_default();
+    let host = std::env::var("HOST").unwrap_or_default();
+
+    let is_msvc_cross = host.contains("linux") && original_target.contains("msvc");
+    if is_msvc_cross {
+        println!("cargo:warning=Aplicando hack de winres: Cambiando TARGET a gnu temporalmente");
+        unsafe {
+            env::set_var("TARGET", "x86_64-pc-windows-gnu");
+        }
+    }
+
+    let mut res = winres::WindowsResource::new();
+
+    if is_msvc_cross {
+        res.set_windres_path("x86_64-w64-mingw32-windres");
+    }
+
+    res.set("FileDescription", "New Relic Agent Control");
+    res.set("ProductName", "New Relic Agent Control");
+    res.set("CompanyName", "New Relic, Inc.");
+    res.set(
+        "LegalCopyright",
+        "© 2026 New Relic, Inc. All rights reserved.",
+    );
+    res.set("OriginalFilename", "newrelic-agent-control.exe");
+
+    if let Ok(version) = env::var("AGENT_CONTROL_VERSION") {
+        let clean_version = version.trim_start_matches('v');
+        let version_semver = format!("{}.0", clean_version);
+
+        if let Ok(u64_version) = parse_version_u64(&version_semver) {
+            res.set_version_info(winres::VersionInfo::PRODUCTVERSION, u64_version);
+            res.set_version_info(winres::VersionInfo::FILEVERSION, u64_version);
+        }
+
+        res.set("ProductVersion", &version);
+        res.set("FileVersion", &version);
+    }
+
+    res.compile()
+        .expect("Failed to compile Windows resources. Is 'mingw-w64' installed?");
+
+    if is_msvc_cross {
+        unsafe {
+            env::set_var("TARGET", &original_target);
+        }
+    }
+}
+
+// Helper to convert string "1.9.1" to u64 (Windows binary format X.X.X.X)
+fn parse_version_u64(v: &str) -> Result<u64, std::num::ParseIntError> {
+    let parts: Result<Vec<u16>, _> = v.split('.').map(|s| s.parse()).collect();
+
+    let parts = parts?;
+
+    // We expect for example "1.9.1".
+    // .first() -> 1 (Major)
+    // .get(1) -> 9 (Minor)
+    // .get(2) -> 1 (Patch)
+    // .get(3) -> None -> defaults to 0 (Build)
+    let major = *parts.first().unwrap_or(&0) as u64;
+    let minor = *parts.get(1).unwrap_or(&0) as u64;
+    let patch = *parts.get(2).unwrap_or(&0) as u64;
+    let build = *parts.get(3).unwrap_or(&0) as u64;
+
+    Ok((major << 48) | (minor << 32) | (patch << 16) | build)
+}