Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Mar 16, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d5d0c0
fix(resources): change fs/promises import to be node 12 compatible
pichlermarc Mar 15, 2023
82c3db8
Merge branch 'main' into fix/fs-promises
pichlermarc Mar 16, 2023
ad39f3a
fix(changelog): add changelog entry.
pichlermarc Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ 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(resources): change fs/promises import to be node 12 compatible [#3681](https://github.com/open-telemetry/opentelemetry-js/pull/3681) @pichlermarc

### :books: (Refine Doc)

Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-bsd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

import * as fs from 'fs/promises';
import { promises as fs } from 'fs';
import { execAsync } from './execAsync';
import { diag } from '@opentelemetry/api';

Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-resources/src/platform/node/machine-id/getMachineId-linux.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import * as fs from 'fs/promises';
import { promises as fs } from 'fs';
import { diag } from '@opentelemetry/api';

export async function getMachineId(): Promise<string> {
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-bsd.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import * as sinon from 'sinon';
import * as assert from 'assert';
import * as fs from 'fs/promises';
import { promises as fs } from 'fs';
import { PromiseWithChild } from 'child_process';
import * as util from '../../../../src/platform/node/machine-id/execAsync';
import { getMachineId } from '../../../../src/platform/node/machine-id/getMachineId-bsd';
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-resources/test/detectors/node/machine-id/getMachineId-linux.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import * as sinon from 'sinon';
import * as assert from 'assert';
import * as fs from 'fs/promises';
import { promises as fs } from 'fs';

import { getMachineId } from '../../../../src/platform/node/machine-id/getMachineId-linux';

Expand Down