Update RUM, add session replay, update GKE deploy (#183)

stanleegoodspeed · web-flow · commit 17d876355b76 · 2021-12-02T11:55:50.000-05:00
* update gke yamls to point to 2.1.1 images

* update RUM, add session replay

* add baseline docker compose

* remove build context from storefront-fixed

* update filename

* allow RUM env to be set via compose

* rebuild patches

* add DD_ENV, regen patches
diff --git a/deploy/docker-compose/docker-compose-broken-instrumented.yml b/deploy/docker-compose/docker-compose-broken-instrumented.yml
@@ -50,6 +50,8 @@ services:
       - DB_PASSWORD
       - DD_CLIENT_TOKEN
       - DD_APPLICATION_ID
+      - DD_ENV=development
+      - DD_SITE=datadoghq.com
     image: "ddtraining/storefront:2.1.0"
     command: sh docker-entrypoint.sh
     ports:
diff --git a/deploy/docker-compose/docker-compose-fixed-instrumented-attack.yml b/deploy/docker-compose/docker-compose-fixed-instrumented-attack.yml
@@ -52,6 +52,8 @@ services:
       - DD_VERSION=1.1
       - DD_CLIENT_TOKEN
       - DD_APPLICATION_ID
+      - DD_ENV=development
+      - DD_SITE=datadoghq.com
     image: "ddtraining/storefront-fixed:2.1.0"
     ports:
       - "3000:3000"
diff --git a/deploy/docker-compose/docker-compose-fixed-instrumented-livecode.yml b/deploy/docker-compose/docker-compose-fixed-instrumented-livecode.yml
@@ -52,6 +52,8 @@ services:
       - DB_PASSWORD
       - DD_CLIENT_TOKEN
       - DD_APPLICATION_ID
+      - DD_ENV=development
+      - DD_SITE=datadoghq.com
     image: "ddtraining/storefront-fixed:2.1.0"
     command: sh docker-entrypoint.sh
     ports:
diff --git a/deploy/docker-compose/docker-compose-fixed-instrumented.yml b/deploy/docker-compose/docker-compose-fixed-instrumented.yml
@@ -52,6 +52,8 @@ services:
       - DD_VERSION=1.1
       - DD_CLIENT_TOKEN
       - DD_APPLICATION_ID
+      - DD_ENV=development
+      - DD_SITE=datadoghq.com
     image: "ddtraining/storefront-fixed:2.1.0"
     command: sh docker-entrypoint.sh
     ports:
diff --git a/deploy/docker-compose/docker-compose-local-baseline.yml b/deploy/docker-compose/docker-compose-local-baseline.yml
@@ -0,0 +1,120 @@
+# Docker compose file which uses build context plus mounted volumes for easier local development
+# Note: storefront-fixed cannot use the build context because the .patch files are located in a parent directory of the Dockerfile
+version: '3'
+services:
+  agent:
+    image: "datadog/agent:7.29.0"
+    environment:
+      - DD_API_KEY
+      - DD_APM_ENABLED=true
+      - DD_LOGS_ENABLED=true
+      - DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL=true
+      - DD_PROCESS_AGENT_ENABLED=true
+      - DD_DOCKER_LABELS_AS_TAGS={"my.custom.label.team":"team"}
+      - DD_TAGS='env:development'
+    ports:
+      - "8126:8126"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /proc/:/host/proc/:ro
+      - /sys/fs/cgroup/:/host/sys/fs/cgroup:ro
+    labels:
+      com.datadoghq.ad.logs: '[{"source": "agent", "service": "agent"}]'
+  discounts:
+    environment:
+      - FLASK_APP=discounts.py
+      - FLASK_DEBUG=1
+      - POSTGRES_PASSWORD
+      - POSTGRES_USER
+      - POSTGRES_HOST=db
+      - DD_SERVICE=discounts-service
+      - DD_AGENT_HOST=agent
+      - DD_LOGS_INJECTION=true
+      - DD_TRACE_ANALYTICS_ENABLED=true
+      - DD_PROFILING_ENABLED=true
+      - DD_VERSION=1.1
+    build:
+      context: ../../discounts-service-fixed
+    volumes:
+      - "../../discounts-service-fixed:/app"
+    command: ddtrace-run flask run --port=5001 --host=0.0.0.0
+    ports:
+      - "5001:5001"
+    depends_on:
+      - agent
+      - db
+    labels:
+      com.datadoghq.ad.logs: '[{"source": "python", "service": "discounts-service"}]'
+      my.custom.label.team: "discount"
+  frontend:
+    environment:
+      - DD_AGENT_HOST=agent
+      - DD_LOGS_INJECTION=true
+      - DD_TRACE_ANALYTICS_ENABLED=true
+      - DD_SERVICE=store-frontend
+      - DB_USERNAME
+      - DB_PASSWORD
+      - DD_VERSION=1.1
+      - DD_CLIENT_TOKEN
+      - DD_APPLICATION_ID
+      - DD_ENV=development
+      - DD_SITE=datadoghq.com
+    image: "ddtraining/storefront-fixed:latest"
+    command: sh docker-entrypoint.sh
+    volumes:
+      - "../../store-frontend/src/store-frontend-instrumented-fixed:/app"
+    ports:
+      - "3000:3000"
+    depends_on:
+      - agent
+      - db
+      - discounts
+      - advertisements
+    labels:
+      com.datadoghq.ad.logs: '[{"source": "ruby", "service": "store-frontend"}]'
+      my.custom.label.team: "frontend"
+  advertisements:
+    environment:
+      - FLASK_APP=ads.py
+      - FLASK_DEBUG=1
+      - POSTGRES_PASSWORD
+      - POSTGRES_USER
+      - POSTGRES_HOST=db
+      - DD_SERVICE=advertisements-service
+      - DD_AGENT_HOST=agent
+      - DD_LOGS_INJECTION=true
+      - DD_TRACE_ANALYTICS_ENABLED=true
+      - DD_PROFILING_ENABLED=true
+      - DD_VERSION=1.0
+    build:
+      context: ../../ads-service-fixed
+    volumes:
+      - "../../ads-service-fixed:/app"
+    command: ddtrace-run flask run --port=5002 --host=0.0.0.0
+    ports:
+      - "5002:5002"
+    depends_on:
+      - agent
+      - db
+    labels:
+      com.datadoghq.ad.logs: '[{"source": "python", "service": "ads-service"}]'
+      my.custom.label.team: "advertisements"
+  db:
+    image: postgres:11-alpine
+    restart: always
+    environment:
+      - POSTGRES_PASSWORD
+      - POSTGRES_USER
+    labels:
+      com.datadoghq.ad.logs: '[{"source": "postgresql", "service": "postgres"}]'
+  attackbox:
+    build:
+      context: ../../attack-box
+    environment:
+      - ATTACK_GOBUSTER
+      - ATTACK_HYDRA
+      - ATTACK_GOBUSTER_INTERVAL
+      - ATTACK_HYDRA_INTERVAL
+    depends_on:
+      - discounts
+      - frontend
diff --git a/deploy/gcp/gke/advertisements.yaml b/deploy/gcp/gke/advertisements.yaml
@@ -20,7 +20,7 @@ spec:
         app: ecommerce
     spec:
       containers:
-      - image: ddtraining/advertisements-service:latest
+      - image: ddtraining/advertisements:2.1.1
         name: advertisements 
         command: ["ddtrace-run"]
         args: ["flask", "run", "--port=5002", "--host=0.0.0.0"]
diff --git a/deploy/gcp/gke/discounts.yaml b/deploy/gcp/gke/discounts.yaml
@@ -20,7 +20,7 @@ spec:
         app: ecommerce
     spec:
       containers:
-      - image: ddtraining/discounts-service:latest
+      - image: ddtraining/discounts-fixed:2.1.1
         name: discounts
         command: ["ddtrace-run"]
         args: ["flask", "run", "--port=5001", "--host=0.0.0.0"]
diff --git a/deploy/gcp/gke/frontend.yaml b/deploy/gcp/gke/frontend.yaml
@@ -48,7 +48,7 @@ spec:
         #  value: ""
         #- name: DD_APPLICATION_ID
         #  value: ""
-        image: ddtraining/ecommerce-frontend:latest
+        image: ddtraining/storefront-fixed:2.1.1
         imagePullPolicy: Always
         name: ecommerce-spree-observability
         ports:
diff --git a/store-frontend/src/broken-instrumented.patch b/store-frontend/src/broken-instrumented.patch
@@ -1,6 +1,6 @@
 diff -urN store-frontend-initial-state/Gemfile store-frontend-broken-instrumented/Gemfile
---- store-frontend-initial-state/Gemfile	2021-07-14 12:26:50.000000000 +0200
-+++ store-frontend-broken-instrumented/Gemfile	2021-07-19 11:19:24.000000000 +0200
+--- store-frontend-initial-state/Gemfile	2021-08-31 09:59:14.000000000 -0400
++++ store-frontend-broken-instrumented/Gemfile	2021-12-01 15:21:36.000000000 -0500
 @@ -43,6 +43,7 @@
  gem 'spree', github: 'spree/spree', ref: 'f8e7b4ed9856d1a2f4521f5b8ef7de158a30b398'
  gem 'spree_auth_devise', github: 'spree/spree_auth_devise', ref: '7e9c4d102e0eb84446ec0f4cb3aeefa7f6dfa65d'
@@ -10,8 +10,8 @@ diff -urN store-frontend-initial-state/Gemfile store-frontend-broken-instrumente
  gem 'amazing_print'
  gem 'rails_semantic_logger'
 diff -urN store-frontend-initial-state/Gemfile.lock store-frontend-broken-instrumented/Gemfile.lock
---- store-frontend-initial-state/Gemfile.lock	2021-07-14 12:26:50.000000000 +0200
-+++ store-frontend-broken-instrumented/Gemfile.lock	2021-07-19 11:19:24.000000000 +0200
+--- store-frontend-initial-state/Gemfile.lock	2021-08-31 09:59:14.000000000 -0400
++++ store-frontend-broken-instrumented/Gemfile.lock	2021-12-01 15:21:36.000000000 -0500
 @@ -164,6 +164,9 @@
      crass (1.0.6)
      css_parser (1.9.0)
@@ -39,78 +39,76 @@ diff -urN store-frontend-initial-state/Gemfile.lock store-frontend-broken-instru
    jbuilder (~> 2.5)
    listen (>= 3.0.5, < 3.2)
 diff -urN store-frontend-initial-state/app/views/layouts/application.html.erb store-frontend-broken-instrumented/app/views/layouts/application.html.erb
---- store-frontend-initial-state/app/views/layouts/application.html.erb	2021-07-14 12:26:50.000000000 +0200
-+++ store-frontend-broken-instrumented/app/views/layouts/application.html.erb	2021-07-19 11:19:24.000000000 +0200
-@@ -2,6 +2,31 @@
+--- store-frontend-initial-state/app/views/layouts/application.html.erb	2021-09-10 16:21:30.000000000 -0400
++++ store-frontend-broken-instrumented/app/views/layouts/application.html.erb	2021-12-01 16:10:03.000000000 -0500
+@@ -2,6 +2,30 @@
  <html>
    <head>
      <title>Sandbox</title>
-+    <script
-+  src="https://www.datadoghq-browser-agent.com/datadog-rum-us.js"
-+  type="text/javascript">
-+</script>
-+<script>
-+if (window.DD_RUM) {
-+  window.DD_RUM.init({
-+    clientToken: '<%= ENV['DD_CLIENT_TOKEN'] %>',
-+    applicationId: '<%= ENV['DD_APPLICATION_ID'] %>',
-+    sampleRate: 100,
-+    trackInteractions: true,
-+    service: 'storedog-ui',
-+    env: 'production',
-+    version: 1.1
-+  });
-+
-+  if (!window._DATADOG_SYNTHETICS_BROWSER) {
-+    window.DD_RUM.setRumGlobalContext({'usr.handle': 'john@storedog.com'});
-+  };
-+
-+  if (window.location.href.includes('utm')) {
-+    window.DD_RUM.addRumGlobalContext({'fromUtm': true});
-+  };
-+}
-+</script>
++    <script src="https://www.datadoghq-browser-agent.com/datadog-rum-v3.js" type="text/javascript"></script>
++    <script>
++      window.DD_RUM && window.DD_RUM.init({
++        clientToken: '<%= ENV['DD_CLIENT_TOKEN'] %>',
++        applicationId: '<%= ENV['DD_APPLICATION_ID'] %>',
++        site: '<%= ENV['DD_SITE'] %>',
++        service: '<%= ENV['DD_SERVICE'] %>',
++        env: '<%= ENV['DD_ENV'] %>',
++        version: '1.0.0',
++        sampleRate: 100,
++        trackInteractions: true,
++        defaultPrivacyLevel: 'mask-user-input'
++      });
++      
++      window.DD_RUM && window.DD_RUM.startSessionReplayRecording();
++      
++      if (!window._DATADOG_SYNTHETICS_BROWSER) {
++        window.DD_RUM.setRumGlobalContext({'usr.handle': 'john@storedog.com'});
++      };
++      
++      if (window.location.href.includes('utm')) {
++        window.DD_RUM.addRumGlobalContext({'fromUtm': true});
++      };
++    </script>
      <%= csrf_meta_tags %>
      <%= csp_meta_tag %>
  
 diff -urN store-frontend-initial-state/app/views/spree/layouts/spree_application.html.erb store-frontend-broken-instrumented/app/views/spree/layouts/spree_application.html.erb
---- store-frontend-initial-state/app/views/spree/layouts/spree_application.html.erb	2021-07-14 12:26:50.000000000 +0200
-+++ store-frontend-broken-instrumented/app/views/spree/layouts/spree_application.html.erb	2021-07-19 11:19:24.000000000 +0200
-@@ -5,6 +5,31 @@
+--- store-frontend-initial-state/app/views/spree/layouts/spree_application.html.erb	2021-08-31 09:59:14.000000000 -0400
++++ store-frontend-broken-instrumented/app/views/spree/layouts/spree_application.html.erb	2021-12-01 16:09:55.000000000 -0500
+@@ -5,6 +5,30 @@
  <!--[if IE 9 ]>    <html class="ie ie9" lang="<%= I18n.locale %>"> <![endif]-->
  <!--[if gt IE 9]><!--><html lang="<%= I18n.locale %>"><!--<![endif]-->
    <head data-hook="inside_head">
-+  <script
-+  src="https://www.datadoghq-browser-agent.com/datadog-rum-us.js"
-+  type="text/javascript">
-+</script>
-+<script>
-+if (window.DD_RUM) {
-+  window.DD_RUM.init({
-+    clientToken: '<%= ENV['DD_CLIENT_TOKEN'] %>',
-+    applicationId: '<%= ENV['DD_APPLICATION_ID'] %>',
-+    sampleRate: 100,
-+    trackInteractions: true,
-+    service: 'storedog-ui',
-+    env: 'production',
-+    version: 1.1
-+  });
-+
-+  if (!window._DATADOG_SYNTHETICS_BROWSER) {
-+    window.DD_RUM.setRumGlobalContext({'usr.handle': 'john@storedog.com'});
-+  };
-+
-+  if (window.location.href.includes('utm')) {
-+    window.DD_RUM.addRumGlobalContext({'fromUtm': true});
-+  };
-+}
-+</script>
++  <script src="https://www.datadoghq-browser-agent.com/datadog-rum-v3.js" type="text/javascript"></script>
++  <script>
++    window.DD_RUM && window.DD_RUM.init({
++      clientToken: '<%= ENV['DD_CLIENT_TOKEN'] %>',
++      applicationId: '<%= ENV['DD_APPLICATION_ID'] %>',
++      site: '<%= ENV['DD_SITE'] %>',
++      service: '<%= ENV['DD_SERVICE'] %>',
++      env: '<%= ENV['DD_ENV'] %>',
++      version: '1.0.0',
++      sampleRate: 100,
++      trackInteractions: true,
++      defaultPrivacyLevel: 'mask-user-input'
++    });
++    
++    window.DD_RUM && window.DD_RUM.startSessionReplayRecording();
++    
++    if (!window._DATADOG_SYNTHETICS_BROWSER) {
++      window.DD_RUM.setRumGlobalContext({'usr.handle': 'john@storedog.com'});
++    };
++    
++    if (window.location.href.includes('utm')) {
++      window.DD_RUM.addRumGlobalContext({'fromUtm': true});
++    };
++  </script>
      <%= render partial: 'spree/shared/head' %>
    </head>
    <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
 diff -urN store-frontend-initial-state/config/environments/development.rb store-frontend-broken-instrumented/config/environments/development.rb
---- store-frontend-initial-state/config/environments/development.rb	2021-07-14 12:26:50.000000000 +0200
-+++ store-frontend-broken-instrumented/config/environments/development.rb	2021-07-19 11:19:24.000000000 +0200
+--- store-frontend-initial-state/config/environments/development.rb	2021-09-10 17:19:31.000000000 -0400
++++ store-frontend-broken-instrumented/config/environments/development.rb	2021-12-01 15:21:36.000000000 -0500
 @@ -107,6 +107,21 @@
      config.log_to = %w[stdout file]
    end
@@ -134,8 +132,8 @@ diff -urN store-frontend-initial-state/config/environments/development.rb store-
    config.show_log_configuration = true
  end
 diff -urN store-frontend-initial-state/config/environments/production.rb store-frontend-broken-instrumented/config/environments/production.rb
---- store-frontend-initial-state/config/environments/production.rb	2021-07-14 12:26:50.000000000 +0200
-+++ store-frontend-broken-instrumented/config/environments/production.rb	2021-07-19 11:19:24.000000000 +0200
+--- store-frontend-initial-state/config/environments/production.rb	2021-08-31 09:59:14.000000000 -0400
++++ store-frontend-broken-instrumented/config/environments/production.rb	2021-12-01 15:21:36.000000000 -0500
 @@ -53,6 +53,9 @@
    # when problems arise.
    config.log_level = :warn
@@ -147,8 +145,8 @@ diff -urN store-frontend-initial-state/config/environments/production.rb store-f
    # config.cache_store = :mem_cache_store
  
 diff -urN store-frontend-initial-state/config/initializers/datadog.rb store-frontend-broken-instrumented/config/initializers/datadog.rb
---- store-frontend-initial-state/config/initializers/datadog.rb	1970-01-01 01:00:00.000000000 +0100
-+++ store-frontend-broken-instrumented/config/initializers/datadog.rb	2021-07-19 11:19:24.000000000 +0200
+--- store-frontend-initial-state/config/initializers/datadog.rb	1969-12-31 19:00:00.000000000 -0500
++++ store-frontend-broken-instrumented/config/initializers/datadog.rb	2021-12-01 15:21:36.000000000 -0500
 @@ -0,0 +1,6 @@
 +Datadog.configure do |c|
 +  # This will activate auto-instrumentation for Rails
diff --git a/store-frontend/src/instrumented-fixed.patch b/store-frontend/src/instrumented-fixed.patch
diff --git a/store-frontend/src/store-frontend-initial-state/app/views/spree/orders/edit.html.erb b/store-frontend/src/store-frontend-initial-state/app/views/spree/orders/edit.html.erb
