Update documentation with new version and small fix on interaction tracker (#158)

Author: crdgonzalezca

README.md

@@ -215,7 +215,7 @@ trace sample rate via an `ocSampleRate` global variable as well.
       // By default this is set to sample 1/10000 requests.
       ocSampleRate = 1.0;  
     </script>
-    <script src="https://unpkg.com/@opencensus/web-scripts@0.0.3/dist/initial-load-all.js"
+    <script src="https://unpkg.com/@opencensus/web-scripts@0.0.4/dist/initial-load-all.js"
             integrity="sha384-VPY9XX7tiXeLekDPFXkfO2AqNpLTCNOzfXxVghzoVP05PXrG+wtHOW2kOP2ggO9o"
             async crossorigin="anonymous">
     </script>
@@ -248,7 +248,7 @@ trace sample rate via an `ocSampleRate` global variable as well.
     (e.g. React, etc.): 
     ```html
         ...
-        <script src="https://unpkg.com/@opencensus/web-scripts@0.0.3/dist/tracing-all-with-zone.js"
+        <script src="https://unpkg.com/@opencensus/web-scripts@0.0.4/dist/tracing-all-with-zone.js"
                 integrity="sha384-VPY9XX7tiXeLekDPFXkfO2AqNpLTCNOzfXxVghzoVP05PXrG+wtHOW2kOP2ggO9o"
                 async crossorigin="anonymous">
         </script>
@@ -258,7 +258,7 @@ trace sample rate via an `ocSampleRate` global variable as well.
   - If your application uses the `Zone.js` library, the case for `Angular` apps:
     ```html
         ...
-        <script src="https://unpkg.com/@opencensus/web-scripts@0.0.3/dist/tracing-all-with-zone-peer-dep.js"
+        <script src="https://unpkg.com/@opencensus/web-scripts@0.0.4/dist/tracing-all-with-zone-peer-dep.js"
                 integrity="sha384-VPY9XX7tiXeLekDPFXkfO2AqNpLTCNOzfXxVghzoVP05PXrG+wtHOW2kOP2ggO9o"
                 async crossorigin="anonymous">
         </script>
@@ -334,7 +334,7 @@ variable. The `traceparent` variable should be in the
     // We don't need to specify `ocSampleRate` since the trace sampling decision
     // is coming from the `traceparent` global variable instead.
   </script>
-  <script src="https://unpkg.com/@opencensus/web-scripts@0.0.3/dist/initial-load-all.js"
+  <script src="https://unpkg.com/@opencensus/web-scripts@0.0.4/dist/initial-load-all.js"
           integrity="sha384-VPY9XX7tiXeLekDPFXkfO2AqNpLTCNOzfXxVghzoVP05PXrG+wtHOW2kOP2ggO9o"
           async crossorigin="anonymous">
   </script>
@@ -356,7 +356,7 @@ In case you want to use trace user interactions:
     // We don't need to specify `ocSampleRate` since the trace sampling decision
     // is coming from the `traceparent` global variable instead.
   </script>
-  <script src="https://unpkg.com/@opencensus/web-scripts@0.0.3/dist/tracing-all-with-zone.js"
+  <script src="https://unpkg.com/@opencensus/web-scripts@0.0.4/dist/tracing-all-with-zone.js"
           integrity="sha384-VPY9XX7tiXeLekDPFXkfO2AqNpLTCNOzfXxVghzoVP05PXrG+wtHOW2kOP2ggO9o"
           async crossorigin="anonymous">
   </script>

examples/user_interaction/client/package-lock.json

@@ -29,8 +29,6 @@ <h1>OpenCensus Web User Interaction Tracing!</h1>
     naming approach.
   </p>
   <div id="root"></div>
-  <script src="http://localhost:8080/tracing-all-with-zone.js"
-  async>
   </script>
 </body>
 

examples/user_interaction/client/public/index.html

@@ -28,7 +28,6 @@ const tracer = setupTracerAndExporters();
 const http = require('http');
 const url = require('url');
 const sleep = require('sleep');
-let fs = require('fs');
 
 /** Starts a HTTP server that receives requests on sample server port. */
 function startServer(port) {
@@ -96,50 +95,22 @@ function handleRequest(request, response) {
       sleep.sleep(2);
       result = { time: Date.now() - time, value: "" };
       console.log("Finished.")
-      request.on('end', () => {
-        span.end();
-        response.statusCode = code;
-        response.end(JSON.stringify(result));
-      });
     } else if (url.parse(request.url).pathname === '/prime_numbers') {
       console.log("Calculate prime numbers...")
       const time = Date.now();
       const prime_numbers = JSON.stringify(calculatePrimeNumbers());
       result = { time: Date.now() - time, value: prime_numbers };
       console.log("Finished.")
-      request.on('end', () => {
-        span.end();
-        response.statusCode = code;
-        response.end(JSON.stringify(result));
-      });
-    } else if (url.parse(request.url).pathname === '/'){
-      fs.readFile('../client/build/index.html', null, function (error, data) {
-        if (error) {
-            response.writeHead(404);
-            response.write('Whoops! File not found!');
-        } else {
-            response.write(data);
-        }
-        response.end();
-      }); 
+    } else {
       result = { time: 0, value: "unknown url" };
       code = 404;
-      return;
-    } else if(url.parse(request.url).pathname.startsWith('/static')){
-      console.log(request.url)
-      fs.readFile('../client/build/' + url.parse(request.url).pathname, null, function (error, data) {
-        if (error) {
-            response.writeHead(404);
-            response.write('Whoops! File not found!');
-        } else {
-            response.write(data);
-        }
-        response.end();
-      }); 
-      result = { time: 0, value: "unknown url" };
-      code = 404;
-      return
     }
+
+    request.on('end', () => {
+      span.end();
+      response.statusCode = code;
+      response.end(JSON.stringify(result));
+    });
   } catch (err) {
     console.log(err);
     span.end();

examples/user_interaction/server/server.js

@@ -129,9 +129,11 @@ export class InteractionTracker {
   private patchZoneCancelTask() {
     const cancelTask = Zone.prototype.cancelTask;
     Zone.prototype.cancelTask = (task: AsyncTask) => {
-      const currentZone = Zone.current;
+      let currentZone = Zone.current;
       if (isTracingZone(currentZone)) {
         task._zone = currentZone;
+      } else if (isTracingZone(task.zone)) {
+        currentZone = task.zone;
       }
 
       try {