fix: issue on path for windows (#1307)

AmadeusITGroup · Feb 1, 2024 · 3850282 · 3850282
2 parents 53702db + f7093e1
commit 3850282
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/packages/@o3r/telemetry/src/builders/index.ts b/packages/@o3r/telemetry/src/builders/index.ts
@@ -38,7 +38,7 @@ export const createBuilderWithMetrics: BuilderWrapper = (builderFn, sendData = d
       // context.builder.builderName does not contain the package name
       const builderName = context.builder.name as string;
       context.logger.info(`${builderName} run in ${duration}ms`);
-      const environment = getEnvironmentInfo();
+      const environment = await getEnvironmentInfo();
       const data: BuilderMetricData = {
         environment,
         duration,

diff --git a/packages/@o3r/telemetry/src/environment/index.ts b/packages/@o3r/telemetry/src/environment/index.ts
@@ -118,7 +118,7 @@ export interface EnvironmentMetricData {
  * Get all environment information
  * Could be useful for debugging issue
  */
-export const getEnvironmentInfo = (): EnvironmentMetricData => {
+export const getEnvironmentInfo = async (): Promise<EnvironmentMetricData> => {
   const osInfo = {
     architecture: os.arch(),
     platform: os.platform(),
@@ -136,17 +136,17 @@ export const getEnvironmentInfo = (): EnvironmentMetricData => {
     otterCorePackageJsonPath = require.resolve('@o3r/core/package.json');
   } catch {
     // Fallback to the @o3r/telemetry package version if @o3r/core is not found
-    otterCorePackageJsonPath = path.posix.join(__dirname, '..', '..', 'package.json');
+    otterCorePackageJsonPath = path.join(__dirname, '..', '..', 'package.json');
   }
   const otterInfo = {
-    version: otterCorePackageJsonPath ? JSON.parse(fs.readFileSync(otterCorePackageJsonPath, { encoding: 'utf-8' })).version as string : undefined
+    version: otterCorePackageJsonPath ? JSON.parse(await fs.promises.readFile(otterCorePackageJsonPath, { encoding: 'utf-8' })).version as string : undefined
   };
 
   const ci = typeof process.env.CI !== undefined && process.env.CI?.toLowerCase() !== 'false';
 
   let projectName: string | undefined;
   try {
-    projectName = JSON.parse(fs.readFileSync(path.posix.join(process.cwd(), 'package.json'), { encoding: 'utf-8' })).name;
+    projectName = JSON.parse(await fs.promises.readFile(path.join(process.cwd(), 'package.json'), { encoding: 'utf-8' })).name;
   } catch {}
 
   return {
@@ -162,8 +162,8 @@ export const getEnvironmentInfo = (): EnvironmentMetricData => {
  * Stringify the result of `getEnvironmentInfo`
  * @see getEnvironmentInfo
  */
-export const getEnvironmentInfoStringify = () => {
-  const { os: osInfo, node: nodeInfo, packageManager: packageManagerInfo, otter: otterInfo, ci } = getEnvironmentInfo();
+export const getEnvironmentInfoStringify = async () => {
+  const { os: osInfo, node: nodeInfo, packageManager: packageManagerInfo, otter: otterInfo, ci } = await getEnvironmentInfo();
   return `
 - User Agent Architecture: ${osInfo.architecture}
 - User Agent Platform: ${osInfo.platform}

diff --git a/packages/@o3r/telemetry/src/schematics/index.ts b/packages/@o3r/telemetry/src/schematics/index.ts
@@ -35,7 +35,7 @@ export const createSchematicWithMetrics: SchematicWrapper =
     finally {
       const endTime = Math.floor(performance.now());
       const duration = endTime - startTime;
-      const environment = getEnvironmentInfo();
+      const environment = await getEnvironmentInfo();
       const schematic = {
         name: `${context.schematic.description.collection.name}:${context.schematic.description.name}`,
         options,