fix: remove New Relic references from configuration files

Author: Bhavani Gudditi

playbooks/mongo_6_0.yml

@@ -25,3 +25,5 @@
       when: COMMON_ENABLE_SPLUNKFORWARDER
     - role: datadog-uninstall
       when: not COMMON_ENABLE_DATADOG
+
+

playbooks/roles/xqueue/templates/xqueue.conf.j2

@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-=======
-[program:xqueue]
-
->>>>>>> ba96c1b05 (chore(edx-services): remove new relic infrastructure and app references)
 {% set executable = xqueue_venv_bin + '/gunicorn' %}
 
 {% if XQUEUE_DATADOG_ENABLE %}

playbooks/roles/xqueue/templates/xqueue_consumer.conf.j2

@@ -10,13 +10,7 @@ command={{ executable }} --pythonpath={{ xqueue_code_dir }} --settings=xqueue.{{
 
 user={{ common_web_user }}
 directory={{ xqueue_code_dir }}
-<<<<<<< HEAD
 
-=======
-
-# Copied DD_TRACE_LOG_STREAM_HANDLER config from edx_django_service. This is required
-# to disable Datadog trace debug logging.
->>>>>>> ba96c1b05 (chore(edx-services): remove new relic infrastructure and app references)
 environment={% if XQUEUE_DATADOG_ENABLE %}DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true,DD_TAGS="service:{{ XQUEUE_CONSUMER_DATADOG_APPNAME }} version:{{ app_version }}",DD_TRACE_LOG_STREAM_HANDLER=false,DD_PROFILING_ENABLED=true,DD_DATA_STREAMS_ENABLED=true,DD_LOGS_INJECTION=true,DD_SERVICE="{{ XQUEUE_CONSUMER_DATADOG_APPNAME }}",{% endif -%}LANG={{ XQUEUE_LANG }},XQUEUE_CFG={{ COMMON_CFG_DIR }}/xqueue.yml
 
 stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log