From a4873719372ce14379dc062aae548c46325598a8 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 19 Jun 2025 21:56:12 +0000
Subject: [PATCH 1/2] Update CloudEvents context interface and test cases

---
 .../google-cloud-serverless/src/gcpfunction/general.ts    | 4 ++--
 packages/google-cloud-serverless/src/index.ts             | 2 --
 .../test/gcpfunction/cloud_event.test.ts                  | 8 +++++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/google-cloud-serverless/src/gcpfunction/general.ts b/packages/google-cloud-serverless/src/gcpfunction/general.ts
index f819bd5aaaf3..cae27ee6c2ee 100644
--- a/packages/google-cloud-serverless/src/gcpfunction/general.ts
+++ b/packages/google-cloud-serverless/src/gcpfunction/general.ts
@@ -29,10 +29,10 @@ export interface CloudFunctionsContext {
 
 export interface CloudEventsContext {
   [key: string]: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  id: string;
+  specversion: string;
   type?: string;
-  specversion?: string;
   source?: string;
-  id?: string;
   time?: string;
   schemaurl?: string;
   contenttype?: string;
diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts
index e9586a9bd820..f2622e591497 100644
--- a/packages/google-cloud-serverless/src/index.ts
+++ b/packages/google-cloud-serverless/src/index.ts
@@ -121,8 +121,6 @@ export {
   consoleLoggingIntegration,
   wrapMcpServerWithSentry,
   NODE_VERSION,
-  featureFlagsIntegration,
-  type FeatureFlagsIntegration,
 } from '@sentry/node';
 
 export {
diff --git a/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
index 758b37c0253b..e3eeccc37c37 100644
--- a/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
+++ b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
@@ -45,6 +45,8 @@ describe('wrapCloudEventFunction', () => {
   function handleCloudEvent(fn: CloudEventFunctionWithCallback): Promise<any> {
     return new Promise((resolve, reject) => {
       const context = {
+        id: 'test-event-id',
+        specversion: '1.0',
         type: 'event.type',
       };
 
@@ -232,6 +234,10 @@ describe('wrapCloudEventFunction', () => {
     const handler: CloudEventFunction = _context => 42;
     const wrappedHandler = wrapCloudEventFunction(handler);
     await handleCloudEvent(wrappedHandler);
-    expect(mockScope.setContext).toBeCalledWith('gcp.function.context', { type: 'event.type' });
+    expect(mockScope.setContext).toBeCalledWith('gcp.function.context', {
+      id: 'test-event-id',
+      specversion: '1.0',
+      type: 'event.type'
+    });
   });
 });

From d94602c93822bb9a781f3e2d9196bf4c620b5b23 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 19 Jun 2025 22:06:02 +0000
Subject: [PATCH 2/2] Export feature flags integration from Sentry Node package

---
 packages/google-cloud-serverless/src/index.ts                   | 2 ++
 .../test/gcpfunction/cloud_event.test.ts                        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts
index f2622e591497..e9586a9bd820 100644
--- a/packages/google-cloud-serverless/src/index.ts
+++ b/packages/google-cloud-serverless/src/index.ts
@@ -121,6 +121,8 @@ export {
   consoleLoggingIntegration,
   wrapMcpServerWithSentry,
   NODE_VERSION,
+  featureFlagsIntegration,
+  type FeatureFlagsIntegration,
 } from '@sentry/node';
 
 export {
diff --git a/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
index e3eeccc37c37..4d34e630814c 100644
--- a/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
+++ b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
@@ -237,7 +237,7 @@ describe('wrapCloudEventFunction', () => {
     expect(mockScope.setContext).toBeCalledWith('gcp.function.context', {
       id: 'test-event-id',
       specversion: '1.0',
-      type: 'event.type'
+      type: 'event.type',
     });
   });
 });