change structure
This commit is contained in:
siyuniu-ms
Родитель
099cda6ee3
Коммит
3d8642e825
|
|
@ -5,25 +5,33 @@
|
|||
|
||||
<!-- import Application Insights JS SDK from CDN -->
|
||||
<script type="text/javascript">!function(T,l,y){var S=T.location,k="script",D="instrumentationKey",C="ingestionendpoint",I="disableExceptionTracking",E="ai.device.",b="toLowerCase",w="crossOrigin",N="POST",e="appInsightsSDK",t=y.name||"appInsights";(y.name||T[e])&&(T[e]=t);var n=T[t]||function(d){var g=!1,f=!1,m={initialize:!0,queue:[],sv:"5",version:2,config:d};function v(e,t){var n={},a="Browser";return n[E+"id"]=a[b](),n[E+"type"]=a,n["ai.operation.name"]=S&&S.pathname||"_unknown_",n["ai.internal.sdkVersion"]="javascript:snippet_"+(m.sv||m.version),{time:function(){var e=new Date;function t(e){var t=""+e;return 1===t.length&&(t="0"+t),t}return e.getUTCFullYear()+"-"+t(1+e.getUTCMonth())+"-"+t(e.getUTCDate())+"T"+t(e.getUTCHours())+":"+t(e.getUTCMinutes())+":"+t(e.getUTCSeconds())+"."+((e.getUTCMilliseconds()/1e3).toFixed(3)+"").slice(2,5)+"Z"}(),iKey:e,name:"Microsoft.ApplicationInsights."+e.replace(/-/g,"")+"."+t,sampleRate:100,tags:n,data:{baseData:{ver:2}}}}var h=d.url||y.src;if(h){function a(e){var t,n,a,i,r,o,s,c,u,p,l;g=!0,m.queue=[],f||(f=!0,t=h,s=function(){var e={},t=d.connectionString;if(t)for(var n=t.split(";"),a=0;a<n.length;a++){var i=n[a].split("=");2===i.length&&(e[i[0][b]()]=i[1])}if(!e[C]){var r=e.endpointsuffix,o=r?e.location:null;e[C]="https://"+(o?o+".":"")+"dc."+(r||"services.visualstudio.com")}return e}(),c=s[D]||d[D]||"",u=s[C],p=u?u+"/v2/track":d.endpointUrl,(l=[]).push((n="SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details)",a=t,i=p,(o=(r=v(c,"Exception")).data).baseType="ExceptionData",o.baseData.exceptions=[{typeName:"SDKLoadFailed",message:n.replace(/\./g,"-"),hasFullStack:!1,stack:n+"\nSnippet failed to load ["+a+"] -- Telemetry is disabled\nHelp Link: https://go.microsoft.com/fwlink/?linkid=2128109\nHost: "+(S&&S.pathname||"_unknown_")+"\nEndpoint: "+i,parsedStack:[]}],r)),l.push(function(e,t,n,a){var i=v(c,"Message"),r=i.data;r.baseType="MessageData";var o=r.baseData;return o.message='AI (Internal): 99 message:"'+("SDK LOAD Failure: Failed to load Application Insights SDK script (See stack for details) ("+n+")").replace(/\"/g,"")+'"',o.properties={endpoint:a},i}(0,0,t,p)),function(e,t){if(JSON){var n=T.fetch;if(n&&!y.useXhr)n(t,{method:N,body:JSON.stringify(e),mode:"cors"});else if(XMLHttpRequest){var a=new XMLHttpRequest;a.open(N,t),a.setRequestHeader("Content-type","application/json"),a.send(JSON.stringify(e))}}}(l,p))}function i(e,t){f||setTimeout(function(){!t&&m.core||a()},500)}var e=function(){var n=l.createElement(k);n.src=h;var e=y[w];return!e&&""!==e||"undefined"==n[w]||(n[w]=e),n.onload=i,n.onerror=a,n.onreadystatechange=function(e,t){"loaded"!==n.readyState&&"complete"!==n.readyState||i(0,t)},n}();y.ld<0?l.getElementsByTagName("head")[0].appendChild(e):setTimeout(function(){l.getElementsByTagName(k)[0].parentNode.appendChild(e)},y.ld||0)}try{m.cookie=l.cookie}catch(p){}function t(e){for(;e.length;)!function(t){m[t]=function(){var e=arguments;g||m.queue.push(function(){m[t].apply(m,e)})}}(e.pop())}var n="track",r="TrackPage",o="TrackEvent";t([n+"Event",n+"PageView",n+"Exception",n+"Trace",n+"DependencyData",n+"Metric",n+"PageViewPerformance","start"+r,"stop"+r,"start"+o,"stop"+o,"addTelemetryInitializer","setAuthenticatedUserContext","clearAuthenticatedUserContext","flush"]),m.SeverityLevel={Verbose:0,Information:1,Warning:2,Error:3,Critical:4};var s=(d.extensionConfig||{}).ApplicationInsightsAnalytics||{};if(!0!==d[I]&&!0!==s[I]){var c="onerror";t(["_"+c]);var u=T[c];T[c]=function(e,t,n,a,i){var r=u&&u(e,t,n,a,i);return!0!==r&&m["_"+c]({message:e,url:t,lineNumber:n,columnNumber:a,error:i}),r},d.autoExceptionInstrumented=!0}return m}(y.cfg);function a(){y.onInit&&y.onInit(n)}(T[t]=n).queue&&0===n.queue.length?(n.queue.push(a),n.trackPageView({})):a()}(window,document,{
|
||||
src: "https://js.monitor.azure.com/scripts/b/ai.2.min.js", // The SDK URL Source for the CDN
|
||||
//src: "http://localhost:9001/AISKU/browser/es5/ai.2.min.js", // The URL Source for the local build
|
||||
src: "http://localhost:9001/AISKU/browser/es5/ai.3.3.0.js", // The URL Source for the local build
|
||||
crossOrigin: "anonymous", // When supplied this will add the provided value as the cross origin attribute on the script tag
|
||||
cfg: { // Application Insights Configuration
|
||||
instrumentationKey: "INSTRUMENTATION_KEY",
|
||||
connectionString: "InstrumentationKey=814a172a-92fd-4950-9023-9cf13bb65696;IngestionEndpoint=https://eastus-8.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus.livediagnostics.monitor.azure.com/",
|
||||
expCfg: {
|
||||
inclScripts: true,
|
||||
expLog : () => {
|
||||
return {logs: ["log info 1", "log info 2"]};
|
||||
},
|
||||
maxLength: 100
|
||||
}
|
||||
//disableIKeyValidation: true
|
||||
}});
|
||||
// getExceptionScriptsInfo: true
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<h1>Hello World!</h1>
|
||||
<!-- trackException manual tests
|
||||
trackException manual tests
|
||||
<button onclick="javascript: throw 'String Error'">Throw String Exception</button>
|
||||
<button onclick="javascript: appInsights.trackException({ exception: 'String Error' })">trackException with String as the exception</button>
|
||||
<button onclick="javascript: try { throw 'String Error'; } catch(e) { appInsights.trackException({exception: e})}">trackException with try / catch</button>
|
||||
|
||||
<button onclick="javascript: appInsights.trackException('String Error')">trackException with String</button>
|
||||
<button onclick="javascript: try { throw 'String Error'; } catch(e) { appInsights.trackException(null)}">trackException with null</button>
|
||||
-->
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -16,8 +16,9 @@ const appInsights = new ApplicationInsights({
|
|||
expCfg: {
|
||||
inclScripts: true,
|
||||
expLog : () => {
|
||||
return {message: ["log info 1", "log info 2"], maxLength: 100};
|
||||
}
|
||||
return {logs: ["log info 1", "log info 2"]};
|
||||
},
|
||||
maxLogs : 100
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -500,32 +500,36 @@ export class AnalyticsPluginTests extends AITestClass {
|
|||
const baseData = (trackStub.args[0][0] as ITelemetryItem).baseData as IExceptionInternal;
|
||||
const prop = baseData.properties;
|
||||
Assert.equal(-1, JSON.stringify(prop).indexOf("test message"), "log info is not included");
|
||||
// check maxLength would truncate the log info
|
||||
let myLogFunction = () => {
|
||||
return {message: ['test message'], maxLength: 7};
|
||||
};
|
||||
appInsights.config.expCfg.expLog = myLogFunction;
|
||||
|
||||
|
||||
// check maxLength default value
|
||||
appInsights.config.expCfg.expLog = () => {
|
||||
return {logs: ['apple'.repeat(10), 'banana'.repeat(10)]};
|
||||
};;
|
||||
this.clock.tick(1);
|
||||
appInsights.trackException({error: new Error(), severityLevel: SeverityLevel.Critical});
|
||||
Assert.ok(trackStub.calledTwice, "second exception is tracked");
|
||||
const baseData2 = (trackStub.args[1][0] as ITelemetryItem).baseData as IExceptionInternal;
|
||||
const prop2 = baseData2.properties;
|
||||
Assert.deepEqual(true, prop2["exceptionLog"].includes('test'), "log info is included");
|
||||
Assert.equal(-1, prop2["exceptionLog"].indexOf("message"), "text after max length should not be included");
|
||||
Assert.deepEqual(true, prop2["exceptionLog"].includes('apple'), "log info before max length is included");
|
||||
Assert.equal(-1, prop2["exceptionLog"].indexOf("banana"), "text after max length should not be included");
|
||||
|
||||
this.clock.tick(1);
|
||||
|
||||
// check maxLength default value
|
||||
appInsights.config.expCfg.expLog = () => {
|
||||
return {message: ['apple'.repeat(10), 'banana'.repeat(10)]};
|
||||
};;
|
||||
// check maxLength would truncate the log info
|
||||
let myLogFunction = () => {
|
||||
return {logs: ['test message', 'check message']};
|
||||
};
|
||||
appInsights.config.expCfg.expLog = myLogFunction;
|
||||
appInsights.config.expCfg.maxLogs = 15;
|
||||
this.clock.tick(1);
|
||||
appInsights.trackException({error: new Error(), severityLevel: SeverityLevel.Critical});
|
||||
this.clock.tick(1);
|
||||
Assert.ok(trackStub.calledThrice, "third exception is tracked");
|
||||
const baseData3 = (trackStub.args[2][0] as ITelemetryItem).baseData as IExceptionInternal;
|
||||
const prop3 = baseData3.properties;
|
||||
Assert.deepEqual(true, prop3["exceptionLog"].includes('apple'), "log info is included");
|
||||
Assert.equal(-1, prop3["exceptionLog"].indexOf("banana"), "text after max length should not be included");
|
||||
Assert.deepEqual(true, prop3["exceptionLog"].includes('test'), "log info is included");
|
||||
Assert.equal(-1, prop3["exceptionLog"].indexOf("message"), "text after max length should not be included");
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ const defaultValues: IConfigDefaults<IConfig> = objDeepFreeze({
|
|||
enableDebug: cfgDfBoolean(),
|
||||
disableFlushOnBeforeUnload: cfgDfBoolean(),
|
||||
disableFlushOnUnload: cfgDfBoolean(false, "disableFlushOnBeforeUnload"),
|
||||
expCfg: cfgDfMerge<IExceptionConfig>({inclScripts: false, expLog: undefined})
|
||||
expCfg: cfgDfMerge<IExceptionConfig>({inclScripts: false, expLog: undefined, maxLogs: 50})
|
||||
});
|
||||
|
||||
function _chkConfigMilliseconds(value: number, defValue: number): number {
|
||||
|
|
@ -123,7 +123,7 @@ export class AnalyticsPlugin extends BaseTelemetryPlugin implements IAppInsights
|
|||
let _autoUnhandledPromiseInstrumented: boolean;
|
||||
let _extConfig: IConfig;
|
||||
let _autoTrackPageVisitTime: boolean;
|
||||
let _reportExpDetails: () => {message: string[], maxLength?: number};
|
||||
let _reportExpDetails: () => {logs: string[]};
|
||||
|
||||
// Counts number of trackAjax invocations.
|
||||
// By default we only monitor X ajax call per view to avoid too much load.
|
||||
|
|
@ -431,8 +431,7 @@ export class AnalyticsPlugin extends BaseTelemetryPlugin implements IAppInsights
|
|||
exceptionPartB.properties["exceptionScripts"] = JSON.stringify(scriptsInfo);
|
||||
}
|
||||
if (_self.config.expCfg?.expLog) {
|
||||
const { message, maxLength = 50 } = _reportExpDetails();
|
||||
exceptionPartB.properties["exceptionLog"] = JSON.stringify(message).substring(0, maxLength);
|
||||
exceptionPartB.properties["exceptionLog"] = JSON.stringify(_reportExpDetails()).substring(0, _self.config.expCfg.maxLogs);
|
||||
}
|
||||
let telemetryItem: ITelemetryItem = createTelemetryItem<IExceptionInternal>(
|
||||
exceptionPartB,
|
||||
|
|
|
|||
|
|
@ -11,18 +11,21 @@ export interface IExceptionConfig{
|
|||
*/
|
||||
inclScripts?: boolean;
|
||||
|
||||
/**
|
||||
* Callback function to generate a message and optionally specify its maximum length for inclusion in telemetry data.
|
||||
* This function should be implemented to provide a custom message. The maximum length of the message is optional;
|
||||
* if not provided, it will default to 50 characters.
|
||||
/**
|
||||
* Callback function for collecting logs to be included in telemetry data.
|
||||
*
|
||||
* The callback will be invoked before sending out telemetry, allowing customization of the telemetry message.
|
||||
* The length of logs to generate is controlled by the `maxLogs` parameter.
|
||||
*
|
||||
* @returns {Object} An object containing:
|
||||
* - message: A string representing the message to include in the telemetry.
|
||||
* - maxLength: (Optional) A number specifying the maximum length allowed for the message. Defaults to 50 if not provided.
|
||||
* This callback is called before telemetry data is sent, allowing for dynamic customization of the logs.
|
||||
*
|
||||
* @returns {Object} An object with the following property:
|
||||
* - logs: An array of strings, where each string represents a log entry to be included in the telemetry.
|
||||
*
|
||||
* @property {number} maxLogs - Specifies the maximum number of logs that can be generated. If not explicitly set, it defaults to 10.
|
||||
*/
|
||||
expLog?: () => { message: string[], maxLength?: number };
|
||||
expLog: () => { logs: string[] },
|
||||
maxLogs: number
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче