avniproject/avni-product#1433 | newrelic fixes

avniproject · Nov 21, 2023 · fba00cc · fba00cc
1 parent b3427ed
commit fba00cc
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/configure/group_vars/prerelease_vars.yml b/configure/group_vars/prerelease_vars.yml
@@ -39,7 +39,7 @@ scheduled_job_repeat_interval: "60"
 
 avni_server_host: "localhost"
 avni_server_port: "8021"
-avni_server_opts: " -Dnewrelic.config.agent_enabled=false -Dnewrelic.environment=production -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xmx1024m -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
+avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xmx1024m -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
 avni_server_db_host: "prereleasedb.avniproject.org."
 avni_server_db_port: "5432"
 avni_server_db_schema: "public"
@@ -70,4 +70,7 @@ avni_webapp_timeout: "21600"
 avni_server_legacy_longitudinal_export_limit: "30000"
 
 newrelic_app_name: "avni"
-newrelic_application_logging_enabled: "false"
+newrelic_environment: "prerelease"
+newrelic_agent_enabled: "false"
+newrelic_application_logging_enabled: "false"
+newrelic_distributed_tracing_enabled: "false"
diff --git a/configure/group_vars/prod_vars.yml b/configure/group_vars/prod_vars.yml
@@ -40,7 +40,7 @@ scheduled_job_repeat_interval: "90"
 
 avni_server_host: "localhost"
 avni_server_port: "8021"
-avni_server_opts: " -Dnewrelic.environment=production -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xmx3072m -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -XX:-OmitStackTraceInFastThrow"
+avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xmx3072m -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -XX:-OmitStackTraceInFastThrow"
 avni_server_db_host: "serverdb.openchs.org."
 avni_server_db_port: "5432"
 avni_server_db_schema: "public"
@@ -71,4 +71,7 @@ avni_server_legacy_longitudinal_export_limit: "30000"
 avni_blacklisted_urls: '["/profile/**", "/manifest.json"]'
 
 newrelic_app_name: "avni"
-newrelic_application_logging_enabled: "false"
+newrelic_environment: "production"
+newrelic_agent_enabled: "true"
+newrelic_application_logging_enabled: "false"
+newrelic_distributed_tracing_enabled: "false"
diff --git a/configure/group_vars/staging_vars.yml b/configure/group_vars/staging_vars.yml
@@ -38,7 +38,7 @@ scheduled_job_trigger_misfire_threshold: "2700000"
 scheduled_job_repeat_interval: "60"
 avni_server_host: "localhost"
 avni_server_port: "8021"
-avni_server_opts: " -Dnewrelic.config.agent_enabled=false -Dnewrelic.environment=staging -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xmx1512m -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
+avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Xmx1512m -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:-OmitStackTraceInFastThrow"
 avni_server_db_host: "stagingdb.openchs.org."
 avni_server_db_port: "5432"
 avni_server_db_schema: "public"
@@ -69,4 +69,7 @@ avni_webapp_timeout: "21600"
 avni_server_legacy_longitudinal_export_limit: "30000"
 
 newrelic_app_name: "avni"
-newrelic_application_logging_enabled: "false"
+newrelic_environment: "staging"
+newrelic_agent_enabled: "false"
+newrelic_application_logging_enabled: "false"
+newrelic_distributed_tracing_enabled: "false"
diff --git a/configure/roles/newrelic/templates/newrelic.yml.j2 b/configure/roles/newrelic/templates/newrelic.yml.j2
@@ -18,7 +18,7 @@ common: &default_settings
   # Agent enabled
   # Use this setting to disable the agent instead of removing it from the startup command.
   # Default is true.
-  agent_enabled: true
+  agent_enabled: {{ newrelic_agent_enabled }}
 
   # Set the name of your application as you'd like it to show up in the New Relic UI.
   # If enable_auto_app_naming is false, the agent reports all data to this application.
@@ -268,7 +268,7 @@ common: &default_settings
 
     # Set to false to disable distributed tracing.
     # Default is true.
-    enabled: true
+    enabled: {{ newrelic_distributed_tracing_enabled }}
 
     # Agent versions 5.10.0+ utilize both the newrelic header and W3C Trace Context headers for distributed tracing.
     # The newrelic distributed tracing header allows interoperability with older agents that don't support W3C Trace Context headers.
@@ -445,3 +445,7 @@ production:
 staging:
   <<: *default_settings
   app_name: {{ newrelic_app_name }} (Staging)
+
+prerelease:
+  <<: *default_settings
+  app_name: {{ newrelic_app_name }} (Prerelease)