Skip to content

Commit ac9668a

Browse files
committed
RI-7020: add new build type in telemetry
1 parent 71bb700 commit ac9668a

File tree

5 files changed

+22
-9
lines changed

5 files changed

+22
-9
lines changed

.env

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RI_STDOUT_LOGGER=false
1515
RI_AUTO_BOOTSTRAP=false
1616
RI_MIGRATE_OLD_FOLDERS=false
1717
RI_BUILD_TYPE='VS_CODE'
18+
RI_APP_TYPE='VS_CODE'
1819
RI_ANALYTICS_START_EVENTS=true
1920
RI_AGREEMENTS_PATH='../../webviews/resources/agreements-spec.json'
2021
RI_ENCRYPTION_KEYTAR_SERVICE="redis-for-vscode"

.github/workflows/pipeline-build-linux.yml

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
echo "RI_CLOUD_IDP_CLIENT_ID=${{ env.RI_CLOUD_IDP_CLIENT_ID }}"
5353
echo "RI_CLOUD_IDP_GOOGLE_ID=${{ env.RI_CLOUD_IDP_GOOGLE_ID }}"
5454
echo "RI_CLOUD_IDP_GH_ID=${{ env.RI_CLOUD_IDP_GH_ID }}"
55+
echo "RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG=${{ env.RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG }}"
56+
echo "RI_APP_TYPE=${{ env.RI_APP_TYPE }}"
5557
} >> "${{ env.envFile }}"
5658
5759
- name: Build linux package (production)
@@ -85,3 +87,4 @@ jobs:
8587
RI_CLOUD_IDP_GOOGLE_ID: ${{ secrets.RI_CLOUD_IDP_GOOGLE_ID }}
8688
RI_CLOUD_IDP_GH_ID: ${{ secrets.RI_CLOUD_IDP_GH_ID }}
8789
RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG: ${{ inputs.enterprise == false }}
90+
RI_APP_TYPE: ${{ inputs.enterprise && 'VS_CODE_ENTERPRISE' || 'VS_CODE' }}

.github/workflows/pipeline-build-macos.yml

+3
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jobs:
4545
echo "RI_CLOUD_IDP_CLIENT_ID=${{ env.RI_CLOUD_IDP_CLIENT_ID }}"
4646
echo "RI_CLOUD_IDP_GOOGLE_ID=${{ env.RI_CLOUD_IDP_GOOGLE_ID }}"
4747
echo "RI_CLOUD_IDP_GH_ID=${{ env.RI_CLOUD_IDP_GH_ID }}"
48+
echo "RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG=${{ env.RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG }}"
49+
echo "RI_APP_TYPE=${{ env.RI_APP_TYPE }}"
4850
} >> "${{ env.envFile }}"
4951
5052
- name: Download backend x64
@@ -102,3 +104,4 @@ jobs:
102104
RI_CLOUD_IDP_GOOGLE_ID: ${{ secrets.RI_CLOUD_IDP_GOOGLE_ID }}
103105
RI_CLOUD_IDP_GH_ID: ${{ secrets.RI_CLOUD_IDP_GH_ID }}
104106
RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG: ${{ inputs.enterprise == false }}
107+
RI_APP_TYPE: ${{ inputs.enterprise && 'VS_CODE_ENTERPRISE' || 'VS_CODE' }}

.github/workflows/pipeline-build-windows.yml

+14-9
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,19 @@ jobs:
3232

3333
- name: Configure Environment Variables
3434
run: |
35-
echo "RI_SEGMENT_WRITE_KEY=${{ env.RI_SEGMENT_WRITE_KEY }}" >> ${{ env.envFile }}
36-
echo "RI_CLOUD_IDP_AUTHORIZE_URL=${{ env.RI_CLOUD_IDP_AUTHORIZE_URL }}" >> ${{ env.envFile }}
37-
echo "RI_CLOUD_IDP_TOKEN_URL=${{ env.RI_CLOUD_IDP_TOKEN_URL }}" >> ${{ env.envFile }}
38-
echo "RI_CLOUD_IDP_REVOKE_TOKEN_URL=${{ env.RI_CLOUD_IDP_REVOKE_TOKEN_URL }}" >> ${{ env.envFile }}
39-
echo "RI_CLOUD_IDP_REDIRECT_URI=${{ env.RI_CLOUD_IDP_REDIRECT_URI }}" >> ${{ env.envFile }}
40-
echo "RI_CLOUD_IDP_ISSUER=${{ env.RI_CLOUD_IDP_ISSUER }}" >> ${{ env.envFile }}
41-
echo "RI_CLOUD_IDP_CLIENT_ID=${{ env.RI_CLOUD_IDP_CLIENT_ID }}" >> ${{ env.envFile }}
42-
echo "RI_CLOUD_IDP_GOOGLE_ID=${{ env.RI_CLOUD_IDP_GOOGLE_ID }}" >> ${{ env.envFile }}
43-
echo "RI_CLOUD_IDP_GH_ID=${{ env.RI_CLOUD_IDP_GH_ID }}" >> ${{ env.envFile }}
35+
{
36+
echo "RI_SEGMENT_WRITE_KEY=${{ env.RI_SEGMENT_WRITE_KEY }}"
37+
echo "RI_CLOUD_IDP_AUTHORIZE_URL=${{ env.RI_CLOUD_IDP_AUTHORIZE_URL }}"
38+
echo "RI_CLOUD_IDP_TOKEN_URL=${{ env.RI_CLOUD_IDP_TOKEN_URL }}"
39+
echo "RI_CLOUD_IDP_REVOKE_TOKEN_URL=${{ env.RI_CLOUD_IDP_REVOKE_TOKEN_URL }}"
40+
echo "RI_CLOUD_IDP_REDIRECT_URI=${{ env.RI_CLOUD_IDP_REDIRECT_URI }}"
41+
echo "RI_CLOUD_IDP_ISSUER=${{ env.RI_CLOUD_IDP_ISSUER }}"
42+
echo "RI_CLOUD_IDP_CLIENT_ID=${{ env.RI_CLOUD_IDP_CLIENT_ID }}"
43+
echo "RI_CLOUD_IDP_GOOGLE_ID=${{ env.RI_CLOUD_IDP_GOOGLE_ID }}"
44+
echo "RI_CLOUD_IDP_GH_ID=${{ env.RI_CLOUD_IDP_GH_ID }}"
45+
echo "RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG=${{ env.RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG }}"
46+
echo "RI_APP_TYPE=${{ env.RI_APP_TYPE }}"
47+
} >> "${{ env.envFile }}"
4448
4549
- name: Build windows package (production)
4650
if: inputs.environment == 'production'
@@ -73,3 +77,4 @@ jobs:
7377
RI_CLOUD_IDP_GOOGLE_ID: ${{ secrets.RI_CLOUD_IDP_GOOGLE_ID }}
7478
RI_CLOUD_IDP_GH_ID: ${{ secrets.RI_CLOUD_IDP_GH_ID }}
7579
RI_FEATURES_CLOUD_ADS_DEFAULT_FLAG: ${{ inputs.enterprise == false }}
80+
RI_APP_TYPE: ${{ inputs.enterprise && 'VS_CODE_ENTERPRISE' || 'VS_CODE' }}

src/server/bootstrapBackendE2E.ts

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export async function startBackendE2E(logger: CustomLogger): Promise<any> {
6868
RI_APP_HOST: appHost,
6969
RI_STDOUT_LOGGER: process.env.RI_STDOUT_LOGGER,
7070
RI_BUILD_TYPE: process.env.RI_BUILD_TYPE,
71+
RI_APP_TYPE: process.env.RI_APP_TYPE,
7172
RI_SEGMENT_WRITE_KEY: process.env.RI_SEGMENT_WRITE_KEY,
7273
RI_MIGRATE_OLD_FOLDERS: process.env.RI_MIGRATE_OLD_FOLDERS,
7374
RI_DEFAULTS_DIR: defaultDirPath,

0 commit comments

Comments
 (0)