remove use of tracked analytics object

Author: raae

lib-es5/utils/index.js

@@ -897,17 +897,19 @@ function url(public_id) {
   }
 
   var urlAnalytics = ensureOption(options, 'urlAnalytics', false);
-  var trackedAnalytics = ensureOption(options, 'trackedAnalytics', false);
 
-  if (urlAnalytics === true || trackedAnalytics) {
-    var sdkVersions = getSDKVersions();
+  if (urlAnalytics === true) {
+    var { sdkCode, sdkSemver, techVersion } = getSDKVersions();
+    var sdkVersions = {
+      sdkCode: ensureOption(options, 'sdkCode', sdkCode),
+      sdkSemver: ensureOption(options, 'sdkSemver', sdkSemver),
+      techVersion: ensureOption(options, 'techVersion', techVersion)
+    };
+
+    var analyticsOptions = getAnalyticsOptions(
+      Object.assign({}, options, sdkVersions)
+    );
 
-    if (trackedAnalytics) {
-      sdkVersions = trackedAnalytics;
-      sdkVersions.urlAnalytics = true;
-    }
-    
-    var analyticsOptions = getAnalyticsOptions(Object.assign({}, options, sdkVersions));
     var sdkAnalyticsSignature = getSDKAnalyticsSignature(analyticsOptions);
 
     // url might already have a '?' query param

lib/utils/index.js

@@ -827,17 +827,19 @@ function url(public_id, options = {}) {
   }
 
   let urlAnalytics = ensureOption(options, 'urlAnalytics', false);
-  let trackedAnalytics = ensureOption(options, 'trackedAnalytics', false);
 
-  if (urlAnalytics === true || trackedAnalytics) {
-    let sdkVersions = getSDKVersions();
+  if (urlAnalytics === true) {
+    let { sdkCode, sdkSemver, techVersion } = getSDKVersions();
+    let sdkVersions = {
+      sdkCode: ensureOption(options, 'sdkCode', sdkCode),
+      sdkSemver: ensureOption(options, 'sdkSemver', sdkSemver),
+      techVersion: ensureOption(options, 'techVersion', techVersion)
+    };
 
-    if (trackedAnalytics) {
-      sdkVersions = trackedAnalytics;
-      sdkVersions.urlAnalytics = true;
-    }
+    let analyticsOptions = getAnalyticsOptions(
+      Object.assign({}, options, sdkVersions)
+    );
 
-    let analyticsOptions = getAnalyticsOptions(Object.assign({}, options, sdkVersions));
     let sdkAnalyticsSignature = getSDKAnalyticsSignature(analyticsOptions);
 
     // url might already have a '?' query param

test/unit/sdkAnalytics/imageTagWithAnalytics.spec.js

@@ -73,11 +73,11 @@ describe('Tests for sdk analytics through image tag', function () {
 
     let imgStr = cloudinary.image("hello", {
       format: "png",
-      trackedAnalytics: {
-        sdkCode: "X",
-        sdkSemver: "7.3.0",
-        techVersion: "3.4.7"
-      }
+      urlAnalytics: true,
+      sdkCode: "X",
+      sdkSemver: "7.3.0",
+      techVersion: "3.4.7"
+      
     });
 
     expect(imgStr).to.contain(`src='http://res.cloudinary.com/${TEST_CLOUD_NAME}/image/upload/hello.png?_s=AXAEzGT0`);