[Core] Fix User-Agent header value issue

sdk/core/core-rest-pipeline/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- Fix invalid format of "User-Agent" header value [Issue #36383](https://github.com/Azure/azure-sdk-for-js/issues/36383)
+
 ### Other Changes
 
 ## 1.22.1 (2025-09-11)

sdk/core/core-rest-pipeline/src/util/userAgentPlatform-browser.mts

@@ -70,28 +70,26 @@ function getBrandVersionString(brands: BrowserBrand[]): BrowserBrand | undefined
  */
 export async function setPlatformSpecificData(map: Map<string, string>): Promise<void> {
   const localNavigator = globalThis.navigator as NavigatorEx;
-  let osPlatform = "unknown";
+  let osInfo = "unknown";
   if (localNavigator?.userAgentData) {
     const entropyValues = await localNavigator.userAgentData.getHighEntropyValues([
       "architecture",
       "platformVersion",
     ]);
-    osPlatform = `${entropyValues.architecture}-${entropyValues.platform}-${entropyValues.platformVersion}`;
+    osInfo = `${entropyValues.platform} ${entropyValues.platformVersion}; ${entropyValues.architecture}`;
 
     // Get the brand and version
     const brand = getBrandVersionString(localNavigator.userAgentData.brands);
     if (brand) {
-      map.set(brand.brand, brand.version);
+      map.set(brand.brand, `${brand.version} (${osInfo})`);
     }
   } else if (localNavigator?.platform) {
-    osPlatform = localNavigator.platform;
+    osInfo = localNavigator.platform;
     const brand = getBrowserInfo(localNavigator.userAgent);
     if (brand) {
-      map.set(brand.brand, brand.version);
+      map.set(brand.brand, `${brand.version} (${osInfo})`);
     }
   } else if (typeof globalThis.EdgeRuntime === "string") {
-    map.set("EdgeRuntime", globalThis.EdgeRuntime);
+    map.set("EdgeRuntime", `${globalThis.EdgeRuntime} (${osInfo})`);
   }
-
-  map.set("OS", osPlatform);
 }

sdk/core/core-rest-pipeline/src/util/userAgentPlatform-react-native.mts

@@ -16,7 +16,6 @@ export function getHeaderName(): string {
 export async function setPlatformSpecificData(map: Map<string, string>): Promise<void> {
   if (Platform.constants?.reactNativeVersion) {
     const { major, minor, patch } = Platform.constants.reactNativeVersion;
-    map.set("react-native", `${major}.${minor}.${patch}`);
+    map.set("react-native", `${major}.${minor}.${patch} (${Platform.OS} ${Platform.Version})`);
   }
-  map.set("OS", `${Platform.OS}-${Platform.Version}`);
 }

sdk/core/core-rest-pipeline/src/util/userAgentPlatform.ts

@@ -24,15 +24,14 @@ export function getHeaderName(): string {
  */
 export async function setPlatformSpecificData(map: Map<string, string>): Promise<void> {
   if (process && process.versions) {
+    const osInfo = `${os.type()} ${os.release()}; ${os.arch()}`;
     const versions = process.versions as ExtendedPlatformVersions;
     if (versions.bun) {
-      map.set("Bun", versions.bun);
+      map.set("Bun", `${versions.bun} (${osInfo})`);
     } else if (versions.deno) {
-      map.set("Deno", versions.deno);
+      map.set("Deno", `${versions.deno} (${osInfo})`);
     } else if (versions.node) {
-      map.set("Node", versions.node);
+      map.set("Node", `${versions.node} (${osInfo})`);
     }
   }
-
-  map.set("OS", `(${os.arch()}-${os.type()}-${os.release()})`);
 }

sdk/core/core-rest-pipeline/test/browser/userAgentPlatform.spec.ts

@@ -5,14 +5,6 @@ import { describe, it, assert } from "vitest";
 import { setPlatformSpecificData } from "../../src/util/userAgentPlatform.js";
 
 describe("userAgentPlatform", () => {
-  it("should set OS", async () => {
-    const map = new Map<string, string>();
-
-    await setPlatformSpecificData(map);
-
-    assert.ok(map.has("OS"));
-  });
-
   it("should set the Browser Type", async () => {
     const map = new Map<string, string>();
 

sdk/core/core-rest-pipeline/test/node/userAgentPlatform.spec.ts

@@ -26,7 +26,6 @@ describe("userAgentPlatform", () => {
 
     await setPlatformSpecificData(map);
 
-    assert.ok(map.has("OS"));
     assert.notOk(map.has("Node"));
     assert.notOk(map.has("Deno"));
     assert.notOk(map.has("Bun"));
@@ -38,9 +37,8 @@ describe("userAgentPlatform", () => {
 
     await setPlatformSpecificData(map);
 
-    assert.ok(map.has("OS"));
     assert.ok(map.has("Bun"));
-    assert.equal(map.get("Bun"), "1.0.0");
+    assert.ok(map.get("Bun")?.startsWith("1.0.0 ("));
     assert.notOk(map.has("Node"));
     assert.notOk(map.has("Deno"));
   });
@@ -51,9 +49,8 @@ describe("userAgentPlatform", () => {
 
     await setPlatformSpecificData(map);
 
-    assert.ok(map.has("OS"));
     assert.ok(map.has("Deno"));
-    assert.equal(map.get("Deno"), "2.0.0");
+    assert.ok(map.get("Deno")?.startsWith("2.0.0 ("));
     assert.notOk(map.has("Node"));
     assert.notOk(map.has("Bun"));
   });
@@ -64,9 +61,8 @@ describe("userAgentPlatform", () => {
 
     await setPlatformSpecificData(map);
 
-    assert.ok(map.has("OS"));
     assert.ok(map.has("Node"));
-    assert.equal(map.get("Node"), "20.0.0");
+    assert.ok(map.get("Node")?.startsWith("20.0.0 ("));
     assert.notOk(map.has("Deno"));
     assert.notOk(map.has("Bun"));
   });

sdk/core/ts-http-runtime/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- Fix invalid format of "User-Agent" header value [Issue #36383](https://github.com/Azure/azure-sdk-for-js/issues/36383)
+
 ### Other Changes
 
 ## 0.3.1 (2025-09-11)

sdk/core/ts-http-runtime/src/util/userAgentPlatform-browser.mts

@@ -70,28 +70,26 @@ function getBrandVersionString(brands: BrowserBrand[]): BrowserBrand | undefined
  */
 export async function setPlatformSpecificData(map: Map<string, string>): Promise<void> {
   const localNavigator = globalThis.navigator as NavigatorEx;
-  let osPlatform = "unknown";
+  let osInfo = "unknown";
   if (localNavigator?.userAgentData) {
     const entropyValues = await localNavigator.userAgentData.getHighEntropyValues([
       "architecture",
       "platformVersion",
     ]);
-    osPlatform = `${entropyValues.architecture}-${entropyValues.platform}-${entropyValues.platformVersion}`;
+    osInfo = `${entropyValues.platform} ${entropyValues.platformVersion}; ${entropyValues.architecture}`;
 
     // Get the brand and version
     const brand = getBrandVersionString(localNavigator.userAgentData.brands);
     if (brand) {
-      map.set(brand.brand, brand.version);
+      map.set(brand.brand, `${brand.version} (${osInfo})`);
     }
   } else if (localNavigator?.platform) {
-    osPlatform = localNavigator.platform;
+    osInfo = localNavigator.platform;
     const brand = getBrowserInfo(localNavigator.userAgent);
     if (brand) {
-      map.set(brand.brand, brand.version);
+      map.set(brand.brand, `${brand.version} (${osInfo})`);
     }
   } else if (typeof globalThis.EdgeRuntime === "string") {
-    map.set("EdgeRuntime", globalThis.EdgeRuntime);
+    map.set("EdgeRuntime", `${globalThis.EdgeRuntime} (${osInfo})`);
   }
-
-  map.set("OS", osPlatform);
 }

sdk/core/ts-http-runtime/src/util/userAgentPlatform-react-native.mts

@@ -16,7 +16,6 @@ export function getHeaderName(): string {
 export async function setPlatformSpecificData(map: Map<string, string>): Promise<void> {
   if (Platform.constants?.reactNativeVersion) {
     const { major, minor, patch } = Platform.constants.reactNativeVersion;
-    map.set("react-native", `${major}.${minor}.${patch}`);
+    map.set("react-native", `${major}.${minor}.${patch} (${Platform.OS} ${Platform.Version})`);
   }
-  map.set("OS", `${Platform.OS}-${Platform.Version}`);
 }

sdk/core/ts-http-runtime/src/util/userAgentPlatform.ts

@@ -24,15 +24,14 @@ export function getHeaderName(): string {
  */
 export async function setPlatformSpecificData(map: Map<string, string>): Promise<void> {
   if (process && process.versions) {
+    const osInfo = `${os.type()} ${os.release()}; ${os.arch()}`;
     const versions = process.versions as ExtendedPlatformVersions;
     if (versions.bun) {
-      map.set("Bun", versions.bun);
+      map.set("Bun", `${versions.bun} (${osInfo})`);
     } else if (versions.deno) {
-      map.set("Deno", versions.deno);
+      map.set("Deno", `${versions.deno} (${osInfo})`);
     } else if (versions.node) {
-      map.set("Node", versions.node);
+      map.set("Node", `${versions.node} (${osInfo})`);
     }
   }
-
-  map.set("OS", `(${os.arch()}-${os.type()}-${os.release()})`);
 }

sdk/core/ts-http-runtime/test/browser/userAgentPlatform.spec.ts

@@ -5,14 +5,6 @@ import { describe, it, assert } from "vitest";
 import { setPlatformSpecificData } from "../../src/util/userAgentPlatform.js";
 
 describe("userAgentPlatform", () => {
-  it("should set OS", async () => {
-    const map = new Map<string, string>();
-
-    await setPlatformSpecificData(map);
-
-    assert.ok(map.has("OS"));
-  });
-
   it("should set the Browser Type", async () => {
     const map = new Map<string, string>();
 

sdk/core/ts-http-runtime/test/node/userAgentPlatform.spec.ts

@@ -26,7 +26,6 @@ describe("userAgentPlatform", () => {
 
     await setPlatformSpecificData(map);
 
-    assert.ok(map.has("OS"));
     assert.notOk(map.has("Node"));
     assert.notOk(map.has("Deno"));
     assert.notOk(map.has("Bun"));
@@ -38,9 +37,8 @@ describe("userAgentPlatform", () => {
 
     await setPlatformSpecificData(map);
 
-    assert.ok(map.has("OS"));
     assert.ok(map.has("Bun"));
-    assert.equal(map.get("Bun"), "1.0.0");
+    assert.ok(map.get("Bun")?.startsWith("1.0.0 ("));
     assert.notOk(map.has("Node"));
     assert.notOk(map.has("Deno"));
   });
@@ -51,9 +49,8 @@ describe("userAgentPlatform", () => {
 
     await setPlatformSpecificData(map);
 
-    assert.ok(map.has("OS"));
     assert.ok(map.has("Deno"));
-    assert.equal(map.get("Deno"), "2.0.0");
+    assert.ok(map.get("Deno")?.startsWith("2.0.0 ("));
     assert.notOk(map.has("Node"));
     assert.notOk(map.has("Bun"));
   });
@@ -64,9 +61,8 @@ describe("userAgentPlatform", () => {
 
     await setPlatformSpecificData(map);
 
-    assert.ok(map.has("OS"));
     assert.ok(map.has("Node"));
-    assert.equal(map.get("Node"), "20.0.0");
+    assert.ok(map.get("Node")?.startsWith("20.0.0 ("));
     assert.notOk(map.has("Deno"));
     assert.notOk(map.has("Bun"));
   });

sdk/servicebus/service-bus/src/util/runtimeInfo-react-native.mts

@@ -1,9 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-/*
- * NOTE: When moving this file, please update "react-native" section in package.json.
- */
 const { Platform } = require("react-native"); // eslint-disable-line @typescript-eslint/no-require-imports
 
 /**
@@ -13,15 +10,5 @@ const { Platform } = require("react-native"); // eslint-disable-line @typescript
  */
 export function getRuntimeInfo(): string {
   const { major, minor, patch } = Platform.constants.reactNativeVersion;
-  const runtimeInfo = {
-    key: "react-native",
-    value: `${major}.${minor}.${patch}`,
-  };
-
-  const osInfo = {
-    key: "OS",
-    value: `${Platform.OS}-${Platform.Version}`,
-  };
-
-  return `${runtimeInfo.key}/${runtimeInfo.value} ${osInfo.key}/${osInfo.value}`;
+  return `react-native/${major}.${minor}.${patch} (${Platform.OS} ${Platform.Version})`;
 }

sdk/servicebus/service-bus/src/util/runtimeInfo.ts

@@ -3,21 +3,31 @@
 
 import os from "node:os";
 
+/**
+ * @internal
+ */
+interface ExtendedPlatformVersions extends NodeJS.ProcessVersions {
+  bun?: string;
+  deno?: string;
+}
+
 /**
  * Returns information about the platform this function is being run on.
  * @hidden
  * @internal
  */
 export function getRuntimeInfo(): string {
-  const runtimeInfo = {
-    key: "Node",
-    value: process.version,
-  };
-
-  const osInfo = {
-    key: "OS",
-    value: `(${os.arch()}-${os.type()}-${os.release()})`,
-  };
+  if (process && process.versions) {
+    const osInfo = `${os.type()} ${os.release()}; ${os.arch()}`;
+    const versions = process.versions as ExtendedPlatformVersions;
+    if (versions.bun) {
+      return `Bun/${process.version} (${osInfo})`;
+    } else if (versions.deno) {
+      return `Deno/${process.version} (${osInfo})`;
+    } else if (versions.node) {
+      return `Node/${process.version} (${osInfo})`;
+    }
+  }
 
-  return `${runtimeInfo.key}/${runtimeInfo.value} ${osInfo.key}/${osInfo.value}`;
+  return "";
 }