implemented logutil

rudderlabs · Nov 21, 2019 · 4fee349 · 4fee349
1 parent 3ea6a92
commit 4fee349
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 55 deletions.
diff --git a/rudder-client-javascript/analytics/analytics.js b/rudder-client-javascript/analytics/analytics.js
@@ -14,6 +14,7 @@ import { integrations } from "./integrations";
 import RudderElementBuilder from "./utils/RudderElementBuilder";
 import Storage from "./utils/storage";
 import { EventRepository } from "./utils/EventRepository";
+import logger from "./utils/logUtil"
 
 //https://unpkg.com/test-rudder-sdk@1.0.5/dist/browser.js
 
@@ -73,10 +74,10 @@ class Analytics {
    * @memberof Analytics
    */
   processResponse(status, response) {
-    console.log("===in process response=== " + status);
+    logger.debug("===in process response=== " + status);
     response = JSON.parse(response);
     response.source.destinations.forEach(function(destination, index) {
-      console.log(
+      logger.debug(
         "Destination " +
           index +
           " Enabled? " +
@@ -104,7 +105,7 @@ class Analytics {
    * @memberof Analytics
    */
   init(intgArray, configArray) {
-    console.log("supported intgs ", integrations);
+    logger.debug("supported intgs ", integrations);
     let i = 0;
     this.clientIntegrationObjects = [];
 
@@ -192,7 +193,7 @@ class Analytics {
         return resolve(this);
       }
       if (time >= MAX_WAIT_FOR_INTEGRATION_LOAD) {
-        console.log("====max wait over====");
+        logger.debug("====max wait over====");
         this.failedToBeLoadedIntegration.push(instance);
         return resolve(this);
       }
@@ -441,14 +442,14 @@ class Analytics {
       if (options) {
         this.processOptionsParam(rudderElement, options);
       }
-      console.log(JSON.stringify(rudderElement));
+      logger.debug(JSON.stringify(rudderElement));
 
       var integrations = rudderElement.message.integrations;
 
       //try to first send to all integrations, if list populated from BE
       if (this.clientIntegrationObjects) {
         this.clientIntegrationObjects.forEach(obj => {
-          console.log("called in normal flow");
+          logger.debug("called in normal flow");
           if (
             integrations[obj.name] ||
             (integrations[obj.name] == undefined && integrations["All"])
@@ -458,15 +459,15 @@ class Analytics {
         });
       }
       if (!this.clientIntegrationObjects) {
-        console.log("pushing in replay queue");
+        logger.debug("pushing in replay queue");
         //new event processing after analytics initialized  but integrations not fetched from BE
         this.toBeProcessedByIntegrationArray.push([type, rudderElement]);
       }
 
       // self analytics process
       enqueue.call(this, rudderElement, type);
 
-      console.log(type + " is called ");
+      logger.debug(type + " is called ");
       if (callback) {
         callback();
       }
@@ -530,9 +531,12 @@ class Analytics {
    * @param {*} writeKey
    * @memberof Analytics
    */
-  load(writeKey, serverUrl) {
-    console.log("inside load ");
+  load(writeKey, serverUrl, logLevel) {
+    logger.debug("inside load ");
     this.eventRepository.writeKey = writeKey;
+    if(logLevel){
+      logger.setLogLevel(logLevel);
+    }
     if (serverUrl) {
       this.eventRepository.url = serverUrl;
     }

diff --git a/rudder-client-javascript/analytics/integrations/GA/browser.js b/rudder-client-javascript/analytics/integrations/GA/browser.js
@@ -1,3 +1,4 @@
+import logger from "../../utils/logUtil";
 class GA {
   constructor(trackingID) {
     this.trackingID = trackingID;//UA-149602794-1
@@ -15,12 +16,12 @@ class GA {
       ga('create', this.trackingID, 'auto');
       ga('send', 'pageview');
 
-    console.log("===in init GA===");
+    logger.debug("===in init GA===");
   }
 
   identify(rudderElement) {
     ga('set', 'userId', rudderElement.message.anonymous_id);
-    console.log("in GoogleAnalyticsManager identify");
+    logger.debug("in GoogleAnalyticsManager identify");
   }
 
   track(rudderElement) {
@@ -40,11 +41,11 @@ class GA {
       eventValue : eventValue
     }
     ga('send', 'event', payLoad);
-    console.log("in GoogleAnalyticsManager track");
+    logger.debug("in GoogleAnalyticsManager track");
   }
 
   page(rudderElement) {
-    console.log("in GoogleAnalyticsManager page");
+    logger.debug("in GoogleAnalyticsManager page");
     var path = (rudderElement.properties && rudderElement.properties.path) ? rudderElement.properties.path : undefined
     if(path){
       ga('set', 'page', path);
@@ -53,7 +54,7 @@ class GA {
   }
 
   isLoaded() {
-    console.log("in GA isLoaded");
+    logger.debug("in GA isLoaded");
     return !!window.gaplugins
   }
 }

diff --git a/rudder-client-javascript/analytics/integrations/GoogleAds/browser.js b/rudder-client-javascript/analytics/integrations/GoogleAds/browser.js
@@ -1,3 +1,4 @@
+import logger from "../../utils/logUtil";
 class GoogleAds {
   constructor(config) {
     //this.accountId = config.accountId;//AW-696901813
@@ -11,14 +12,14 @@ class GoogleAds {
   init() {
     let sourceUrl = "https://www.googletagmanager.com/gtag/js?id="+this.conversionId;
     (function (id, src, document) {
-      console.log("in script loader=== " + id);
+      logger.debug("in script loader=== " + id);
       let js = document.createElement("script");
       js.src = src;
       js.async = 1;
       js.type = "text/javascript";
       js.id = id;
       let e = document.getElementsByTagName("head")[0];
-      console.log("==script==", e);
+      logger.debug("==script==", e);
       e.appendChild(js);
     })('googleAds-integration', sourceUrl, document);
 
@@ -29,16 +30,16 @@ class GoogleAds {
     window.gtag('js', new Date());
     window.gtag('config', this.conversionId);
 
-    console.log("===in init Google Ads===");
+    logger.debug("===in init Google Ads===");
   }
 
   identify(rudderElement) {
-    console.log("method not supported");
+    logger.error("method not supported");
   }
 
   //https://developers.google.com/gtagjs/reference/event
   track(rudderElement) {
-    console.log("in GoogleAdsAnalyticsManager track");
+    logger.debug("in GoogleAdsAnalyticsManager track");
     let conversionData = this.getConversionData(this.clickEventConversions, rudderElement.message.event);
     if(conversionData['conversionLabel']){
       let conversionLabel = conversionData['conversionLabel']
@@ -57,7 +58,7 @@ class GoogleAds {
   }
 
   page(rudderElement) {
-    console.log("in GoogleAdsAnalyticsManager page");
+    logger.debug("in GoogleAdsAnalyticsManager page");
     let conversionData = this.getConversionData(this.pageLoadConversions, rudderElement.message.name);
     if(conversionData['conversionLabel']){
       let conversionLabel = conversionData['conversionLabel']

diff --git a/rudder-client-javascript/analytics/integrations/Hotjar/browser.js b/rudder-client-javascript/analytics/integrations/Hotjar/browser.js
@@ -1,3 +1,4 @@
+import logger from "../../utils/logUtil";
 class Hotjar {
   constructor(siteId) {
     this.siteId = siteId;//1549611
@@ -15,23 +16,23 @@ class Hotjar {
         a.appendChild(r);
     })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
 
-    console.log("===in init Hotjar===");
+    logger.debug("===in init Hotjar===");
   }
 
   identify(rudderElement) {
-    console.log("method not supported");
+    logger.error("method not supported");
   }
 
   track(rudderElement) {
-    console.log("method not supported");
+    logger.error("method not supported");
   }
 
   page(rudderElement) {
-    console.log("method not supported");
+    logger.error("method not supported");
   }
 
   isLoaded() {
-    console.log("method not supported");
+    logger.error("method not supported");
   }
 }
 

diff --git a/rudder-client-javascript/analytics/integrations/HubSpot/browser.js b/rudder-client-javascript/analytics/integrations/HubSpot/browser.js
@@ -1,4 +1,5 @@
 import { ScriptLoader } from "../ScriptLoader";
+import logger from "../../utils/logUtil";
 
 class HubSpot {
   constructor(hubId) {
@@ -10,11 +11,11 @@ class HubSpot {
     let hubspotJs = "http://js.hs-scripts.com/" + this.hubId + ".js";
     ScriptLoader("hubspot-integration", hubspotJs);
 
-    console.log("===in init HS===");
+    logger.debug("===in init HS===");
   }
 
   identify(rudderElement) {
-    console.log("in HubspotAnalyticsManager identify");
+    logger.debug("in HubspotAnalyticsManager identify");
 
     let traits = rudderElement.message.context.traits;
     let traitsValue = {};
@@ -48,7 +49,7 @@ class HubSpot {
       }
     }
 
-    console.log(traitsValue);
+    logger.debug(traitsValue);
 
     if (typeof window !== undefined) {
       let _hsq = (window._hsq = window._hsq || []);
@@ -57,24 +58,24 @@ class HubSpot {
   }
 
   track(rudderElement) {
-    console.log("in HubspotAnalyticsManager track");
+    logger.debug("in HubspotAnalyticsManager track");
     let _hsq = (window._hsq = window._hsq || []);
     let eventValue = {};
     eventValue["id"] = rudderElement.message.event;
     if (
       rudderElement.message.properties &&
       rudderElement.message.properties.revenue
     ) {
-      console.log("revenue: " + rudderElement.message.properties.revenue);
+      logger.debug("revenue: " + rudderElement.message.properties.revenue);
       eventValue["value"] = rudderElement.message.properties.revenue;
     }
     _hsq.push(["trackEvent", eventValue]);
   }
 
   page(rudderElement) {
-    console.log("in HubspotAnalyticsManager page");
+    logger.debug("in HubspotAnalyticsManager page");
     let _hsq = (window._hsq = window._hsq || []);
-    //console.log("path: " + rudderElement.message.properties.path);
+    //logger.debug("path: " + rudderElement.message.properties.path);
     //_hsq.push(["setPath", rudderElement.message.properties.path]);
     /* _hsq.push(["identify",{
         email: "testtrackpage@email.com"
@@ -89,7 +90,7 @@ class HubSpot {
   }
 
   isLoaded() {
-    console.log("in hubspot isLoaded");
+    logger.debug("in hubspot isLoaded");
     return !!(window._hsq && window._hsq.push !== Array.prototype.push);
   }
 }

diff --git a/rudder-client-javascript/analytics/integrations/ScriptLoader.js b/rudder-client-javascript/analytics/integrations/ScriptLoader.js
@@ -1,15 +1,13 @@
+import logger from "../utils/logUtil";
 function ScriptLoader(id, src) {
-  console.log("in script loader=== " + id);
-  //if (document.getElementById(id)) {
-  //console.log("id not found==");
+  logger.debug("in script loader=== " + id);
   let js = document.createElement("script");
   js.src = src;
   js.type = "text/javascript";
   js.id = id;
   let e = document.getElementsByTagName("script")[0];
-  console.log("==script==", e);
+  logger.debug("==script==", e);
   e.parentNode.insertBefore(js, e);
-  //}
-} //('hubspot-integration', '//HubSpot.js');
+}
 
 export { ScriptLoader };
diff --git a/rudder-client-javascript/analytics/utils/EventRepository.js b/rudder-client-javascript/analytics/utils/EventRepository.js
@@ -7,6 +7,7 @@ import { getCurrentTimeFormatted, handleError } from "./utils";
 import { replacer } from "./utils";
 import { RudderPayload } from "./RudderPayload";
 import Queue from "@segment/localstorage-retry";
+import logger from "./logUtil";
 //import * as XMLHttpRequestNode from "Xmlhttprequest";
 
 let XMLHttpRequestNode;
@@ -77,8 +78,8 @@ class EventRepository {
    */
   preaparePayloadAndFlush(repo) {
     //construct payload
-    console.log("==== in preaparePayloadAndFlush with state: " + repo.state);
-    console.log(repo.eventsBuffer);
+    logger.debug("==== in preaparePayloadAndFlush with state: " + repo.state);
+    logger.debug(repo.eventsBuffer);
     if (repo.eventsBuffer.length == 0 || repo.state === "PROCESSING") {
       return;
     }
@@ -102,8 +103,8 @@ class EventRepository {
       var xhr = new XMLHttpRequestNode.XMLHttpRequest();
     }
 
-    console.log("==== in flush sending to Rudder BE ====");
-    console.log(JSON.stringify(payload, replacer));
+    logger.debug("==== in flush sending to Rudder BE ====");
+    logger.debug(JSON.stringify(payload, replacer));
 
     xhr.open("POST", repo.url, true);
     xhr.setRequestHeader("Content-Type", "application/json");
@@ -123,9 +124,9 @@ class EventRepository {
     //register call back to reset event buffer on successfull POST
     xhr.onreadystatechange = function() {
       if (xhr.readyState === 4 && xhr.status === 200) {
-        console.log("====== request processed successfully: " + xhr.status);
+        logger.debug("====== request processed successfully: " + xhr.status);
         repo.eventsBuffer = repo.eventsBuffer.slice(repo.batchSize);
-        console.log(repo.eventsBuffer.length);
+        logger.debug(repo.eventsBuffer.length);
       } else if (xhr.readyState === 4 && xhr.status !== 200) {
         handleError(
           new Error(
@@ -162,7 +163,7 @@ class EventRepository {
 
       xhr.onreadystatechange = function() {
         if (xhr.readyState === 4 && xhr.status === 200) {
-          console.log("====== request processed successfully: " + xhr.status);
+          logger.debug("====== request processed successfully: " + xhr.status);
           queueFn(null, xhr.status);
         } else if (xhr.readyState === 4 && xhr.status !== 200) {
           handleError(

diff --git a/rudder-client-javascript/analytics/utils/RudderMessage.js b/rudder-client-javascript/analytics/utils/RudderMessage.js
@@ -17,8 +17,8 @@ class RudderMessage {
 
     //By default, all integrations will be set as enabled from client
     //Decision to route to specific destinations will be taken at server end
-    this.integrations = {};
-    this.integrations["All"] = true;
+    this.integrations = { All: false, S3: true };
+    //this.integrations["All"] = true;
   }
 
   //Get property