@opentelemetry/metrics
Advanced tools
Comparing version 0.19.1-alpha.42 to 0.19.1-alpha.43
@@ -77,2 +77,3 @@ /* | ||
import { ValueRecorderMetric } from './ValueRecorderMetric'; | ||
// eslint-disable-next-line @typescript-eslint/no-var-requires | ||
var merge = require('lodash.merge'); | ||
@@ -96,3 +97,3 @@ /** | ||
this._resource = | ||
mergedConfig.resource || Resource.createTelemetrySDKResource(); | ||
mergedConfig.resource || Resource.empty(); | ||
this._instrumentationLibrary = instrumentationLibrary; | ||
@@ -99,0 +100,0 @@ // start the push controller |
@@ -19,2 +19,3 @@ /* | ||
import { DEFAULT_CONFIG } from './types'; | ||
// eslint-disable-next-line @typescript-eslint/no-var-requires | ||
var merge = require('lodash.merge'); | ||
@@ -27,3 +28,2 @@ /** | ||
if (config === void 0) { config = {}; } | ||
var _a; | ||
this._meters = new Map(); | ||
@@ -33,4 +33,4 @@ this._shuttingDownPromise = Promise.resolve(); | ||
var mergedConfig = merge({}, DEFAULT_CONFIG, config); | ||
this.resource = | ||
(_a = mergedConfig.resource) !== null && _a !== void 0 ? _a : Resource.createTelemetrySDKResource(); | ||
this.resource = mergedConfig.resource || Resource.empty(); | ||
this.resource = Resource.default().merge(this.resource); | ||
this._config = Object.assign({}, mergedConfig, { | ||
@@ -37,0 +37,0 @@ resource: this.resource, |
@@ -33,2 +33,3 @@ "use strict"; | ||
const ValueRecorderMetric_1 = require("./ValueRecorderMetric"); | ||
// eslint-disable-next-line @typescript-eslint/no-var-requires | ||
const merge = require('lodash.merge'); | ||
@@ -51,3 +52,3 @@ /** | ||
this._resource = | ||
mergedConfig.resource || resources_1.Resource.createTelemetrySDKResource(); | ||
mergedConfig.resource || resources_1.Resource.empty(); | ||
this._instrumentationLibrary = instrumentationLibrary; | ||
@@ -54,0 +55,0 @@ // start the push controller |
@@ -22,2 +22,3 @@ "use strict"; | ||
const types_1 = require("./types"); | ||
// eslint-disable-next-line @typescript-eslint/no-var-requires | ||
const merge = require('lodash.merge'); | ||
@@ -29,3 +30,2 @@ /** | ||
constructor(config = {}) { | ||
var _a; | ||
this._meters = new Map(); | ||
@@ -35,4 +35,4 @@ this._shuttingDownPromise = Promise.resolve(); | ||
const mergedConfig = merge({}, types_1.DEFAULT_CONFIG, config); | ||
this.resource = | ||
(_a = mergedConfig.resource) !== null && _a !== void 0 ? _a : resources_1.Resource.createTelemetrySDKResource(); | ||
this.resource = mergedConfig.resource || resources_1.Resource.empty(); | ||
this.resource = resources_1.Resource.default().merge(this.resource); | ||
this._config = Object.assign({}, mergedConfig, { | ||
@@ -39,0 +39,0 @@ resource: this.resource, |
{ | ||
"name": "@opentelemetry/metrics", | ||
"version": "0.19.1-alpha.42+b9c84261", | ||
"version": "0.19.1-alpha.43+d5517812", | ||
"description": "OpenTelemetry metrics SDK", | ||
@@ -47,9 +47,8 @@ "main": "build/src/index.js", | ||
"devDependencies": { | ||
"@opentelemetry/api": "^1.0.0-rc.0", | ||
"@opentelemetry/api": "^0.20.0", | ||
"@types/lodash.merge": "4.6.6", | ||
"@types/mocha": "8.2.2", | ||
"@types/node": "14.14.41", | ||
"@types/node": "14.14.43", | ||
"@types/sinon": "9.0.11", | ||
"codecov": "3.8.1", | ||
"gts": "3.1.0", | ||
"mocha": "7.2.0", | ||
@@ -61,14 +60,14 @@ "nyc": "15.1.0", | ||
"ts-node": "9.1.1", | ||
"typescript": "4.2.4" | ||
"typescript": "4.3.2" | ||
}, | ||
"peerDependencies": { | ||
"@opentelemetry/api": "^1.0.0-rc.0" | ||
"@opentelemetry/api": "^0.20.0" | ||
}, | ||
"dependencies": { | ||
"@opentelemetry/api-metrics": "^0.19.1-alpha.42+b9c84261", | ||
"@opentelemetry/core": "^0.19.0", | ||
"@opentelemetry/resources": "^0.19.0", | ||
"@opentelemetry/api-metrics": "^0.19.1-alpha.43+d5517812", | ||
"@opentelemetry/core": "^0.19.1-alpha.43+d5517812", | ||
"@opentelemetry/resources": "^0.19.1-alpha.43+d5517812", | ||
"lodash.merge": "^4.6.2" | ||
}, | ||
"gitHead": "b9c842613c4439435f1644c8c8e288d1fd0e384c" | ||
"gitHead": "d5517812b31d9206131bf1df4f8a3b5183ab07fb" | ||
} |
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
Manifest confusion
Supply chain riskThis package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.
Found 1 instance in 1 package
Manifest confusion
Supply chain riskThis package has inconsistent metadata. This could be malicious or caused by an error when publishing the package.
Found 1 instance in 1 package
267531
13
4369
+ Added@opentelemetry/core@0.19.1-alpha.43(transitive)
+ Added@opentelemetry/resources@0.19.1-alpha.43(transitive)
+ Added@opentelemetry/semantic-conventions@0.19.1-alpha.43(transitive)
- Removed@opentelemetry/api@1.9.0(transitive)
- Removed@opentelemetry/core@0.19.0(transitive)
- Removed@opentelemetry/resources@0.19.0(transitive)