Enable sidecar on 8.3 (#2716)

* Revert "Disable sidecar on 8.3 (#2700)"

This reverts commit d943c71.

* Use sidecar with v0.4 encoding support.

* Prevent running the sidecar in the background sender test.

* Increase request attempt number in order to avoid flakyness when sidecar is enabled.

---------

Co-authored-by: Julio Gonzalez <[email protected]>

Author: pierotibou

Makefile

@@ -985,7 +985,7 @@ define run_composer_with_retry
 endef
 
 define run_tests_without_coverage
-	$(TEST_EXTRA_ENV) $(ENV_OVERRIDE) php $(TEST_EXTRA_INI) -d datadog.instrumentation_telemetry_enabled=0 -d datadog.trace.sidecar_trace_sender=$(shell test $(PHP_MAJOR_MINOR) -ge 84 && echo 1 || echo 0) $(TRACER_SOURCES_INI) $(PHPUNIT) $(1) --filter=$(FILTER)
+	$(TEST_EXTRA_ENV) $(ENV_OVERRIDE) php $(TEST_EXTRA_INI) -d datadog.instrumentation_telemetry_enabled=0 -d datadog.trace.sidecar_trace_sender=$(shell test $(PHP_MAJOR_MINOR) -ge 83 && echo 1 || echo 0) $(TRACER_SOURCES_INI) $(PHPUNIT) $(1) --filter=$(FILTER)
 endef
 
 define run_tests_with_coverage

ext/configuration.h

@@ -53,7 +53,7 @@ enum ddtrace_sampling_rules_format {
 #define DD_INTEGRATION_ANALYTICS_ENABLED_DEFAULT false
 #define DD_INTEGRATION_ANALYTICS_SAMPLE_RATE_DEFAULT 1
 
-#if defined(_WIN32)
+#if PHP_VERSION_ID >= 80300 || defined(_WIN32)
 #define DD_SIDECAR_TRACE_SENDER_DEFAULT true
 #else
 #define DD_SIDECAR_TRACE_SENDER_DEFAULT false

libdatadog

@@ -441,7 +441,7 @@ public function retrieveDumpedData(callable $until = null, $throw = false)
         // When tests run with the background sender enabled, there might be some delay between when a trace is flushed
         // and actually sent. While we should find a smart way to tackle this, for now we do it quick and dirty, in a
         // for loop.
-        for ($attemptNumber = 1; $attemptNumber <= 20; $attemptNumber++) {
+        for ($attemptNumber = 1; $attemptNumber <= 50; $attemptNumber++) {
             $curl = curl_init(self::$agentRequestDumperUrl . '/replay');
             curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
             // Retrieving data

tests/Common/TracerTestTrait.php

@@ -24,6 +24,7 @@ private static function getAppErrorLog()
     protected static function getEnvs()
     {
         return array_merge(parent::getEnvs(), [
+            'DD_TRACE_SIDECAR_TRACE_SENDER' => false,
             'DD_TRACE_DEBUG_CURL_OUTPUT' => true,
             'DD_TRACE_AGENT_FLUSH_INTERVAL' => self::BGS_FLUSH_INTERVAL_MS,
         ]);

tests/Integrations/Custom/Autoloaded/BackgroundSenderLogTest.php

@@ -2,7 +2,6 @@
 Send telemetry about the sidecar being disabled
 --SKIPIF--
 <?php include __DIR__ . '/../includes/skipif_no_dev_env.inc'; ?>
-<?php die('skip: Sidecar is nowhere enabled by default yet.'); ?>
 <?php if (PHP_VERSION_ID < 80300) die('skip: Sidecar fallback exists only on PHP 8.3'); ?>
 <?php if (strncasecmp(PHP_OS, "WIN", 3) == 0) die('skip: There is no background sender on Windows'); ?>
 <?php if (getenv('USE_ZEND_ALLOC') === '0' && !getenv("SKIP_ASAN")) die('skip: valgrind reports sendmsg(msg.msg_control) points to uninitialised byte(s), but it is unproblematic and outside our control in rust code'); ?>

tests/ext/background-sender/sidecar_fallback.phpt

@@ -6,9 +6,6 @@ Sidecar should be disabled when telemetry is disabled
 <?php
 include_once 'startup_logging.inc';
 
-// This test isn't relevant now as we're not enabling sidecar on 8.3.
-// It is still working so I'll leave it here as a commodity.
-
 // IN PHP 8.3, the sidecar is enabled
 // In all other versions the sidecar is disabled.
 // But we disable in all cases if telemetry is disabled.

tests/ext/sidecar_disabled_when_telemetry_disabled.phpt

@@ -1,14 +1,11 @@
 --TEST--
 Sidecar should be enabled by default on PHP 8.3
 --SKIPIF--
-<?php include 'startup_logging_skip_unless_unix_83.inc'; ?>
+<?php include 'startup_logging_skipif_unix_83.inc'; ?>
 --FILE--
 <?php
 include_once 'startup_logging.inc';
 
-// This test isn't relevant now as we're not enabling sidecar on 8.3.
-// I'll leave it here as a commodity.
-
 // IN PHP 8.3, the sidecar is enabled by default, let's test this here
 // In all other versions the sidecar is disabled but this is tested by sidecar_disabled_when_telemetry_disabled.phpt
 $logs = dd_get_startup_logs([], [
@@ -21,4 +18,4 @@ dd_dump_startup_logs($logs, [
 
 ?>
 --EXPECT--
-sidecar_trace_sender: false
+sidecar_trace_sender: true