Merge remote-tracking branch 'upstream/feature/pbs-25.02' into fix/performance-improvements

Author: nsemets

.github/rules/All Branch Rules.json

@@ -8,7 +8,7 @@
   "conditions": {
     "ref_name": {
       "exclude": ["refs/heads/main", "refs/heads/develop"],
-      "include": ["~ALL"]
+      "include": ["~DEFAULT_BRANCH", "refs/heads/main"]
     }
   },
   "rules": [
@@ -29,7 +29,7 @@
         "require_code_owner_review": false,
         "require_last_push_approval": true,
         "automatic_copilot_code_review_enabled": false,
-        "allowed_merge_methods": ["squash"]
+        "allowed_merge_methods": ["merge", "squash", "rebase"]
       }
     }
   ],

.github/rules/Main_Develop Branch Rules.json

@@ -21,7 +21,7 @@
     {
       "type": "merge_queue",
       "parameters": {
-        "merge_method": "SQUASH",
+        "merge_method": "MERGE",
         "max_entries_to_build": 8,
         "min_entries_to_merge": 1,
         "max_entries_to_merge": 5,
@@ -44,7 +44,7 @@
         "require_code_owner_review": false,
         "require_last_push_approval": true,
         "automatic_copilot_code_review_enabled": false,
-        "allowed_merge_methods": ["squash"]
+        "allowed_merge_methods": ["merge", "squash", "rebase"]
       }
     }
   ],

package-lock.json

@@ -44,6 +44,7 @@
     "@citation-js/core": "^0.7.18",
     "@citation-js/plugin-csl": "^0.7.18",
     "@fortawesome/fontawesome-free": "^6.7.2",
+    "@newrelic/browser-agent": "^1.301.0",
     "@ngx-translate/core": "^16.0.4",
     "@ngx-translate/http-loader": "^16.0.1",
     "@ngxs/store": "^19.0.0",

package.json

@@ -4,6 +4,7 @@ import { OSFConfigService } from '@core/services/osf-config.service';
 
 import { ENVIRONMENT } from './environment.provider';
 
+import { BrowserAgent } from '@newrelic/browser-agent/loaders/browser-agent';
 import * as Sentry from '@sentry/angular';
 import { GoogleTagManagerConfiguration } from 'angular-google-tag-manager';
 
@@ -25,6 +26,7 @@ export function initializeApplication() {
     await configService.load();
 
     const googleTagManagerId = environment.googleTagManagerId;
+
     if (googleTagManagerId) {
       googleTagManagerConfiguration.set({ id: googleTagManagerId });
     }
@@ -41,6 +43,33 @@ export function initializeApplication() {
         integrations: [],
       });
     }
+
+    if (environment.newRelicEnabled) {
+      const newRelicConfig = {
+        enabled: environment.newRelicEnabled,
+        init: {
+          distributed_tracing: { enabled: environment.newRelicInitDistributedTracingEnabled },
+          performance: { capture_measures: environment.newRelicInitPerformanceCaptureMeasures },
+          privacy: { cookies_enabled: environment.newRelicInitPrivacyCookiesEnabled },
+          ajax: { deny_list: environment.newRelicInitAjaxDenyList },
+        },
+        info: {
+          beacon: environment.newRelicInfoBeacon,
+          errorBeacon: environment.newRelicInfoErrorBeacon,
+          licenseKey: environment.newRelicInfoLicenseKey,
+          applicationID: environment.newRelicInfoApplicationID,
+          sa: environment.newRelicInfoSa,
+        },
+        loader_config: {
+          accountID: environment.newRelicLoaderConfigAccountID,
+          trustKey: environment.newRelicLoaderConfigTrustKey,
+          agentID: environment.newRelicLoaderConfigAgengID,
+          licenseKey: environment.newRelicLoaderConfigLicenseKey,
+          applicationID: environment.newRelicLoaderConfigApplicationID,
+        },
+      };
+      new BrowserAgent(newRelicConfig);
+    }
   };
 }
 

src/app/core/provider/application.initialization.provider.ts

@@ -13,7 +13,21 @@ export interface EnvironmentModel {
   defaultProvider: string;
   dataciteTrackerRepoId: string | null;
   dataciteTrackerAddress: string;
-
+  newRelicEnabled: boolean;
+  newRelicInitDistributedTracingEnabled: boolean;
+  newRelicInitPerformanceCaptureMeasures: boolean;
+  newRelicInitPrivacyCookiesEnabled: boolean;
+  newRelicInitAjaxDenyList: string[];
+  newRelicInfoBeacon: string;
+  newRelicInfoErrorBeacon: string;
+  newRelicInfoLicenseKey: string;
+  newRelicInfoApplicationID: string;
+  newRelicInfoSa: number;
+  newRelicLoaderConfigAccountID: string;
+  newRelicLoaderConfigTrustKey: string;
+  newRelicLoaderConfigAgengID: string;
+  newRelicLoaderConfigLicenseKey: string;
+  newRelicLoaderConfigApplicationID: string;
   activityLogs?: {
     pageSize?: number;
   };

src/app/shared/models/environment.model.ts

@@ -1,12 +1,53 @@
 {
   "webUrl": "",
   "apiDomainUrl": "",
+  "shareTroveUrl": "",
   "addonsApiUrl": "",
+  "funderApiUrl": "",
   "casUrl": "",
   "recaptchaSiteKey": "",
-  "dataciteTrackerRepoId": "",
+  "dataciteTrackerRepoId": null,
+  "dataciteTrackerAddress": "",
   "sentryDsn": "",
   "googleTagManagerId": "",
   "googleFilePickerApiKey": "",
-  "googleFilePickerAppId": 0
+  "googleFilePickerAppId": 0,
+  "newRelic": {
+    "enabled": false,
+    "init": {
+      "distributed_tracing": { "enabled": false },
+      "performance": { "capture_measures": false },
+      "privacy": { "cookies_enabled": true },
+      "ajax": { "deny_list": [""] }
+    },
+    "info": {
+      "beacon": "",
+      "errorBeacon": "",
+      "licenseKey": "",
+      "applicationID": "",
+      "sa": 1
+    },
+    "loader_config": {
+      "accountID": "",
+      "trustKey": "",
+      "agentID": "",
+      "licenseKey": "",
+      "applicationID": ""
+    }
+  },
+  "newRelicEnabled": true,
+  "newRelicInitDistributedTracingEnabled": false,
+  "newRelicInitPerformanceCaptureMeasures": false,
+  "newRelicInitPrivacyCookiesEnabled": true,
+  "newRelicInitAjaxDenyList": [""],
+  "newRelicInfoBeacon": "",
+  "newRelicInfoErrorBeacon": "",
+  "newRelicInfoLicenseKey": "",
+  "newRelicInfoApplicationID": "",
+  "newRelicInfoSa": 1,
+  "newRelicLoaderConfigAccountID": "",
+  "newRelicLoaderConfigTrustKey": "",
+  "newRelicLoaderConfigAgengID": "",
+  "newRelicLoaderConfigLicenseKey": "",
+  "newRelicLoaderConfigApplicationID": ""
 }