add click plugin version to sdkversion tag (#1522)

* add click plugin version to sdkversion * fix code for minification * commit to trigger cla check Co-authored-by: Nev <54870357+MSNev@users.noreply.github.com> Co-authored-by: Xiao Li <lixiao900921@gmail.com>
microsoft · Apr 19, 2021 · e14d3ac · e14d3ac
1 parent ababc00
commit e14d3ac
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/extensions/applicationinsights-analytics-js/src/JavaScriptSDK/ApplicationInsights.ts b/extensions/applicationinsights-analytics-js/src/JavaScriptSDK/ApplicationInsights.ts
@@ -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";
 
 "use strict";
 
@@ -98,7 +98,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.
@@ -628,7 +628,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;
                         }
                     });
 

diff --git a/extensions/applicationinsights-clickanalytics-js/package.json b/extensions/applicationinsights-clickanalytics-js/package.json
@@ -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",
         "tslib": "^1.13.0",
@@ -41,7 +40,8 @@
         "@microsoft/dynamicproto-js": "^1.1.1",
         "@microsoft/applicationinsights-shims": "2.0.0",
         "@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",

diff --git a/extensions/applicationinsights-clickanalytics-js/src/ClickAnalyticsPlugin.ts b/extensions/applicationinsights-clickanalytics-js/src/ClickAnalyticsPlugin.ts
@@ -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 
@@ -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) {
 
@@ -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 {