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

add click plugin version to sdkversion tag #1522

Merged
merged 6 commits into from
Apr 19, 2021
Merged

add click plugin version to sdkversion tag #1522

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c8b5333
add click plugin version to sdkversion
kryalama Apr 1, 2021
dea8ab2
fix code for minification
kryalama Apr 1, 2021
3754705
commit to trigger cla check
kryalama Apr 2, 2021
11498a8
Merge branch 'master' into kryalama/addclickversion
MSNev Apr 15, 2021
393e68e
Merge branch 'master' into kryalama/addclickversion
xiao-lix Apr 16, 2021
12c2930
Merge branch 'master' into kryalama/addclickversion
kryalama Apr 16, 2021
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
6 changes: 3 additions & 3 deletions extensions/applicationinsights-analytics-js/src/JavaScriptSDK/ApplicationInsights.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { ITelemetryConfig } from "../JavaScriptSDK.Interfaces/ITelemetryConfig";
import dynamicProto from "@microsoft/dynamicproto-js";

// For types only
import * as properties from "@microsoft/applicationinsights-properties-js";
import { PropertiesPlugin } from "@microsoft/applicationinsights-properties-js";
kryalama marked this conversation as resolved.
Show resolved Hide resolved

"use strict";

Expand Down Expand Up @@ -94,7 +94,7 @@ export class ApplicationInsights extends BaseTelemetryPlugin implements IAppInsi
super();
let _eventTracking: Timing;
let _pageTracking: Timing;
let _properties: properties.PropertiesPlugin;
let _properties: PropertiesPlugin;

// Counts number of trackAjax invocations.
// By default we only monitor X ajax call per view to avoid too much load.
Expand Down Expand Up @@ -624,7 +624,7 @@ export class ApplicationInsights extends BaseTelemetryPlugin implements IAppInsi
// Find the properties plugin
arrForEach(extensions, extension => {
if (extension.identifier === PropertiesPluginIdentifier) {
_properties = extension as properties.PropertiesPlugin;
_properties = extension as PropertiesPlugin;
}
});

Expand Down
4 changes: 2 additions & 2 deletions extensions/applicationinsights-clickanalytics-js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"devDependencies": {
"@microsoft/applicationinsights-rollup-plugin-uglify3-js": "1.0.0",
"@microsoft/applicationinsights-rollup-es3": "1.1.3",
"@microsoft/applicationinsights-properties-js": "2.6.1",
"@microsoft/api-extractor" : "^7.9.11",
"typescript": "2.5.3",
"globby": "^11.0.0",
Expand All @@ -39,7 +38,8 @@
"@microsoft/dynamicproto-js": "^1.1.1",
"@microsoft/applicationinsights-shims": "1.0.3",
"@microsoft/applicationinsights-core-js": "2.6.1",
"@microsoft/applicationinsights-common": "2.6.1"
"@microsoft/applicationinsights-common": "2.6.1",
"@microsoft/applicationinsights-properties-js": "2.6.1"
},
"repository": {
"type": "git",
Expand Down
21 changes: 16 additions & 5 deletions extensions/applicationinsights-clickanalytics-js/src/ClickAnalyticsPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ import {
BaseTelemetryPlugin, isNullOrUndefined, ITelemetryItem,
IProcessTelemetryContext, ITelemetryPluginChain,
_InternalMessageId, ICustomProperties,
LoggingSeverity,
dumpObj,
getExceptionName
LoggingSeverity, arrForEach, dumpObj, getExceptionName
} from "@microsoft/applicationinsights-core-js";
import { IConfig } from "@microsoft/applicationinsights-common";
import { IConfig, IPropertiesPlugin, PropertiesPluginIdentifier } from "@microsoft/applicationinsights-common";
import {
IClickAnalyticsConfiguration, IContentHandler,
IAutoCaptureHandler, IPageActionTelemetry
Expand All @@ -23,16 +21,17 @@ import {
import { PageAction } from './events/PageAction';
import { AutoCaptureHandler } from "./handlers/AutoCaptureHandler";
import { DomContentHandler } from "./handlers/DomContentHandler";
import { PropertiesPlugin } from "@microsoft/applicationinsights-properties-js";
export { BehaviorMapValidator, BehaviorValueValidator, BehaviorEnumValidator }

export class ClickAnalyticsPlugin extends BaseTelemetryPlugin {
public identifier: string = 'ClickAnalyticsPlugin';
public priority: number = 181;
public static Version = "2.6.1";
private _config: IClickAnalyticsConfiguration;
private pageAction: PageAction;
private _autoCaptureHandler: IAutoCaptureHandler;
private _contentHandler: IContentHandler;


initialize(config: IConfiguration & IConfig, core: IAppInsightsCore, extensions: IPlugin[], pluginChain?: ITelemetryPluginChain) {

Expand All @@ -52,6 +51,18 @@ export class ClickAnalyticsPlugin extends BaseTelemetryPlugin {
if (this._config.autoCapture) {
this._autoCaptureHandler.click();
}
// Find the properties plugin
let _propertiesExtension:IPropertiesPlugin;
arrForEach(extensions, extension => {
if (extension.identifier === PropertiesPluginIdentifier) {
_propertiesExtension = extension as PropertiesPlugin;
}
});
// Append Click Analytics Plugin Version to SDK version
if (_propertiesExtension && _propertiesExtension.context &&
_propertiesExtension.context.internal && _propertiesExtension.context.internal.sdkVersion) {
_propertiesExtension.context.internal.sdkVersion += "_ClickPlugin"+ ClickAnalyticsPlugin.Version;
}
}

processTelemetry(env: ITelemetryItem, itemCtx?: IProcessTelemetryContext): void {
Expand Down