Merge branch

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.0.3 - 2019-06-08
+
+- Support custom end time for span (#95), thanks @skjindal93
+- Upgraded types to match `@opencensus/core` package version `0.0.13`.
+- Package upgrades
 - Add support for object(`SpanOptions`) as an argument for `startChildSpan` function, similar to `startRootSpan`.
 - Please note that there is an API breaking change in methods `addMessageEvent()`. The field `id` is now number instead of string.
 

lerna.json

@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.0.2"
+  "version": "0.0.3"
 }

packages/opencensus-web-all/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencensus/web-all",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OpenCensus Web All combines all the main OpenCensus Web packages to provide distributions for easy use in web applications via <script> tags.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -70,10 +70,10 @@
     "webpack-dev-server": "^3.2.1"
   },
   "dependencies": {
-    "@opencensus/web-core": "^0.0.2",
-    "@opencensus/web-exporter-ocagent": "^0.0.2",
-    "@opencensus/web-instrumentation-perf": "^0.0.2",
-    "@opencensus/web-propagation-tracecontext": "^0.0.2"
+    "@opencensus/web-core": "^0.0.3",
+    "@opencensus/web-exporter-ocagent": "^0.0.3",
+    "@opencensus/web-instrumentation-perf": "^0.0.3",
+    "@opencensus/web-propagation-tracecontext": "^0.0.3"
   },
   "sideEffects": [
     "./src/entrypoints/*.ts"

packages/opencensus-web-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencensus/web-core",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OpenCensus Web is a toolkit for collecting application performance and behavior data from client side web browser apps.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -62,7 +62,7 @@
     "webpack-cli": "^3.1.0"
   },
   "dependencies": {
-    "@opencensus/web-types": "^0.0.2"
+    "@opencensus/web-types": "^0.0.3"
   },
   "sideEffects": false
 }

packages/opencensus-web-core/src/trace/model/span.ts

@@ -261,7 +261,9 @@ export class Span implements webTypes.Span {
 
   /** Ends the span by setting `endTime` to now. */
   end() {
-    this.endPerfTime = performance.now();
+    if (this.endPerfTime === 0) {
+      this.endPerfTime = performance.now();
+    }
   }
 
   /** Forces the span to end. Same as `end` for opencensus-web. */

packages/opencensus-web-core/test/test-span.ts

@@ -95,6 +95,12 @@ describe('Span', () => {
     expect(span.endPerfTime).toBe(33);
   });
 
+  it('does not set endPerfTime when end is called, if endPerfTime is already set', () => {
+    span.endPerfTime = 22;
+    span.end();
+    expect(span.endPerfTime).toBe(22);
+  });
+
   it('sets endPerfTime when truncate is called', () => {
     spyOn(performance, 'now').and.returnValue(77);
     span.truncate();

packages/opencensus-web-exporter-ocagent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencensus/web-exporter-ocagent",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OpenCensus Agent Exporter web allows user to send collected traces to the OpenCensus Agent via HTTP/JSON in a browser.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -62,7 +62,7 @@
     "webpack-cli": "^3.1.0"
   },
   "dependencies": {
-    "@opencensus/web-core": "^0.0.2"
+    "@opencensus/web-core": "^0.0.3"
   },
   "sideEffects": false
 }

packages/opencensus-web-instrumentation-perf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencensus/web-instrumentation-perf",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OpenCensus Web instrumentation to generate spans for browser performance API data.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -63,7 +63,7 @@
     "webpack-cli": "^3.1.0"
   },
   "dependencies": {
-    "@opencensus/web-core": "^0.0.2"
+    "@opencensus/web-core": "^0.0.3"
   },
   "sideEffects": false
 }

packages/opencensus-web-instrumentation-zone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencensus/web-instrumentation-zone",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OpenCensus Web instrumentation zone is used to generate user interaction spans for interactions after the initial page loads.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -65,8 +65,8 @@
     "zone.js": "~0.9.1"
   },
   "dependencies": {
-    "@opencensus/web-core": "^0.0.2",
-    "@opencensus/web-exporter-ocagent": "^0.0.2"
+    "@opencensus/web-core": "^0.0.3",
+    "@opencensus/web-exporter-ocagent": "^0.0.3"
   },
   "peerDependencies": {
     "zone.js": "~0.9.1"

packages/opencensus-web-propagation-tracecontext/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencensus/web-propagation-tracecontext",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OpenCensus Trace Context format propagation for the web browser",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -61,7 +61,7 @@
     "webpack-cli": "^3.1.0"
   },
   "dependencies": {
-    "@opencensus/web-core": "^0.0.2"
+    "@opencensus/web-core": "^0.0.3"
   },
   "sideEffects": false
 }

packages/opencensus-web-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencensus/web-types",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "OpenCensus Web types is a slightly-patched copy of the `types.ts` files from `@opencensus/core` so that they can be easily imported in web-specific packages.",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",