Skip to content

Commit efe6433

Browse files
committed
chore: refresh patches
1 parent 3b3235a commit efe6433

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

patches/disable-builtin-ext-update.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
1818
if (!this.local.preRelease && this.gallery.properties.isPreReleaseVersion) {
1919
return false;
2020
}
21-
@@ -1122,6 +1126,10 @@ export class ExtensionsWorkbenchService
21+
@@ -1122,6 +1126,10 @@ export class ExtensionsWorkbenchService
2222
// Skip if check updates only for builtin extensions and current extension is not builtin.
2323
continue;
2424
}

patches/heartbeat.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Index: code-server/lib/vscode/src/vs/base/parts/ipc/common/ipc.net.ts
1515

1616
export const enum SocketDiagnosticsEventType {
1717
Created = 'created',
18-
@@ -828,6 +829,19 @@ export class PersistentProtocol implemen
18+
@@ -829,6 +830,19 @@ export class PersistentProtocol implemen
1919
this._socketDisposables.push(this._socketWriter);
2020
this._socketReader = new ProtocolReader(this._socket);
2121
this._socketDisposables.push(this._socketReader);

patches/telemetry.diff

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@ Index: code-server/lib/vscode/src/vs/workbench/services/telemetry/browser/teleme
104104
- sendErrorTelemetry: this.sendErrorTelemetry,
105105
- };
106106
- this.impl = this._register(new BaseTelemetryService(config, configurationService, productService));
107+
-
108+
- if (getTelemetryLevel(configurationService) !== TelemetryLevel.NONE) {
109+
- // If we cannot fetch the endpoint it means it is down and we should not send any telemetry.
110+
- // This is most likely due to ad blockers
111+
- fetch(telemetryEndpointUrl, { method: 'POST' }).catch(err => {
112+
- this.impl = NullTelemetryService;
113+
- });
107114
+ const telemetryProvider: ITelemetryAppender | undefined = remoteAgentService.getConnection() !== null ? { log: remoteAgentService.logTelemetry.bind(remoteAgentService), flush: remoteAgentService.flushTelemetry.bind(remoteAgentService) } : productService.aiConfig?.ariaKey ? new OneDataSystemWebAppender(isInternal, 'monacoworkbench', null, productService.aiConfig?.ariaKey) : undefined;
108115
+ if (telemetryProvider) {
109116
+ appenders.push(telemetryProvider);
@@ -114,13 +121,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/telemetry/browser/teleme
114121
+ sendErrorTelemetry: this.sendErrorTelemetry,
115122
+ };
116123
+ this.impl = this._register(new BaseTelemetryService(config, configurationService, productService));
117-
118-
- if (getTelemetryLevel(configurationService) !== TelemetryLevel.NONE) {
119-
- // If we cannot fetch the endpoint it means it is down and we should not send any telemetry.
120-
- // This is most likely due to ad blockers
121-
- fetch(telemetryEndpointUrl, { method: 'POST' }).catch(err => {
122-
- this.impl = NullTelemetryService;
123-
- });
124+
+
124125
+ if (remoteAgentService.getConnection() === null && getTelemetryLevel(configurationService) !== TelemetryLevel.NONE) {
125126
+ // If we cannot fetch the endpoint it means it is down and we should not send any telemetry.
126127
+ // This is most likely due to ad blockers

0 commit comments

Comments
 (0)