changes from review

Author: msonnb

packages/aws-serverless/src/index.ts

@@ -148,5 +148,6 @@ export { awsIntegration } from './integration/aws';
 export { awsLambdaIntegration } from './integration/awslambda';
 
 export { getDefaultIntegrations, init } from './init';
-export { wrapHandler } from './sdk';
+// eslint-disable-next-line deprecation/deprecation
+export { tryPatchHandler, wrapHandler } from './sdk';
 export type { WrapperOptions } from './sdk';

packages/aws-serverless/src/integration/instrumentation-aws-lambda/instrumentation.ts

@@ -57,9 +57,11 @@ import type { LambdaModule } from './internal-types';
 import { ATTR_FAAS_COLDSTART } from './semconv';
 import type { AwsLambdaInstrumentationConfig, EventContextExtractor } from './types';
 import { wrapHandler } from '../../sdk';
+import { SDK_VERSION } from '@sentry/core';
 
-const PACKAGE_VERSION = '0.54.0';
-const PACKAGE_NAME = '@opentelemetry/instrumentation-aws-lambda';
+// OpenTelemetry package version was 0.54.0 at time of vendoring.
+const PACKAGE_VERSION = SDK_VERSION;
+const PACKAGE_NAME = '@sentry/instrumentation-aws-lambda';
 
 const headerGetter: TextMapGetter<APIGatewayProxyEventHeaders> = {
   keys(carrier): string[] {

packages/aws-serverless/src/sdk.ts

@@ -59,6 +59,17 @@ function getRejectedReasons<T>(results: PromiseSettledResult<T>[]): T[] {
   }, []);
 }
 
+/**
+ * TODO(v11): Remove this function
+ * @deprecated This function is no longer used and will be removed in a future major version.
+ */
+export function tryPatchHandler(_taskRoot: string, _handlerPath: string): void {
+  consoleSandbox(() => {
+    // eslint-disable-next-line no-console
+    console.warn('The `tryPatchHandler` function is deprecated and will be removed in a future major version.');
+  });
+}
+
 /**
  * Tries to invoke context.getRemainingTimeInMillis if not available returns 0
  * Some environments use AWS lambda but don't support this function
@@ -200,6 +211,8 @@ export function wrapHandler<TEvent, TResult>(
           });
         }
       } catch (e) {
+        // Errors should already captured in the instrumentation's `responseHook`,
+        // we capture them here just to be safe. Double captures are deduplicated by the SDK.
         captureException(e, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.handler'));
         throw e;
       } finally {