Fix OpenTelemetry makefile conflicts

Signed-off-by: Bob Weinand <[email protected]>
DataDog · Feb 19, 2025 · cb41689 · cb41689
1 parent fbfbccd
commit cb41689
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 57 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -1152,10 +1152,13 @@ define run_benchmarks_with_ddprof
 endef
 
 define run_composer_with_lock
-	rm $1/composer.lock-php* 2>/dev/null || true
+	rm $1/$(if $2,$(2:.json=.lock),composer.lock)-php* 2>/dev/null || true
+	$(eval CURRENT_COMPOSER:=$(COMPOSER))
+	$(if $(2), $(eval COMPOSER:=COMPOSER=$2 $(COMPOSER)))
 	$(call run_composer_with_retry,$1,)
+	$(eval COMPOSER:=$(CURRENT_COMPOSER))
 	find $1/vendor* \( -name Tests -prune -o -name tests -prune \) -exec rm -rf '{}' \;
-	touch $1/composer.lock-php$(PHP_MAJOR_MINOR)
+	touch $1/$(if $2,$(2:.json=.lock),composer.lock)-php$(PHP_MAJOR_MINOR)
 endef
 
 # use this as the first target if you want to use uncompiled files instead of the _generated_*.php compiled file.
@@ -1240,26 +1243,19 @@ benchmarks: benchmarks_run_dependencies call_benchmarks
 
 benchmarks_opcache: benchmarks_run_dependencies call_benchmarks_opcache
 
-define setup_opentelemetry
-	cp $(1) $(dir $(1))/composer.json
-endef
-
 define run_opentelemetry_tests
-	$(eval TEST_EXTRA_ENV=$(shell [ $(PHP_MAJOR_MINOR) -ge 81 ] && echo "OTEL_PHP_FIBERS_ENABLED=1" || echo '') DD_TRACE_OTEL_ENABLED=1 DD_TRACE_GENERATE_ROOT_SPAN=0)
+	$(eval TEST_EXTRA_ENV=$(shell [ $(PHP_MAJOR_MINOR) -ge 81 ] && echo "OTEL_PHP_FIBERS_ENABLED=1" || echo '') DD_TRACE_OTEL_ENABLED=1 DD_TRACE_GENERATE_ROOT_SPAN=0 $1)
 	$(call run_tests,--testsuite=opentelemetry1 $(TESTS))
 	$(eval TEST_EXTRA_ENV=)
 endef
 
-_test_opentelemetry_beta_setup: global_test_run_dependencies
-	$(call setup_opentelemetry,tests/OpenTelemetry/composer-beta.json)
-
-test_opentelemetry_beta: _test_opentelemetry_beta_setup tests/Frameworks/Custom/OpenTelemetry/composer.lock-php$(PHP_MAJOR_MINOR) tests/OpenTelemetry/composer.lock-php$(PHP_MAJOR_MINOR)
-	$(call run_opentelemetry_tests)
+test_opentelemetry_beta: tests/Frameworks/Custom/OpenTelemetry/composer.lock-php$(PHP_MAJOR_MINOR) tests/OpenTelemetry/composer-beta.lock-php$(PHP_MAJOR_MINOR)
+	$(call run_opentelemetry_tests, TESTSUITE_VENDOR_DIR=vendor-beta)
 
-_test_opentelemetry_1_setup: global_test_run_dependencies
-	$(call setup_opentelemetry,tests/OpenTelemetry/composer-1.json)
+tests/OpenTelemetry/composer-beta.lock-php$(PHP_MAJOR_MINOR): tests/OpenTelemetry/composer-beta.json
+	$(call run_composer_with_lock,tests/OpenTelemetry,composer-beta.json)
 
-test_opentelemetry_1: _test_opentelemetry_1_setup tests/Frameworks/Custom/OpenTelemetry/composer.lock-php$(PHP_MAJOR_MINOR) tests/OpenTelemetry/composer.lock-php$(PHP_MAJOR_MINOR)
+test_opentelemetry_1: tests/Frameworks/Custom/OpenTelemetry/composer.lock-php$(PHP_MAJOR_MINOR) tests/OpenTelemetry/composer.lock-php$(PHP_MAJOR_MINOR)
 	$(call run_opentelemetry_tests)
 
 test_opentracing_10: global_test_run_dependencies tests/OpenTracer1Unit/composer.lock-php$(PHP_MAJOR_MINOR) tests/Frameworks/Custom/OpenTracing/composer.lock-php$(PHP_MAJOR_MINOR)

diff --git a/dockerfiles/ci/xfail_tests/8.2.list b/dockerfiles/ci/xfail_tests/8.2.list
@@ -53,6 +53,7 @@ ext/mbstring/tests/zend_multibyte-01.phpt
 ext/mbstring/tests/zend_multibyte-02.phpt
 ext/mbstring/tests/zend_multibyte-06.phpt
 ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-double.phpt
+ext/mysqli/tests/protocol_stmt_row_fetch_data.phpt
 ext/openssl/tests/bug46127.phpt
 ext/openssl/tests/bug48182.phpt
 ext/openssl/tests/bug54992.phpt

diff --git a/libdatadog b/libdatadog
diff --git a/tests/OpenTelemetry/Integration/Context/Fiber/test_context_switching_ffi_observer.phpt b/tests/OpenTelemetry/Integration/Context/Fiber/test_context_switching_ffi_observer.phpt
@@ -8,7 +8,8 @@ OTEL_PHP_FIBERS_ENABLED=1
 <?php
 use OpenTelemetry\Context\Context;
 
-require_once './tests/OpenTelemetry/vendor/autoload.php';
+$vendorDir = getenv("TESTSUITE_VENDOR_DIR") ?: "vendor";
+require_once "./tests/OpenTelemetry/$vendorDir/autoload.php";
 
 $key = Context::createKey('-');
 $scope = Context::getCurrent()

diff --git a/.../Integration/Context/Fiber/test_context_switching_ffi_observer_registered_on_startup.phpt b/.../Integration/Context/Fiber/test_context_switching_ffi_observer_registered_on_startup.phpt
@@ -8,7 +8,8 @@ OTEL_PHP_FIBERS_ENABLED=1
 <?php
 use OpenTelemetry\Context\Context;
 
-require_once './tests/OpenTelemetry/vendor/autoload.php';
+$vendorDir = getenv("TESTSUITE_VENDOR_DIR") ?: "vendor";
+require_once "./tests/OpenTelemetry/$vendorDir/autoload.php";
 
 $key = Context::createKey('-');
 

diff --git a/tests/OpenTelemetry/composer-beta.json b/tests/OpenTelemetry/composer-beta.json
@@ -5,5 +5,8 @@
         "open-telemetry/extension-propagator-b3": "@beta",
         "open-telemetry/opentelemetry-logger-monolog": "@beta"
     },
-    "minimum-stability": "beta"
+    "minimum-stability": "beta",
+    "config": {
+        "vendor-dir": "vendor-beta/"
+    }
 }
diff --git a/tests/OpenTelemetry/composer-1.json → tests/OpenTelemetry/composer.json b/tests/OpenTelemetry/composer-1.json → tests/OpenTelemetry/composer.json
diff --git a/tests/bootstrap_common.php b/tests/bootstrap_common.php
@@ -90,14 +90,15 @@ function update_test_agent_session_token($token) {
 
     // ensure the integration-specific autoloader is loaded
     $hook = function ($object, $scope, $args) {
+        $vendorDir = getenv("TESTSUITE_VENDOR_DIR") ?: "vendor";
         $path = dirname($args[0]);
         if (strpos($path, "vendor")) {
             return; // No nested vendor
         }
         while (strlen($path) > strlen(__DIR__)) {
-            if (file_exists("$path/vendor/autoload.php")) {
+            if (file_exists("$path/$vendorDir/autoload.php")) {
                 putenv("COMPOSER_ROOT_VERSION=1.0.0"); // silence composer
-                \DDTrace\Tests\Common\IntegrationTestCase::$autoloadPath = "$path/vendor/autoload.php";
+                \DDTrace\Tests\Common\IntegrationTestCase::$autoloadPath = "$path/$vendorDir/autoload.php";
                 require_once \DDTrace\Tests\Common\IntegrationTestCase::$autoloadPath;
                 return;
             } elseif (file_exists("$path/composer.json")) {
+1 −17		Cargo.lock
+0 −3		data-pipeline/Cargo.toml
+3 −3		data-pipeline/src/trace_exporter/mod.rs
+4 −3		dogstatsd-client/Cargo.toml
+127 −66		dogstatsd-client/src/lib.rs
+0 −11		sidecar/Cargo.toml
+2 −2		sidecar/src/service/sidecar_server.rs
+4 −0		trace-protobuf/build.rs
+4 −0		trace-protobuf/src/pb.rs
+58 −0		trace-utils/src/trace_utils.rs