@opentelemetry/sdk-trace-base
Advanced tools
Comparing version 1.0.0 to 1.0.1
@@ -17,3 +17,3 @@ /* | ||
import { trace, context, propagation, diag, } from '@opentelemetry/api'; | ||
import { CompositePropagator, W3CBaggagePropagator, W3CTraceContextPropagator, getEnv, } from '@opentelemetry/core'; | ||
import { CompositePropagator, W3CBaggagePropagator, W3CTraceContextPropagator, getEnv, merge, } from '@opentelemetry/core'; | ||
import { Resource } from '@opentelemetry/resources'; | ||
@@ -24,4 +24,2 @@ import { Tracer } from '.'; | ||
import { NoopSpanProcessor } from './export/NoopSpanProcessor'; | ||
// eslint-disable-next-line @typescript-eslint/no-var-requires | ||
var merge = require('lodash.merge'); | ||
import { BatchSpanProcessor } from './platform'; | ||
@@ -28,0 +26,0 @@ export var ForceFlushState; |
@@ -1,2 +0,2 @@ | ||
export declare const VERSION = "1.0.0"; | ||
export declare const VERSION = "1.0.1"; | ||
//# sourceMappingURL=version.d.ts.map |
@@ -17,3 +17,3 @@ /* | ||
// this is autogenerated file, see scripts/version-update.js | ||
export var VERSION = '1.0.0'; | ||
export var VERSION = '1.0.1'; | ||
//# sourceMappingURL=version.js.map |
@@ -26,4 +26,2 @@ "use strict"; | ||
const NoopSpanProcessor_1 = require("./export/NoopSpanProcessor"); | ||
// eslint-disable-next-line @typescript-eslint/no-var-requires | ||
const merge = require('lodash.merge'); | ||
const platform_1 = require("./platform"); | ||
@@ -45,3 +43,3 @@ var ForceFlushState; | ||
this._tracers = new Map(); | ||
const mergedConfig = merge({}, config_1.DEFAULT_CONFIG, config); | ||
const mergedConfig = core_1.merge({}, config_1.DEFAULT_CONFIG, config); | ||
this.resource = (_a = mergedConfig.resource) !== null && _a !== void 0 ? _a : resources_1.Resource.empty(); | ||
@@ -48,0 +46,0 @@ this.resource = resources_1.Resource.default().merge(this.resource); |
@@ -1,2 +0,2 @@ | ||
export declare const VERSION = "1.0.0"; | ||
export declare const VERSION = "1.0.1"; | ||
//# sourceMappingURL=version.d.ts.map |
@@ -20,3 +20,3 @@ "use strict"; | ||
// this is autogenerated file, see scripts/version-update.js | ||
exports.VERSION = '1.0.0'; | ||
exports.VERSION = '1.0.1'; | ||
//# sourceMappingURL=version.js.map |
{ | ||
"name": "@opentelemetry/sdk-trace-base", | ||
"version": "1.0.0", | ||
"version": "1.0.1", | ||
"description": "OpenTelemetry Tracing", | ||
@@ -58,4 +58,3 @@ "main": "build/src/index.js", | ||
"devDependencies": { | ||
"@opentelemetry/api": "^1.0.2", | ||
"@types/lodash.merge": "4.6.6", | ||
"@opentelemetry/api": "~1.0.3", | ||
"@types/mocha": "8.2.3", | ||
@@ -67,3 +66,3 @@ "@types/node": "14.17.11", | ||
"istanbul-instrumenter-loader": "3.0.1", | ||
"karma": "5.2.3", | ||
"karma": "6.3.7", | ||
"karma-chrome-launcher": "3.1.0", | ||
@@ -77,3 +76,3 @@ "karma-coverage-istanbul-reporter": "3.0.3", | ||
"rimraf": "3.0.2", | ||
"sinon": "11.1.2", | ||
"sinon": "12.0.1", | ||
"ts-loader": "8.3.0", | ||
@@ -85,11 +84,10 @@ "ts-mocha": "8.0.0", | ||
"peerDependencies": { | ||
"@opentelemetry/api": "^1.0.2" | ||
"@opentelemetry/api": ">=1.0.0 <1.1.0" | ||
}, | ||
"dependencies": { | ||
"@opentelemetry/core": "1.0.0", | ||
"@opentelemetry/resources": "1.0.0", | ||
"@opentelemetry/semantic-conventions": "1.0.0", | ||
"lodash.merge": "^4.6.2" | ||
"@opentelemetry/core": "1.0.1", | ||
"@opentelemetry/resources": "1.0.1", | ||
"@opentelemetry/semantic-conventions": "1.0.1" | ||
}, | ||
"gitHead": "69b925d142a4405c7c6bec7deadd8b4e96c7d5d6" | ||
"gitHead": "9cf402ee4231ee1446884b5f59958ceafc1b5188" | ||
} |
@@ -73,2 +73,2 @@ # OpenTelemetry Tracing SDK | ||
[npm-url]: https://www.npmjs.com/package/@opentelemetry/sdk-trace-base | ||
[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Ftracing.svg | ||
[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fsdk-trace-base.svg |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
375519
4
21
4040
+ Added@opentelemetry/api@1.0.4(transitive)
+ Added@opentelemetry/core@1.0.1(transitive)
+ Added@opentelemetry/resources@1.0.1(transitive)
+ Added@opentelemetry/semantic-conventions@1.0.1(transitive)
- Removedlodash.merge@^4.6.2
- Removed@opentelemetry/api@1.9.0(transitive)
- Removed@opentelemetry/core@1.0.0(transitive)
- Removed@opentelemetry/resources@1.0.0(transitive)
- Removed@opentelemetry/semantic-conventions@1.0.0(transitive)
- Removedlodash.merge@4.6.2(transitive)
- Removedsemver@7.6.2(transitive)
Updated@opentelemetry/core@1.0.1