remove new relic envs and revert caddy changes

appsmithorg · Dec 23, 2024 · c8c07e5 · c8c07e5
1 parent 02a8e73
commit c8c07e5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 36 deletions.
diff --git a/app/client/public/index.html b/app/client/public/index.html
@@ -213,22 +213,9 @@
           ceKey: parseConfig('{{env "APPSMITH_SEGMENT_CE_KEY"}}'),
         },
         observability: {
-          // TODO @diljit - Add faro related keys here
           deploymentName: parseConfig('{{env "APPSMITH_DEPLOYMENT_NAME"}}') || "self-hosted",
           serviceInstanceId: parseConfig('{{env "APPSMITH_HOSTNAME"}}') || "appsmith-0",
-        },
-        // TODO @diljit - Remove the following keys from the feature configs
-        newRelic:{
-          enableNewRelic: parseConfig('{{env "APPSMITH_NEW_RELIC_ACCOUNT_ENABLE"}}'),
-          accountId: parseConfig('{{env "APPSMITH_NEW_RELIC_ACCOUNT_ID"}}'),
-          applicationId: parseConfig('{{env "APPSMITH_NEW_RELIC_APPLICATION_ID"}}'),
-          browserAgentlicenseKey: parseConfig('{{env "APPSMITH_NEW_RELIC_BROWSER_AGENT_LICENSE_KEY"}}'),
-          browserAgentEndpoint: parseConfig('{{env "APPSMITH_NEW_RELIC_BROWSER_AGENT_ENDPOINT"}}'),
-          otlpLicenseKey: parseConfig('{{env "APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY"}}'),
-          //OTLP following the naming convention of Sdk initialisation
-          otlpServiceName: parseConfig('{{env "APPSMITH_NEW_RELIC_OTEL_SERVICE_NAME"}}'),
-          otlpEndpoint:parseConfig('{{env "APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT"}}'),
-
+          tracingUrl: parseConfig('{{env "APPSMITH_FRONTEND_TRACING_URL"}}'),
         },
         fusioncharts: {
           licenseKey: parseConfig('{{env "APPSMITH_FUSIONCHARTS_LICENSE_KEY"}}'),

diff --git a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
@@ -38,14 +38,6 @@ if (CUSTOM_DOMAIN !== "") {
 const frameAncestorsPolicy = (process.env.APPSMITH_ALLOWED_FRAME_ANCESTORS || "'self'")
   .replace(/;.*$/, "")
 
-const monitoringParts = [{
-  path: "/monitoring/traces",
-  rewrite: "/v1/traces",
-}, {
-  path: "/monitoring/metrics",
-  rewrite: "/v1/metrics",
-}];
-
 const parts = []
 
 parts.push(`
@@ -147,20 +139,6 @@ parts.push(`
     import reverse_proxy 8091
   }
 
-${
-  monitoringParts.map((telemetry) => `
-  handle ${telemetry.path} {
-    @unauthorized not header api-key "${process.env.APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY}"
-    respond @unauthorized "Forbidden" 403
-
-    @method_not_allowed not method POST
-    respond @method_not_allowed "Method Not Allowed" 405
-
-    rewrite * ${telemetry.rewrite}
-    import reverse_proxy 4318
-  }`).join("\n")
-}
-
   redir /supervisor /supervisor/
   handle_path /supervisor/* {
     import reverse_proxy 9001