Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Monitor-Query] Update monitor-query to use new recorder #20178

Merged
merged 16 commits into from
Feb 14, 2022
Merged

[Monitor-Query] Update monitor-query to use new recorder #20178

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
141a940
Update test-recorder version
JonathanCrd Jan 29, 2022
6cc629b
Update test scripts
JonathanCrd Jan 29, 2022
aac3280
Removing old recorder instances
JonathanCrd Feb 1, 2022
2efecc7
Making Karma changes
JonathanCrd Feb 11, 2022
0741942
Update node recordings
JonathanCrd Feb 11, 2022
86deb27
Fixing missing recordings_relative_path in environment vars
JonathanCrd Feb 11, 2022
df5f80e
Update browser recordings
JonathanCrd Feb 11, 2022
7273438
Update browser recordings
JonathanCrd Feb 11, 2022
6c1d7df
Merge remote-tracking branch 'upstream/main' into migrate-monitor-que…
JonathanCrd Feb 11, 2022
8efdf36
Discard unintentional change in vscode settings
JonathanCrd Feb 11, 2022
5d18bba
Throw error if required env var is not defined
JonathanCrd Feb 11, 2022
921e6a9
Apply suggestions from code review
JonathanCrd Feb 11, 2022
f556b2d
Adressing comments and fixing build with last changes from main
JonathanCrd Feb 11, 2022
f4b03c1
Regenerate recordings/ folder
JonathanCrd Feb 11, 2022
c7f1916
format files
JonathanCrd Feb 11, 2022
527b127
Discover all test inside test/internal/unit/
JonathanCrd Feb 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@
"git.ignoreLimitWarning": true,
"cSpell.words": [
"datalake"
]
],
"typescript.tsdk": "node_modules\\typescript\\lib"
JonathanCrd marked this conversation as resolved.
Show resolved Hide resolved
}
1 change: 1 addition & 0 deletions sdk/monitor/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ extends:
parameters:
ServiceDirectory: monitor
RunUnitTests: true
TestProxy: true
JonathanCrd marked this conversation as resolved.
Show resolved Hide resolved
Artifacts:
- name: azure-monitor-opentelemetry-exporter
safeName: azuremonitoropentelemetryexporter
Expand Down
25 changes: 6 additions & 19 deletions sdk/monitor/monitor-query/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
// https://github.com/karma-runner/karma-chrome-launcher
process.env.CHROME_BIN = require("puppeteer").executablePath();
require("dotenv").config();
const {
jsonRecordingFilterFunction,
isPlaybackMode,
isSoftRecordMode,
isRecordMode,
} = require("@azure-tools/test-recorder");
const { relativeRecordingsPath } = require("@azure-tools/test-recorder");

process.env.RECORDINGS_RELATIVE_PATH = relativeRecordingsPath();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A passing observation: this has absolutely nothing to do with your changes and you don't need to do anything about it, but it irks me slightly that the environment variable is RECORDINGS_RELATIVE_PATH ('recordings', then 'relative'), but the function is the other way around ('relative', then 'recordings').


module.exports = function (config) {
config.set({
Expand All @@ -30,15 +27,13 @@ module.exports = function (config) {
"karma-env-preprocessor",
"karma-coverage",
"karma-junit-reporter",
"karma-json-to-file-reporter",
"karma-json-preprocessor",
],

// list of files / patterns to load in the browser
files: [
"dist-test/index.browser.js",
{ pattern: "dist-test/index.browser.js.map", type: "html", included: false, served: true },
].concat(isPlaybackMode() || isSoftRecordMode() ? ["recordings/browsers/**/*.json"] : []),
],

// list of files / patterns to exclude
exclude: [],
Expand All @@ -47,7 +42,6 @@ module.exports = function (config) {
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
"**/*.js": ["env"],
"recordings/browsers/**/*.json": ["json"],
// IMPORTANT: COMMENT following line if you want to debug in your browsers!!
// Preprocess source file to calculate code coverage, however this will make source file unreadable
//"dist-test/index.browser.js": ["coverage"]
Expand All @@ -62,12 +56,13 @@ module.exports = function (config) {
"AZURE_CLIENT_ID",
"AZURE_CLIENT_SECRET",
"AZURE_TENANT_ID",
"RECORDINGS_RELATIVE_PATH"
],

// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ["mocha", "coverage", "junit", "json-to-file"],
reporters: ["mocha", "coverage", "junit"],

coverageReporter: {
// specify a common output directory
Expand All @@ -85,11 +80,6 @@ module.exports = function (config) {
properties: {}, // key value pair of properties to add to the <properties> section of the report
},

jsonToFileReporter: {
filter: jsonRecordingFilterFunction,
outputPath: ".",
},

// web server port
port: 9876,

Expand Down Expand Up @@ -124,9 +114,6 @@ module.exports = function (config) {
browserNoActivityTimeout: 600000,
browserDisconnectTimeout: 10000,
browserDisconnectTolerance: 3,
browserConsoleLogOptions: {
terminal: !isRecordMode(),
},

client: {
mocha: {
Expand Down
15 changes: 7 additions & 8 deletions sdk/monitor/monitor-query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@
"generate:client:metrics": "autorest --typescript swagger/metrics.md",
"generate:client:metrics-namespaces": "autorest --typescript swagger/metric-namespaces.md",
"generate:client:metrics-definitions": "autorest --typescript swagger/metric-definitions.md",
"integration-test:browser": "karma start --single-run",
"integration-test:node": "nyc mocha -r esm --require source-map-support/register --slow 5000 --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 5000000 --full-trace \"dist-esm/test/{,!(browser)/**/}/*.spec.js\"",
"integration-test:browser": "dev-tool run test:browser",
"integration-test:node": "dev-tool run test:node-js-input -- --timeout 5000000 'dist-esm/test/**/*.spec.js'",
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
"lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]",
"lint": "eslint package.json api-extractor.json src test --format unix --ext .ts",
"pack": "npm pack 2>&1",
"test:browser": "npm run build:test && npm run integration-test:browser",
"test:node": "npm run build:test && npm run integration-test:node",
"test": "npm run build:test && npm run integration-test",
"unit-test:browser": "karma start --single-run",
"unit-test:node": "mocha -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace \"test/{,!(browser)/**/}*.spec.ts\"",
"unit-test:browser": "dev-tool run test:browser",
"unit-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 --exclude 'test/**/browser/*.spec.ts' 'test/**/*.spec.ts'",
"unit-test": "npm run build:test && npm run unit-test:node && npm run unit-test:browser"
},
"files": [
Expand Down Expand Up @@ -111,7 +111,7 @@
"@azure/identity": "^2.0.1",
"@azure/monitor-opentelemetry-exporter": "1.0.0-beta.4",
"@azure/test-utils": "^1.0.0",
"@azure-tools/test-recorder": "^1.0.0",
"@azure-tools/test-recorder": "^2.0.0",
"@microsoft/api-extractor": "^7.18.11",
"@opentelemetry/api": "^1.0.1",
"@opentelemetry/node": "^0.24.0",
Expand All @@ -134,8 +134,6 @@
"karma-env-preprocessor": "^0.1.1",
"karma-firefox-launcher": "^1.1.0",
"karma-ie-launcher": "^1.0.0",
"karma-json-preprocessor": "^0.3.3",
"karma-json-to-file-reporter": "^1.0.1",
"karma-junit-reporter": "^2.0.1",
"karma-mocha-reporter": "^2.2.5",
"karma-mocha": "^2.0.1",
Expand All @@ -146,7 +144,8 @@
"prettier": "^2.5.1",
"rimraf": "^3.0.0",
"source-map-support": "^0.5.9",
"typescript": "~4.2.0"
"typescript": "~4.2.0",
"@azure-tools/test-credential": "^1.0.0"
},
"//sampleConfiguration": {
"skipFolder": false,
Expand Down
Loading