Avoids activation event delay

Author: eamodio

src/extension.ts

@@ -177,6 +177,9 @@ export async function activate(context: ExtensionContext): Promise<GitLensApi |
 		void setContext(ContextKeys.Debugging, true);
 	}
 
+	// TODO@eamodio do we want to capture any vscode settings that are relevant to GitLens?
+	const flatCfg = flatten(configuration.getAll(true), { prefix: 'config', stringify: 'all' });
+
 	container.telemetry.setGlobalAttributes({
 		debugging: container.debugging,
 		insiders: insiders,
@@ -199,22 +202,18 @@ export async function activate(context: ExtensionContext): Promise<GitLensApi |
 		}`,
 	});
 
-	setTimeout(() => {
-		// TODO@eamodio do we want to capture any vscode settings that are relevant to GitLens?
-		const config = flatten(configuration.getAll(true), { prefix: 'config', stringify: 'all' });
-		container.telemetry.sendEvent(
-			'activate',
-			{
-				'activation.elapsed': elapsed,
-				'activation.mode': mode?.name,
-				...config,
-			},
-			startTime,
-			endTime,
-		);
+	container.telemetry.sendEvent(
+		'activate',
+		{
+			'activation.elapsed': elapsed,
+			'activation.mode': mode?.name,
+			...flatCfg,
+		},
+		startTime,
+		endTime,
+	);
 
-		setTimeout(() => uninstallDeprecatedAuthentication(), 25000);
-	}, 5000);
+	setTimeout(() => uninstallDeprecatedAuthentication(), 25000);
 
 	return Promise.resolve(api);
 }

src/telemetry/openTelemetryProvider.ts

@@ -1,4 +1,5 @@
 import type { AttributeValue, Span, TimeInput, Tracer } from '@opentelemetry/api';
+import { SpanKind } from '@opentelemetry/api';
 // import { diag, DiagConsoleLogger } from '@opentelemetry/api';
 // import { DiagLogLevel } from '@opentelemetry/api/build/src/diag/types';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
@@ -63,17 +64,23 @@ export class OpenTelemetryProvider implements TelemetryProvider {
 	}
 
 	sendEvent(name: string, data?: Record<string, AttributeValue>, startTime?: TimeInput, endTime?: TimeInput): void {
-		const span = this.tracer.startSpan(name, { startTime: startTime ?? Date.now() });
-		span.setAttributes(this._globalAttributes);
+		const span = this.tracer.startSpan(name, {
+			attributes: this._globalAttributes,
+			kind: SpanKind.INTERNAL,
+			startTime: startTime ?? Date.now(),
+		});
 		if (data != null) {
 			span.setAttributes(data);
 		}
 		span.end(endTime);
 	}
 
 	startEvent(name: string, data?: Record<string, AttributeValue>, startTime?: TimeInput): Span {
-		const span = this.tracer.startSpan(name, { startTime: startTime ?? Date.now() });
-		span.setAttributes(this._globalAttributes);
+		const span = this.tracer.startSpan(name, {
+			attributes: this._globalAttributes,
+			kind: SpanKind.INTERNAL,
+			startTime: startTime ?? Date.now(),
+		});
 		if (data != null) {
 			span.setAttributes(data);
 		}