diff --git a/packages/opencensus-core/package.json b/packages/opencensus-core/package.json index 8f34d4a7c..e0f438784 100644 --- a/packages/opencensus-core/package.json +++ b/packages/opencensus-core/package.json @@ -9,7 +9,7 @@ "test": "nyc -x '**/test/**' --reporter=html --reporter=text mocha 'build/test/**/*.js'", "clean": "rimraf build/*", "check": "gts check", - "compile": "tsc -p . && cp package.json build/", + "compile": "tsc -p .", "fix": "gts fix", "prepare": "npm run compile", "pretest": "npm run compile", diff --git a/packages/opencensus-core/src/common/version.ts b/packages/opencensus-core/src/common/version.ts index 1ed54cde5..2dc170f29 100644 --- a/packages/opencensus-core/src/common/version.ts +++ b/packages/opencensus-core/src/common/version.ts @@ -15,5 +15,14 @@ * limitations under the License. */ -const pjson = require('../../package.json'); +type Package = { + version: string; +}; + +// Load the package details. Note that the `require` is performed at runtime, +// which means the source files will be in the `/build` directory, so the +// package path is relative to that location. +const pjson: Package = require('../../../package.json'); + +// Export the core package version export const version: string = pjson.version; diff --git a/packages/opencensus-exporter-ocagent/src/ocagent.ts b/packages/opencensus-exporter-ocagent/src/ocagent.ts index c88fa5efd..ca96e8637 100644 --- a/packages/opencensus-exporter-ocagent/src/ocagent.ts +++ b/packages/opencensus-exporter-ocagent/src/ocagent.ts @@ -15,7 +15,7 @@ */ import * as protoLoader from '@grpc/proto-loader'; -import {Exporter, ExporterBuffer, ExporterConfig, logger, Logger, RootSpan, SamplerBuilder} from '@opencensus/core'; +import {Exporter, ExporterBuffer, ExporterConfig, logger, Logger, RootSpan, SamplerBuilder, version as coreVersion} from '@opencensus/core'; import * as tracing from '@opencensus/nodejs'; import * as grpc from 'grpc'; import * as os from 'os'; @@ -91,8 +91,7 @@ export class OCAgentExporter implements Exporter { * Get node properties */ this.exporterVersion = require('../../package.json').version; - this.coreVersion = - require('../../node_modules/@opencensus/core/package.json').version; + this.coreVersion = coreVersion; this.hostName = os.hostname(); this.processStartTimeMillis = Date.now() - (process.uptime() * 1000);