Update deps

Author: jeanp413

package.json

@@ -136,8 +136,6 @@
 		"test": "mocha -u tdd"
 	},
 	"devDependencies": {
-		"@types/analytics-node": "^3.1.9",
-		"@types/crypto-js": "4.1.1",
 		"@types/google-protobuf": "^3.7.4",
 		"@types/js-yaml": "^4.0.5",
 		"@types/mocha": "^9.1.1",
@@ -163,12 +161,12 @@
 		"webpack-cli": "^4.7.2"
 	},
 	"dependencies": {
-		"@bufbuild/connect-node": "^0.7.0",
+		"@bufbuild/connect-node": "^0.8.4",
 		"@gitpod/gitpod-protocol": "main",
 		"@gitpod/local-app-api-grpcweb": "main",
 		"@gitpod/public-api": "^0.1.5-main.6530",
 		"@improbable-eng/grpc-web-node-http-transport": "^0.14.0",
-		"analytics-node": "^6.2.0",
+		"@segment/analytics-node": "^1.0.0-beta.24",
 		"configcat-node": "^8.0.0",
 		"js-yaml": "^4.1.0",
 		"node-fetch-commonjs": "^3.2.4",

src/common/telemetry.ts

@@ -429,8 +429,8 @@ export class BaseTelemetryReporter extends Disposable {
 		}
 	}
 
-	public override async dispose(): Promise<any> {
-		await this.telemetryAppender.flush();
+	public override async dispose(): Promise<void> {
 		super.dispose();
+		await this.telemetryAppender.flush();
 	}
 }

src/metrics.ts

@@ -6,9 +6,8 @@
 import * as vscode from 'vscode';
 import * as grpc from '@grpc/grpc-js';
 import { Registry, Counter, Histogram, metric } from 'prom-client';
-import { Code, connectErrorFromReason, Interceptor, StreamRequest, UnaryRequest } from '@bufbuild/connect-node';
 import { MethodKind } from '@bufbuild/protobuf';
-import { StreamResponse, UnaryResponse } from '@bufbuild/connect-core';
+import { StreamResponse, UnaryResponse, Code, connectErrorFromReason, Interceptor, StreamRequest, UnaryRequest } from '@bufbuild/connect';
 
 export type GrpcMethodType = 'unary' | 'client_stream' | 'server_stream' | 'bidi_stream';
 

src/publicApi.ts

@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createConnectTransport, createPromiseClient, Interceptor, PromiseClient } from '@bufbuild/connect-node';
+import { createConnectTransport } from '@bufbuild/connect-node';
+import { createPromiseClient, Interceptor, PromiseClient } from '@bufbuild/connect';
 import { WorkspacesService } from '@gitpod/public-api/lib/gitpod/experimental/v1/workspaces_connectweb';
 import { IDEClientService } from '@gitpod/public-api/lib/gitpod/experimental/v1/ide_client_connectweb';
 import { UserService } from '@gitpod/public-api/lib/gitpod/experimental/v1/user_connectweb';

src/telemetryReporter.ts

@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AppenderData, BaseTelemetryAppender, BaseTelemetryClient, BaseTelemetryReporter } from './common/telemetry';
-import SegmentAnalytics from 'analytics-node';
+import { Analytics } from '@segment/analytics-node';
 import * as os from 'os';
 import * as vscode from 'vscode';
 
 const analyticsClientFactory = async (key: string): Promise<BaseTelemetryClient> => {
-	let segmentAnalyticsClient = new SegmentAnalytics(key);
+	let segmentAnalyticsClient = new Analytics({ writeKey: key });
 
 	// Sets the analytics client into a standardized form
 	const telemetryClient: BaseTelemetryClient = {
@@ -34,8 +34,8 @@ const analyticsClientFactory = async (key: string): Promise<BaseTelemetryClient>
 			properties['error_message'] = exception.message;
 			properties['debug_workspace'] = String(properties['debug_workspace'] ?? false);
 
-			const workspaceId  = properties['workspaceId'] ?? '';
-			const instanceId  = properties['instanceId'] ?? '';
+			const workspaceId = properties['workspaceId'] ?? '';
+			const instanceId = properties['instanceId'] ?? '';
 			const userId = properties['userId'] ?? '';
 
 			delete properties['workspaceId'];
@@ -67,7 +67,7 @@ const analyticsClientFactory = async (key: string): Promise<BaseTelemetryClient>
 		},
 		flush: async () => {
 			try {
-				await segmentAnalyticsClient.flush();
+				await segmentAnalyticsClient.closeAndFlush({ timeout: 3000 });
 			} catch (e: any) {
 				console.error('Failed to flush app analytics!', e);
 			}