Merge pull request #851 from NordicSemiconductor/fix/azure-insights-c…

…ommom-props Fix: send common app metadata to insights
NordicSemiconductor · Dec 13, 2023 · 6e6f8d0 · 6e6f8d0
2 parents 6aa7120 + 9ad5791
commit 6e6f8d0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -7,6 +7,12 @@ This project does _not_ adhere to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html) but contrary to it
 every new version is a new major version.
 
+## 142.0.0 - 2023-12-13
+
+### Fixed
+
+-   `UsageData` sends common app metadata
+
 ## 141.0.0 - 2023-12-12
 
 ### Added

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "141.0.0",
+    "version": "142.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",

diff --git a/src/utils/usageDataMain.ts b/src/utils/usageDataMain.ts
@@ -52,12 +52,14 @@ const init = () => {
             envelope.data.baseData = { name: envelope.data?.baseData.name };
         } else {
             envelope.tags['ai.cloud.roleInstance'] = undefined; // remove PC name
-            envelope.data.baseData = {
-                applicationName,
-                applicationVersion,
-                isDevelopment,
-                ...envelope.data.baseData,
-            };
+            if (envelope.data.baseData) {
+                envelope.data.baseData.properties = {
+                    applicationName,
+                    applicationVersion,
+                    isDevelopment,
+                    ...envelope.data.baseData.properties,
+                };
+            }
         }
 
         return true;

diff --git a/src/utils/usageDataRenderer.ts b/src/utils/usageDataRenderer.ts
@@ -66,12 +66,12 @@ const init = async () => {
                 name: applicationName,
             };
             envelope.ext = { ...envelope.ext, trace };
-            envelope.baseData = {
+            envelope.data = {
+                ...envelope.data,
                 applicationName,
                 applicationVersion,
                 isDevelopment,
                 source,
-                ...envelope.baseData,
             };
         }
     });