Get extensions and packages versions to CI artifacts (#2553)

pablomartinezbernardo · web-flow · commit 91227e576ddc · 2024-03-18T15:44:40.000+01:00
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -512,6 +512,8 @@ commands:
             mkdir /tmp/bashenv
             sudo mkdir /rust
             sudo chmod 777 /rust
+            mkdir /tmp/artifacts
+            sudo chmod 777 /tmp/artifacts
             image=<< parameters.docker_image >>
             retries=$max_retries
             while
@@ -531,6 +533,7 @@ commands:
                   -v $(pwd):/home/circleci/datadog \
                   -v /tmp/bashenv:/home/circleci/bashenv \
                   -v /rust:/rust \
+                  -v /tmp/artifacts:/tmp/artifacts \
                   $(if [ -n "${CARGO_TARGET_DIR:-}" ]; then echo -v ${CARGO_TARGET_DIR}:${CARGO_TARGET_DIR} -e CARGO_TARGET_DIR=${CARGO_TARGET_DIR}; fi) \
                   $image \
                   bash -c 'echo Started; sleep 10000' 2>&1 | tee /tmp/docker.out &
@@ -1825,6 +1828,9 @@ jobs:
           php_version: << parameters.switch_php_version >>
       - install_extension:
           lib_curl_command: << parameters.lib_curl_command >>
+      - run:
+          name: Install required packages
+          command: sudo apt update && sudo apt install -y jq
       - <<: *STEP_COMPOSER_CACHE_RESTORE
       - <<: *STEP_COMPOSER_UPDATE
       - <<: *STEP_COMPOSER_TESTS_UPDATE
diff --git a/Makefile b/Makefile
@@ -968,11 +968,15 @@ TEST_WEB_83 := \
 FILTER := .
 MAX_RETRIES := 3
 
+# Note: The "composer show" command below outputs a csv with pairs of dependency;version such as "phpunit/phpunit;9.6.17" 
 define run_composer_with_retry
 	for i in $$(seq 1 $(MAX_RETRIES)); do \
 		echo "Attempting composer update (attempt $$i of $(MAX_RETRIES))..."; \
 		$(COMPOSER) --working-dir=$1 update $2 && break || (echo "Retry $$i failed, waiting 5 seconds before next attempt..." && sleep 5); \
-	done
+	done \
+
+	mkdir -p /tmp/artifacts
+	$(COMPOSER) --working-dir=$1 show -f json -D | grep -o '"name": "[^"]*\|"version": "[^"]*' | paste -d';' - - | sed 's/"name": //; s/"version": //' | tr -d '"' >> "/tmp/artifacts/web_versions.csv"
 endef
 
 define run_tests_without_coverage
diff --git a/ext/integrations/integrations.c b/ext/integrations/integrations.c
@@ -80,7 +80,7 @@ static void dd_invoke_integration_loader_and_unhook_posthook(zend_ulong invocati
             success = zai_symbol_call_global((zai_str)ZAI_STRL("ddtrace\\integrations\\load_deferred_integration"), &rv, 1, &integration);
         }
 
-        if (UNEXPECTED(!success)) {
+        if (UNEXPECTED(!success) && get_DD_TRACE_ENABLED()) {
             LOG(WARN,
                     "Error loading deferred integration '%s' from DDTrace\\Integrations\\load_deferred_integration",
                     Z_STRVAL(integration));
diff --git a/tests/Common/IntegrationTestCase.php b/tests/Common/IntegrationTestCase.php
@@ -19,6 +19,34 @@ abstract class IntegrationTestCase extends BaseTestCase
     public static function ddSetUpBeforeClass()
     {
         parent::ddSetUpBeforeClass();
+
+        $exts = get_loaded_extensions(false);
+        $csv = '';
+        foreach ($exts as $ext) {
+            $csv = $csv . "ext/" . $ext . ";" . phpversion($ext) . "\n";
+        }
+
+        $zendExts = get_loaded_extensions(true);
+        foreach ($zendExts as $ext) {
+            $csv = $csv . "ext/" . $ext . ";" . phpversion($ext) . "\n";
+        }
+
+        $artifactsDir = "/tmp/artifacts";
+        if ( !file_exists( $artifactsDir ) && !is_dir( $artifactsDir ) ) {
+            mkdir($artifactsDir, 0777, true);
+        }
+
+        file_put_contents($artifactsDir . "/extension_versions.csv", $csv);
+
+        $csv = '';
+        $output = shell_exec('DD_TRACE_ENABLED=0 composer show -f json -D');
+        $data = json_decode($output, true);
+
+        foreach ($data['installed'] as $package) {
+            $csv = $csv . $package['name'] . ";" . $package['version'] . "\n";
+        }
+
+        file_put_contents($artifactsDir . "/composer_versions.csv", $csv);
     }
 
     public static function ddTearDownAfterClass()

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ static void dd_invoke_integration_loader_and_unhook_posthook(zend_ulong invocati`
`80`	`80`	`success = zai_symbol_call_global((zai_str)ZAI_STRL("ddtrace\\integrations\\load_deferred_integration"), &rv, 1, &integration);`
`81`	`81`	`}`
`82`	`82`
`83`		`- if (UNEXPECTED(!success)) {`
	`83`	`+ if (UNEXPECTED(!success) && get_DD_TRACE_ENABLED()) {`
`84`	`84`	`LOG(WARN,`
`85`	`85`	`"Error loading deferred integration '%s' from DDTrace\\Integrations\\load_deferred_integration",`
`86`	`86`	`Z_STRVAL(integration));`