diff --git a/app/client/docker/templates/nginx-app.conf.template b/app/client/docker/templates/nginx-app.conf.template index cc11b83c09..c21b7fe84d 100644 --- a/app/client/docker/templates/nginx-app.conf.template +++ b/app/client/docker/templates/nginx-app.conf.template @@ -50,8 +50,9 @@ server { sub_filter __APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX__ '${APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX}'; sub_filter __APPSMITH_NEW_RELIC_ACCOUNT_ID__ '${APPSMITH_NEW_RELIC_ACCOUNT_ID}'; sub_filter __APPSMITH_NEW_RELIC_APPLICATION_ID__ '${APPSMITH_NEW_RELIC_APPLICATION_ID}'; - sub_filter __APPSMITH_APP_NEW_RELIC_LICENSE_KEY__ '${APPSMITH_APP_NEW_RELIC_LICENSE_KEY}'; + sub_filter __APPSMITH_NEW_RELIC_BROWSER_AGENT_LICENSE_KEY__ '${APPSMITH_NEW_RELIC_BROWSER_AGENT_LICENSE_KEY}'; sub_filter __APPSMITH_NEW_RELIC_ACCOUNT_ENABLE__ '${APPSMITH_NEW_RELIC_ACCOUNT_ENABLE}'; + sub_filter __APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY__ '${APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY}'; } diff --git a/app/client/jest.config.js b/app/client/jest.config.js index 678475e3b9..7006556898 100644 --- a/app/client/jest.config.js +++ b/app/client/jest.config.js @@ -83,6 +83,13 @@ module.exports = { apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"), ceKey: parseConfig("__APPSMITH_SEGMENT_CE_KEY__"), }, + newRelic:{ + enableNewRelic: parseConfig("__APPSMITH_NEW_RELIC_ACCOUNT_ENABLE__"), + accountId: parseConfig("__APPSMITH_NEW_RELIC_ACCOUNT_ID__"), + applicationId: parseConfig("__APPSMITH_NEW_RELIC_APPLICATION_ID__"), + browserAgentlicenseKey: parseConfig("__APPSMITH_NEW_RELIC_BROWSER_AGENT_LICENSE_KEY__"), + otlpLicenseKey: parseConfig("__APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY__"), + }, fusioncharts: { licenseKey: parseConfig("__APPSMITH_FUSIONCHARTS_LICENSE_KEY__"), }, diff --git a/app/client/package.json b/app/client/package.json index ec10b8d35e..e7d7f0bc5f 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -61,6 +61,14 @@ "@loadable/component": "^5.15.3", "@manaflair/redux-batch": "^1.0.0", "@mantine/hooks": "^5.10.1", + "@opentelemetry/auto-instrumentations-web": "^0.33.2", + "@opentelemetry/context-zone": "^1.17.1", + "@opentelemetry/exporter-trace-otlp-proto": "^0.44.0", + "@opentelemetry/instrumentation": "^0.44.0", + "@opentelemetry/resources": "^1.17.1", + "@opentelemetry/sdk-trace-base": "^1.17.1", + "@opentelemetry/sdk-trace-web": "^1.17.1", + "@opentelemetry/semantic-conventions": "^1.17.1", "@sentry/react": "^6.2.4", "@sentry/tracing": "^6.2.4", "@shared/ast": "workspace:^", diff --git a/app/client/public/index.html b/app/client/public/index.html index 1bcb8a1026..d7efcbc795 100755 --- a/app/client/public/index.html +++ b/app/client/public/index.html @@ -40,30 +40,30 @@ const CLOUD_HOSTING = parseConfig("__APPSMITH_CLOUD_HOSTING__"); const ZIPY_KEY = parseConfig("__APPSMITH_ZIPY_SDK_KEY__"); const AIRGAPPED = parseConfig("__APPSMITH_AIRGAP_ENABLED__"); + // NREUM variable is required when we are we are are dynamically loading new relic browser agent script + NREUM = undefined - -