Skip to content

Commit 9ff974e

Browse files
adliusadlius
committed
Merge branch 'hotfix/25.1.2'
2 parents 3bbf2bd + d1bf4ac commit 9ff974e

File tree

9 files changed

+146
-28
lines changed

9 files changed

+146
-28
lines changed

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,31 @@ export function initializeApplication() {
4444
});
4545
}
4646

47-
if (environment.newRelic?.enabled) {
48-
new BrowserAgent(environment.newRelic);
47+
if (environment.newRelicEnabled) {
48+
const newRelicConfig = {
49+
enabled: environment.newRelicEnabled,
50+
init: {
51+
distributed_tracing: { enabled: environment.newRelicInitDistributedTracingEnabled },
52+
performance: { capture_measures: environment.newRelicInitPerformanceCaptureMeasures },
53+
privacy: { cookies_enabled: environment.newRelicInitPrivacyCookiesEnabled },
54+
ajax: { deny_list: environment.newRelicInitAjaxDenyList },
55+
},
56+
info: {
57+
beacon: environment.newRelicInfoBeacon,
58+
errorBeacon: environment.newRelicInfoErrorBeacon,
59+
licenseKey: environment.newRelicInfoLicenseKey,
60+
applicationID: environment.newRelicInfoApplicationID,
61+
sa: environment.newRelicInfoSa,
62+
},
63+
loader_config: {
64+
accountID: environment.newRelicLoaderConfigAccountID,
65+
trustKey: environment.newRelicLoaderConfigTrustKey,
66+
agentID: environment.newRelicLoaderConfigAgengID,
67+
licenseKey: environment.newRelicLoaderConfigLicenseKey,
68+
applicationID: environment.newRelicLoaderConfigApplicationID,
69+
},
70+
};
71+
new BrowserAgent(newRelicConfig);
4972
}
5073
};
5174
}

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

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,21 @@ export interface EnvironmentModel {
1313
defaultProvider: string;
1414
dataciteTrackerRepoId: string | null;
1515
dataciteTrackerAddress: string;
16-
newRelic: NewRelicConfig;
16+
newRelicEnabled: boolean;
17+
newRelicInitDistributedTracingEnabled: boolean;
18+
newRelicInitPerformanceCaptureMeasures: boolean;
19+
newRelicInitPrivacyCookiesEnabled: boolean;
20+
newRelicInitAjaxDenyList: string[];
21+
newRelicInfoBeacon: string;
22+
newRelicInfoErrorBeacon: string;
23+
newRelicInfoLicenseKey: string;
24+
newRelicInfoApplicationID: string;
25+
newRelicInfoSa: number;
26+
newRelicLoaderConfigAccountID: string;
27+
newRelicLoaderConfigTrustKey: string;
28+
newRelicLoaderConfigAgengID: string;
29+
newRelicLoaderConfigLicenseKey: string;
30+
newRelicLoaderConfigApplicationID: string;
1731
activityLogs?: {
1832
pageSize?: number;
1933
};
@@ -50,27 +64,3 @@ export interface EnvironmentModel {
5064
*/
5165
googleFilePickerAppId: number;
5266
}
53-
54-
interface NewRelicConfig {
55-
enabled: boolean;
56-
init: {
57-
distributed_tracing: { enabled: boolean };
58-
performance: { capture_measures: boolean };
59-
privacy: { cookies_enabled: boolean };
60-
ajax: { deny_list: string[] };
61-
};
62-
info: {
63-
beacon: string;
64-
errorBeacon: string;
65-
licenseKey: string;
66-
applicationID: string;
67-
sa: number;
68-
};
69-
loader_config: {
70-
accountID: string;
71-
trustKey: string;
72-
agentID: string;
73-
licenseKey: string;
74-
applicationID: string;
75-
};
76-
}

‎src/assets/config/template.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,20 @@
3434
"licenseKey": "",
3535
"applicationID": ""
3636
}
37-
}
37+
},
38+
"newRelicEnabled": true,
39+
"newRelicInitDistributedTracingEnabled": false,
40+
"newRelicInitPerformanceCaptureMeasures": false,
41+
"newRelicInitPrivacyCookiesEnabled": true,
42+
"newRelicInitAjaxDenyList": [""],
43+
"newRelicInfoBeacon": "",
44+
"newRelicInfoErrorBeacon": "",
45+
"newRelicInfoLicenseKey": "",
46+
"newRelicInfoApplicationID": "",
47+
"newRelicInfoSa": 1,
48+
"newRelicLoaderConfigAccountID": "",
49+
"newRelicLoaderConfigTrustKey": "",
50+
"newRelicLoaderConfigAgengID": "",
51+
"newRelicLoaderConfigLicenseKey": "",
52+
"newRelicLoaderConfigApplicationID": ""
3853
}

‎src/environments/environment.development.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,19 @@ export const environment = {
5656
defaultProvider: 'osf',
5757
dataciteTrackerRepoId: null,
5858
dataciteTrackerAddress: 'https://analytics.datacite.org/api/metric',
59+
newRelicEnabled: true,
60+
newRelicInitDistributedTracingEnabled: false,
61+
newRelicInitPerformanceCaptureMeasures: false,
62+
newRelicInitPrivacyCookiesEnabled: true,
63+
newRelicInitAjaxDenyList: [''],
64+
newRelicInfoBeacon: '',
65+
newRelicInfoErrorBeacon: '',
66+
newRelicInfoLicenseKey: '',
67+
newRelicInfoApplicationID: '',
68+
newRelicInfoSa: 1,
69+
newRelicLoaderConfigAccountID: '',
70+
newRelicLoaderConfigTrustKey: '',
71+
newRelicLoaderConfigAgengID: '',
72+
newRelicLoaderConfigLicenseKey: '',
73+
newRelicLoaderConfigApplicationID: '',
5974
};

‎src/environments/environment.docker.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,19 @@ export const environment = {
1313
defaultProvider: 'osf',
1414
dataciteTrackerRepoId: null,
1515
dataciteTrackerAddress: 'https://analytics.datacite.org/api/metric',
16+
newRelicEnabled: true,
17+
newRelicInitDistributedTracingEnabled: false,
18+
newRelicInitPerformanceCaptureMeasures: false,
19+
newRelicInitPrivacyCookiesEnabled: true,
20+
newRelicInitAjaxDenyList: [''],
21+
newRelicInfoBeacon: '',
22+
newRelicInfoErrorBeacon: '',
23+
newRelicInfoLicenseKey: '',
24+
newRelicInfoApplicationID: '',
25+
newRelicInfoSa: 1,
26+
newRelicLoaderConfigAccountID: '',
27+
newRelicLoaderConfigTrustKey: '',
28+
newRelicLoaderConfigAgengID: '',
29+
newRelicLoaderConfigLicenseKey: '',
30+
newRelicLoaderConfigApplicationID: '',
1631
};

‎src/environments/environment.staging.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,19 @@ export const environment = {
5656
defaultProvider: 'osf',
5757
dataciteTrackerRepoId: null,
5858
dataciteTrackerAddress: 'https://analytics.datacite.org/api/metric',
59+
newRelicEnabled: true,
60+
newRelicInitDistributedTracingEnabled: false,
61+
newRelicInitPerformanceCaptureMeasures: false,
62+
newRelicInitPrivacyCookiesEnabled: true,
63+
newRelicInitAjaxDenyList: [''],
64+
newRelicInfoBeacon: '',
65+
newRelicInfoErrorBeacon: '',
66+
newRelicInfoLicenseKey: '',
67+
newRelicInfoApplicationID: '',
68+
newRelicInfoSa: 1,
69+
newRelicLoaderConfigAccountID: '',
70+
newRelicLoaderConfigTrustKey: '',
71+
newRelicLoaderConfigAgengID: '',
72+
newRelicLoaderConfigLicenseKey: '',
73+
newRelicLoaderConfigApplicationID: '',
5974
};

‎src/environments/environment.test-osf.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,19 @@ export const environment = {
1616
defaultProvider: 'osf',
1717
dataciteTrackerRepoId: null,
1818
dataciteTrackerAddress: 'https://analytics.datacite.org/api/metric',
19+
newRelicEnabled: true,
20+
newRelicInitDistributedTracingEnabled: false,
21+
newRelicInitPerformanceCaptureMeasures: false,
22+
newRelicInitPrivacyCookiesEnabled: true,
23+
newRelicInitAjaxDenyList: [''],
24+
newRelicInfoBeacon: '',
25+
newRelicInfoErrorBeacon: '',
26+
newRelicInfoLicenseKey: '',
27+
newRelicInfoApplicationID: '',
28+
newRelicInfoSa: 1,
29+
newRelicLoaderConfigAccountID: '',
30+
newRelicLoaderConfigTrustKey: '',
31+
newRelicLoaderConfigAgengID: '',
32+
newRelicLoaderConfigLicenseKey: '',
33+
newRelicLoaderConfigApplicationID: '',
1934
};

‎src/environments/environment.test.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,19 @@ export const environment = {
1616
defaultProvider: 'osf',
1717
dataciteTrackerRepoId: null,
1818
dataciteTrackerAddress: 'https://analytics.datacite.org/api/metric',
19+
newRelicEnabled: true,
20+
newRelicInitDistributedTracingEnabled: false,
21+
newRelicInitPerformanceCaptureMeasures: false,
22+
newRelicInitPrivacyCookiesEnabled: true,
23+
newRelicInitAjaxDenyList: [''],
24+
newRelicInfoBeacon: '',
25+
newRelicInfoErrorBeacon: '',
26+
newRelicInfoLicenseKey: '',
27+
newRelicInfoApplicationID: '',
28+
newRelicInfoSa: 1,
29+
newRelicLoaderConfigAccountID: '',
30+
newRelicLoaderConfigTrustKey: '',
31+
newRelicLoaderConfigAgengID: '',
32+
newRelicLoaderConfigLicenseKey: '',
33+
newRelicLoaderConfigApplicationID: '',
1934
};

‎src/environments/environment.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,19 @@ export const environment = {
5656
defaultProvider: 'osf',
5757
dataciteTrackerRepoId: null,
5858
dataciteTrackerAddress: 'https://analytics.datacite.org/api/metric',
59+
newRelicEnabled: true,
60+
newRelicInitDistributedTracingEnabled: false,
61+
newRelicInitPerformanceCaptureMeasures: false,
62+
newRelicInitPrivacyCookiesEnabled: true,
63+
newRelicInitAjaxDenyList: [''],
64+
newRelicInfoBeacon: '',
65+
newRelicInfoErrorBeacon: '',
66+
newRelicInfoLicenseKey: '',
67+
newRelicInfoApplicationID: '',
68+
newRelicInfoSa: 1,
69+
newRelicLoaderConfigAccountID: '',
70+
newRelicLoaderConfigTrustKey: '',
71+
newRelicLoaderConfigAgengID: '',
72+
newRelicLoaderConfigLicenseKey: '',
73+
newRelicLoaderConfigApplicationID: '',
5974
};

0 commit comments

Comments
 (0)