Merge pull request #61 from edx/nadeem/GSRE-1686

feat: Add Datadog-Git Repository Source Code Integration

playbooks/roles/analytics_api/defaults/main.yml

@@ -48,6 +48,7 @@ ANALYTICS_API_VERSION: "master"
 ANALYTICS_API_NGINX_PORT: '1{{ analytics_api_gunicorn_port }}'
 ANALYTICS_API_SSL_NGINX_PORT: '4{{ analytics_api_gunicorn_port }}'
 
+ANALYTICS_API_REPOSITORY_GIT_URL: "https://github.com/edx/edx-analytics-data-api.git"
 ANALYTICS_API_REPOS:
   - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
     DOMAIN: "{{ COMMON_GIT_MIRROR }}"

playbooks/roles/analytics_api/meta/main.yml

@@ -52,3 +52,4 @@ dependencies:
     edx_django_service_decrypt_config_enabled: '{{ ANALYTICS_API_DECRYPT_CONFIG_ENABLED }}'
     edx_django_service_copy_config_enabled: '{{ ANALYTICS_API_COPY_CONFIG_ENABLED }}'
     edx_django_datadog_service: '{{ analytics_api_datadog_service_name }}'
+    edx_django_service_repository_git_url: '{{ ANALYTICS_API_REPOSITORY_GIT_URL }}'

playbooks/roles/ecommerce/defaults/main.yml

@@ -13,6 +13,7 @@
 
 ECOMMERCE_GIT_IDENTITY: !!null
 
+ECOMMERCE_REPOSITORY_GIT_URL: "https://github.com/edx/ecommerce.git"
 ECOMMERCE_REPOS:
   - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
     DOMAIN: "{{ COMMON_GIT_MIRROR }}"

playbooks/roles/ecommerce/meta/main.yml

@@ -69,6 +69,7 @@ dependencies:
     edx_django_service_copy_config_enabled: '{{ ECOMMERCE_COPY_CONFIG_ENABLED }}'
     EDX_DJANGO_SERVICE_ENABLE_ADMIN_URLS_RESTRICTION: '{{ ECOMMERCE_ENABLE_ADMIN_URLS_RESTRICTION }}'
     EDX_DJANGO_SERVICE_ADMIN_URLS: '{{ ECOMMERCE_ADMIN_URLS }}'
+    edx_django_service_repository_git_url: '{{ ECOMMERCE_REPOSITORY_GIT_URL }}'
   - role: antivirus
     ANTIVIRUS_SCAN_DIRECTORY: "{{ ECOMMERCE_ANTIVIRUS_SCAN_DIRECTORY }}"
     when: ECOMMERCE_ENABLE_ANTIVIRUS

playbooks/roles/ecomworker/defaults/main.yml

@@ -14,6 +14,7 @@ ECOMMERCE_WORKER_GIT_IDENTITY: !!null
 ECOMMERCE_WORKER_VERSION: '2u/main'
 ECOMMERCE_WORKER_USE_PYTHON38: true
 
+ECOMMERCE_WORKER_REPOSITORY_GIT_URL: "https://github.com/edx/ecommerce-worker.git"
 ECOMMERCE_WORKER_REPOS:
   - PROTOCOL: '{{ COMMON_GIT_PROTOCOL }}'
     DOMAIN: '{{ COMMON_GIT_MIRROR }}'

playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2

@@ -24,6 +24,8 @@ export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true
 export DD_TRACE_LOG_STREAM_HANDLER=false
 export DD_PROFILING_ENABLED=true
 export DD_DATA_STREAMS_ENABLED=true
+export DD_GIT_COMMIT_SHA="{{ app_version }}"
+export DD_GIT_REPOSITORY_URL="{{ ECOMMERCE_WORKER_REPOSITORY_GIT_URL }}"
 {% endif -%}
 
 source {{ ecommerce_worker_home }}/{{ ecommerce_worker_service_name }}_env

playbooks/roles/edx_django_service/defaults/main.yml

@@ -17,6 +17,7 @@ edx_django_service_name_devstack_logs:
   - '{{ supervisor_log_dir }}/{{ edx_django_service_name }}-stdout.log'
   - '{{ supervisor_log_dir }}/{{ edx_django_service_name }}-stderr.log'
 
+edx_django_service_repository_git_url: ''
 edx_django_service_git_protocol: '{{ COMMON_GIT_PROTOCOL }}'
 edx_django_service_git_domain: '{{ COMMON_GIT_MIRROR }}'
 edx_django_service_git_path: '{{ COMMON_GIT_PATH }}'

playbooks/roles/edx_django_service/templates/edx/app/app/app.sh.j2

@@ -34,6 +34,8 @@ export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true
 # other trace-related configs that are documented seem to help, but
 # from testing DD_TRACE_LOG_STREAM_HANDLER=false seems to help.
 export DD_TRACE_LOG_STREAM_HANDLER=false
+export DD_GIT_COMMIT_SHA="{{ app_version }}"
+export DD_GIT_REPOSITORY_URL="{{ edx_django_service_repository_git_url }}"
 {% endif -%}
 
 export EDX_REST_API_CLIENT_NAME="{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ edx_django_service_name }}"

playbooks/roles/insights/defaults/main.yml

@@ -179,6 +179,7 @@ INSIGHTS_MODULE_PREVIEW_URL: "{{ INSIGHTS_LMS_BASE }}/xblock"
 INSIGHTS_VERSION: "master"
 INSIGHTS_GIT_IDENTITY: !!null
 
+INSIGHTS_REPOSITORY_GIT_URL: "https://github.com/edx/edx-analytics-dashboard.git"
 INSIGHTS_REPOS:
   - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
     DOMAIN: "{{ COMMON_GIT_MIRROR }}"

playbooks/roles/insights/templates/edx/app/insights/insights.sh.j2

@@ -22,6 +22,8 @@ export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true
 # trace debug logging issue doesn't actually affect edxapp for some
 # reason.
 export DD_TRACE_LOG_STREAM_HANDLER=false
+export DD_GIT_COMMIT_SHA="{{ app_version }}"
+export DD_GIT_REPOSITORY_URL="{{ INSIGHTS_REPOSITORY_GIT_URL }}"
 
 # TODO: There seems to be some potential issues enabling APM profiling in both NewRelic and Datadog.
 # A safe bet would be to enable these after NewRelic profiling is disabled.