Merge branch 'master' into fix-delete-widgets-when-dashboard-deleted

pnrgenc · pnrgenc · commit 53dfd351a826 · 2025-07-21T11:40:33.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,12 @@
 Fixes:
 - [core] Fix user analytics widget chart
 - [core] Fix mongo connection url parsing
+- [crashes] Fix free session and free user calculation
 - [dashboards] Delete associated widgets and reports when a dashboard is removed
 
+Enterprise Fixes:
+- [crash_symbolication] Remove auto symbolication setting
+
 ## Version 25.03.10
 Enterprise Fixes:
 - [okta] Fix body parser middleware version mismatch causing OKTA authentication break
diff --git a/bin/scripts/modify-data/changeOwner.js b/bin/scripts/modify-data/changeOwner.js
@@ -11,29 +11,32 @@ var OLD_ID = "59832c06c5e80024b5e1fa1f"; //Id for old user
 var pluginManager = require('./../../../plugins/pluginManager');
 var common = require('./../../../api/utils/common');
 var async = require('async');
+const Promise = require('bluebird');
 
 pluginManager.dbConnection("countly").then((db) => {
     common.db = db;
+    const NEW_OID = common.db.ObjectID(NEW_ID);
+    const OLD_OID = common.db.ObjectID(OLD_ID);
 
     function changeOwner(NEW_ID, OLD_ID, done) {
         changeOwnerDashboard(NEW_ID, OLD_ID, function() {
-            common.db.collection("alerts").update({createdBy: OLD_ID}, {$set: {createdBy: NEW_ID}}, function(err, res) {
+            common.db.collection("alerts").update({createdBy: OLD_OID}, {$set: {createdBy: NEW_OID}}, function(err, res) {
                 console.log("alerts", err, res && res.result);
                 common.db.collection("auth_tokens").update({owner: OLD_ID}, {$set: {owner: NEW_ID}}, function(err, res) {
                     console.log("auth_tokens", err, res && res.result);
                     common.db.collection("calculated_metrics").update({owner_id: OLD_ID}, {$set: {owner_id: NEW_ID}}, function(err, res) {
                         console.log("calculated_metrics", err, res && res.result);
-                        common.db.collection("concurrent_users_alerts").update({created_by: OLD_ID}, {$set: {created_by: NEW_ID}}, function(err, res) {
+                        common.db.collection("concurrent_users_alerts").update({created_by: OLD_OID}, {$set: {created_by: NEW_OID}}, function(err, res) {
                             console.log("concurrent_users_alerts", err, res && res.result);
-                            common.db.collection("data_migrations").update({userid: OLD_ID}, {$set: {userid: NEW_ID}}, function(err, res) {
+                            common.db.collection("data_migrations").update({userid: OLD_OID}, {$set: {userid: NEW_OID}}, function(err, res) {
                                 console.log("data_migrations", err, res && res.result);
                                 changeOwnerLongTasks(NEW_ID, OLD_ID, function(err, res) {
-                                    console.log("messages", err, res && res.result);
-                                    common.db.collection("messages").update({creator: OLD_ID}, {$set: {creator: NEW_ID}}, function(err, res) {
+                                    console.log("messages", err, res && res.result); // "createdBy": { "$oid": "63442fa1ec94a1edb60f2453"}
+                                    common.db.collection("messages").update({"info.createdBy": OLD_ID}, {$set: {"info.createdBy": NEW_ID}}, function(err, res) {
                                         console.log("messages", err, res && res.result);
                                         common.db.collection("notes").update({owner: OLD_ID}, {$set: {owner: NEW_ID}}, function(err, res) {
                                             console.log("notes", err, res && res.result);
-                                            common.db.collection("reports").update({user: OLD_ID}, {$set: {user: NEW_ID}}, function(err, res) {
+                                            common.db.collection("reports").update({user: OLD_OID}, {$set: {user: NEW_OID}}, function(err, res) {
                                                 console.log("reports", err, res && res.result);
                                                 done();
                                             });
diff --git a/bin/upgrade/25.03/scripts/remove_auto_symbol_setting.js b/bin/upgrade/25.03/scripts/remove_auto_symbol_setting.js
@@ -0,0 +1,15 @@
+const pluginManager = require('../../../../plugins/pluginManager.js');
+
+console.log('Removing auto symbolication setting');
+
+pluginManager.dbConnection().then(async(db) => {
+    try {
+        await db.collection('plugins').updateOne({ _id: 'plugins' }, { $unset: { 'crashes.automatic_symbolication': '' } });
+        console.log('Auto symbolication setting removed');
+    }
+    catch(err) {
+        console.error('Error while removing auto symbolication setting', err);
+    }
+
+    db.close();
+});
diff --git a/plugins/crashes/frontend/public/javascripts/countly.models.js b/plugins/crashes/frontend/public/javascripts/countly.models.js
@@ -131,6 +131,7 @@ function transformAppVersion(inpVersion) {
             var realSession = state.realSession;
             var realTotalSession = (realSession.usage && realSession.usage['total-sessions'].total) || 0;
             var dashboard = {};
+            var wholeUsers = {};
 
             if ("data" in state.rawData) {
                 dashboard = countlyCommon.getDashboardData(state.filteredData.data, ["cr", "crnf", "crf", "cru", "cruf", "crunf", "crru", "crau", "crauf", "craunf", "crses", "crfses", "crnfses", "cr_s", "cr_u"], ["cru", "crau", "cruf", "crunf", "crauf", "craunf", "cr_u"], null, countlyCrashes.clearObject);
@@ -139,6 +140,12 @@ function transformAppVersion(inpVersion) {
                 return dashboard;
             }
 
+            if ('users' in state.rawData) {
+                wholeUsers.total = state.rawData.users.total;
+                wholeUsers.fatal = state.rawData.users.fatal;
+                wholeUsers.nonfatal = state.rawData.users.nonfatal;
+            }
+
             /**
             * Populates the metric's change and trend properties according to its total and prev-total.
             * @param {string} metric - A metric name e.g. "cr"
@@ -173,7 +180,7 @@ function transformAppVersion(inpVersion) {
                     });
                 }
 
-                if (isPercent && ["crses", "crnfses", "crfses", "crau", "craunf", "crauf"].includes(metric)) {
+                if (isPercent && ["crses", "crnfses", "crfses", "crau", "craunf", "crauf", 'crinv', 'crfinv', 'crnfinv', 'crauinv', 'craufinv', 'craunfinv'].includes(metric)) {
                     ["total", "prev-total"].forEach(function(prop) {
                         dashboard[metric][prop] = dashboard[metric][prop].toFixed(2) + '%';
                     });
@@ -195,7 +202,7 @@ function transformAppVersion(inpVersion) {
                 });
             });
 
-            ["cr-session", "crtf", "crtnf", "crau", "crses"].forEach(function(metric) {
+            ["cr-session", "crtf", "crtnf", "crau", "crses", 'crinv', 'crfinv', 'crnfinv', 'crauinv', 'craufinv', 'craunfinv'].forEach(function(metric) {
                 dashboard[metric] = {};
             });
 
@@ -211,9 +218,16 @@ function transformAppVersion(inpVersion) {
                     dashboard.cr_s[prop] += dashboard.crfses[prop] + dashboard.crnfses[prop];
                 }
 
-                if (dashboard.cr_u[prop] < (dashboard.crauf[prop] + dashboard.craunf[prop])) {
-                    dashboard.cr_u[prop] += dashboard.crauf[prop] + dashboard.craunf[prop];
+                // derive user count from whole users
+                if (dashboard.crau[prop] > dashboard.cr_u[prop] && 'users' in state.rawData) {
+                    dashboard.crauf[prop] = dashboard.cr_u[prop] * ((wholeUsers.fatal / wholeUsers.total) - (dashboard.crf[prop] / dashboard.cr_s[prop]));
+                    dashboard.craunf[prop] = dashboard.cr_u[prop] * ((wholeUsers.nonfatal / wholeUsers.total) - (dashboard.crnf[prop] / dashboard.cr_s[prop]));
+                    dashboard.crau[prop] = dashboard.crauf[prop] + dashboard.craunf[prop];
                 }
+
+                dashboard.crinv[prop] = Math.max(0, dashboard.cr_s[prop] - dashboard.cr[prop]);
+                dashboard.crfinv[prop] = Math.max(0, dashboard.cr_s[prop] - dashboard.crf[prop]);
+                dashboard.crnfinv[prop] = Math.max(0, dashboard.cr_s[prop] - dashboard.crnf[prop]);
             });
 
             ["cr-session", "crtf", "crtnf"].forEach(function(metric) {
@@ -222,7 +236,7 @@ function transformAppVersion(inpVersion) {
 
             ["crau", "craunf", "crauf"].forEach(function(name) {
                 ["total", "prev-total"].forEach(function(prop) {
-                    dashboard[name][prop] = Math.min(100, (dashboard.cr_u[prop] === 0 || dashboard[name][prop] === 0) ? 100 : ((dashboard.cr_u[prop] - dashboard[name][prop]) / dashboard.cr_u[prop] * 100));
+                    dashboard[name][prop] = Math.min(100, (dashboard.cr_u[prop] === 0 || dashboard[name][prop] === 0) ? 100 : (Math.abs(dashboard.cr_u[prop] - dashboard[name][prop]) / dashboard.cr_u[prop] * 100));
                 });
                 populateMetric(name, true);
             });
@@ -249,6 +263,22 @@ function transformAppVersion(inpVersion) {
                 populateMetric(name, true);
             });
 
+            ['crinv', 'crfinv', 'crnfinv'].forEach(function(name) {
+                ["total", "prev-total"].forEach(function(prop) {
+                    var propValue = 0;
+
+                    if (dashboard.cr_s[prop] === 0) {
+                        propValue = 100;
+                    }
+                    else {
+                        propValue = dashboard[name][prop] / dashboard.cr_s[prop] * 100;
+                    }
+
+                    dashboard[name][prop] = Math.min(100, propValue);
+                });
+                populateMetric(name, true);
+            });
+
             return dashboard;
         };
 
@@ -270,14 +300,22 @@ function transformAppVersion(inpVersion) {
                     return {};
                 }
 
+                var wholeUsers = {};
+                if ('users' in state.rawData) {
+                    wholeUsers.total = state.rawData.users.total;
+                    wholeUsers.fatal = state.rawData.users.fatal;
+                    wholeUsers.nonfatal = state.rawData.users.nonfatal;
+                }
+
                 var chartData, dataProps;
 
                 var metricChartConfig = {
                     "cr-session": {labelKey: "crashes.total-per-session", colorIndex: 1},
                     "crses": {labelKey: "crashes.free-sessions", colorIndex: 1},
                     "crau": {labelKey: "crashes.free-users", colorIndex: 1},
                     "cr": {labelKey: "crashes.total", colorIndex: 1},
-                    "cru": {labelKey: "crashes.unique", colorIndex: 1}
+                    "cru": {labelKey: "crashes.unique", colorIndex: 1},
+                    "crinv": {labelKey: "crashes.free-sessions", colorIndex: 1},
                 }[metric];
 
                 if (typeof metricChartConfig !== "undefined") {
@@ -298,7 +336,8 @@ function transformAppVersion(inpVersion) {
                     "crses": {"fatal": "crfses", "nonfatal": "crnfses"},
                     "crau": {"fatal": "crauf", "nonfatal": "craunf"},
                     "cr": {"fatal": "crf", "nonfatal": "crnf"},
-                    "cru": {"fatal": "cruf", "nonfatal": "crunf"}
+                    "cru": {"fatal": "cruf", "nonfatal": "crunf"},
+                    "crinv": {"fatal": "crfinv", "nonfatal": "crnfinv"},
                 };
 
                 name = name || ((metric in metricNames && state.activeFilter.fatality !== "both") ? metricNames[metric][state.activeFilter.fatality] : metric);
@@ -311,7 +350,15 @@ function transformAppVersion(inpVersion) {
                         return (obj.cr_s === 0 || obj.crfses + obj.crnfses === 0) ? 100 : Math.round(Math.min(Math.max((obj.crfses + obj.crnfses - obj.cr_s) / obj.cr_s, 0), 1) * 10000) / 100;
                     },
                     "^crau$": function(obj) {
-                        return (obj.cr_u === 0 || obj.crauf + obj.craunf === 0) ? 100 : Math.round(Math.min(Math.max((obj.crauf + obj.craunf - obj.cr_u) / obj.cr_u, 0), 1) * 10000) / 100;
+                        if (obj.cr_u === 0 || obj.crauf + obj.craunf === 0) {
+                            return 100;
+                        }
+                        else if (obj.crauf + obj.craunf > obj.cr_u && obj.cr_s !== 0 && 'users' in state.rawData) {
+                            var value = (obj.cr_u - (obj.cr_u * ((wholeUsers.fatal / wholeUsers.total) - (obj.crf / obj.cr_s))) - (obj.cr_u * ((wholeUsers.nonfatal / wholeUsers.total) - (obj.crnf / obj.cr_s)))) / obj.cr_u * 100;
+                            return Math.round(value * 100) / 100;
+                        }
+
+                        return Math.round(Math.min(Math.max((obj.crauf + obj.craunf - obj.cr_u) / obj.cr_u, 0), 1) * 10000) / 100;
                     },
                     "^cr$": function(obj) {
                         return obj.crf + obj.crnf;
@@ -325,9 +372,40 @@ function transformAppVersion(inpVersion) {
                     "^crn?fses$": function(obj) {
                         return (obj.cr_s === 0 || obj[name] === 0) ? 100 : Math.round(Math.min(obj[name] / obj.cr_s, 1) * 10000) / 100;
                     },
-                    "^craun?f$": function(obj) {
-                        return (obj.cr_s === 0 || obj[name] === 0) ? 100 : Math.round(Math.min(obj[name] / obj.cr_u, 1) * 10000) / 100;
-                    }
+                    "^crauf$": function(obj) {
+                        if (obj.cr_u === 0 || obj[name] === 0) {
+                            return 100;
+                        }
+                        else if (obj.crauf + obj.craunf > obj.cr_u && obj.cr_s !== 0 && 'users' in state.rawData) {
+                            var value = (obj.cr_u - (obj.cr_u * ((wholeUsers.fatal / wholeUsers.total) - (obj.crf / obj.cr_s)))) / obj.cr_u * 100;
+                            return Math.round(value * 100) / 100;
+                        }
+
+                        return Math.round(Math.min(obj[name] / obj.cr_u, 1) * 10000) / 100;
+                    },
+                    "^craunf$": function(obj) {
+                        if (obj.cr_u === 0 || obj[name] === 0) {
+                            return 100;
+                        }
+                        else if (obj.crauf + obj.craunf > obj.cr_u && obj.cr_s !== 0 && 'users' in state.rawData) {
+                            var value = (obj.cr_u - (obj.cr_u * ((wholeUsers.nonfatal / wholeUsers.total) - (obj.crnf / obj.cr_s)))) / obj.cr_u * 100;
+                            return Math.round(value * 100) / 100;
+                        }
+
+                        return Math.round(Math.min(obj[name] / obj.cr_u, 1) * 10000) / 100;
+                    },
+                    '^crinv$': function(obj) {
+                        var value = (obj.cr_s === 0) ? 100 : (obj.cr_s - (obj.crf + obj.crnf)) / obj.cr_s * 100;
+                        return Math.round(value * 100) / 100;
+                    },
+                    '^crfinv$': function(obj) {
+                        var value = (obj.cr_s === 0) ? 100 : (obj.cr_s - obj.crf) / obj.cr_s * 100;
+                        return Math.round(value * 100) / 100;
+                    },
+                    '^crnfinv$': function(obj) {
+                        var value = (obj.cr_s === 0) ? 100 : (obj.cr_s - obj.crnf) / obj.cr_s * 100;
+                        return Math.round(value * 100) / 100;
+                    },
                 };
 
                 dataProps = [
@@ -370,6 +448,7 @@ function transformAppVersion(inpVersion) {
                 state.isLoading = false;
                 return chartOptions;
             };
+
         };
 
         _overviewSubmodule.getters.statistics = function(state) {
diff --git a/plugins/crashes/frontend/public/templates/overview.html b/plugins/crashes/frontend/public/templates/overview.html
@@ -215,14 +215,14 @@
                         </el-tab-pane>
                         <el-tab-pane name="crashfree-sessions" style="border-top-right-radius: 4px;" data-test-id="crashfree-sessions-graph">
                             <div class="bu-p-5" slot="label">
-                                <crash-tab-label :title="i18n('crashes.free-sessions')" :tooltip="i18n('crashes.help-free-sessions')" :data="dashboardData[{'both': 'crses', 'fatal': 'crfses', 'nonfatal': 'crnfses'}[activeFilter.fatality]]">
+                                <crash-tab-label :title="i18n('crashes.free-sessions')" :tooltip="i18n('crashes.help-free-sessions')" :data="dashboardData[{'both': 'crinv', 'fatal': 'crfinv', 'nonfatal': 'crnfinv'}[activeFilter.fatality]]">
                                 </crash-tab-label>
                             </div>
-                            <cly-chart-line xAxisLabelOverflow="unset" :option="chartData('crses')" category="crashes"></cly-chart-line>
+                            <cly-chart-line xAxisLabelOverflow="unset" :option="chartData('crinv')" category="crashes"></cly-chart-line>
                         </el-tab-pane>
                     </el-tabs>
                 </div>
             </cly-main>
         </el-tab-pane>
     </cly-tabs>
-</div>
+</div>
