@@ -18,13 +18,19 @@ export const CREATE_VENV_FAILED_MARKER = 'CREATE_VENV.VENV_FAILED_CREATION';
18
18
export const VENV_ALREADY_EXISTS_MARKER = 'CREATE_VENV.VENV_ALREADY_EXISTS' ;
19
19
export const INSTALLED_REQUIREMENTS_MARKER = 'CREATE_VENV.PIP_INSTALLED_REQUIREMENTS' ;
20
20
export const INSTALLED_PYPROJECT_MARKER = 'CREATE_VENV.PIP_INSTALLED_PYPROJECT' ;
21
- export const PIP_UPGRADE_FAILED_MARKER = 'CREATE_VENV.PIP_UPGRADE_FAILED' ;
21
+ export const UPGRADE_PIP_FAILED_MARKER = 'CREATE_VENV.UPGRADE_PIP_FAILED' ;
22
+ export const UPGRADING_PIP_MARKER = 'CREATE_VENV.UPGRADING_PIP' ;
23
+ export const UPGRADED_PIP_MARKER = 'CREATE_VENV.UPGRADED_PIP' ;
22
24
23
25
export class VenvProgressAndTelemetry {
24
26
private venvCreatedReported = false ;
25
27
26
28
private venvOrPipMissingReported = false ;
27
29
30
+ private venvUpgradingPipReported = false ;
31
+
32
+ private venvUpgradedPipReported = false ;
33
+
28
34
private venvFailedReported = false ;
29
35
30
36
private venvInstallingPackagesReported = false ;
@@ -70,6 +76,15 @@ export class VenvProgressAndTelemetry {
70
76
reason : 'noPip' ,
71
77
} ) ;
72
78
this . lastError = PIP_NOT_INSTALLED_MARKER ;
79
+ } else if ( ! this . venvUpgradingPipReported && output . includes ( UPGRADING_PIP_MARKER ) ) {
80
+ this . venvUpgradingPipReported = true ;
81
+ this . progress . report ( {
82
+ message : CreateEnv . Venv . upgradingPip ,
83
+ } ) ;
84
+ sendTelemetryEvent ( EventName . ENVIRONMENT_INSTALLING_PACKAGES , undefined , {
85
+ environmentType : 'venv' ,
86
+ using : 'pipUpgrade' ,
87
+ } ) ;
73
88
} else if ( ! this . venvFailedReported && output . includes ( CREATE_VENV_FAILED_MARKER ) ) {
74
89
this . venvFailedReported = true ;
75
90
sendTelemetryEvent ( EventName . ENVIRONMENT_FAILED , undefined , {
@@ -95,13 +110,13 @@ export class VenvProgressAndTelemetry {
95
110
environmentType : 'venv' ,
96
111
using : 'pyproject.toml' ,
97
112
} ) ;
98
- } else if ( ! this . venvInstallingPackagesFailedReported && output . includes ( PIP_UPGRADE_FAILED_MARKER ) ) {
113
+ } else if ( ! this . venvInstallingPackagesFailedReported && output . includes ( UPGRADE_PIP_FAILED_MARKER ) ) {
99
114
this . venvInstallingPackagesFailedReported = true ;
100
115
sendTelemetryEvent ( EventName . ENVIRONMENT_INSTALLING_PACKAGES_FAILED , undefined , {
101
116
environmentType : 'venv' ,
102
117
using : 'pipUpgrade' ,
103
118
} ) ;
104
- this . lastError = PIP_UPGRADE_FAILED_MARKER ;
119
+ this . lastError = UPGRADE_PIP_FAILED_MARKER ;
105
120
} else if ( ! this . venvInstallingPackagesFailedReported && output . includes ( INSTALL_REQUIREMENTS_FAILED_MARKER ) ) {
106
121
this . venvInstallingPackagesFailedReported = true ;
107
122
sendTelemetryEvent ( EventName . ENVIRONMENT_INSTALLING_PACKAGES_FAILED , undefined , {
@@ -116,6 +131,12 @@ export class VenvProgressAndTelemetry {
116
131
using : 'pyproject.toml' ,
117
132
} ) ;
118
133
this . lastError = INSTALL_PYPROJECT_FAILED_MARKER ;
134
+ } else if ( ! this . venvUpgradedPipReported && output . includes ( UPGRADED_PIP_MARKER ) ) {
135
+ this . venvUpgradedPipReported = true ;
136
+ sendTelemetryEvent ( EventName . ENVIRONMENT_INSTALLED_PACKAGES , undefined , {
137
+ environmentType : 'venv' ,
138
+ using : 'pipUpgrade' ,
139
+ } ) ;
119
140
} else if ( ! this . venvInstalledPackagesReported && output . includes ( INSTALLED_REQUIREMENTS_MARKER ) ) {
120
141
this . venvInstalledPackagesReported = true ;
121
142
sendTelemetryEvent ( EventName . ENVIRONMENT_INSTALLED_PACKAGES , undefined , {
0 commit comments