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

[Azure Monitor OpenTelemetry] Update Application Insights Web Snippet Package #28827

Merged
merged 5 commits into from
Mar 8, 2024
Merged

[Azure Monitor OpenTelemetry] Update Application Insights Web Snippet Package #28827

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9c6b76
Update web-snippet package.
JacksonWeber Mar 7, 2024
76c2b2b
Update changelog.
JacksonWeber Mar 7, 2024
8d603a4
Fix format.
JacksonWeber Mar 8, 2024
6c9eb23
Merge branch 'main' into jacksonweber/update-web-snippet-package
JacksonWeber Mar 8, 2024
2c83d89
Update pnpm-lock.
JacksonWeber Mar 8, 2024
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
12 changes: 6 additions & 6 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions sdk/monitor/monitor-opentelemetry/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release History

## Unreleased ()

### Other Changes

- Updated the @microsoft/applicationinsights-web-snippet to v1.1.2.

## 1.3.0 (2024-02-13)

### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/monitor/monitor-opentelemetry/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"@opentelemetry/sdk-trace-node": "^1.21.0",
"@opentelemetry/semantic-conventions": "^1.21.0",
"tslib": "^2.2.0",
"@microsoft/applicationinsights-web-snippet": "1.0.1",
"@microsoft/applicationinsights-web-snippet": "^1.1.2",
"@opentelemetry/resource-detector-azure": "^0.2.4"
},
"sideEffects": false,
Expand Down
58 changes: 38 additions & 20 deletions ...onitor/monitor-opentelemetry/test/internal/unit/browserSdkLoader/browserSdkLoader.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
shutdownAzureMonitor,
useAzureMonitor,
} from "../../../../src/index";
import { isLinux, isWindows } from "../../../../src/utils/common";
import { getOsPrefix } from "../../../../src/utils/common";
import { metrics, trace } from "@opentelemetry/api";
import { logs } from "@opentelemetry/api-logs";

Expand Down Expand Up @@ -117,9 +117,15 @@ describe("#BrowserSdkLoader", () => {
let validHtml = "<html><head></head><body></body></html>";
assert.equal(browserSdkLoader.ValidateInjection(response, validHtml), true);
let newHtml = browserSdkLoader.InjectSdkLoader(response, validHtml).toString();
assert.ok(newHtml.indexOf("https://js.monitor.azure.com/scripts/b/ai.2.min.js") >= 0);
assert.ok(newHtml.indexOf("<html><head>") == 0);
assert.ok(newHtml.indexOf('instrumentationKey: "1aa11111-bbbb-1ccc-8ddd-eeeeffff3333"') >= 0);
assert.ok(
newHtml.indexOf("https://js.monitor.azure.com/scripts/b/ai.3.gbl.min.js") >= 0,
"src path does not exist in the snippet",
);
assert.ok(newHtml.indexOf("<html><head>") == 0, "No snippet content was populated");
assert.ok(
newHtml.indexOf("InstrumentationKey=1aa11111-bbbb-1ccc-8ddd-eeeeffff3333") >= 0,
"Instrumentation Key is not set correctly",
);
});

it("injection of browser SDK should overwrite content length ", () => {
Expand Down Expand Up @@ -184,16 +190,16 @@ describe("#BrowserSdkLoader", () => {
let validHtml = "<html><head></head><body></body></html>";
assert.equal(browserSdkLoader.ValidateInjection(response, validHtml), true);
let newHtml = browserSdkLoader.InjectSdkLoader(response, validHtml);
let osType: string = "u";
if (isWindows()) {
osType = "w";
} else if (isLinux()) {
osType = "l";
}
let expectedStr = ` instrumentationKey: "1aa11111-bbbb-1ccc-8ddd-eeeeffff3333",\r\n disableIkeyDeprecationMessage: true,\r\n sdkExtension: "u${osType}d_n_`;
assert.ok(newHtml.indexOf("https://js.monitor.azure.com/scripts/b/ai.2.min.js") >= 0);
assert.ok(newHtml.indexOf("<html><head>") == 0);
assert.ok(newHtml.indexOf(expectedStr) >= 0, expectedStr);
const expectedSdkVersion = `sdkExtension: "u${getOsPrefix()}d_n_"`;
assert.ok(
newHtml.indexOf("https://js.monitor.azure.com/scripts/b/ai.3.gbl.min.js") >= 0,
"src path does not exist in the snippet",
);
assert.ok(newHtml.indexOf("<html><head>") == 0, "No snippet content was populated");
assert.ok(
newHtml.indexOf(expectedSdkVersion) >= 0,
`Expected string does not exist in the snippet. Expected: ${expectedSdkVersion} in ${newHtml}`,
);
});

it("browser SDK loader injection to buffer", () => {
Expand Down Expand Up @@ -227,9 +233,15 @@ describe("#BrowserSdkLoader", () => {
let validBuffer = Buffer.from(validHtml);
assert.equal(browserSdkLoader.ValidateInjection(response, validBuffer), true);
let newHtml = browserSdkLoader.InjectSdkLoader(response, validBuffer).toString();
assert.ok(newHtml.indexOf("https://js.monitor.azure.com/scripts/b/ai.2.min.js") >= 0);
assert.ok(newHtml.indexOf("<html><head>") == 0);
assert.ok(newHtml.indexOf('instrumentationKey: "1aa11111-bbbb-1ccc-8ddd-eeeeffff3333"') >= 0);
assert.ok(
newHtml.indexOf("https://js.monitor.azure.com/scripts/b/ai.3.gbl.min.js") >= 0,
"src path does not exist in the snippet",
);
assert.ok(newHtml.indexOf("<html><head>") == 0, "No snippet content was populated");
assert.ok(
newHtml.indexOf("InstrumentationKey=1aa11111-bbbb-1ccc-8ddd-eeeeffff3333") >= 0,
"Instrumentation Key is not set correctly",
);
});

it("injection of browser SDK should overwrite content length using buffer ", () => {
Expand Down Expand Up @@ -304,9 +316,15 @@ describe("#BrowserSdkLoader", () => {
let validHtml = "<html><head></head><body></body></html>";
assert.equal(browserSdkLoader.ValidateInjection(response, validHtml), true);
let newHtml = browserSdkLoader.InjectSdkLoader(response, validHtml).toString();
assert.ok(newHtml.indexOf("https://js.monitor.azure.com/scripts/b/ai.2.min.js") >= 0, newHtml);
assert.ok(newHtml.indexOf("<html><head>") == 0);
assert.ok(newHtml.indexOf('instrumentationKey: "1aa11111-bbbb-1ccc-8ddd-eeeeffff3333"') >= 0);
assert.ok(
newHtml.indexOf("https://js.monitor.azure.com/scripts/b/ai.3.gbl.min.js") >= 0,
"src path does not exist in the snippet",
);
assert.ok(newHtml.indexOf("<html><head>") == 0, "No snippet content was populated");
assert.ok(
newHtml.indexOf("InstrumentationKey=1aa11111-bbbb-1ccc-8ddd-eeeeffff3333") >= 0,
"Instrumentation Key is not set correctly",
);
});

it("injection should throw errors when ikey from config is not valid", () => {
Expand Down
Loading