fix: incorporate review comments

aws · Jun 17, 2024 · ae0b174 · ae0b174
1 parent 25f0197
commit ae0b174
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 60 deletions.
diff --git a/...ics/test/integ.canary-run-config.js.snapshot/cdk-synthetics-canary-run-config.assets.json b/...ics/test/integ.canary-run-config.js.snapshot/cdk-synthetics-canary-run-config.assets.json
diff --git a/...s/test/integ.canary-run-config.js.snapshot/cdk-synthetics-canary-run-config.template.json b/...s/test/integ.canary-run-config.js.snapshot/cdk-synthetics-canary-run-config.template.json
@@ -188,7 +188,7 @@
     "Name": "next",
     "RunConfig": {
      "ActiveTracing": true,
-     "MemoryInMB": 1024,
+     "MemoryInMB": 2048,
      "TimeoutInSeconds": 240
     },
     "RuntimeVersion": "syn-nodejs-puppeteer-7.0",

diff --git a/...ramework-integ/test/aws-synthetics/test/integ.canary-run-config.js.snapshot/manifest.json b/...ramework-integ/test/aws-synthetics/test/integ.canary-run-config.js.snapshot/manifest.json
diff --git a/...ng/framework-integ/test/aws-synthetics/test/integ.canary-run-config.js.snapshot/tree.json b/...ng/framework-integ/test/aws-synthetics/test/integ.canary-run-config.js.snapshot/tree.json
diff --git a/...ages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary-run-config.ts b/...ages/@aws-cdk-testing/framework-integ/test/aws-synthetics/test/integ.canary-run-config.ts
@@ -19,7 +19,7 @@ class TestStack extends Stack {
       }),
       cleanup: synthetics.Cleanup.LAMBDA,
       activeTracing: true,
-      memory: Size.mebibytes(1024),
+      memory: Size.mebibytes(2048),
       timeout: Duration.minutes(4),
     });
   }

diff --git a/packages/aws-cdk-lib/aws-synthetics/lib/canary.ts b/packages/aws-cdk-lib/aws-synthetics/lib/canary.ts
@@ -1,7 +1,7 @@
 import * as crypto from 'crypto';
 import { Construct } from 'constructs';
 import { Code } from './code';
-import { Runtime } from './runtime';
+import { Runtime, RuntimeFamily } from './runtime';
 import { Schedule } from './schedule';
 import { CloudWatchSyntheticsMetrics } from './synthetics-canned-metrics.generated';
 import { CfnCanary } from './synthetics.generated';
@@ -206,7 +206,7 @@ export interface CanaryProps {
    * This value must be a multiple of 64 Mib.
    * The range is 960 MiB to 3008 MiB.
    *
-   * @default Size.mebibytes(5)
+   * @default Size.mebibytes(1024)
    */
   readonly memory?: cdk.Size;
 
@@ -552,12 +552,8 @@ export class Canary extends cdk.Resource implements ec2.IConnectable {
       !props.timeout) {
       return undefined;
     }
-    const activeTracingNotSupportedRuntime = [
-      Runtime.SYNTHETICS_PYTHON_SELENIUM_2_1,
-      Runtime.SYNTHETICS_PYTHON_SELENIUM_3_0,
-    ];
 
-    if (props.activeTracing && activeTracingNotSupportedRuntime.includes(props.runtime)) {
+    if (props.activeTracing && !cdk.Token.isUnresolved(props.runtime.family) && props.runtime.family !== RuntimeFamily.NODEJS) {
       throw new Error('You can enable active tracing only for canaries that use version `syn-nodejs-2.0` or later for their canary runtime.');
     }
 

diff --git a/packages/aws-cdk-lib/aws-synthetics/test/canary.test.ts b/packages/aws-cdk-lib/aws-synthetics/test/canary.test.ts
@@ -272,7 +272,7 @@ test('throws when activeTracing is enabled with an unsupported runtime', () => {
     runtime: synthetics.Runtime.SYNTHETICS_PYTHON_SELENIUM_2_1,
     activeTracing: true,
   }))
-    .toThrow('You can enable active tracing only for canaries that use version syn-nodejs-2.0 or later for their canary runtime.');
+    .toThrow('You can enable active tracing only for canaries that use version `syn-nodejs-2.0` or later for their canary runtime.');
 });
 
 test('environment variables can be specified', () => {