@opentelemetry/resources
Advanced tools
Comparing version 0.17.1-alpha.8 to 0.17.1-alpha.10
@@ -31,3 +31,3 @@ import { ResourceAttributes } from './types'; | ||
* Returns a new, merged {@link Resource} by merging the current Resource | ||
* with the other Resource. In case of a collision, current Resource takes | ||
* with the other Resource. In case of a collision, other Resource takes | ||
* precedence. | ||
@@ -34,0 +34,0 @@ * |
@@ -53,3 +53,3 @@ "use strict"; | ||
* Returns a new, merged {@link Resource} by merging the current Resource | ||
* with the other Resource. In case of a collision, current Resource takes | ||
* with the other Resource. In case of a collision, other Resource takes | ||
* precedence. | ||
@@ -64,3 +64,3 @@ * | ||
// SpanAttributes from resource overwrite attributes from other resource. | ||
const mergedAttributes = Object.assign({}, other.attributes, this.attributes); | ||
const mergedAttributes = Object.assign({}, this.attributes, other.attributes); | ||
return new Resource(mergedAttributes); | ||
@@ -67,0 +67,0 @@ } |
{ | ||
"name": "@opentelemetry/resources", | ||
"version": "0.17.1-alpha.8+67f7e70a", | ||
"version": "0.17.1-alpha.10+4c609aa1", | ||
"description": "OpenTelemetry SDK resources", | ||
@@ -62,5 +62,5 @@ "main": "build/src/index.js", | ||
"@opentelemetry/api": "^0.18.0", | ||
"@opentelemetry/core": "^0.17.1-alpha.8+67f7e70a" | ||
"@opentelemetry/core": "^0.17.0" | ||
}, | ||
"gitHead": "67f7e70a3de005484d3e110b06f6bbee75b6f8a6" | ||
"gitHead": "4c609aa13c899dd2b7a963d2e3e491bc35ffb742" | ||
} |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
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
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
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
61385
+ Added@opentelemetry/api@0.17.0(transitive)
+ Added@opentelemetry/context-base@0.17.0(transitive)
+ Added@opentelemetry/core@0.17.0(transitive)
- Removed@opentelemetry/api@0.17.1-alpha.21(transitive)
- Removed@opentelemetry/context-base@0.17.1-alpha.21(transitive)
- Removed@opentelemetry/core@0.17.1-alpha.21(transitive)
Updated@opentelemetry/core@^0.17.0