Skip to content

[main] snippet generation fix for pr #2428 #2445

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

Merged
siyuniu-ms merged 1 commit into from
Nov 11, 2024
Merged

[main] snippet generation fix for pr #2428 #2445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions tools/applicationinsights-web-snippet/src/1dsSupport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ let capturePage = "capturePage";
export const oneDsMethods = [
track + "Event",
track + "Exception",
trackPage + "View",
trackPage + "ViewPerformance",
track + "PageView",
track + "PageViewPerformance",
"addTelemetryInitializer",
track,
trackPage + "Action",
Expand Down
4 changes: 2 additions & 2 deletions tools/applicationinsights-web-snippet/src/aiSupport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ let trackEvent = "TrackEvent";
export const aiMethod = [
track + "Event",
track + "Exception",
trackPage + "View",
trackPage + "ViewPerformance",
track + "PageView",
track + "PageViewPerformance",
"addTelemetryInitializer",
track + "Trace",
track + "DependencyData",
Expand Down
26 changes: 15 additions & 11 deletions tools/applicationinsights-web-snippet/src/snippet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,29 +36,33 @@ declare var cfg:ISnippetConfig;
let sdkInstanceName:string;
let aiName:string;


if (isOneDS){
sdkInstanceName = "onedsSDK";
aiName = cfg.name || "oneDSWeb"; // provide non default instance name through snipConfig name value
} else {
sdkInstanceName = "appInsightsSDK";
aiName = cfg.name || "appInsights";
}

if (cfg.name || win[sdkInstanceName]) {
// Only set if supplied or another name is defined to avoid polluting the global namespace
win[sdkInstanceName] = aiName;
}

let aiSdk = win[aiName] || (function (aiConfig: IConfiguration & IConfig , aiExtensions?: any) {
let targetSrc : string = (aiConfig as any)["url"] || cfg.src;
if (isOneDS){
sdkInstanceName = "onedsSDK";
aiName = cfg.name || "oneDSWeb"; // provide non default instance name through snipConfig name value
} else {
sdkInstanceName = "appInsightsSDK";
aiName = cfg.name || "appInsights";
}


let loadFailed = false;
let handled = false;
let appInsights: (Snippet & {cookie?:any, core?:any, extensions?:any, initialize?: boolean, isInitialized?: () => boolean;}) = null;
appInsights= {
let appInsights: (Snippet & {cookie?:any, core?:any, extensions?:any, initialize?: boolean, isInitialized?: () => boolean;}) = {
initialize: true, // initialize sdk on download
queue: [],
sv: "8", // Track the actual snippet version for reporting.
config: aiConfig,
extensions: aiExtensions,
initialize: true // initialize sdk on download
version: 2.0,
extensions: aiExtensions
};

if (isOneDS && !aiConfig["webAnalyticsConfiguration"]){
Expand Down