Skip to content

Commit d16b547

Browse files
removed error and added single promise for addContainerMetadata
1 parent 42a8343 commit d16b547

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/cmap/handshake/client_metadata.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,16 @@ function addFAASOnlyEnvClientMetadata(metadataDocument: LimitedSizeDocument): Li
168168

169169

170170
let isDocker: boolean;
171+
let dockerPromise: any;
171172
export async function addAllEnvClientMetadata(metadataDocument: LimitedSizeDocument) {
172173
const faasEnv = getFAASEnv();
173174

174175
async function getContainerMetadata() {
175176
const containerMetadata: Record<string, any> = {};
176-
if (isDocker !== false && isDocker !== true) {
177+
if (isDocker == null) {
178+
dockerPromise ??= fs.access('/.dockerenv');
177179
try {
178-
await fs.access('/.dockerenv');
180+
await dockerPromise;
179181
isDocker = true;
180182
} catch {
181183
isDocker = false;
@@ -195,8 +197,8 @@ export async function addAllEnvClientMetadata(metadataDocument: LimitedSizeDocum
195197
}
196198

197199
const containerMetadata = await getContainerMetadata();
198-
const envMetadata = faasEnv ? faasEnv.set('container', containerMetadata) : containerMetadata;
199-
200+
const envMetadata = faasEnv ?? new Map();
201+
envMetadata.set('container', containerMetadata);
200202
if (envMetadata != null) {
201203
if (!metadataDocument.ifItFitsItSits('env', envMetadata)) {
202204
for (const key of envMetadata.keys()) {

0 commit comments

Comments
 (0)