From cb416891978bb0d476d9b6951bd3db928f6d2400 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Wed, 19 Feb 2025 21:50:33 +0100 Subject: [PATCH] Fix OpenTelemetry makefile conflicts Signed-off-by: Bob Weinand --- Cargo.lock | 37 +------------------ Makefile | 26 ++++++------- dockerfiles/ci/xfail_tests/8.2.list | 1 + libdatadog | 2 +- .../test_context_switching_ffi_observer.phpt | 3 +- ...ng_ffi_observer_registered_on_startup.phpt | 3 +- tests/OpenTelemetry/composer-beta.json | 5 ++- .../{composer-1.json => composer.json} | 0 tests/bootstrap_common.php | 5 ++- 9 files changed, 25 insertions(+), 57 deletions(-) rename tests/OpenTelemetry/{composer-1.json => composer.json} (100%) diff --git a/Cargo.lock b/Cargo.lock index cbefa5aad6..d5e0418bf1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1099,7 +1099,6 @@ dependencies = [ "ciborium", "clap", "criterion-plot", - "csv", "is-terminal", "itertools 0.10.5", "num-traits", @@ -1274,15 +1273,12 @@ dependencies = [ "bytes", "criterion", "datadog-ddsketch", - "datadog-trace-normalization", - "datadog-trace-obfuscation", "datadog-trace-protobuf", "datadog-trace-utils", "ddcommon 0.0.1", "ddtelemetry", "dogstatsd-client", "either", - "futures", "httpmock", "hyper 0.14.32", "log", @@ -1549,8 +1545,6 @@ dependencies = [ "arrayref", "base64 0.22.1", "bincode", - "bytes", - "cadence", "chrono", "console-subscriber", "data-pipeline", @@ -1561,30 +1555,23 @@ dependencies = [ "datadog-live-debugger", "datadog-remote-config", "datadog-sidecar-macros", - "datadog-trace-normalization", - "datadog-trace-protobuf", "datadog-trace-utils", "ddcommon 0.0.1", "ddtelemetry", "dogstatsd-client", "futures", - "hashbrown 0.14.5", "http 0.2.12", "httpmock", "hyper 0.14.32", - "io-lifetimes", "lazy_static", "libc 0.2.169", "manual_future", "memory-stats", "microseh", "nix 0.27.1", - "pin-project", "prctl", "priority-queue", "rand 0.8.5", - "regex", - "rmp-serde", "sendfd", "serde", "serde_json", @@ -1592,7 +1579,6 @@ dependencies = [ "sha2", "simd-json", "spawn_worker", - "sys-info", "tempfile", "tinybytes", "tokio", @@ -1600,7 +1586,6 @@ dependencies = [ "tracing", "tracing-log", "tracing-subscriber", - "uuid", "winapi 0.3.9", "windows", "windows-sys 0.52.0", @@ -1646,24 +1631,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "datadog-trace-obfuscation" -version = "0.0.1" -dependencies = [ - "anyhow", - "criterion", - "datadog-trace-protobuf", - "datadog-trace-utils", - "ddcommon 0.0.1", - "duplicate", - "log", - "percent-encoding", - "regex", - "serde", - "serde_json", - "url", -] - [[package]] name = "datadog-trace-protobuf" version = "0.0.1" @@ -1979,12 +1946,10 @@ version = "0.0.1" dependencies = [ "anyhow", "cadence", - "datadog-ddsketch", - "datadog-trace-normalization", - "datadog-trace-protobuf", "ddcommon 0.0.1", "http 0.2.12", "serde", + "tokio", "tracing", ] diff --git a/Makefile b/Makefile index d98f01e4dc..e23e56904b 100644 --- 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 index f588fd51d8..0375cc1dd2 100644 --- 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 index 3f188fd273..0f7acb1e03 160000 --- a/libdatadog +++ b/libdatadog @@ -1 +1 @@ -Subproject commit 3f188fd273762d68544dc78e80373089328f7f77 +Subproject commit 0f7acb1e03e6a99f9a3cbb155f3960c1720d9fa1 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 index 7caf00f006..67823ab10e 100644 --- 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 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")) {