Fixed tests

Author: SergeyKleyman

agent/php/ElasticApm/Impl/AutoInstrument/TransactionForExtensionRequest.php

@@ -345,6 +345,12 @@ private function setTxPropsBasedOnHttpRequestData(TransactionInterface $tx): voi
 
     private function beforeHttpEnd(TransactionInterface $tx): void
     {
+        ($loggerProxy = $this->logger->ifDebugLevelEnabled(__LINE__, __FUNCTION__))
+        && $loggerProxy->log(
+            'Entered',
+            ['tx' => ['result' => $tx->getResult(), 'outcome' => $tx->getOutcome()], 'lastThrown' => $this->lastThrown, "ini_get('display_errors')" => ini_get('display_errors')]
+        );
+
         if ($tx->getResult() === null) {
             $this->discoverHttpResult($tx);
         }
@@ -449,6 +455,9 @@ public function onNotCaughtThrowableCapturedByPhpPart(Throwable $thrown): void
         if ($this->prevExceptionHandler !== null) {
             ($this->prevExceptionHandler)($thrown);
         }
+
+        // Re-throw because otherwise HTTP status will be 200 instead of 500
+        throw $thrown;
     }
 
     public function onShutdown(): void

tests/ElasticApmTests/ComponentTests/CurlAutoInstrumentationTest.php

@@ -96,7 +96,7 @@ public static function appCodeServer(): void
 
     public function testLocalClientServer(): void
     {
-        // OLD TODO: Sergey Kleyman: Implement: CurlAutoInstrumentationTest::testLocalClientServer
+        // OLD TODO: Implement: CurlAutoInstrumentationTest::testLocalClientServer
         if (PHP_MAJOR_VERSION < 9) {
             self::dummyAssert();
             return;
@@ -125,7 +125,7 @@ function (AppCodeRequestParams $reqParams) use ($serverAppCode): void {
 
     public function testLocalClientExternalServer(): void
     {
-        // OLD TODO: Sergey Kleyman: Implement: CurlAutoInstrumentationTest::testLocalClientExternalServer
+        // OLD TODO: Implement: CurlAutoInstrumentationTest::testLocalClientExternalServer
         self::dummyAssert();
     }
 }

tests/ElasticApmTests/ComponentTests/ErrorComponentTest.php

@@ -26,6 +26,7 @@
 use Elastic\Apm\ElasticApm;
 use Elastic\Apm\Impl\Config\AllOptionsMetadata;
 use Elastic\Apm\Impl\Config\OptionNames;
+use Elastic\Apm\Impl\Constants;
 use Elastic\Apm\Impl\StackTraceFrame;
 use Elastic\Apm\Impl\Util\ArrayUtil;
 use Elastic\Apm\Impl\Util\ClassNameUtil;
@@ -193,10 +194,10 @@ public function dataProviderForTestPhpErrorUndefinedVariable(): iterable
     {
         $result = (new DataProviderForTestBuilder())
             ->addBoolKeyedDimensionAllValuesCombinable(self::INCLUDE_IN_ERROR_REPORTING_KEY)
-            ->addBoolKeyedDimensionAllValuesCombinable(OptionNames::CAPTURE_ERRORS)
-            ->addBoolKeyedDimensionAllValuesCombinable(OptionNames::CAPTURE_ERRORS_WITH_PHP_PART)
-            ->addKeyedDimensionAllValuesCombinable(OptionNames::CAPTURE_EXCEPTIONS, [null, false, true])
-            ->addKeyedDimensionAllValuesCombinable(OptionNames::DEV_INTERNAL_CAPTURE_ERRORS_ONLY_TO_LOG, [false, true])
+            ->addAgentBoolConfigOptionKeyedDimensionAllValuesCombinable(OptionNames::CAPTURE_ERRORS)
+            ->addAgentBoolConfigOptionKeyedDimensionAllValuesCombinable(OptionNames::CAPTURE_ERRORS_WITH_PHP_PART)
+            ->addAgentNullableBoolConfigOptionKeyedDimensionAllValuesCombinable(OptionNames::CAPTURE_EXCEPTIONS)
+            ->addAgentBoolConfigOptionKeyedDimensionAllValuesCombinable(OptionNames::DEV_INTERNAL_CAPTURE_ERRORS_ONLY_TO_LOG)
             ->build();
 
         return DataProviderForTestBuilder::convertEachDataSetToMixedMap(self::adaptKeyValueToSmoke($result));
@@ -226,6 +227,7 @@ function (AppCodeRequestParams $appCodeRequestParams) use ($testArgs): void {
         $expectedErrorCount = $isErrorExpected ? 1 : 0;
         $dataFromAgent = $testCaseHandle->waitForDataFromAgent((new ExpectedEventCounts())->transactions(1)->errors($expectedErrorCount));
         $dbgCtx->add(compact('dataFromAgent'));
+
         self::assertCount($expectedErrorCount, $dataFromAgent->idToError);
         if (!$isErrorExpected) {
             return;
@@ -302,6 +304,14 @@ function () use ($testArgs): void {
 
     public static function appCodeForTestPhpErrorUncaughtExceptionWrapper(bool $justReturnLineNumber = false): int
     {
+        if (!$justReturnLineNumber) {
+            /**
+             * We set display_errors to 0 to ensure HTTP status 500 is returned on PHP error.
+             * For more details see https://bugs.php.net/bug.php?id=50921
+             */
+            ini_set('display_errors', '0');
+        }
+
         return $justReturnLineNumber ? __LINE__ : appCodeForTestPhpErrorUncaughtException();
     }
 
@@ -337,12 +347,7 @@ private function implTestPhpErrorUncaughtException(MixedMap $testArgs): void
             AppCodeTarget::asRouted([__CLASS__, 'appCodeForTestPhpErrorUncaughtExceptionWrapper']),
             function (AppCodeRequestParams $appCodeRequestParams): void {
                 if ($appCodeRequestParams instanceof HttpAppCodeRequestParams) {
-                    /**
-                     * It seems it depends on 'display_errors' whether 200 or 500 is returned on PHP error.
-                     * We ignore HTTP status since it's not the main point of the test case.
-                     * For more details see https://bugs.php.net/bug.php?id=50921
-                     */
-                    $appCodeRequestParams->expectedHttpResponseStatusCode = null;
+                    $appCodeRequestParams->expectedHttpResponseStatusCode = HttpConstantsForTests::STATUS_INTERNAL_SERVER_ERROR;
                 }
             }
         );
@@ -364,6 +369,11 @@ function (AppCodeRequestParams $appCodeRequestParams): void {
         $expectedErrorCount = $isErrorExpected ? 1 : 0;
         $dataFromAgent = $testCaseHandle->waitForDataFromAgent((new ExpectedEventCounts())->transactions(1)->errors($expectedErrorCount));
         $dbgCtx->add(compact('dataFromAgent'));
+
+        if (self::isMainAppCodeHostHttp()) {
+            self::assertSame(Constants::OUTCOME_FAILURE, $dataFromAgent->singleTransaction()->outcome);
+        }
+
         self::assertCount($expectedErrorCount, $dataFromAgent->idToError);
         if (!$isErrorExpected) {
             return;
@@ -468,6 +478,11 @@ function (AppCodeRequestParams $appCodeRequestParams): void {
         $expectedErrorCount = $isErrorExpected ? 1 : 0;
         $dataFromAgent = $testCaseHandle->waitForDataFromAgent((new ExpectedEventCounts())->transactions(1)->errors($expectedErrorCount));
         $dbgCtx->add(compact('dataFromAgent'));
+
+        if (self::isMainAppCodeHostHttp()) {
+            self::assertSame(Constants::OUTCOME_FAILURE, $dataFromAgent->singleTransaction()->outcome);
+        }
+
         self::assertCount($expectedErrorCount, $dataFromAgent->idToError);
         if (!$isErrorExpected) {
             return;

tests/ElasticApmTests/ComponentTests/InferredSpansComponentTest.php

@@ -72,7 +72,7 @@ final class InferredSpansComponentTest extends ComponentTestCaseBase
     public function dataProviderForTestInferredSpans(): iterable
     {
         $result = (new DataProviderForTestBuilder())
-            // OLD TODO: Sergey Kleyman: Implement: test with PROFILING_INFERRED_SPANS_ENABLED set to true
+            // OLD TODO: Implement: test with PROFILING_INFERRED_SPANS_ENABLED set to true
             // ->addBoolKeyedDimensionOnlyFirstValueCombinable(self::IS_INFERRED_SPANS_ENABLED_KEY)
             ->addKeyedDimensionOnlyFirstValueCombinable(self::IS_INFERRED_SPANS_ENABLED_KEY, DataProviderForTestBuilder::isLongRunMode() ? [true, false] : [false])
             ->addBoolKeyedDimensionOnlyFirstValueCombinable(self::IS_TRANSACTION_SAMPLED_KEY)

tests/ElasticApmTests/ComponentTests/Util/HttpAppCodeHostHandle.php

@@ -99,6 +99,9 @@ public function sendHttpRequest(AppCodeTarget $appCodeTarget, ?Closure $setParam
         );
         $this->afterAppCodeInvocation($appCodeInvocation);
 
+        ($loggerProxy = $localLogger->ifDebugLevelEnabled(__LINE__, __FUNCTION__))
+        && $loggerProxy->log('HTTP response status code: ' . $response->getStatusCode());
+
         if ($requestParams->expectedHttpResponseStatusCode !== null) {
             TestCase::assertSame(
                 $requestParams->expectedHttpResponseStatusCode,

tests/ElasticApmTests/TestsSharedCode/TransactionMaxSpansTest/SharedCode.php

@@ -47,7 +47,7 @@ final class SharedCode
      */
     public static function configTransactionMaxSpansVariants(int $testingDepth): iterable
     {
-        // OLD TODO: Sergey Kleyman: UNCOMMENT and remove the "if" block below
+        // OLD TODO: UNCOMMENT and remove the "if" block below
         // yield null;
         if ($testingDepth >= self::TESTING_DEPTH_1) {
             yield null;