Disable sidecar on 8.3 (#2700)

pierotibou · bwoebi · web-flow · commit d943c7123370 · 2024-06-10T14:36:06.000+02:00
* disable sidecar on 8.3

* Update sidecar_fallback.phpt

* Run tests without explicit sidecar

---------

Co-authored-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/Makefile b/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 83 && 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 84 && echo 1 || echo 0) $(TRACER_SOURCES_INI) $(PHPUNIT) $(1) --filter=$(FILTER)
 endef
 
 define run_tests_with_coverage
diff --git a/ext/configuration.h b/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 PHP_VERSION_ID >= 80300 || defined(_WIN32)
+#if defined(_WIN32)
 #define DD_SIDECAR_TRACE_SENDER_DEFAULT true
 #else
 #define DD_SIDECAR_TRACE_SENDER_DEFAULT false
diff --git a/tests/ext/background-sender/sidecar_fallback.phpt b/tests/ext/background-sender/sidecar_fallback.phpt
@@ -2,6 +2,7 @@
 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'); ?>
diff --git a/tests/ext/sidecar_disabled_when_telemetry_disabled.phpt b/tests/ext/sidecar_disabled_when_telemetry_disabled.phpt
@@ -6,6 +6,9 @@ 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.
diff --git a/tests/ext/sidecar_enabled.phpt b/tests/ext/sidecar_enabled.phpt
@@ -1,11 +1,14 @@
 --TEST--
 Sidecar should be enabled by default on PHP 8.3
 --SKIPIF--
-<?php include 'startup_logging_skipif_unix_83.inc'; ?>
+<?php include 'startup_logging_skip_unless_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([], [
@@ -18,4 +21,4 @@ dd_dump_startup_logs($logs, [
 
 ?>
 --EXPECT--
-sidecar_trace_sender: true
+sidecar_trace_sender: false
diff --git a/tests/ext/startup_logging_skip_unless_unix_83.inc b/tests/ext/startup_logging_skip_unless_unix_83.inc
