Skip to content

Commit 60894e9

Browse files
CopilotJoeRobich
andcommitted
Thread ITelemetryReporter through OmniSharp components
Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
1 parent bd12e03 commit 60894e9

File tree

5 files changed

+19
-9
lines changed

5 files changed

+19
-9
lines changed

src/omnisharp/omnisharpDownloader.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ import { getRuntimeDependenciesPackages } from '../tools/runtimeDependencyPackag
1919
import { getAbsolutePathPackagesToInstall } from '../packageManager/getAbsolutePathPackagesToInstall';
2020
import { isValidDownload } from '../packageManager/isValidDownload';
2121
import { LatestBuildDownloadStart } from './omnisharpLoggingEvents';
22+
import { ITelemetryReporter } from '../shared/telemetryReporter';
2223

2324
export class OmnisharpDownloader {
2425
public constructor(
2526
private networkSettingsProvider: NetworkSettingsProvider,
2627
private eventStream: EventStream,
2728
private packageJSON: any,
2829
private platformInfo: PlatformInformation,
29-
private extensionPath: string
30+
private extensionPath: string,
31+
private reporter: ITelemetryReporter
3032
) {}
3133

3234
public async DownloadAndInstallOmnisharp(
@@ -57,7 +59,7 @@ export class OmnisharpDownloader {
5759
this.networkSettingsProvider,
5860
this.eventStream,
5961
isValidDownload,
60-
undefined
62+
this.reporter
6163
)
6264
) {
6365
this.eventStream.post(new InstallationSuccess());

src/omnisharp/omnisharpLanguageServer.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ export async function activateOmniSharpLanguageServer(
178178
networkSettingsProvider,
179179
eventStream,
180180
context.extension.extensionPath,
181-
omnisharpChannel
181+
omnisharpChannel,
182+
reporter
182183
);
183184
}
184185

@@ -189,7 +190,8 @@ async function activate(
189190
provider: NetworkSettingsProvider,
190191
eventStream: EventStream,
191192
extensionPath: string,
192-
outputChannel: vscode.OutputChannel
193+
outputChannel: vscode.OutputChannel,
194+
reporter: ITelemetryReporter
193195
) {
194196
const disposables = new CompositeDisposable();
195197

@@ -211,7 +213,8 @@ async function activate(
211213
omnisharpDotnetResolver,
212214
context,
213215
outputChannel,
214-
languageMiddlewareFeature
216+
languageMiddlewareFeature,
217+
reporter
215218
);
216219
const advisor = new Advisor(server); // create before server is started
217220
const testManager = new TestManager(server, eventStream, languageMiddlewareFeature);

src/omnisharp/server.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import TestManager from './features/dotnetTest';
3434
import { findLaunchTargets } from './launcher';
3535
import { ProjectConfigurationMessage } from '../shared/projectConfiguration';
3636
import { commonOptions, omnisharpOptions, razorOptions } from '../shared/options';
37+
import { ITelemetryReporter } from '../shared/telemetryReporter';
3738

3839
enum ServerState {
3940
Starting,
@@ -117,14 +118,16 @@ export class OmniSharpServer {
117118
private dotnetResolver: IHostExecutableResolver,
118119
private context: ExtensionContext,
119120
private outputChannel: OutputChannel,
120-
private languageMiddlewareFeature: LanguageMiddlewareFeature
121+
private languageMiddlewareFeature: LanguageMiddlewareFeature,
122+
reporter: ITelemetryReporter
121123
) {
122124
const downloader = new OmnisharpDownloader(
123125
networkSettingsProvider,
124126
this.eventStream,
125127
this.packageJSON,
126128
platformInfo,
127-
extensionPath
129+
extensionPath,
130+
reporter
128131
);
129132
this._omnisharpManager = new OmnisharpManager(downloader, platformInfo);
130133
this.updateProjectDebouncer.pipe(debounceTime(1500)).subscribe(async (_) => {

test/omnisharp/omnisharpUnitTests/omnisharpDownloader.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ import { modernNetVersion } from '../../../src/omnisharp/omnisharpPackageCreator
5454
eventStream,
5555
testPackageJSON,
5656
platformInfo,
57-
extensionPath
57+
extensionPath,
58+
undefined as any
5859
);
5960
server = await MockHttpsServer.CreateMockHttpsServer();
6061
testZip = await TestZip.createTestZipAsync(createTestFile('Foo', 'foo.txt'));

test/omnisharp/omnisharpUnitTests/omnisharpManager.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ function GetTestOmniSharpManager(
245245
eventStream,
246246
testPackageJSON,
247247
platformInfo,
248-
extensionPath
248+
extensionPath,
249+
undefined as any
249250
);
250251
return new OmnisharpManager(downloader, platformInfo, serverUrl);
251252
}

0 commit comments

Comments
 (0)