Use AWS_LAMBDA_FUNCTION_VERSION env var for release if available (#…

…1742)
getsentry · May 24, 2024 · 2ceeca4 · 2ceeca4
1 parent 8761545
commit 2ceeca4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Options.php b/src/Options.php
@@ -1104,7 +1104,7 @@ private function configureOptions(OptionsResolver $resolver): void
             'logger' => null,
             'spotlight' => false,
             'spotlight_url' => 'http://localhost:8969',
-            'release' => $_SERVER['SENTRY_RELEASE'] ?? null,
+            'release' => $_SERVER['SENTRY_RELEASE'] ?? $_SERVER['AWS_LAMBDA_FUNCTION_VERSION'] ?? null,
             'dsn' => $_SERVER['SENTRY_DSN'] ?? null,
             'server_name' => gethostname(),
             'ignore_exceptions' => [],

diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
@@ -611,6 +611,27 @@ public function testReleaseOptionDefaultValueIsGotFromEnvironmentVariable(): voi
         $this->assertSame('0.0.1', (new Options())->getRelease());
     }
 
+    /**
+     * @backupGlobals enabled
+     */
+    public function testReleaseOptionDefaultValueIsGotFromLambdaEnvironmentVariable(): void
+    {
+        $_SERVER['AWS_LAMBDA_FUNCTION_VERSION'] = '0.0.2';
+
+        $this->assertSame('0.0.2', (new Options())->getRelease());
+    }
+
+    /**
+     * @backupGlobals enabled
+     */
+    public function testReleaseOptionDefaultValueIsPreferredFromSentryEnvironmentVariable(): void
+    {
+        $_SERVER['AWS_LAMBDA_FUNCTION_VERSION'] = '0.0.3';
+        $_SERVER['SENTRY_RELEASE'] = '0.0.4';
+
+        $this->assertSame('0.0.4', (new Options())->getRelease());
+    }
+
     public function testErrorTypesOptionIsNotDynamiclyReadFromErrorReportingLevelWhenSet(): void
     {
         $errorReportingBeforeTest = error_reporting(\E_ERROR);