Revert "Revert "Load Track.js 20% of the time on embeds""

NEWS.md

@@ -16,6 +16,7 @@ sudo make install
 - Inform users about quota errors (#14921)
 
 ### Bug fixes / enhancements
+- Load Track.js only 20% of the time [#14928](https://github.com/CartoDB/cartodb/pull/14928)
 - Fix choice of dataservices provider for metrics [#14729](https://github.com/CartoDB/cartodb/pull/14729)
 - Improve caching management when table permissions change ([CartoDB/cartodb-management#5218](https://github.com/CartoDB/cartodb-management/issues/5218))
 - Chaging test related to deprecated st_text function [#14865](https://github.com/CartoDB/cartodb/pull/14865)

app/helpers/trackjs_helper.rb

@@ -1,6 +1,7 @@
 module TrackjsHelper
-  def insert_trackjs(app = 'editor')
-    if Cartodb.get_config(:trackjs, 'customer') && params[:cookies] != '0'
+  def insert_trackjs(app = 'editor', freq = 1)
+    lucky = freq.nil? || freq >= rand
+    if Cartodb.get_config(:trackjs, 'customer') && params[:cookies] != '0' && lucky
       customer = Cartodb.get_config(:trackjs, 'customer')
       enabled = Cartodb.get_config(:trackjs, 'enabled')
       app_key = Cartodb.get_config(:trackjs, 'app_keys', app)

app/views/admin/visualizations/embed_map.html.erb

@@ -43,7 +43,7 @@
 <% end %>
 
 <%= content_for(:js) do %>
-  <%= insert_trackjs('embeds') %>
+  <%= insert_trackjs('embeds', Cartodb.config[:trackjs]['frequency']) %>
   <%= render :partial => 'admin/visualizations/public/embed_map_inline_js' %>
   <%= insert_google_analytics('embeds', true) %>
 <% end %>

app/views/admin/visualizations/public_map.html.erb

@@ -299,7 +299,7 @@
 
 
 <%= content_for(:js) do %>
-  <%= insert_trackjs('embeds') %>
+  <%= insert_trackjs('embeds', Cartodb.config[:trackjs]['frequency']) %>
 
   <% if @visualization.map.provider == 'googlemaps' %>
     <%= insert_google_maps(@google_maps_query_string) %>

app/views/carto/builder/public/embeds/show.html.erb

@@ -25,7 +25,7 @@
 <% end %>
 
 <%= content_for(:js) do %>
-  <%= insert_trackjs('builder-embeds') %>
+  <%= insert_trackjs('builder-embeds', Cartodb.config[:trackjs]['frequency']) %>
 
   <% if @vizjson[:map_provider] == 'googlemaps' && @google_maps_qs.present? %>
     <%= insert_google_maps(@google_maps_qs) %>

app/views/layouts/application_password_layout.html.erb

@@ -30,7 +30,7 @@
       </div>
     </div>
 
-    <%= insert_trackjs('embeds') %>
+    <%= insert_trackjs('embeds', Cartodb.config[:trackjs]['frequency']) %>
     <%= insert_google_analytics('embeds', true) %>
     <%= insert_hubspot() %>
   </body>

config/app_config.yml.sample

@@ -81,6 +81,7 @@ defaults: &defaults
     app_keys:
       editor: ''
       embeds: ''
+    frequency: 0.2
   #fullstory:
     #org: 'XXXXX'
   facebook:

spec/requests/carto/builder/public/embeds_controller_spec.rb

@@ -171,7 +171,8 @@ describe Carto::Builder::Public::EmbedsController do
     it 'includes 3rd party scripts for analytics' do
       Cartodb.with_config(
         trackjs: {
-          'customer' => 'fake_trackjs_customer'
+          'customer' => 'fake_trackjs_customer',
+          'frequency' => 1
         },
         metrics: {
           'hubspot': {
@@ -194,7 +195,8 @@ describe Carto::Builder::Public::EmbedsController do
     it 'does not include 3rd party scripts if cookies=0 query param is present' do
       Cartodb.with_config(
         trackjs: {
-          'customer' => 'fake_trackjs_customer'
+          'customer' => 'fake_trackjs_customer',
+          'frequency' => 1
         },
         metrics: {
           'hubspot': {