Fixes matomo-org#4946

 * Set idaction_name to 0 instead of NULL. This should fix the error of requests not recorded.
 * Only set the custom variables if it's not already set. Tests show it breaks log replay of ecommerce logs (which use custom variable slots)

core/Tracker/Action.php

@@ -255,7 +255,7 @@ public function record($idVisit, $visitorIdCookie, $idReferrerActionUrl, $idRefe
                                                                Tracker\Action::TYPE_SITE_SEARCH
                                                          ))
             ? (int)$this->getIdActionName()
-            : null;
+            : 0;
 
         $visitAction = array(
             'idvisit'               => $idVisit,

misc/log-analytics/import_logs.py

@@ -1282,6 +1282,7 @@ def _get_hit_args(self, hit):
         if config.options.replay_tracking:
             # prevent request to be force recorded when option replay-tracking
             args['rec'] = '0'
+
         args.update(hit.args)
 
         if hit.is_download:
@@ -1294,15 +1295,16 @@ def _get_hit_args(self, hit):
             else:
                 args['_cvar'] = '{"1":["Not-Bot","%s"]}' % hit.user_agent
 
-        args['cvar'] = '{"1":["HTTP-code","%s"]}' % hit.status
+        # do not overwrite custom variables if it's already set (eg. when replaying ecommerce logs)
+        if not args['cvar']:
+            args['cvar'] = '{"1":["HTTP-code","%s"]}' % hit.status
+
         if hit.is_error or hit.is_redirect:
 			args['action_name'] = '%s/URL = %s%s' % (
 				hit.status,
 				urllib.quote(args['url'], ''),
 				("/From = %s" % urllib.quote(args['urlref'], '') if args['urlref'] != ''  else '')
 			)
-        else:
-			args['action_name'] = urllib.quote(args['url'], '')
 
         if hit.generation_time_milli > 0:
             args['gt_ms'] = hit.generation_time_milli

tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml

@@ -1,5 +1,41 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
+	<row>
+		<label>HTTP-code</label>
+		<nb_actions>30</nb_actions>
+		<subtable>
+			<row>
+				<label>200</label>
+				<nb_visits>24</nb_visits>
+				<nb_actions>26</nb_actions>
+				<sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>301</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>307</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>404</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>500</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+		</subtable>
+	</row>
 	<row>
 		<label>Not-Bot</label>
 		<nb_visits>7</nb_visits>
@@ -84,36 +120,6 @@
 			</row>
 		</subtable>
 	</row>
-	<row>
-		<label>HTTP-code</label>
-		<nb_actions>4</nb_actions>
-		<subtable>
-			<row>
-				<label>301</label>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			</row>
-			<row>
-				<label>307</label>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			</row>
-			<row>
-				<label>404</label>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			</row>
-			<row>
-				<label>500</label>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-			</row>
-		</subtable>
-	</row>
 	<row>
 		<label>Bot</label>
 		<nb_visits>1</nb_visits>

tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml

@@ -971,6 +971,12 @@
 				<pageIdAction>41</pageIdAction>
 
 				<pageId>37</pageId>
+				<customVariables>
+					<row>
+						<customVariablePageName1>HTTP-code</customVariablePageName1>
+						<customVariablePageValue1>200</customVariablePageValue1>
+					</row>
+				</customVariables>
 				<generationTime>0.15s</generationTime>
 				<icon />
 			</row>