1.10.1 backports (#3682)

* fix(resource): make properties for async resource resolution optional (#3677)

* fix(resource): make properties for async resolution optional

* fix(changelog): add changelog

* fix(resources): add regression test

* fix(resources): remove ts-ignore in tests

---------

Co-authored-by: Daniel Dyla <[email protected]>

* Changelog

* Bump patch versions

* fix(resources): change fs/promises import to be node 12 compatible (#3681)

* fix(resources): change fs/promises import to be node 12 compatible

* fix(changelog): add changelog entry.

---------

Co-authored-by: Marc Pichler <[email protected]>

Author: dyladan

CHANGELOG.md

@@ -13,10 +13,19 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :bug: (Bug Fix)
 
+* fix(resource): make properties for async resource resolution optional [#3677](https://github.com/open-telemetry/opentelemetry-js/pull/3677) @pichlermarc
+* fix(resource): change fs/promises import to be node 12 compatible [#3681](https://github.com/open-telemetry/opentelemetry-js/pull/3681) @pichlermarc
+
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
+## 1.10.1
+
+### :bug: (Bug Fix)
+
+* fix(resource): make properties for async resource resolution optional [#3677](https://github.com/open-telemetry/opentelemetry-js/pull/3677) @pichlermarc
+
 ## 1.10.0
 
 ### :rocket: (Enhancement)

examples/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-example",
   "private": true,
-  "version": "0.35.1",
+  "version": "0.35.2",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -34,9 +34,9 @@
     "@opentelemetry/instrumentation": "0.35.1",
     "@opentelemetry/instrumentation-http": "0.35.1",
     "@opentelemetry/resources": "1.9.1",
-    "@opentelemetry/semantic-conventions": "1.9.1",
+    "@opentelemetry/sdk-trace-base": "1.9.1",
     "@opentelemetry/sdk-trace-node": "1.9.1",
-    "@opentelemetry/sdk-trace-base": "1.9.1"
+    "@opentelemetry/semantic-conventions": "1.9.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
   "devDependencies": {

examples/https/package.json

@@ -1,7 +1,7 @@
 {
   "name": "https-example",
   "private": true,
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Example of HTTPs integration with OpenTelemetry",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -33,14 +33,14 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/exporter-jaeger": "1.10.0",
-    "@opentelemetry/exporter-zipkin": "1.10.0",
-    "@opentelemetry/instrumentation": "0.36.0",
-    "@opentelemetry/instrumentation-http": "0.36.0",
-    "@opentelemetry/resources": "1.10.0",
-    "@opentelemetry/sdk-trace-base": "1.10.0",
-    "@opentelemetry/sdk-trace-node": "1.10.0",
-    "@opentelemetry/semantic-conventions": "1.10.0"
+    "@opentelemetry/exporter-jaeger": "1.10.1",
+    "@opentelemetry/exporter-zipkin": "1.10.1",
+    "@opentelemetry/instrumentation": "0.36.1",
+    "@opentelemetry/instrumentation-http": "0.36.1",
+    "@opentelemetry/resources": "1.10.1",
+    "@opentelemetry/sdk-trace-base": "1.10.1",
+    "@opentelemetry/sdk-trace-node": "1.10.1",
+    "@opentelemetry/semantic-conventions": "1.10.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
   "devDependencies": {

examples/opentelemetry-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "web-opentelemetry-example",
   "private": true,
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
   "main": "index.js",
   "scripts": {
@@ -43,20 +43,20 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/context-zone": "1.10.0",
-    "@opentelemetry/core": "1.10.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.36.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.36.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.36.0",
-    "@opentelemetry/exporter-zipkin": "1.10.0",
-    "@opentelemetry/instrumentation": "0.36.0",
-    "@opentelemetry/instrumentation-fetch": "0.36.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.36.0",
-    "@opentelemetry/propagator-b3": "1.10.0",
-    "@opentelemetry/sdk-metrics": "1.10.0",
-    "@opentelemetry/sdk-trace-base": "1.10.0",
-    "@opentelemetry/sdk-trace-web": "1.10.0",
-    "@opentelemetry/semantic-conventions": "1.10.0"
+    "@opentelemetry/context-zone": "1.10.1",
+    "@opentelemetry/core": "1.10.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.36.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.36.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.36.1",
+    "@opentelemetry/exporter-zipkin": "1.10.1",
+    "@opentelemetry/instrumentation": "0.36.1",
+    "@opentelemetry/instrumentation-fetch": "0.36.1",
+    "@opentelemetry/instrumentation-xml-http-request": "0.36.1",
+    "@opentelemetry/propagator-b3": "1.10.1",
+    "@opentelemetry/sdk-metrics": "1.10.1",
+    "@opentelemetry/sdk-trace-base": "1.10.1",
+    "@opentelemetry/sdk-trace-web": "1.10.1",
+    "@opentelemetry/semantic-conventions": "1.10.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
 }

examples/otlp-exporter-node/package.json

@@ -1,7 +1,7 @@
 {
   "name": "example-otlp-exporter-node",
   "private": true,
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Example of using @opentelemetry/collector-exporter in Node.js",
   "main": "index.js",
   "scripts": {
@@ -29,17 +29,17 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/core": "1.10.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.36.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.36.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.36.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "0.36.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.36.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.36.0",
-    "@opentelemetry/resources": "1.10.0",
-    "@opentelemetry/sdk-metrics": "1.10.0",
-    "@opentelemetry/sdk-trace-base": "1.10.0",
-    "@opentelemetry/semantic-conventions": "1.10.0"
+    "@opentelemetry/core": "1.10.1",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.36.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.36.1",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.36.1",
+    "@opentelemetry/exporter-trace-otlp-grpc": "0.36.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.36.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.36.1",
+    "@opentelemetry/resources": "1.10.1",
+    "@opentelemetry/sdk-metrics": "1.10.1",
+    "@opentelemetry/sdk-trace-base": "1.10.1",
+    "@opentelemetry/semantic-conventions": "1.10.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
 }

experimental/backwards-compatability/node14/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node14",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "private": true,
   "description": "Backwards compatability app for node 14 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,8 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.36.0",
-    "@opentelemetry/sdk-trace-base": "1.10.0"
+    "@opentelemetry/sdk-node": "0.36.1",
+    "@opentelemetry/sdk-trace-base": "1.10.1"
   },
   "devDependencies": {
     "@types/node": "14.18.25",

experimental/backwards-compatability/node16/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backcompat-node16",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "private": true,
   "description": "Backwards compatability app for node 16 types and the OpenTelemetry Node.js SDK",
   "main": "index.js",
@@ -9,8 +9,8 @@
     "peer-api-check": "node ../../../scripts/peer-api-check.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.36.0",
-    "@opentelemetry/sdk-trace-base": "1.10.0"
+    "@opentelemetry/sdk-node": "0.36.1",
+    "@opentelemetry/sdk-trace-base": "1.10.1"
   },
   "devDependencies": {
     "@types/node": "16.11.52",

experimental/examples/prometheus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prometheus-example",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "private": true,
   "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
   "main": "index.js",
@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-prometheus": "0.36.0",
-    "@opentelemetry/sdk-metrics": "1.10.0"
+    "@opentelemetry/exporter-prometheus": "0.36.1",
+    "@opentelemetry/sdk-metrics": "1.10.1"
   }
 }

experimental/packages/api-events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-events",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Public events API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",

experimental/packages/api-logs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-logs",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Public logs API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",