Skip to content

Commit b7bcaf9

Browse files
fix(deps): update dependency @vscode/extension-telemetry to v0.7.5 (#3274)
* fix(deps): update dependency @vscode/extension-telemetry to v0.7.5 * fix breaking changes --------- Co-authored-by: Matt Seddon <[email protected]>
1 parent 4602b97 commit b7bcaf9

File tree

6 files changed

+241
-79
lines changed

6 files changed

+241
-79
lines changed

extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@
15421542
},
15431543
"dependencies": {
15441544
"@hediet/std": "0.6.0",
1545-
"@vscode/extension-telemetry": "0.6.2",
1545+
"@vscode/extension-telemetry": "0.7.5",
15461546
"appdirs": "1.1.0",
15471547
"execa": "5.1.1",
15481548
"fs-extra": "11.1.0",

extension/src/telemetry/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { SortDefinition } from '../experiments/model/sortBy'
55
import { Section, SectionCollapsed } from '../plots/webview/contract'
66

77
export const APPLICATION_INSIGHTS_KEY = '46e8e554-d50a-471a-a53b-4af2b1cd6594'
8-
export const EXTENSION_ID = 'iterative.dvc'
98

109
const ViewOpenedEvent = {
1110
VIEWS_EXPERIMENTS_FILTER_BY_TREE_OPENED:

extension/src/telemetry/index.test.ts

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
1-
import { extensions } from 'vscode'
2-
// eslint-disable-next-line import/default
31
import TelemetryReporter from '@vscode/extension-telemetry'
42
import { getTelemetryReporter, sendTelemetryEvent } from '.'
53
import {
64
APPLICATION_INSIGHTS_KEY,
7-
EXTENSION_ID,
85
IEventNamePropertyMapping
96
} from './constants'
107
import { getUserId } from './uuid'
118

129
const mockedTelemetryReporter = jest.mocked(TelemetryReporter)
1310

14-
const mockedExtensions = jest.mocked(extensions)
15-
const mockedGetExtension = jest.fn()
16-
mockedExtensions.getExtension = mockedGetExtension
17-
const mockedPackageJSON = {
18-
id: EXTENSION_ID,
19-
name: 'dvc',
20-
version: '0.1.0'
21-
}
2211
const mockedSendTelemetryEvent = jest.fn()
2312
const mockedGetUserId = jest.mocked(getUserId)
2413

@@ -46,20 +35,12 @@ describe('getTelemetryReporter', () => {
4635
let telemetryReporter: TelemetryReporter | undefined
4736

4837
it('should create a reporter on the first call', () => {
49-
mockedGetExtension.mockReturnValueOnce({
50-
packageJSON: mockedPackageJSON
51-
})
5238
telemetryReporter = getTelemetryReporter()
5339

5440
expect(telemetryReporter).toBeDefined()
55-
expect(mockedGetExtension).toHaveBeenCalledTimes(1)
56-
expect(mockedGetExtension).toHaveBeenCalledWith('iterative.dvc')
5741
expect(mockedTelemetryReporter).toHaveBeenCalledTimes(1)
5842
expect(mockedTelemetryReporter).toHaveBeenCalledWith(
59-
EXTENSION_ID,
60-
mockedPackageJSON.version,
61-
APPLICATION_INSIGHTS_KEY,
62-
true
43+
APPLICATION_INSIGHTS_KEY
6344
)
6445
})
6546

@@ -68,7 +49,6 @@ describe('getTelemetryReporter', () => {
6849

6950
expect(telemetryReporter).toStrictEqual(sameTelemetryReporter)
7051
expect(mockedTelemetryReporter).not.toHaveBeenCalled()
71-
expect(mockedGetExtension).not.toHaveBeenCalled()
7252
})
7353
})
7454

extension/src/telemetry/index.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
// eslint-disable-next-line import/default
22
import TelemetryReporter from '@vscode/extension-telemetry'
33
import {
4-
EXTENSION_ID,
54
APPLICATION_INSIGHTS_KEY,
65
IEventNamePropertyMapping,
76
ViewOpenedEventName
87
} from './constants'
98
import { getUserId } from './uuid'
109
import { Logger } from '../common/logger'
11-
import { getExtensionVersion } from '../vscode/extensions'
1210

1311
const isTestExecution = (): boolean =>
1412
!!process.env.VSC_TEST || process.env.NODE_ENV === 'test'
@@ -20,14 +18,7 @@ export const getTelemetryReporter = (): TelemetryReporter => {
2018
return telemetryReporter
2119
}
2220

23-
const version = getExtensionVersion(EXTENSION_ID) || 'unknown'
24-
25-
telemetryReporter = new TelemetryReporter(
26-
EXTENSION_ID,
27-
version,
28-
APPLICATION_INSIGHTS_KEY,
29-
true
30-
)
21+
telemetryReporter = new TelemetryReporter(APPLICATION_INSIGHTS_KEY)
3122
return telemetryReporter
3223
}
3324

extension/src/vscode/extensions.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@ export const getExtensionAPI = async <T>(
2626
} catch {}
2727
}
2828

29-
export const getExtensionVersion = <T>(id: string): string | undefined => {
30-
const extension = getExtension<T>(id)
31-
32-
if (!extension) {
33-
return
34-
}
35-
36-
return (extension.packageJSON as { version: string }).version
37-
}
38-
3929
export const isInstalled = (id: string): boolean =>
4030
!!extensions.all.some(extension => extension.id === id)
4131

0 commit comments

Comments
 (0)