From 26fd241083d91bd890d49afc5dabe92ae9cc37e0 Mon Sep 17 00:00:00 2001 From: Karlie Li Date: Fri, 6 Sep 2024 11:39:55 -0700 Subject: [PATCH 1/5] update test endpoint --- tools/github-page-script-injection/injectScript.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/github-page-script-injection/injectScript.js b/tools/github-page-script-injection/injectScript.js index 82696387c..db3d04092 100644 --- a/tools/github-page-script-injection/injectScript.js +++ b/tools/github-page-script-injection/injectScript.js @@ -31,7 +31,9 @@ let scriptContent = fs.readFileSync(scriptFilePath, 'utf8'); // Replace the placeholder string with the actual connection string const connectionString = 'InstrumentationKey=1ae9e7ce-18f1-4e14-8fc0-acbf0ed28895;IngestionEndpoint=https://eastus-8.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus.livediagnostics.monitor.azure.com/'; let iKeyForCfgSync = "1ae9e7ce-18f1-4e14-8fc0-acbf0ed28895"; -scriptContent = scriptContent.replace(`connectionString: "YOUR_CONNECTION_STRING"`, `instrumentationKey: "${iKeyForCfgSync}",\n \t\textensionConfig: {\n\t\t\t"AppInsightsCfgSyncPlugin": {\n\t\t\t\tcfgUrl:"https://js.monitor.azure.com/beta/ai.config.1.cfg.json"\n\t\t\t}\n\t\t}`); +//let cfgUrl = "https://js.monitor.azure.com/beta/ai.config.1.cfg.json"; +let cfgUrl = "https://tst2cdnstore.blob.core.windows.net/cdn/nevtest/ai.cfgSync.json"; +scriptContent = scriptContent.replace(`connectionString: "YOUR_CONNECTION_STRING"`, `instrumentationKey: "${iKeyForCfgSync}",\n \t\textensionConfig: {\n\t\t\t"AppInsightsCfgSyncPlugin": {\n\t\t\t\tcfgUrl:"${cfgUrl}"\n\t\t\t}\n\t\t}`); //scriptContent = scriptContent.replace('YOUR_CONNECTION_STRING', connectionString); scriptContent = ``; From 56d5791a861007c1bd7a1cbc87163d9212e30179 Mon Sep 17 00:00:00 2001 From: Karlie Li Date: Fri, 6 Sep 2024 14:25:30 -0700 Subject: [PATCH 2/5] update --- tools/config/package.json | 3 ++- tools/config/test-config.json | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 tools/config/test-config.json diff --git a/tools/config/package.json b/tools/config/package.json index ae569f4b3..edb9f7a84 100644 --- a/tools/config/package.json +++ b/tools/config/package.json @@ -10,8 +10,9 @@ }, "scripts": { "clean": "git clean -xdf", - "build": "npm run build:browser", + "build": "npm run build:browser && npm run build:test", "build:browser": "grunt copy-config", + "build:test": "grunt copy-testConfig", "rebuild": "npm run build", "test": "" }, diff --git a/tools/config/test-config.json b/tools/config/test-config.json new file mode 100644 index 000000000..009dee959 --- /dev/null +++ b/tools/config/test-config.json @@ -0,0 +1,42 @@ +{ + "version": "1.0.0", + "enabled": true, + "featureOptIn": { + "iKeyUsage": { + "mode": 3, + "onCfg": { + "throttleMgrCfg.109.disabled": false, + "throttleMgrCfg.106.disabled": false + }, + "offCfg": { + "throttleMgrCfg.109.disabled": true, + "throttleMgrCfg.106.disabled": true + } + } + }, + "config": { + "throttleMgrCfg": { + "109": { + "disabled": false, + "limit": { + "samplingRate": 2000000, + "maxSendNumber": 1 + }, + "interval": { + "dayInterval": 2 + } + }, + "106": { + "disabled": false, + "limit": { + "samplingRate": 1, + "maxSendNumber": 1 + }, + "interval": { + "monthInterval": 2, + "daysOfMonth": [1] + } + } + } + } +} \ No newline at end of file From 6d2ad1d5f8ff21de8b3961ca7054166058aeacb5 Mon Sep 17 00:00:00 2001 From: Karlie Li Date: Fri, 6 Sep 2024 14:33:27 -0700 Subject: [PATCH 3/5] update --- gruntfile.js | 8 ++++++++ tools/github-page-script-injection/injectScript.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gruntfile.js b/gruntfile.js index e2f88d3cc..4fb609cc0 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -803,6 +803,13 @@ module.exports = function (grunt) { { src: "./tools/config/config.json", dest: `./tools/config/browser/es5/ai.config${configVer}.cfg.json` }, { src: "./tools/config/config.json", dest: `./tools/config/browser/es5/ai.config${configMajorVer}.cfg.json` } ] + }, + + testConfig: { + files: [ + { src: "./tools/config/config.json", dest: `./tools/config/browser/es5/ai_test.config${configVer}.cfg.json` }, + { src: "./tools/config/config.json", dest: `./tools/config/browser/es5/ai_test.config${configMajorVer}.cfg.json` } + ] } } })); @@ -955,6 +962,7 @@ module.exports = function (grunt) { grunt.registerTask("serve", ["connect:server:keepalive"]); grunt.registerTask("copy-config", ["copy:config"]); + grunt.registerTask("copy-testConfig", ["copy:testConfig"]); grunt.registerTask("example-aisku", tsBuildActions("example-aisku")); grunt.registerTask("example-dependency", tsBuildActions("example-dependency")); diff --git a/tools/github-page-script-injection/injectScript.js b/tools/github-page-script-injection/injectScript.js index db3d04092..a9623b9b1 100644 --- a/tools/github-page-script-injection/injectScript.js +++ b/tools/github-page-script-injection/injectScript.js @@ -32,7 +32,7 @@ let scriptContent = fs.readFileSync(scriptFilePath, 'utf8'); const connectionString = 'InstrumentationKey=1ae9e7ce-18f1-4e14-8fc0-acbf0ed28895;IngestionEndpoint=https://eastus-8.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus.livediagnostics.monitor.azure.com/'; let iKeyForCfgSync = "1ae9e7ce-18f1-4e14-8fc0-acbf0ed28895"; //let cfgUrl = "https://js.monitor.azure.com/beta/ai.config.1.cfg.json"; -let cfgUrl = "https://tst2cdnstore.blob.core.windows.net/cdn/nevtest/ai.cfgSync.json"; +let cfgUrl = "https://js.monitor.azure.com/nightly/ai_test.config.1.cfg.json"; scriptContent = scriptContent.replace(`connectionString: "YOUR_CONNECTION_STRING"`, `instrumentationKey: "${iKeyForCfgSync}",\n \t\textensionConfig: {\n\t\t\t"AppInsightsCfgSyncPlugin": {\n\t\t\t\tcfgUrl:"${cfgUrl}"\n\t\t\t}\n\t\t}`); //scriptContent = scriptContent.replace('YOUR_CONNECTION_STRING', connectionString); scriptContent = ``; From 0c8b5365674c6eebacbf764b97e30d9296622524 Mon Sep 17 00:00:00 2001 From: Karlie Li Date: Fri, 6 Sep 2024 14:49:29 -0700 Subject: [PATCH 4/5] update --- gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gruntfile.js b/gruntfile.js index 4fb609cc0..0e5f15e47 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -807,8 +807,8 @@ module.exports = function (grunt) { testConfig: { files: [ - { src: "./tools/config/config.json", dest: `./tools/config/browser/es5/ai_test.config${configVer}.cfg.json` }, - { src: "./tools/config/config.json", dest: `./tools/config/browser/es5/ai_test.config${configMajorVer}.cfg.json` } + { src: "./tools/config/test-config.json", dest: `./tools/config/browser/es5/ai_test.config${configVer}.cfg.json` }, + { src: "./tools/config/test-config.json", dest: `./tools/config/browser/es5/ai_test.config${configMajorVer}.cfg.json` } ] } } From f1b4b147efcacee5e35a9a5e32a7d93d9d0a2a70 Mon Sep 17 00:00:00 2001 From: Karlie Li Date: Tue, 10 Sep 2024 09:43:25 -0700 Subject: [PATCH 5/5] update --- tools/github-page-script-injection/injectScript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/github-page-script-injection/injectScript.js b/tools/github-page-script-injection/injectScript.js index a9623b9b1..79ed5043d 100644 --- a/tools/github-page-script-injection/injectScript.js +++ b/tools/github-page-script-injection/injectScript.js @@ -32,7 +32,7 @@ let scriptContent = fs.readFileSync(scriptFilePath, 'utf8'); const connectionString = 'InstrumentationKey=1ae9e7ce-18f1-4e14-8fc0-acbf0ed28895;IngestionEndpoint=https://eastus-8.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus.livediagnostics.monitor.azure.com/'; let iKeyForCfgSync = "1ae9e7ce-18f1-4e14-8fc0-acbf0ed28895"; //let cfgUrl = "https://js.monitor.azure.com/beta/ai.config.1.cfg.json"; -let cfgUrl = "https://js.monitor.azure.com/nightly/ai_test.config.1.cfg.json"; +let cfgUrl = "https://js.monitor.azure.com/nightly/ai_test.config.1.0-nightly3.cfg.json"; scriptContent = scriptContent.replace(`connectionString: "YOUR_CONNECTION_STRING"`, `instrumentationKey: "${iKeyForCfgSync}",\n \t\textensionConfig: {\n\t\t\t"AppInsightsCfgSyncPlugin": {\n\t\t\t\tcfgUrl:"${cfgUrl}"\n\t\t\t}\n\t\t}`); //scriptContent = scriptContent.replace('YOUR_CONNECTION_STRING', connectionString); scriptContent = ``;