Update JSON parse error matcher

Looks like this text changed?

CHANGELOG.md

@@ -22,14 +22,33 @@ Code v99.99.999
 
 ## Unreleased
 
+## [4.90.2](https://github.com/coder/code-server/releases/tag/v4.90.2) - 2024-06-14
+
+Code v1.90.1
+
+### Changed
+
+- Updated to Code 1.90.1.
+
+## [4.90.1](https://github.com/coder/code-server/releases/tag/v4.90.1) - 2024-06-12
+
 Code v1.90.0
 
-## Changed
+### Fixed
+
+- Cache a call to get CPU information used in telemetry that could result in a
+  lack responsiveness if it was particularly slow.
+
+## [4.90.0](https://github.com/coder/code-server/releases/tag/v4.90.0) - 2024-06-11
+
+Code v1.90.0
+
+### Changed
 
 - Updated to Code 1.90.0.
 - Updated Node to 20.11.1.
 
-## Added
+### Added
 
 - Send contents to the clipboard in the integrated terminal by piping to
   `code-server --stdin-to-clipboard` or `code-server -c`.
@@ -45,7 +64,7 @@ Code v1.90.0
 
 Code v1.89.1
 
-## Changed
+### Changed
 
 - Updated to Code 1.89.1.
 
@@ -53,7 +72,7 @@ Code v1.89.1
 
 Code v1.89.0
 
-## Changed
+### Changed
 
 - Updated to Code 1.89.0.
 
@@ -61,7 +80,7 @@ Code v1.89.0
 
 Code v1.88.1
 
-## Changed
+### Changed
 
 - Updated to Code 1.88.1.
 
@@ -69,12 +88,12 @@ Code v1.88.1
 
 Code v1.88.0
 
-## Changed
+### Changed
 
 - Updated to Code 1.88.0.
 - Updated Node to 18.18.2.
 
-## Fixed
+### Fixed
 
 - Fix masking the exit code when failing to install extensions on the command
   line outside the integrated terminal. Installing extensions inside the
@@ -84,7 +103,7 @@ Code v1.88.0
 
 Code v1.87.2
 
-## Changed
+### Changed
 
 - Updated to Code 1.87.2.
 - Enable keep-alive for proxy agent.
@@ -93,7 +112,7 @@ Code v1.87.2
 
 Code v1.87.0
 
-## Changed
+### Changed
 
 - Updated to Code 1.87.0.
 
@@ -101,7 +120,7 @@ Code v1.87.0
 
 Code v1.86.2
 
-## Changed
+### Changed
 
 - Updated to Code 1.86.2.
 
@@ -109,12 +128,12 @@ Code v1.86.2
 
 Code v1.86.1
 
-## Changed
+### Changed
 
 - Updated to Code 1.86.1.
 - Updated to Node 18.17.1.
 
-## Added
+### Added
 
 - Docker images for Fedora and openSUSE.
 
@@ -122,7 +141,7 @@ Code v1.86.1
 
 Code v1.86.0
 
-## Changed
+### Changed
 
 - Updated to Code 1.86.0.
 
@@ -130,11 +149,11 @@ Code v1.86.0
 
 Code v1.85.2
 
-## Changed
+### Changed
 
 - Updated to Code 1.85.2.
 
-## Fixed
+### Fixed
 
 - Query variables are no longer double-encoded when going over the path proxy.
 

ci/helm-chart/Chart.yaml

@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.20.0
+version: 3.21.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 4.89.1
+appVersion: 4.90.2

ci/helm-chart/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: codercom/code-server
-  tag: '4.89.1'
+  tag: '4.90.2'
   pullPolicy: Always
 
 # Specifies one or more secrets to be used when pulling images from a

patches/telemetry.diff

@@ -50,50 +50,66 @@ Index: code-server/lib/vscode/src/vs/server/node/telemetryClient.ts
 ===================================================================
 --- /dev/null
 +++ code-server/lib/vscode/src/vs/server/node/telemetryClient.ts
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,71 @@
 +import { AppInsightsCore, IExtendedTelemetryItem, ITelemetryItem } from '@microsoft/1ds-core-js';
 +import * as https from 'https';
 +import * as http from 'http';
 +import * as os from 'os';
 +
++interface SystemInfo {
++	measurements: Record<string, number | undefined>;
++	properties: Record<string, string | boolean | null | undefined>;
++}
++
 +export class TelemetryClient extends AppInsightsCore {
++	private readonly systemInfo: SystemInfo = {
++		measurements: {},
++		properties: {},
++	};
++
 +	public constructor(
 +		private readonly endpoint: string,
-+		private readonly machineId: string,
-+		private readonly isContainer: Boolean | undefined) {
++		machineId: string,
++		isContainer: boolean | undefined) {
 +		super();
++
++		// os.cpus() can take a very long time sometimes (personally I see 1-2
++		// seconds in a Coder workspace).  This adds up significantly, especially
++		// when many telemetry requests are sent during startup, which can cause
++		// connection timeouts.  Try to cache as much as we can.
++		try {
++			const cpus = os.cpus();
++			this.systemInfo.measurements.cores = cpus.length;
++			this.systemInfo.properties['common.cpuModel'] = cpus[0].model;
++		} catch (error) {}
++
++		try {
++			this.systemInfo.properties['common.shell'] = os.userInfo().shell;
++			this.systemInfo.properties['common.release'] = os.release();
++			this.systemInfo.properties['common.arch'] = os.arch();
++		} catch (error) {}
++
++		this.systemInfo.properties['common.remoteMachineId'] = machineId;
++		this.systemInfo.properties['common.isContainer'] = isContainer;
 +	}
 +
 +	public override track(item: IExtendedTelemetryItem | ITelemetryItem): void {
 +		const options = item.baseData || {}
-+		if (!options.properties) {
-+			options.properties = {};
++		options.measurements = {
++			...(options.measurements || {}),
++			...this.systemInfo.measurements,
 +		}
-+		if (!options.measurements) {
-+			options.measurements = {};
++		options.properties = {
++			...(options.properties || {}),
++			...this.systemInfo.properties,
 +		}
 +
 +		try {
-+			const cpus = os.cpus();
-+			options.measurements.cores = cpus.length;
-+			options.properties['common.cpuModel'] = cpus[0].model;
-+		} catch (error) {}
-+
-+		try {
 +			options.measurements.memoryFree = os.freemem();
 +			options.measurements.memoryTotal = os.totalmem();
 +		} catch (error) {}
 +
 +		try {
-+			options.properties['common.shell'] = os.userInfo().shell;
-+			options.properties['common.release'] = os.release();
-+			options.properties['common.arch'] = os.arch();
-+		} catch (error) {}
-+
-+		options.properties['common.remoteMachineId'] = this.machineId;
-+		options.properties['common.isContainer'] = this.isContainer;
-+
-+		try {
 +			const request = (/^http:/.test(this.endpoint) ? http : https).request(this.endpoint, {
 +				method: 'POST',
 +				headers: {

src/node/wrapper.ts

@@ -248,9 +248,10 @@ export class ParentProcess extends Process {
     const opts = {
       size: "10M",
       maxFiles: 10,
+      path: path.join(paths.data, "coder-logs"),
     }
-    this.logStdoutStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stdout.log"), opts)
-    this.logStderrStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stderr.log"), opts)
+    this.logStdoutStream = rfs.createStream("code-server-stdout.log", opts)
+    this.logStderrStream = rfs.createStream("code-server-stderr.log", opts)
 
     this.onDispose(() => this.disposeChild())
 

test/unit/node/settings.test.ts

@@ -29,7 +29,7 @@ describe("settings", () => {
       const settings = new SettingsProvider<CoderSettings>(pathToMockSettingsFile)
       await settings.read()
       // This happens when we can't parse a JSON (usually error in file)
-      expect(logger.warn).toHaveBeenCalledWith("Unexpected token t in JSON at position 29")
+      expect(logger.warn).toHaveBeenCalledWith(expect.stringMatching(/Unexpected token/))
     })
   })
   describe("with invalid settings file path", () => {

test/yarn.lock

@@ -1198,11 +1198,11 @@ brace-expansion@^1.1.7:
     concat-map "0.0.1"
 
 braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
@@ -1668,10 +1668,10 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"