@aws-cdk/mixins-preview 2.267.0-alpha.0 → 2.268.0-alpha.0

package/lib/services/aws-bedrockagentcore/logs-delivery-mixins.generated.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CfnWorkloadIdentityApplicationLogsRecordFields = exports.CfnWorkloadIdentityApplicationLogsOutputFormat = exports.CfnWorkloadIdentityLogsMixin = exports.CfnWorkloadIdentityApplicationLogs = exports.CfnRuntimeUsageLogsRecordFields = exports.CfnRuntimeUsageLogsOutputFormat = exports.CfnRuntimeTracesRecordFields = exports.CfnRuntimeTracesOutputFormat = exports.CfnRuntimeApplicationLogsRecordFields = exports.CfnRuntimeApplicationLogsOutputFormat = exports.CfnRuntimeLogsMixin = exports.CfnRuntimeUsageLogs = exports.CfnRuntimeTraces = exports.CfnRuntimeApplicationLogs = exports.CfnMemoryTracesRecordFields = exports.CfnMemoryTracesOutputFormat = exports.CfnMemoryApplicationLogsRecordFields = exports.CfnMemoryApplicationLogsOutputFormat = exports.CfnMemoryLogsMixin = exports.CfnMemoryTraces = exports.CfnMemoryApplicationLogs = exports.CfnGatewayTracesRecordFields = exports.CfnGatewayTracesOutputFormat = exports.CfnGatewayApplicationLogsRecordFields = exports.CfnGatewayApplicationLogsOutputFormat = exports.CfnGatewayLogsMixin = exports.CfnGatewayTraces = exports.CfnGatewayApplicationLogs = exports.CfnCodeInterpreterCustomUsageLogsRecordFields = exports.CfnCodeInterpreterCustomUsageLogsOutputFormat = exports.CfnCodeInterpreterCustomApplicationLogsRecordFields = exports.CfnCodeInterpreterCustomApplicationLogsOutputFormat = exports.CfnCodeInterpreterCustomLogsMixin = exports.CfnCodeInterpreterCustomUsageLogs = exports.CfnCodeInterpreterCustomApplicationLogs = exports.CfnCodeInterpreterUsageLogsRecordFields = exports.CfnCodeInterpreterUsageLogsOutputFormat = exports.CfnCodeInterpreterApplicationLogsRecordFields = exports.CfnCodeInterpreterApplicationLogsOutputFormat = exports.CfnCodeInterpreterLogsMixin = exports.CfnCodeInterpreterUsageLogs = exports.CfnCodeInterpreterApplicationLogs = exports.CfnBrowserCustomUsageLogsRecordFields = exports.CfnBrowserCustomUsageLogsOutputFormat = exports.CfnBrowserCustomLogsMixin = exports.CfnBrowserCustomUsageLogs = exports.CfnBrowserUsageLogsRecordFields = exports.CfnBrowserUsageLogsOutputFormat = exports.CfnBrowserLogsMixin = exports.CfnBrowserUsageLogs = void 0;
+exports.CfnWorkloadIdentityTracesRecordFields = exports.CfnWorkloadIdentityTracesOutputFormat = exports.CfnWorkloadIdentityApplicationLogsRecordFields = exports.CfnWorkloadIdentityApplicationLogsOutputFormat = exports.CfnWorkloadIdentityLogsMixin = exports.CfnWorkloadIdentityTraces = exports.CfnWorkloadIdentityApplicationLogs = exports.CfnRuntimeUsageLogsRecordFields = exports.CfnRuntimeUsageLogsOutputFormat = exports.CfnRuntimeApplicationLogsRecordFields = exports.CfnRuntimeApplicationLogsOutputFormat = exports.CfnRuntimeTracesRecordFields = exports.CfnRuntimeTracesOutputFormat = exports.CfnRuntimeLogsMixin = exports.CfnRuntimeUsageLogs = exports.CfnRuntimeApplicationLogs = exports.CfnRuntimeTraces = exports.CfnMemoryApplicationLogsRecordFields = exports.CfnMemoryApplicationLogsOutputFormat = exports.CfnMemoryTracesRecordFields = exports.CfnMemoryTracesOutputFormat = exports.CfnMemoryLogsMixin = exports.CfnMemoryApplicationLogs = exports.CfnMemoryTraces = exports.CfnGatewayApplicationLogsRecordFields = exports.CfnGatewayApplicationLogsOutputFormat = exports.CfnGatewayTracesRecordFields = exports.CfnGatewayTracesOutputFormat = exports.CfnGatewayLogsMixin = exports.CfnGatewayApplicationLogs = exports.CfnGatewayTraces = exports.CfnCodeInterpreterCustomUsageLogsRecordFields = exports.CfnCodeInterpreterCustomUsageLogsOutputFormat = exports.CfnCodeInterpreterCustomApplicationLogsRecordFields = exports.CfnCodeInterpreterCustomApplicationLogsOutputFormat = exports.CfnCodeInterpreterCustomTracesRecordFields = exports.CfnCodeInterpreterCustomTracesOutputFormat = exports.CfnCodeInterpreterCustomLogsMixin = exports.CfnCodeInterpreterCustomUsageLogs = exports.CfnCodeInterpreterCustomApplicationLogs = exports.CfnCodeInterpreterCustomTraces = exports.CfnBrowserCustomUsageLogsRecordFields = exports.CfnBrowserCustomUsageLogsOutputFormat = exports.CfnBrowserCustomTracesRecordFields = exports.CfnBrowserCustomTracesOutputFormat = exports.CfnBrowserCustomLogsMixin = exports.CfnBrowserCustomUsageLogs = exports.CfnBrowserCustomTraces = void 0;
 const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
@@ -41,89 +41,40 @@ const cdk = __importStar(require("aws-cdk-lib/core"));
 const logsDelivery = __importStar(require("../aws-logs/logs-delivery"));
 const service = __importStar(require("aws-cdk-lib/aws-bedrockagentcore"));
 /**
- * Builder for CfnBrowserLogsMixin to generate USAGE_LOGS for CfnBrowser
+ * Builder for CfnBrowserCustomLogsMixin to generate TRACES for CfnBrowserCustom
  *
- * @cloudformationResource AWS::BedrockAgentCore::Browser
- * @logType USAGE_LOGS
+ * @cloudformationResource AWS::BedrockAgentCore::BrowserCustom
+ * @logType TRACES
  * @stability external
  */
-class CfnBrowserUsageLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserUsageLogs", version: "2.267.0-alpha.0" };
-    /**
-     * Send logs to an S3 Bucket
-     *
-     * @param props Additional properties that are optionally used in log delivery for S3 destinations
-     */
-    toS3(bucket, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnBrowserUsageLogsS3Props(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toS3);
-            }
-            throw error;
-        }
-        {
-            return new CfnBrowserLogsMixin("USAGE_LOGS", new logsDelivery.S3LogsDelivery(bucket, {
-                permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V2,
-                kmsKey: props?.encryptionKey,
-                outputFormat: props?.outputFormat,
-                providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp", "resource", "attributes", "metrics"]
-            }));
-        }
-    }
-    /**
-     * Send logs to a CloudWatch Log Group
-     *
-     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
-     */
-    toLogGroup(logGroup, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnBrowserUsageLogsLogGroupProps(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toLogGroup);
-            }
-            throw error;
-        }
-        {
-            return new CfnBrowserLogsMixin("USAGE_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup, {
-                outputFormat: props?.outputFormat,
-                providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp", "resource", "attributes", "metrics"]
-            }));
-        }
-    }
+class CfnBrowserCustomTraces {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserCustomTraces", version: "2.268.0-alpha.0" };
     /**
-     * Send logs to a Firehose Delivery Stream
+     * Send traces to X-Ray
      *
-     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
+     * @param props Additional properties that are optionally used in log delivery for XRay destinations
      */
-    toFirehose(deliveryStream, props) {
+    toXRay(props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnBrowserUsageLogsFirehoseProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnBrowserCustomTracesXRayProps(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toFirehose);
+                Error.captureStackTrace(error, this.toXRay);
             }
             throw error;
         }
         {
-            return new CfnBrowserLogsMixin("USAGE_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream, {
-                outputFormat: props?.outputFormat,
+            return new CfnBrowserCustomLogsMixin("TRACES", new logsDelivery.XRayLogsDelivery({
                 providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp", "resource", "attributes", "metrics"]
+                mandatoryFields: ["trace"]
             }));
         }
     }
     /**
      * Delivers logs to a pre-created delivery destination
      *
-     * Supported destinations are S3, CWL, FH
+     * Supported destinations are XRAY
      * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
      * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
      *
@@ -131,7 +82,7 @@ class CfnBrowserUsageLogs {
      */
     toDestination(destination, props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnBrowserUsageLogsDestProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnBrowserCustomTracesDestProps(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
@@ -140,102 +91,14 @@ class CfnBrowserUsageLogs {
             throw error;
         }
         {
-            return new CfnBrowserLogsMixin("USAGE_LOGS", new logsDelivery.DestinationLogsDelivery(destination, {
+            return new CfnBrowserCustomLogsMixin("TRACES", new logsDelivery.DestinationLogsDelivery(destination, {
                 providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp", "resource", "attributes", "metrics"]
+                mandatoryFields: ["trace"]
             }));
         }
     }
 }
-exports.CfnBrowserUsageLogs = CfnBrowserUsageLogs;
-/**
- * Definition of AWS::BedrockAgentCore::Browser Resource Type.
- *
- * This is a read-only resource representing the default service-managed browser.
- *
- * @cloudformationResource AWS::BedrockAgentCore::Browser
- * @mixin true
- * @stability external
- * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-browser.html
- */
-class CfnBrowserLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserLogsMixin", version: "2.267.0-alpha.0" };
-    static USAGE_LOGS = new CfnBrowserUsageLogs();
-    logType;
-    logDelivery;
-    /**
-     * Create a mixin to enable vended logs for `AWS::BedrockAgentCore::Browser`.
-     *
-     * @param logType Type of logs that are getting vended
-     * @param logDelivery Object in charge of setting up the delivery source, delivery destination, and delivery connection
-     */
-    constructor(logType, logDelivery) {
-        super();
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_logs_ILogsDelivery(logDelivery);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, CfnBrowserLogsMixin);
-            }
-            throw error;
-        }
-        this.logType = logType;
-        this.logDelivery = logDelivery;
-    }
-    /**
-     * Check if this mixin supports the given construct (has vendedLogs property)
-     */
-    supports(construct) {
-        return (cdk.CfnResource.isCfnResource(construct) && service.CfnBrowser.isCfnBrowser(construct));
-    }
-    /**
-     * Apply vended logs configuration to the construct
-     */
-    applyTo(resource) {
-        if (!this.supports(resource)) {
-            return;
-        }
-        const sourceArn = service.CfnBrowser.arnForBrowser(resource);
-        this.logDelivery.bind(resource, this.logType, sourceArn);
-    }
-}
-exports.CfnBrowserLogsMixin = CfnBrowserLogsMixin;
-/**
- * Output Format options for each destination of CfnBrowserUsageLogs.
- */
-class CfnBrowserUsageLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserUsageLogsOutputFormat", version: "2.267.0-alpha.0" };
-}
-exports.CfnBrowserUsageLogsOutputFormat = CfnBrowserUsageLogsOutputFormat;
-(function (CfnBrowserUsageLogsOutputFormat) {
-    let S3;
-    (function (S3) {
-        S3["JSON"] = "json";
-        S3["PLAIN"] = "plain";
-        S3["W3C"] = "w3c";
-        S3["PARQUET"] = "parquet";
-    })(S3 = CfnBrowserUsageLogsOutputFormat.S3 || (CfnBrowserUsageLogsOutputFormat.S3 = {}));
-    let LogGroup;
-    (function (LogGroup) {
-        LogGroup["PLAIN"] = "plain";
-        LogGroup["JSON"] = "json";
-    })(LogGroup = CfnBrowserUsageLogsOutputFormat.LogGroup || (CfnBrowserUsageLogsOutputFormat.LogGroup = {}));
-    let Firehose;
-    (function (Firehose) {
-        Firehose["JSON"] = "json";
-        Firehose["PLAIN"] = "plain";
-        Firehose["RAW"] = "raw";
-    })(Firehose = CfnBrowserUsageLogsOutputFormat.Firehose || (CfnBrowserUsageLogsOutputFormat.Firehose = {}));
-})(CfnBrowserUsageLogsOutputFormat || (exports.CfnBrowserUsageLogsOutputFormat = CfnBrowserUsageLogsOutputFormat = {}));
-var CfnBrowserUsageLogsRecordFields;
-(function (CfnBrowserUsageLogsRecordFields) {
-    CfnBrowserUsageLogsRecordFields["RESOURCE_ARN"] = "resource_arn";
-    CfnBrowserUsageLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
-    CfnBrowserUsageLogsRecordFields["RESOURCE"] = "resource";
-    CfnBrowserUsageLogsRecordFields["ATTRIBUTES"] = "attributes";
-    CfnBrowserUsageLogsRecordFields["METRICS"] = "metrics";
-})(CfnBrowserUsageLogsRecordFields || (exports.CfnBrowserUsageLogsRecordFields = CfnBrowserUsageLogsRecordFields = {}));
+exports.CfnBrowserCustomTraces = CfnBrowserCustomTraces;
 /**
  * Builder for CfnBrowserCustomLogsMixin to generate USAGE_LOGS for CfnBrowserCustom
  *
@@ -244,7 +107,7 @@ var CfnBrowserUsageLogsRecordFields;
  * @stability external
  */
 class CfnBrowserCustomUsageLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserCustomUsageLogs", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserCustomUsageLogs", version: "2.268.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -357,7 +220,8 @@ exports.CfnBrowserCustomUsageLogs = CfnBrowserCustomUsageLogs;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-browsercustom.html
  */
 class CfnBrowserCustomLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserCustomLogsMixin", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserCustomLogsMixin", version: "2.268.0-alpha.0" };
+    static TRACES = new CfnBrowserCustomTraces();
     static USAGE_LOGS = new CfnBrowserCustomUsageLogs();
     logType;
     logDelivery;
@@ -399,18 +263,31 @@ class CfnBrowserCustomLogsMixin extends cdk.Mixin {
     }
 }
 exports.CfnBrowserCustomLogsMixin = CfnBrowserCustomLogsMixin;
+/**
+ * Output Format options for each destination of CfnBrowserCustomTraces.
+ */
+class CfnBrowserCustomTracesOutputFormat {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserCustomTracesOutputFormat", version: "2.268.0-alpha.0" };
+}
+exports.CfnBrowserCustomTracesOutputFormat = CfnBrowserCustomTracesOutputFormat;
+var CfnBrowserCustomTracesRecordFields;
+(function (CfnBrowserCustomTracesRecordFields) {
+    CfnBrowserCustomTracesRecordFields["TIMESTAMP"] = "timestamp";
+    CfnBrowserCustomTracesRecordFields["RESOURCEARN"] = "resourceArn";
+    CfnBrowserCustomTracesRecordFields["TRACE"] = "trace";
+})(CfnBrowserCustomTracesRecordFields || (exports.CfnBrowserCustomTracesRecordFields = CfnBrowserCustomTracesRecordFields = {}));
 /**
  * Output Format options for each destination of CfnBrowserCustomUsageLogs.
  */
 class CfnBrowserCustomUsageLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserCustomUsageLogsOutputFormat", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnBrowserCustomUsageLogsOutputFormat", version: "2.268.0-alpha.0" };
 }
 exports.CfnBrowserCustomUsageLogsOutputFormat = CfnBrowserCustomUsageLogsOutputFormat;
 (function (CfnBrowserCustomUsageLogsOutputFormat) {
     let S3;
     (function (S3) {
-        S3["JSON"] = "json";
         S3["PLAIN"] = "plain";
+        S3["JSON"] = "json";
         S3["W3C"] = "w3c";
         S3["PARQUET"] = "parquet";
     })(S3 = CfnBrowserCustomUsageLogsOutputFormat.S3 || (CfnBrowserCustomUsageLogsOutputFormat.S3 = {}));
@@ -421,13 +298,16 @@ exports.CfnBrowserCustomUsageLogsOutputFormat = CfnBrowserCustomUsageLogsOutputF
     })(LogGroup = CfnBrowserCustomUsageLogsOutputFormat.LogGroup || (CfnBrowserCustomUsageLogsOutputFormat.LogGroup = {}));
     let Firehose;
     (function (Firehose) {
-        Firehose["JSON"] = "json";
         Firehose["PLAIN"] = "plain";
+        Firehose["JSON"] = "json";
         Firehose["RAW"] = "raw";
     })(Firehose = CfnBrowserCustomUsageLogsOutputFormat.Firehose || (CfnBrowserCustomUsageLogsOutputFormat.Firehose = {}));
 })(CfnBrowserCustomUsageLogsOutputFormat || (exports.CfnBrowserCustomUsageLogsOutputFormat = CfnBrowserCustomUsageLogsOutputFormat = {}));
 var CfnBrowserCustomUsageLogsRecordFields;
 (function (CfnBrowserCustomUsageLogsRecordFields) {
+    CfnBrowserCustomUsageLogsRecordFields["TIMESTAMP"] = "timestamp";
+    CfnBrowserCustomUsageLogsRecordFields["BROWSER_ID"] = "browser_id";
+    CfnBrowserCustomUsageLogsRecordFields["INTERNAL_ACCOUNTID_BASED_ARN"] = "internal_accountid_based_arn";
     CfnBrowserCustomUsageLogsRecordFields["RESOURCE_ARN"] = "resource_arn";
     CfnBrowserCustomUsageLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
     CfnBrowserCustomUsageLogsRecordFields["RESOURCE"] = "resource";
@@ -435,197 +315,40 @@ var CfnBrowserCustomUsageLogsRecordFields;
     CfnBrowserCustomUsageLogsRecordFields["METRICS"] = "metrics";
 })(CfnBrowserCustomUsageLogsRecordFields || (exports.CfnBrowserCustomUsageLogsRecordFields = CfnBrowserCustomUsageLogsRecordFields = {}));
 /**
- * Builder for CfnCodeInterpreterLogsMixin to generate APPLICATION_LOGS for CfnCodeInterpreter
+ * Builder for CfnCodeInterpreterCustomLogsMixin to generate TRACES for CfnCodeInterpreterCustom
  *
- * @cloudformationResource AWS::BedrockAgentCore::CodeInterpreter
- * @logType APPLICATION_LOGS
- * @stability external
- */
-class CfnCodeInterpreterApplicationLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterApplicationLogs", version: "2.267.0-alpha.0" };
-    /**
-     * Send logs to an S3 Bucket
-     *
-     * @param props Additional properties that are optionally used in log delivery for S3 destinations
-     */
-    toS3(bucket, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterApplicationLogsS3Props(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toS3);
-            }
-            throw error;
-        }
-        {
-            return new CfnCodeInterpreterLogsMixin("APPLICATION_LOGS", new logsDelivery.S3LogsDelivery(bucket, {
-                permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V2,
-                kmsKey: props?.encryptionKey,
-                outputFormat: props?.outputFormat,
-                providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp"]
-            }));
-        }
-    }
-    /**
-     * Send logs to a CloudWatch Log Group
-     *
-     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
-     */
-    toLogGroup(logGroup, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterApplicationLogsLogGroupProps(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toLogGroup);
-            }
-            throw error;
-        }
-        {
-            return new CfnCodeInterpreterLogsMixin("APPLICATION_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup, {
-                outputFormat: props?.outputFormat,
-                providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp"]
-            }));
-        }
-    }
-    /**
-     * Send logs to a Firehose Delivery Stream
-     *
-     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
-     */
-    toFirehose(deliveryStream, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterApplicationLogsFirehoseProps(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toFirehose);
-            }
-            throw error;
-        }
-        {
-            return new CfnCodeInterpreterLogsMixin("APPLICATION_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream, {
-                outputFormat: props?.outputFormat,
-                providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp"]
-            }));
-        }
-    }
-    /**
-     * Delivers logs to a pre-created delivery destination
-     *
-     * Supported destinations are S3, CWL, FH
-     * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
-     * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
-     *
-     * @param props Additional properties that are optionally used in log delivery for destinations
-     */
-    toDestination(destination, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterApplicationLogsDestProps(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toDestination);
-            }
-            throw error;
-        }
-        {
-            return new CfnCodeInterpreterLogsMixin("APPLICATION_LOGS", new logsDelivery.DestinationLogsDelivery(destination, {
-                providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp"]
-            }));
-        }
-    }
-}
-exports.CfnCodeInterpreterApplicationLogs = CfnCodeInterpreterApplicationLogs;
-/**
- * Builder for CfnCodeInterpreterLogsMixin to generate USAGE_LOGS for CfnCodeInterpreter
- *
- * @cloudformationResource AWS::BedrockAgentCore::CodeInterpreter
- * @logType USAGE_LOGS
+ * @cloudformationResource AWS::BedrockAgentCore::CodeInterpreterCustom
+ * @logType TRACES
  * @stability external
  */
-class CfnCodeInterpreterUsageLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterUsageLogs", version: "2.267.0-alpha.0" };
-    /**
-     * Send logs to an S3 Bucket
-     *
-     * @param props Additional properties that are optionally used in log delivery for S3 destinations
-     */
-    toS3(bucket, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterUsageLogsS3Props(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toS3);
-            }
-            throw error;
-        }
-        {
-            return new CfnCodeInterpreterLogsMixin("USAGE_LOGS", new logsDelivery.S3LogsDelivery(bucket, {
-                permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V2,
-                kmsKey: props?.encryptionKey,
-                outputFormat: props?.outputFormat,
-                providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp", "resource", "attributes", "metrics"]
-            }));
-        }
-    }
-    /**
-     * Send logs to a CloudWatch Log Group
-     *
-     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
-     */
-    toLogGroup(logGroup, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterUsageLogsLogGroupProps(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toLogGroup);
-            }
-            throw error;
-        }
-        {
-            return new CfnCodeInterpreterLogsMixin("USAGE_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup, {
-                outputFormat: props?.outputFormat,
-                providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp", "resource", "attributes", "metrics"]
-            }));
-        }
-    }
+class CfnCodeInterpreterCustomTraces {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomTraces", version: "2.268.0-alpha.0" };
     /**
-     * Send logs to a Firehose Delivery Stream
+     * Send traces to X-Ray
      *
-     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
+     * @param props Additional properties that are optionally used in log delivery for XRay destinations
      */
-    toFirehose(deliveryStream, props) {
+    toXRay(props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterUsageLogsFirehoseProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterCustomTracesXRayProps(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toFirehose);
+                Error.captureStackTrace(error, this.toXRay);
             }
             throw error;
         }
         {
-            return new CfnCodeInterpreterLogsMixin("USAGE_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream, {
-                outputFormat: props?.outputFormat,
+            return new CfnCodeInterpreterCustomLogsMixin("TRACES", new logsDelivery.XRayLogsDelivery({
                 providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp", "resource", "attributes", "metrics"]
+                mandatoryFields: ["trace"]
             }));
         }
     }
     /**
      * Delivers logs to a pre-created delivery destination
      *
-     * Supported destinations are S3, CWL, FH
+     * Supported destinations are XRAY
      * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
      * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
      *
@@ -633,7 +356,7 @@ class CfnCodeInterpreterUsageLogs {
      */
     toDestination(destination, props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterUsageLogsDestProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnCodeInterpreterCustomTracesDestProps(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
@@ -641,153 +364,15 @@ class CfnCodeInterpreterUsageLogs {
             }
             throw error;
         }
-        {
-            return new CfnCodeInterpreterLogsMixin("USAGE_LOGS", new logsDelivery.DestinationLogsDelivery(destination, {
-                providedFields: props?.recordFields,
-                mandatoryFields: ["resource_arn", "event_timestamp", "resource", "attributes", "metrics"]
-            }));
-        }
-    }
-}
-exports.CfnCodeInterpreterUsageLogs = CfnCodeInterpreterUsageLogs;
-/**
- * Definition of AWS::BedrockAgentCore::CodeInterpreter Resource Type.
- *
- * This is a read-only resource representing the AWS-managed default code interpreter (aws.codeinterpreter.v1).
- *
- * @cloudformationResource AWS::BedrockAgentCore::CodeInterpreter
- * @mixin true
- * @stability external
- * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-codeinterpreter.html
- */
-class CfnCodeInterpreterLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterLogsMixin", version: "2.267.0-alpha.0" };
-    static APPLICATION_LOGS = new CfnCodeInterpreterApplicationLogs();
-    static USAGE_LOGS = new CfnCodeInterpreterUsageLogs();
-    logType;
-    logDelivery;
-    /**
-     * Create a mixin to enable vended logs for `AWS::BedrockAgentCore::CodeInterpreter`.
-     *
-     * @param logType Type of logs that are getting vended
-     * @param logDelivery Object in charge of setting up the delivery source, delivery destination, and delivery connection
-     */
-    constructor(logType, logDelivery) {
-        super();
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_logs_ILogsDelivery(logDelivery);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, CfnCodeInterpreterLogsMixin);
-            }
-            throw error;
-        }
-        this.logType = logType;
-        this.logDelivery = logDelivery;
-    }
-    /**
-     * Check if this mixin supports the given construct (has vendedLogs property)
-     */
-    supports(construct) {
-        return (cdk.CfnResource.isCfnResource(construct) && service.CfnCodeInterpreter.isCfnCodeInterpreter(construct));
-    }
-    /**
-     * Apply vended logs configuration to the construct
-     */
-    applyTo(resource) {
-        if (!this.supports(resource)) {
-            return;
-        }
-        const sourceArn = service.CfnCodeInterpreter.arnForCodeInterpreter(resource);
-        this.logDelivery.bind(resource, this.logType, sourceArn);
-    }
-}
-exports.CfnCodeInterpreterLogsMixin = CfnCodeInterpreterLogsMixin;
-/**
- * Output Format options for each destination of CfnCodeInterpreterApplicationLogs.
- */
-class CfnCodeInterpreterApplicationLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterApplicationLogsOutputFormat", version: "2.267.0-alpha.0" };
-}
-exports.CfnCodeInterpreterApplicationLogsOutputFormat = CfnCodeInterpreterApplicationLogsOutputFormat;
-(function (CfnCodeInterpreterApplicationLogsOutputFormat) {
-    let S3;
-    (function (S3) {
-        S3["JSON"] = "json";
-        S3["PLAIN"] = "plain";
-        S3["W3C"] = "w3c";
-        S3["PARQUET"] = "parquet";
-    })(S3 = CfnCodeInterpreterApplicationLogsOutputFormat.S3 || (CfnCodeInterpreterApplicationLogsOutputFormat.S3 = {}));
-    let LogGroup;
-    (function (LogGroup) {
-        LogGroup["PLAIN"] = "plain";
-        LogGroup["JSON"] = "json";
-    })(LogGroup = CfnCodeInterpreterApplicationLogsOutputFormat.LogGroup || (CfnCodeInterpreterApplicationLogsOutputFormat.LogGroup = {}));
-    let Firehose;
-    (function (Firehose) {
-        Firehose["JSON"] = "json";
-        Firehose["PLAIN"] = "plain";
-        Firehose["RAW"] = "raw";
-    })(Firehose = CfnCodeInterpreterApplicationLogsOutputFormat.Firehose || (CfnCodeInterpreterApplicationLogsOutputFormat.Firehose = {}));
-})(CfnCodeInterpreterApplicationLogsOutputFormat || (exports.CfnCodeInterpreterApplicationLogsOutputFormat = CfnCodeInterpreterApplicationLogsOutputFormat = {}));
-var CfnCodeInterpreterApplicationLogsRecordFields;
-(function (CfnCodeInterpreterApplicationLogsRecordFields) {
-    CfnCodeInterpreterApplicationLogsRecordFields["ACCOUNT_ID"] = "account_id";
-    CfnCodeInterpreterApplicationLogsRecordFields["REQUEST_ID"] = "request_id";
-    CfnCodeInterpreterApplicationLogsRecordFields["TOOL_SESSION_ID"] = "tool_session_id";
-    CfnCodeInterpreterApplicationLogsRecordFields["SPAN_ID"] = "span_id";
-    CfnCodeInterpreterApplicationLogsRecordFields["TRACE_ID"] = "trace_id";
-    CfnCodeInterpreterApplicationLogsRecordFields["SERVICE_NAME"] = "service_name";
-    CfnCodeInterpreterApplicationLogsRecordFields["OPERATION"] = "operation";
-    CfnCodeInterpreterApplicationLogsRecordFields["REQUEST_PAYLOAD"] = "request_payload";
-    CfnCodeInterpreterApplicationLogsRecordFields["RESPONSE_PAYLOAD"] = "response_payload";
-    CfnCodeInterpreterApplicationLogsRecordFields["RESOURCE"] = "resource";
-    CfnCodeInterpreterApplicationLogsRecordFields["ATTRIBUTES"] = "attributes";
-    CfnCodeInterpreterApplicationLogsRecordFields["TIMEUNIXNANO"] = "timeUnixNano";
-    CfnCodeInterpreterApplicationLogsRecordFields["SEVERITYNUMBER"] = "severityNumber";
-    CfnCodeInterpreterApplicationLogsRecordFields["SEVERITYTEXT"] = "severityText";
-    CfnCodeInterpreterApplicationLogsRecordFields["BODY"] = "body";
-    CfnCodeInterpreterApplicationLogsRecordFields["TRACEID"] = "traceId";
-    CfnCodeInterpreterApplicationLogsRecordFields["SPANID"] = "spanId";
-    CfnCodeInterpreterApplicationLogsRecordFields["RESOURCE_ARN"] = "resource_arn";
-    CfnCodeInterpreterApplicationLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
-})(CfnCodeInterpreterApplicationLogsRecordFields || (exports.CfnCodeInterpreterApplicationLogsRecordFields = CfnCodeInterpreterApplicationLogsRecordFields = {}));
-/**
- * Output Format options for each destination of CfnCodeInterpreterUsageLogs.
- */
-class CfnCodeInterpreterUsageLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterUsageLogsOutputFormat", version: "2.267.0-alpha.0" };
-}
-exports.CfnCodeInterpreterUsageLogsOutputFormat = CfnCodeInterpreterUsageLogsOutputFormat;
-(function (CfnCodeInterpreterUsageLogsOutputFormat) {
-    let S3;
-    (function (S3) {
-        S3["JSON"] = "json";
-        S3["PLAIN"] = "plain";
-        S3["W3C"] = "w3c";
-        S3["PARQUET"] = "parquet";
-    })(S3 = CfnCodeInterpreterUsageLogsOutputFormat.S3 || (CfnCodeInterpreterUsageLogsOutputFormat.S3 = {}));
-    let LogGroup;
-    (function (LogGroup) {
-        LogGroup["PLAIN"] = "plain";
-        LogGroup["JSON"] = "json";
-    })(LogGroup = CfnCodeInterpreterUsageLogsOutputFormat.LogGroup || (CfnCodeInterpreterUsageLogsOutputFormat.LogGroup = {}));
-    let Firehose;
-    (function (Firehose) {
-        Firehose["JSON"] = "json";
-        Firehose["PLAIN"] = "plain";
-        Firehose["RAW"] = "raw";
-    })(Firehose = CfnCodeInterpreterUsageLogsOutputFormat.Firehose || (CfnCodeInterpreterUsageLogsOutputFormat.Firehose = {}));
-})(CfnCodeInterpreterUsageLogsOutputFormat || (exports.CfnCodeInterpreterUsageLogsOutputFormat = CfnCodeInterpreterUsageLogsOutputFormat = {}));
-var CfnCodeInterpreterUsageLogsRecordFields;
-(function (CfnCodeInterpreterUsageLogsRecordFields) {
-    CfnCodeInterpreterUsageLogsRecordFields["RESOURCE_ARN"] = "resource_arn";
-    CfnCodeInterpreterUsageLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
-    CfnCodeInterpreterUsageLogsRecordFields["RESOURCE"] = "resource";
-    CfnCodeInterpreterUsageLogsRecordFields["ATTRIBUTES"] = "attributes";
-    CfnCodeInterpreterUsageLogsRecordFields["METRICS"] = "metrics";
-})(CfnCodeInterpreterUsageLogsRecordFields || (exports.CfnCodeInterpreterUsageLogsRecordFields = CfnCodeInterpreterUsageLogsRecordFields = {}));
+        {
+            return new CfnCodeInterpreterCustomLogsMixin("TRACES", new logsDelivery.DestinationLogsDelivery(destination, {
+                providedFields: props?.recordFields,
+                mandatoryFields: ["trace"]
+            }));
+        }
+    }
+}
+exports.CfnCodeInterpreterCustomTraces = CfnCodeInterpreterCustomTraces;
 /**
  * Builder for CfnCodeInterpreterCustomLogsMixin to generate APPLICATION_LOGS for CfnCodeInterpreterCustom
  *
@@ -796,7 +381,7 @@ var CfnCodeInterpreterUsageLogsRecordFields;
  * @stability external
  */
 class CfnCodeInterpreterCustomApplicationLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomApplicationLogs", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomApplicationLogs", version: "2.268.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -904,7 +489,7 @@ exports.CfnCodeInterpreterCustomApplicationLogs = CfnCodeInterpreterCustomApplic
  * @stability external
  */
 class CfnCodeInterpreterCustomUsageLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomUsageLogs", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomUsageLogs", version: "2.268.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -1019,7 +604,8 @@ exports.CfnCodeInterpreterCustomUsageLogs = CfnCodeInterpreterCustomUsageLogs;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-codeinterpretercustom.html
  */
 class CfnCodeInterpreterCustomLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomLogsMixin", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomLogsMixin", version: "2.268.0-alpha.0" };
+    static TRACES = new CfnCodeInterpreterCustomTraces();
     static APPLICATION_LOGS = new CfnCodeInterpreterCustomApplicationLogs();
     static USAGE_LOGS = new CfnCodeInterpreterCustomUsageLogs();
     logType;
@@ -1062,18 +648,31 @@ class CfnCodeInterpreterCustomLogsMixin extends cdk.Mixin {
     }
 }
 exports.CfnCodeInterpreterCustomLogsMixin = CfnCodeInterpreterCustomLogsMixin;
+/**
+ * Output Format options for each destination of CfnCodeInterpreterCustomTraces.
+ */
+class CfnCodeInterpreterCustomTracesOutputFormat {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomTracesOutputFormat", version: "2.268.0-alpha.0" };
+}
+exports.CfnCodeInterpreterCustomTracesOutputFormat = CfnCodeInterpreterCustomTracesOutputFormat;
+var CfnCodeInterpreterCustomTracesRecordFields;
+(function (CfnCodeInterpreterCustomTracesRecordFields) {
+    CfnCodeInterpreterCustomTracesRecordFields["TIMESTAMP"] = "timestamp";
+    CfnCodeInterpreterCustomTracesRecordFields["RESOURCEARN"] = "resourceArn";
+    CfnCodeInterpreterCustomTracesRecordFields["TRACE"] = "trace";
+})(CfnCodeInterpreterCustomTracesRecordFields || (exports.CfnCodeInterpreterCustomTracesRecordFields = CfnCodeInterpreterCustomTracesRecordFields = {}));
 /**
  * Output Format options for each destination of CfnCodeInterpreterCustomApplicationLogs.
  */
 class CfnCodeInterpreterCustomApplicationLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomApplicationLogsOutputFormat", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomApplicationLogsOutputFormat", version: "2.268.0-alpha.0" };
 }
 exports.CfnCodeInterpreterCustomApplicationLogsOutputFormat = CfnCodeInterpreterCustomApplicationLogsOutputFormat;
 (function (CfnCodeInterpreterCustomApplicationLogsOutputFormat) {
     let S3;
     (function (S3) {
-        S3["JSON"] = "json";
         S3["PLAIN"] = "plain";
+        S3["JSON"] = "json";
         S3["W3C"] = "w3c";
         S3["PARQUET"] = "parquet";
     })(S3 = CfnCodeInterpreterCustomApplicationLogsOutputFormat.S3 || (CfnCodeInterpreterCustomApplicationLogsOutputFormat.S3 = {}));
@@ -1084,13 +683,16 @@ exports.CfnCodeInterpreterCustomApplicationLogsOutputFormat = CfnCodeInterpreter
     })(LogGroup = CfnCodeInterpreterCustomApplicationLogsOutputFormat.LogGroup || (CfnCodeInterpreterCustomApplicationLogsOutputFormat.LogGroup = {}));
     let Firehose;
     (function (Firehose) {
-        Firehose["JSON"] = "json";
         Firehose["PLAIN"] = "plain";
+        Firehose["JSON"] = "json";
         Firehose["RAW"] = "raw";
     })(Firehose = CfnCodeInterpreterCustomApplicationLogsOutputFormat.Firehose || (CfnCodeInterpreterCustomApplicationLogsOutputFormat.Firehose = {}));
 })(CfnCodeInterpreterCustomApplicationLogsOutputFormat || (exports.CfnCodeInterpreterCustomApplicationLogsOutputFormat = CfnCodeInterpreterCustomApplicationLogsOutputFormat = {}));
 var CfnCodeInterpreterCustomApplicationLogsRecordFields;
 (function (CfnCodeInterpreterCustomApplicationLogsRecordFields) {
+    CfnCodeInterpreterCustomApplicationLogsRecordFields["TIMESTAMP"] = "timestamp";
+    CfnCodeInterpreterCustomApplicationLogsRecordFields["TOOL_ID"] = "tool_id";
+    CfnCodeInterpreterCustomApplicationLogsRecordFields["INTERNAL_ACCOUNTID_BASED_ARN"] = "internal_accountid_based_arn";
     CfnCodeInterpreterCustomApplicationLogsRecordFields["ACCOUNT_ID"] = "account_id";
     CfnCodeInterpreterCustomApplicationLogsRecordFields["REQUEST_ID"] = "request_id";
     CfnCodeInterpreterCustomApplicationLogsRecordFields["TOOL_SESSION_ID"] = "tool_session_id";
@@ -1115,14 +717,14 @@ var CfnCodeInterpreterCustomApplicationLogsRecordFields;
  * Output Format options for each destination of CfnCodeInterpreterCustomUsageLogs.
  */
 class CfnCodeInterpreterCustomUsageLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomUsageLogsOutputFormat", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnCodeInterpreterCustomUsageLogsOutputFormat", version: "2.268.0-alpha.0" };
 }
 exports.CfnCodeInterpreterCustomUsageLogsOutputFormat = CfnCodeInterpreterCustomUsageLogsOutputFormat;
 (function (CfnCodeInterpreterCustomUsageLogsOutputFormat) {
     let S3;
     (function (S3) {
-        S3["JSON"] = "json";
         S3["PLAIN"] = "plain";
+        S3["JSON"] = "json";
         S3["W3C"] = "w3c";
         S3["PARQUET"] = "parquet";
     })(S3 = CfnCodeInterpreterCustomUsageLogsOutputFormat.S3 || (CfnCodeInterpreterCustomUsageLogsOutputFormat.S3 = {}));
@@ -1133,19 +735,81 @@ exports.CfnCodeInterpreterCustomUsageLogsOutputFormat = CfnCodeInterpreterCustom
     })(LogGroup = CfnCodeInterpreterCustomUsageLogsOutputFormat.LogGroup || (CfnCodeInterpreterCustomUsageLogsOutputFormat.LogGroup = {}));
     let Firehose;
     (function (Firehose) {
-        Firehose["JSON"] = "json";
         Firehose["PLAIN"] = "plain";
+        Firehose["JSON"] = "json";
         Firehose["RAW"] = "raw";
     })(Firehose = CfnCodeInterpreterCustomUsageLogsOutputFormat.Firehose || (CfnCodeInterpreterCustomUsageLogsOutputFormat.Firehose = {}));
 })(CfnCodeInterpreterCustomUsageLogsOutputFormat || (exports.CfnCodeInterpreterCustomUsageLogsOutputFormat = CfnCodeInterpreterCustomUsageLogsOutputFormat = {}));
 var CfnCodeInterpreterCustomUsageLogsRecordFields;
 (function (CfnCodeInterpreterCustomUsageLogsRecordFields) {
+    CfnCodeInterpreterCustomUsageLogsRecordFields["TIMESTAMP"] = "timestamp";
+    CfnCodeInterpreterCustomUsageLogsRecordFields["CODEINTERPRETER_ID"] = "codeinterpreter_id";
+    CfnCodeInterpreterCustomUsageLogsRecordFields["INTERNAL_ACCOUNTID_BASED_ARN"] = "internal_accountid_based_arn";
     CfnCodeInterpreterCustomUsageLogsRecordFields["RESOURCE_ARN"] = "resource_arn";
     CfnCodeInterpreterCustomUsageLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
     CfnCodeInterpreterCustomUsageLogsRecordFields["RESOURCE"] = "resource";
     CfnCodeInterpreterCustomUsageLogsRecordFields["ATTRIBUTES"] = "attributes";
     CfnCodeInterpreterCustomUsageLogsRecordFields["METRICS"] = "metrics";
 })(CfnCodeInterpreterCustomUsageLogsRecordFields || (exports.CfnCodeInterpreterCustomUsageLogsRecordFields = CfnCodeInterpreterCustomUsageLogsRecordFields = {}));
+/**
+ * Builder for CfnGatewayLogsMixin to generate TRACES for CfnGateway
+ *
+ * @cloudformationResource AWS::BedrockAgentCore::Gateway
+ * @logType TRACES
+ * @stability external
+ */
+class CfnGatewayTraces {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayTraces", version: "2.268.0-alpha.0" };
+    /**
+     * Send traces to X-Ray
+     *
+     * @param props Additional properties that are optionally used in log delivery for XRay destinations
+     */
+    toXRay(props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnGatewayTracesXRayProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toXRay);
+            }
+            throw error;
+        }
+        {
+            return new CfnGatewayLogsMixin("TRACES", new logsDelivery.XRayLogsDelivery({
+                providedFields: props?.recordFields,
+                mandatoryFields: ["trace"]
+            }));
+        }
+    }
+    /**
+     * Delivers logs to a pre-created delivery destination
+     *
+     * Supported destinations are XRAY
+     * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
+     * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
+     *
+     * @param props Additional properties that are optionally used in log delivery for destinations
+     */
+    toDestination(destination, props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnGatewayTracesDestProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toDestination);
+            }
+            throw error;
+        }
+        {
+            return new CfnGatewayLogsMixin("TRACES", new logsDelivery.DestinationLogsDelivery(destination, {
+                providedFields: props?.recordFields,
+                mandatoryFields: ["trace"]
+            }));
+        }
+    }
+}
+exports.CfnGatewayTraces = CfnGatewayTraces;
 /**
  * Builder for CfnGatewayLogsMixin to generate APPLICATION_LOGS for CfnGateway
  *
@@ -1154,7 +818,7 @@ var CfnCodeInterpreterCustomUsageLogsRecordFields;
  * @stability external
  */
 class CfnGatewayApplicationLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayApplicationLogs", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayApplicationLogs", version: "2.268.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -1254,65 +918,6 @@ class CfnGatewayApplicationLogs {
     }
 }
 exports.CfnGatewayApplicationLogs = CfnGatewayApplicationLogs;
-/**
- * Builder for CfnGatewayLogsMixin to generate TRACES for CfnGateway
- *
- * @cloudformationResource AWS::BedrockAgentCore::Gateway
- * @logType TRACES
- * @stability external
- */
-class CfnGatewayTraces {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayTraces", version: "2.267.0-alpha.0" };
-    /**
-     * Send traces to X-Ray
-     *
-     * @param props Additional properties that are optionally used in log delivery for XRay destinations
-     */
-    toXRay(props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnGatewayTracesXRayProps(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toXRay);
-            }
-            throw error;
-        }
-        {
-            return new CfnGatewayLogsMixin("TRACES", new logsDelivery.XRayLogsDelivery({
-                providedFields: props?.recordFields,
-                mandatoryFields: ["trace"]
-            }));
-        }
-    }
-    /**
-     * Delivers logs to a pre-created delivery destination
-     *
-     * Supported destinations are XRAY
-     * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
-     * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
-     *
-     * @param props Additional properties that are optionally used in log delivery for destinations
-     */
-    toDestination(destination, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnGatewayTracesDestProps(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toDestination);
-            }
-            throw error;
-        }
-        {
-            return new CfnGatewayLogsMixin("TRACES", new logsDelivery.DestinationLogsDelivery(destination, {
-                providedFields: props?.recordFields,
-                mandatoryFields: ["trace"]
-            }));
-        }
-    }
-}
-exports.CfnGatewayTraces = CfnGatewayTraces;
 /**
  * Amazon Bedrock AgentCore Gateway provides a unified connectivity layer between agents and the tools and resources they need to interact with.
  *
@@ -1326,9 +931,9 @@ exports.CfnGatewayTraces = CfnGatewayTraces;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-gateway.html
  */
 class CfnGatewayLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayLogsMixin", version: "2.267.0-alpha.0" };
-    static APPLICATION_LOGS = new CfnGatewayApplicationLogs();
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayLogsMixin", version: "2.268.0-alpha.0" };
     static TRACES = new CfnGatewayTraces();
+    static APPLICATION_LOGS = new CfnGatewayApplicationLogs();
     logType;
     logDelivery;
     /**
@@ -1369,18 +974,31 @@ class CfnGatewayLogsMixin extends cdk.Mixin {
     }
 }
 exports.CfnGatewayLogsMixin = CfnGatewayLogsMixin;
+/**
+ * Output Format options for each destination of CfnGatewayTraces.
+ */
+class CfnGatewayTracesOutputFormat {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayTracesOutputFormat", version: "2.268.0-alpha.0" };
+}
+exports.CfnGatewayTracesOutputFormat = CfnGatewayTracesOutputFormat;
+var CfnGatewayTracesRecordFields;
+(function (CfnGatewayTracesRecordFields) {
+    CfnGatewayTracesRecordFields["TIMESTAMP"] = "timestamp";
+    CfnGatewayTracesRecordFields["RESOURCEARN"] = "resourceArn";
+    CfnGatewayTracesRecordFields["TRACE"] = "trace";
+})(CfnGatewayTracesRecordFields || (exports.CfnGatewayTracesRecordFields = CfnGatewayTracesRecordFields = {}));
 /**
  * Output Format options for each destination of CfnGatewayApplicationLogs.
  */
 class CfnGatewayApplicationLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayApplicationLogsOutputFormat", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayApplicationLogsOutputFormat", version: "2.268.0-alpha.0" };
 }
 exports.CfnGatewayApplicationLogsOutputFormat = CfnGatewayApplicationLogsOutputFormat;
 (function (CfnGatewayApplicationLogsOutputFormat) {
     let S3;
     (function (S3) {
-        S3["JSON"] = "json";
         S3["PLAIN"] = "plain";
+        S3["JSON"] = "json";
         S3["W3C"] = "w3c";
         S3["PARQUET"] = "parquet";
     })(S3 = CfnGatewayApplicationLogsOutputFormat.S3 || (CfnGatewayApplicationLogsOutputFormat.S3 = {}));
@@ -1391,13 +1009,15 @@ exports.CfnGatewayApplicationLogsOutputFormat = CfnGatewayApplicationLogsOutputF
     })(LogGroup = CfnGatewayApplicationLogsOutputFormat.LogGroup || (CfnGatewayApplicationLogsOutputFormat.LogGroup = {}));
     let Firehose;
     (function (Firehose) {
-        Firehose["JSON"] = "json";
         Firehose["PLAIN"] = "plain";
+        Firehose["JSON"] = "json";
         Firehose["RAW"] = "raw";
     })(Firehose = CfnGatewayApplicationLogsOutputFormat.Firehose || (CfnGatewayApplicationLogsOutputFormat.Firehose = {}));
 })(CfnGatewayApplicationLogsOutputFormat || (exports.CfnGatewayApplicationLogsOutputFormat = CfnGatewayApplicationLogsOutputFormat = {}));
 var CfnGatewayApplicationLogsRecordFields;
 (function (CfnGatewayApplicationLogsRecordFields) {
+    CfnGatewayApplicationLogsRecordFields["TIMESTAMP"] = "timestamp";
+    CfnGatewayApplicationLogsRecordFields["GATEWAY_ID"] = "gateway_id";
     CfnGatewayApplicationLogsRecordFields["BODY"] = "body";
     CfnGatewayApplicationLogsRecordFields["ACCOUNT_ID"] = "account_id";
     CfnGatewayApplicationLogsRecordFields["REQUEST_ID"] = "request_id";
@@ -1414,90 +1034,92 @@ var CfnGatewayApplicationLogsRecordFields;
     CfnGatewayApplicationLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
 })(CfnGatewayApplicationLogsRecordFields || (exports.CfnGatewayApplicationLogsRecordFields = CfnGatewayApplicationLogsRecordFields = {}));
 /**
- * Output Format options for each destination of CfnGatewayTraces.
- */
-class CfnGatewayTracesOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnGatewayTracesOutputFormat", version: "2.267.0-alpha.0" };
-}
-exports.CfnGatewayTracesOutputFormat = CfnGatewayTracesOutputFormat;
-var CfnGatewayTracesRecordFields;
-(function (CfnGatewayTracesRecordFields) {
-    CfnGatewayTracesRecordFields["TRACE"] = "trace";
-})(CfnGatewayTracesRecordFields || (exports.CfnGatewayTracesRecordFields = CfnGatewayTracesRecordFields = {}));
-/**
- * Builder for CfnMemoryLogsMixin to generate APPLICATION_LOGS for CfnMemory
+ * Builder for CfnMemoryLogsMixin to generate TRACES for CfnMemory
  *
  * @cloudformationResource AWS::BedrockAgentCore::Memory
- * @logType APPLICATION_LOGS
+ * @logType TRACES
  * @stability external
  */
-class CfnMemoryApplicationLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryApplicationLogs", version: "2.267.0-alpha.0" };
+class CfnMemoryTraces {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryTraces", version: "2.268.0-alpha.0" };
     /**
-     * Send logs to an S3 Bucket
+     * Send traces to X-Ray
      *
-     * @param props Additional properties that are optionally used in log delivery for S3 destinations
+     * @param props Additional properties that are optionally used in log delivery for XRay destinations
      */
-    toS3(bucket, props) {
+    toXRay(props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryApplicationLogsS3Props(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryTracesXRayProps(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toS3);
+                Error.captureStackTrace(error, this.toXRay);
             }
             throw error;
         }
         {
-            return new CfnMemoryLogsMixin("APPLICATION_LOGS", new logsDelivery.S3LogsDelivery(bucket, {
-                permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V2,
-                kmsKey: props?.encryptionKey,
-                outputFormat: props?.outputFormat,
+            return new CfnMemoryLogsMixin("TRACES", new logsDelivery.XRayLogsDelivery({
                 providedFields: props?.recordFields,
-                mandatoryFields: undefined
+                mandatoryFields: ["trace"]
             }));
         }
     }
     /**
-     * Send logs to a CloudWatch Log Group
+     * Delivers logs to a pre-created delivery destination
      *
-     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
+     * Supported destinations are XRAY
+     * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
+     * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
+     *
+     * @param props Additional properties that are optionally used in log delivery for destinations
      */
-    toLogGroup(logGroup, props) {
+    toDestination(destination, props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryApplicationLogsLogGroupProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryTracesDestProps(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toLogGroup);
+                Error.captureStackTrace(error, this.toDestination);
             }
             throw error;
         }
         {
-            return new CfnMemoryLogsMixin("APPLICATION_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup, {
-                outputFormat: props?.outputFormat,
+            return new CfnMemoryLogsMixin("TRACES", new logsDelivery.DestinationLogsDelivery(destination, {
                 providedFields: props?.recordFields,
-                mandatoryFields: undefined
+                mandatoryFields: ["trace"]
             }));
         }
     }
+}
+exports.CfnMemoryTraces = CfnMemoryTraces;
+/**
+ * Builder for CfnMemoryLogsMixin to generate APPLICATION_LOGS for CfnMemory
+ *
+ * @cloudformationResource AWS::BedrockAgentCore::Memory
+ * @logType APPLICATION_LOGS
+ * @stability external
+ */
+class CfnMemoryApplicationLogs {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryApplicationLogs", version: "2.268.0-alpha.0" };
     /**
-     * Send logs to a Firehose Delivery Stream
+     * Send logs to an S3 Bucket
      *
-     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
+     * @param props Additional properties that are optionally used in log delivery for S3 destinations
      */
-    toFirehose(deliveryStream, props) {
+    toS3(bucket, props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryApplicationLogsFirehoseProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryApplicationLogsS3Props(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toFirehose);
+                Error.captureStackTrace(error, this.toS3);
             }
             throw error;
         }
         {
-            return new CfnMemoryLogsMixin("APPLICATION_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream, {
+            return new CfnMemoryLogsMixin("APPLICATION_LOGS", new logsDelivery.S3LogsDelivery(bucket, {
+                permissionsVersion: logsDelivery.S3LogsDeliveryPermissionsVersion.V2,
+                kmsKey: props?.encryptionKey,
                 outputFormat: props?.outputFormat,
                 providedFields: props?.recordFields,
                 mandatoryFields: undefined
@@ -1505,68 +1127,55 @@ class CfnMemoryApplicationLogs {
         }
     }
     /**
-     * Delivers logs to a pre-created delivery destination
-     *
-     * Supported destinations are S3, CWL, FH
-     * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
-     * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
+     * Send logs to a CloudWatch Log Group
      *
-     * @param props Additional properties that are optionally used in log delivery for destinations
+     * @param props Additional properties that are optionally used in log delivery for Log Group destinations
      */
-    toDestination(destination, props) {
+    toLogGroup(logGroup, props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryApplicationLogsDestProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryApplicationLogsLogGroupProps(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toDestination);
+                Error.captureStackTrace(error, this.toLogGroup);
             }
             throw error;
         }
         {
-            return new CfnMemoryLogsMixin("APPLICATION_LOGS", new logsDelivery.DestinationLogsDelivery(destination, {
+            return new CfnMemoryLogsMixin("APPLICATION_LOGS", new logsDelivery.LogGroupLogsDelivery(logGroup, {
+                outputFormat: props?.outputFormat,
                 providedFields: props?.recordFields,
                 mandatoryFields: undefined
-            }));
-        }
-    }
-}
-exports.CfnMemoryApplicationLogs = CfnMemoryApplicationLogs;
-/**
- * Builder for CfnMemoryLogsMixin to generate TRACES for CfnMemory
- *
- * @cloudformationResource AWS::BedrockAgentCore::Memory
- * @logType TRACES
- * @stability external
- */
-class CfnMemoryTraces {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryTraces", version: "2.267.0-alpha.0" };
+            }));
+        }
+    }
     /**
-     * Send traces to X-Ray
+     * Send logs to a Firehose Delivery Stream
      *
-     * @param props Additional properties that are optionally used in log delivery for XRay destinations
+     * @param props Additional properties that are optionally used in log delivery for Firehose destinations
      */
-    toXRay(props) {
+    toFirehose(deliveryStream, props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryTracesXRayProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryApplicationLogsFirehoseProps(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toXRay);
+                Error.captureStackTrace(error, this.toFirehose);
             }
             throw error;
         }
         {
-            return new CfnMemoryLogsMixin("TRACES", new logsDelivery.XRayLogsDelivery({
+            return new CfnMemoryLogsMixin("APPLICATION_LOGS", new logsDelivery.FirehoseLogsDelivery(deliveryStream, {
+                outputFormat: props?.outputFormat,
                 providedFields: props?.recordFields,
-                mandatoryFields: ["trace"]
+                mandatoryFields: undefined
             }));
         }
     }
     /**
      * Delivers logs to a pre-created delivery destination
      *
-     * Supported destinations are XRAY
+     * Supported destinations are S3, CWL, FH
      * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
      * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
      *
@@ -1574,7 +1183,7 @@ class CfnMemoryTraces {
      */
     toDestination(destination, props) {
         try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryTracesDestProps(props);
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnMemoryApplicationLogsDestProps(props);
         }
         catch (error) {
             if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
@@ -1583,14 +1192,14 @@ class CfnMemoryTraces {
             throw error;
         }
         {
-            return new CfnMemoryLogsMixin("TRACES", new logsDelivery.DestinationLogsDelivery(destination, {
+            return new CfnMemoryLogsMixin("APPLICATION_LOGS", new logsDelivery.DestinationLogsDelivery(destination, {
                 providedFields: props?.recordFields,
-                mandatoryFields: ["trace"]
+                mandatoryFields: undefined
             }));
         }
     }
 }
-exports.CfnMemoryTraces = CfnMemoryTraces;
+exports.CfnMemoryApplicationLogs = CfnMemoryApplicationLogs;
 /**
  * Memory allows AI agents to maintain both immediate and long-term knowledge, enabling context-aware and personalized interactions.
  *
@@ -1604,9 +1213,9 @@ exports.CfnMemoryTraces = CfnMemoryTraces;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-memory.html
  */
 class CfnMemoryLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryLogsMixin", version: "2.267.0-alpha.0" };
-    static APPLICATION_LOGS = new CfnMemoryApplicationLogs();
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryLogsMixin", version: "2.268.0-alpha.0" };
     static TRACES = new CfnMemoryTraces();
+    static APPLICATION_LOGS = new CfnMemoryApplicationLogs();
     logType;
     logDelivery;
     /**
@@ -1647,18 +1256,31 @@ class CfnMemoryLogsMixin extends cdk.Mixin {
     }
 }
 exports.CfnMemoryLogsMixin = CfnMemoryLogsMixin;
+/**
+ * Output Format options for each destination of CfnMemoryTraces.
+ */
+class CfnMemoryTracesOutputFormat {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryTracesOutputFormat", version: "2.268.0-alpha.0" };
+}
+exports.CfnMemoryTracesOutputFormat = CfnMemoryTracesOutputFormat;
+var CfnMemoryTracesRecordFields;
+(function (CfnMemoryTracesRecordFields) {
+    CfnMemoryTracesRecordFields["TIMESTAMP"] = "timestamp";
+    CfnMemoryTracesRecordFields["RESOURCEARN"] = "resourceArn";
+    CfnMemoryTracesRecordFields["TRACE"] = "trace";
+})(CfnMemoryTracesRecordFields || (exports.CfnMemoryTracesRecordFields = CfnMemoryTracesRecordFields = {}));
 /**
  * Output Format options for each destination of CfnMemoryApplicationLogs.
  */
 class CfnMemoryApplicationLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryApplicationLogsOutputFormat", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryApplicationLogsOutputFormat", version: "2.268.0-alpha.0" };
 }
 exports.CfnMemoryApplicationLogsOutputFormat = CfnMemoryApplicationLogsOutputFormat;
 (function (CfnMemoryApplicationLogsOutputFormat) {
     let S3;
     (function (S3) {
-        S3["JSON"] = "json";
         S3["PLAIN"] = "plain";
+        S3["JSON"] = "json";
         S3["W3C"] = "w3c";
         S3["PARQUET"] = "parquet";
     })(S3 = CfnMemoryApplicationLogsOutputFormat.S3 || (CfnMemoryApplicationLogsOutputFormat.S3 = {}));
@@ -1669,14 +1291,16 @@ exports.CfnMemoryApplicationLogsOutputFormat = CfnMemoryApplicationLogsOutputFor
     })(LogGroup = CfnMemoryApplicationLogsOutputFormat.LogGroup || (CfnMemoryApplicationLogsOutputFormat.LogGroup = {}));
     let Firehose;
     (function (Firehose) {
-        Firehose["JSON"] = "json";
         Firehose["PLAIN"] = "plain";
+        Firehose["JSON"] = "json";
         Firehose["RAW"] = "raw";
     })(Firehose = CfnMemoryApplicationLogsOutputFormat.Firehose || (CfnMemoryApplicationLogsOutputFormat.Firehose = {}));
 })(CfnMemoryApplicationLogsOutputFormat || (exports.CfnMemoryApplicationLogsOutputFormat = CfnMemoryApplicationLogsOutputFormat = {}));
 var CfnMemoryApplicationLogsRecordFields;
 (function (CfnMemoryApplicationLogsRecordFields) {
+    CfnMemoryApplicationLogsRecordFields["TIMESTAMP"] = "timestamp";
     CfnMemoryApplicationLogsRecordFields["RESOURCE_ARN"] = "resource_arn";
+    CfnMemoryApplicationLogsRecordFields["RESOURCE_ID"] = "resource_id";
     CfnMemoryApplicationLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
     CfnMemoryApplicationLogsRecordFields["MEMORY_STRATEGY_ID"] = "memory_strategy_id";
     CfnMemoryApplicationLogsRecordFields["NAMESPACE"] = "namespace";
@@ -1693,16 +1317,64 @@ var CfnMemoryApplicationLogsRecordFields;
     CfnMemoryApplicationLogsRecordFields["SPANID"] = "spanId";
 })(CfnMemoryApplicationLogsRecordFields || (exports.CfnMemoryApplicationLogsRecordFields = CfnMemoryApplicationLogsRecordFields = {}));
 /**
- * Output Format options for each destination of CfnMemoryTraces.
+ * Builder for CfnRuntimeLogsMixin to generate TRACES for CfnRuntime
+ *
+ * @cloudformationResource AWS::BedrockAgentCore::Runtime
+ * @logType TRACES
+ * @stability external
  */
-class CfnMemoryTracesOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnMemoryTracesOutputFormat", version: "2.267.0-alpha.0" };
+class CfnRuntimeTraces {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeTraces", version: "2.268.0-alpha.0" };
+    /**
+     * Send traces to X-Ray
+     *
+     * @param props Additional properties that are optionally used in log delivery for XRay destinations
+     */
+    toXRay(props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnRuntimeTracesXRayProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toXRay);
+            }
+            throw error;
+        }
+        {
+            return new CfnRuntimeLogsMixin("TRACES", new logsDelivery.XRayLogsDelivery({
+                providedFields: props?.recordFields,
+                mandatoryFields: ["trace"]
+            }));
+        }
+    }
+    /**
+     * Delivers logs to a pre-created delivery destination
+     *
+     * Supported destinations are XRAY
+     * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
+     * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
+     *
+     * @param props Additional properties that are optionally used in log delivery for destinations
+     */
+    toDestination(destination, props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnRuntimeTracesDestProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toDestination);
+            }
+            throw error;
+        }
+        {
+            return new CfnRuntimeLogsMixin("TRACES", new logsDelivery.DestinationLogsDelivery(destination, {
+                providedFields: props?.recordFields,
+                mandatoryFields: ["trace"]
+            }));
+        }
+    }
 }
-exports.CfnMemoryTracesOutputFormat = CfnMemoryTracesOutputFormat;
-var CfnMemoryTracesRecordFields;
-(function (CfnMemoryTracesRecordFields) {
-    CfnMemoryTracesRecordFields["TRACE"] = "trace";
-})(CfnMemoryTracesRecordFields || (exports.CfnMemoryTracesRecordFields = CfnMemoryTracesRecordFields = {}));
+exports.CfnRuntimeTraces = CfnRuntimeTraces;
 /**
  * Builder for CfnRuntimeLogsMixin to generate APPLICATION_LOGS for CfnRuntime
  *
@@ -1711,7 +1383,7 @@ var CfnMemoryTracesRecordFields;
  * @stability external
  */
 class CfnRuntimeApplicationLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeApplicationLogs", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeApplicationLogs", version: "2.268.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -1811,65 +1483,6 @@ class CfnRuntimeApplicationLogs {
     }
 }
 exports.CfnRuntimeApplicationLogs = CfnRuntimeApplicationLogs;
-/**
- * Builder for CfnRuntimeLogsMixin to generate TRACES for CfnRuntime
- *
- * @cloudformationResource AWS::BedrockAgentCore::Runtime
- * @logType TRACES
- * @stability external
- */
-class CfnRuntimeTraces {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeTraces", version: "2.267.0-alpha.0" };
-    /**
-     * Send traces to X-Ray
-     *
-     * @param props Additional properties that are optionally used in log delivery for XRay destinations
-     */
-    toXRay(props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnRuntimeTracesXRayProps(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toXRay);
-            }
-            throw error;
-        }
-        {
-            return new CfnRuntimeLogsMixin("TRACES", new logsDelivery.XRayLogsDelivery({
-                providedFields: props?.recordFields,
-                mandatoryFields: ["trace"]
-            }));
-        }
-    }
-    /**
-     * Delivers logs to a pre-created delivery destination
-     *
-     * Supported destinations are XRAY
-     * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
-     * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
-     *
-     * @param props Additional properties that are optionally used in log delivery for destinations
-     */
-    toDestination(destination, props) {
-        try {
-            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnRuntimeTracesDestProps(props);
-        }
-        catch (error) {
-            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
-                Error.captureStackTrace(error, this.toDestination);
-            }
-            throw error;
-        }
-        {
-            return new CfnRuntimeLogsMixin("TRACES", new logsDelivery.DestinationLogsDelivery(destination, {
-                providedFields: props?.recordFields,
-                mandatoryFields: ["trace"]
-            }));
-        }
-    }
-}
-exports.CfnRuntimeTraces = CfnRuntimeTraces;
 /**
  * Builder for CfnRuntimeLogsMixin to generate USAGE_LOGS for CfnRuntime
  *
@@ -1878,7 +1491,7 @@ exports.CfnRuntimeTraces = CfnRuntimeTraces;
  * @stability external
  */
 class CfnRuntimeUsageLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeUsageLogs", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeUsageLogs", version: "2.268.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -1993,9 +1606,9 @@ exports.CfnRuntimeUsageLogs = CfnRuntimeUsageLogs;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-runtime.html
  */
 class CfnRuntimeLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeLogsMixin", version: "2.267.0-alpha.0" };
-    static APPLICATION_LOGS = new CfnRuntimeApplicationLogs();
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeLogsMixin", version: "2.268.0-alpha.0" };
     static TRACES = new CfnRuntimeTraces();
+    static APPLICATION_LOGS = new CfnRuntimeApplicationLogs();
     static USAGE_LOGS = new CfnRuntimeUsageLogs();
     logType;
     logDelivery;
@@ -2037,18 +1650,31 @@ class CfnRuntimeLogsMixin extends cdk.Mixin {
     }
 }
 exports.CfnRuntimeLogsMixin = CfnRuntimeLogsMixin;
+/**
+ * Output Format options for each destination of CfnRuntimeTraces.
+ */
+class CfnRuntimeTracesOutputFormat {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeTracesOutputFormat", version: "2.268.0-alpha.0" };
+}
+exports.CfnRuntimeTracesOutputFormat = CfnRuntimeTracesOutputFormat;
+var CfnRuntimeTracesRecordFields;
+(function (CfnRuntimeTracesRecordFields) {
+    CfnRuntimeTracesRecordFields["TIMESTAMP"] = "timestamp";
+    CfnRuntimeTracesRecordFields["RESOURCEARN"] = "resourceArn";
+    CfnRuntimeTracesRecordFields["TRACE"] = "trace";
+})(CfnRuntimeTracesRecordFields || (exports.CfnRuntimeTracesRecordFields = CfnRuntimeTracesRecordFields = {}));
 /**
  * Output Format options for each destination of CfnRuntimeApplicationLogs.
  */
 class CfnRuntimeApplicationLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeApplicationLogsOutputFormat", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeApplicationLogsOutputFormat", version: "2.268.0-alpha.0" };
 }
 exports.CfnRuntimeApplicationLogsOutputFormat = CfnRuntimeApplicationLogsOutputFormat;
 (function (CfnRuntimeApplicationLogsOutputFormat) {
     let S3;
     (function (S3) {
-        S3["JSON"] = "json";
         S3["PLAIN"] = "plain";
+        S3["JSON"] = "json";
         S3["W3C"] = "w3c";
         S3["PARQUET"] = "parquet";
     })(S3 = CfnRuntimeApplicationLogsOutputFormat.S3 || (CfnRuntimeApplicationLogsOutputFormat.S3 = {}));
@@ -2059,13 +1685,15 @@ exports.CfnRuntimeApplicationLogsOutputFormat = CfnRuntimeApplicationLogsOutputF
     })(LogGroup = CfnRuntimeApplicationLogsOutputFormat.LogGroup || (CfnRuntimeApplicationLogsOutputFormat.LogGroup = {}));
     let Firehose;
     (function (Firehose) {
-        Firehose["JSON"] = "json";
         Firehose["PLAIN"] = "plain";
+        Firehose["JSON"] = "json";
         Firehose["RAW"] = "raw";
     })(Firehose = CfnRuntimeApplicationLogsOutputFormat.Firehose || (CfnRuntimeApplicationLogsOutputFormat.Firehose = {}));
 })(CfnRuntimeApplicationLogsOutputFormat || (exports.CfnRuntimeApplicationLogsOutputFormat = CfnRuntimeApplicationLogsOutputFormat = {}));
 var CfnRuntimeApplicationLogsRecordFields;
 (function (CfnRuntimeApplicationLogsRecordFields) {
+    CfnRuntimeApplicationLogsRecordFields["TIMESTAMP"] = "timestamp";
+    CfnRuntimeApplicationLogsRecordFields["RUNTIME_ID"] = "runtime_id";
     CfnRuntimeApplicationLogsRecordFields["ACCOUNT_ID"] = "account_id";
     CfnRuntimeApplicationLogsRecordFields["REQUEST_ID"] = "request_id";
     CfnRuntimeApplicationLogsRecordFields["SESSION_ID"] = "session_id";
@@ -2086,29 +1714,18 @@ var CfnRuntimeApplicationLogsRecordFields;
     CfnRuntimeApplicationLogsRecordFields["RESOURCE_ARN"] = "resource_arn";
     CfnRuntimeApplicationLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
 })(CfnRuntimeApplicationLogsRecordFields || (exports.CfnRuntimeApplicationLogsRecordFields = CfnRuntimeApplicationLogsRecordFields = {}));
-/**
- * Output Format options for each destination of CfnRuntimeTraces.
- */
-class CfnRuntimeTracesOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeTracesOutputFormat", version: "2.267.0-alpha.0" };
-}
-exports.CfnRuntimeTracesOutputFormat = CfnRuntimeTracesOutputFormat;
-var CfnRuntimeTracesRecordFields;
-(function (CfnRuntimeTracesRecordFields) {
-    CfnRuntimeTracesRecordFields["TRACE"] = "trace";
-})(CfnRuntimeTracesRecordFields || (exports.CfnRuntimeTracesRecordFields = CfnRuntimeTracesRecordFields = {}));
 /**
  * Output Format options for each destination of CfnRuntimeUsageLogs.
  */
 class CfnRuntimeUsageLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeUsageLogsOutputFormat", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnRuntimeUsageLogsOutputFormat", version: "2.268.0-alpha.0" };
 }
 exports.CfnRuntimeUsageLogsOutputFormat = CfnRuntimeUsageLogsOutputFormat;
 (function (CfnRuntimeUsageLogsOutputFormat) {
     let S3;
     (function (S3) {
-        S3["JSON"] = "json";
         S3["PLAIN"] = "plain";
+        S3["JSON"] = "json";
         S3["W3C"] = "w3c";
         S3["PARQUET"] = "parquet";
     })(S3 = CfnRuntimeUsageLogsOutputFormat.S3 || (CfnRuntimeUsageLogsOutputFormat.S3 = {}));
@@ -2119,13 +1736,15 @@ exports.CfnRuntimeUsageLogsOutputFormat = CfnRuntimeUsageLogsOutputFormat;
     })(LogGroup = CfnRuntimeUsageLogsOutputFormat.LogGroup || (CfnRuntimeUsageLogsOutputFormat.LogGroup = {}));
     let Firehose;
     (function (Firehose) {
-        Firehose["JSON"] = "json";
         Firehose["PLAIN"] = "plain";
+        Firehose["JSON"] = "json";
         Firehose["RAW"] = "raw";
     })(Firehose = CfnRuntimeUsageLogsOutputFormat.Firehose || (CfnRuntimeUsageLogsOutputFormat.Firehose = {}));
 })(CfnRuntimeUsageLogsOutputFormat || (exports.CfnRuntimeUsageLogsOutputFormat = CfnRuntimeUsageLogsOutputFormat = {}));
 var CfnRuntimeUsageLogsRecordFields;
 (function (CfnRuntimeUsageLogsRecordFields) {
+    CfnRuntimeUsageLogsRecordFields["TIMESTAMP"] = "timestamp";
+    CfnRuntimeUsageLogsRecordFields["RUNTIME_ID"] = "runtime_id";
     CfnRuntimeUsageLogsRecordFields["RESOURCE_ARN"] = "resource_arn";
     CfnRuntimeUsageLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
     CfnRuntimeUsageLogsRecordFields["RESOURCE"] = "resource";
@@ -2140,7 +1759,7 @@ var CfnRuntimeUsageLogsRecordFields;
  * @stability external
  */
 class CfnWorkloadIdentityApplicationLogs {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnWorkloadIdentityApplicationLogs", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnWorkloadIdentityApplicationLogs", version: "2.268.0-alpha.0" };
     /**
      * Send logs to an S3 Bucket
      *
@@ -2240,6 +1859,65 @@ class CfnWorkloadIdentityApplicationLogs {
     }
 }
 exports.CfnWorkloadIdentityApplicationLogs = CfnWorkloadIdentityApplicationLogs;
+/**
+ * Builder for CfnWorkloadIdentityLogsMixin to generate TRACES for CfnWorkloadIdentity
+ *
+ * @cloudformationResource AWS::BedrockAgentCore::WorkloadIdentity
+ * @logType TRACES
+ * @stability external
+ */
+class CfnWorkloadIdentityTraces {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnWorkloadIdentityTraces", version: "2.268.0-alpha.0" };
+    /**
+     * Send traces to X-Ray
+     *
+     * @param props Additional properties that are optionally used in log delivery for XRay destinations
+     */
+    toXRay(props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnWorkloadIdentityTracesXRayProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toXRay);
+            }
+            throw error;
+        }
+        {
+            return new CfnWorkloadIdentityLogsMixin("TRACES", new logsDelivery.XRayLogsDelivery({
+                providedFields: props?.recordFields,
+                mandatoryFields: ["trace"]
+            }));
+        }
+    }
+    /**
+     * Delivers logs to a pre-created delivery destination
+     *
+     * Supported destinations are XRAY
+     * You are responsible for setting up the correct permissions for your delivery destination, toDestination() does not set up any permissions for you.
+     * Delivery destinations that are imported from another stack using CfnDeliveryDestination.fromDeliveryDestinationArn() or CfnDeliveryDestination.fromDeliveryDestinationName() are supported by toDestination().
+     *
+     * @param props Additional properties that are optionally used in log delivery for destinations
+     */
+    toDestination(destination, props) {
+        try {
+            jsiiDeprecationWarnings._aws_cdk_mixins_preview_aws_bedrockagentcore_mixins_CfnWorkloadIdentityTracesDestProps(props);
+        }
+        catch (error) {
+            if (process.env.JSII_DEBUG !== "1" && error.name === "DeprecationError") {
+                Error.captureStackTrace(error, this.toDestination);
+            }
+            throw error;
+        }
+        {
+            return new CfnWorkloadIdentityLogsMixin("TRACES", new logsDelivery.DestinationLogsDelivery(destination, {
+                providedFields: props?.recordFields,
+                mandatoryFields: ["trace"]
+            }));
+        }
+    }
+}
+exports.CfnWorkloadIdentityTraces = CfnWorkloadIdentityTraces;
 /**
  * Creates a workload identity for Amazon Bedrock AgentCore.
  *
@@ -2255,8 +1933,9 @@ exports.CfnWorkloadIdentityApplicationLogs = CfnWorkloadIdentityApplicationLogs;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrockagentcore-workloadidentity.html
  */
 class CfnWorkloadIdentityLogsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnWorkloadIdentityLogsMixin", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnWorkloadIdentityLogsMixin", version: "2.268.0-alpha.0" };
     static APPLICATION_LOGS = new CfnWorkloadIdentityApplicationLogs();
+    static TRACES = new CfnWorkloadIdentityTraces();
     logType;
     logDelivery;
     /**
@@ -2301,14 +1980,14 @@ exports.CfnWorkloadIdentityLogsMixin = CfnWorkloadIdentityLogsMixin;
  * Output Format options for each destination of CfnWorkloadIdentityApplicationLogs.
  */
 class CfnWorkloadIdentityApplicationLogsOutputFormat {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnWorkloadIdentityApplicationLogsOutputFormat", version: "2.267.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnWorkloadIdentityApplicationLogsOutputFormat", version: "2.268.0-alpha.0" };
 }
 exports.CfnWorkloadIdentityApplicationLogsOutputFormat = CfnWorkloadIdentityApplicationLogsOutputFormat;
 (function (CfnWorkloadIdentityApplicationLogsOutputFormat) {
     let S3;
     (function (S3) {
-        S3["JSON"] = "json";
         S3["PLAIN"] = "plain";
+        S3["JSON"] = "json";
         S3["W3C"] = "w3c";
         S3["PARQUET"] = "parquet";
     })(S3 = CfnWorkloadIdentityApplicationLogsOutputFormat.S3 || (CfnWorkloadIdentityApplicationLogsOutputFormat.S3 = {}));
@@ -2319,14 +1998,18 @@ exports.CfnWorkloadIdentityApplicationLogsOutputFormat = CfnWorkloadIdentityAppl
     })(LogGroup = CfnWorkloadIdentityApplicationLogsOutputFormat.LogGroup || (CfnWorkloadIdentityApplicationLogsOutputFormat.LogGroup = {}));
     let Firehose;
     (function (Firehose) {
-        Firehose["JSON"] = "json";
         Firehose["PLAIN"] = "plain";
+        Firehose["JSON"] = "json";
         Firehose["RAW"] = "raw";
     })(Firehose = CfnWorkloadIdentityApplicationLogsOutputFormat.Firehose || (CfnWorkloadIdentityApplicationLogsOutputFormat.Firehose = {}));
 })(CfnWorkloadIdentityApplicationLogsOutputFormat || (exports.CfnWorkloadIdentityApplicationLogsOutputFormat = CfnWorkloadIdentityApplicationLogsOutputFormat = {}));
 var CfnWorkloadIdentityApplicationLogsRecordFields;
 (function (CfnWorkloadIdentityApplicationLogsRecordFields) {
+    CfnWorkloadIdentityApplicationLogsRecordFields["TIMESTAMP"] = "timestamp";
+    CfnWorkloadIdentityApplicationLogsRecordFields["WORKLOAD_IDENTITY_ID"] = "workload_identity_id";
     CfnWorkloadIdentityApplicationLogsRecordFields["REQUEST_ID"] = "request_id";
+    CfnWorkloadIdentityApplicationLogsRecordFields["TRACE_ID"] = "trace_id";
+    CfnWorkloadIdentityApplicationLogsRecordFields["SPAN_ID"] = "span_id";
     CfnWorkloadIdentityApplicationLogsRecordFields["OPERATION_NAME"] = "operation_name";
     CfnWorkloadIdentityApplicationLogsRecordFields["OPERATION_TYPE"] = "operation_type";
     CfnWorkloadIdentityApplicationLogsRecordFields["START_TIME"] = "start_time";
@@ -2335,8 +2018,6 @@ var CfnWorkloadIdentityApplicationLogsRecordFields;
     CfnWorkloadIdentityApplicationLogsRecordFields["ACCOUNT_ID"] = "account_id";
     CfnWorkloadIdentityApplicationLogsRecordFields["REQUEST"] = "request";
     CfnWorkloadIdentityApplicationLogsRecordFields["RESPONSE"] = "response";
-    CfnWorkloadIdentityApplicationLogsRecordFields["TRACE_ID"] = "trace_id";
-    CfnWorkloadIdentityApplicationLogsRecordFields["SPAN_ID"] = "span_id";
     CfnWorkloadIdentityApplicationLogsRecordFields["RESOURCE"] = "resource";
     CfnWorkloadIdentityApplicationLogsRecordFields["ATTRIBUTES"] = "attributes";
     CfnWorkloadIdentityApplicationLogsRecordFields["TIMEUNIXNANO"] = "timeUnixNano";
@@ -2348,3 +2029,16 @@ var CfnWorkloadIdentityApplicationLogsRecordFields;
     CfnWorkloadIdentityApplicationLogsRecordFields["RESOURCE_ARN"] = "resource_arn";
     CfnWorkloadIdentityApplicationLogsRecordFields["EVENT_TIMESTAMP"] = "event_timestamp";
 })(CfnWorkloadIdentityApplicationLogsRecordFields || (exports.CfnWorkloadIdentityApplicationLogsRecordFields = CfnWorkloadIdentityApplicationLogsRecordFields = {}));
+/**
+ * Output Format options for each destination of CfnWorkloadIdentityTraces.
+ */
+class CfnWorkloadIdentityTracesOutputFormat {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_bedrockagentcore.mixins.CfnWorkloadIdentityTracesOutputFormat", version: "2.268.0-alpha.0" };
+}
+exports.CfnWorkloadIdentityTracesOutputFormat = CfnWorkloadIdentityTracesOutputFormat;
+var CfnWorkloadIdentityTracesRecordFields;
+(function (CfnWorkloadIdentityTracesRecordFields) {
+    CfnWorkloadIdentityTracesRecordFields["TIMESTAMP"] = "timestamp";
+    CfnWorkloadIdentityTracesRecordFields["RESOURCEARN"] = "resourceArn";
+    CfnWorkloadIdentityTracesRecordFields["TRACE"] = "trace";
+})(CfnWorkloadIdentityTracesRecordFields || (exports.CfnWorkloadIdentityTracesRecordFields = CfnWorkloadIdentityTracesRecordFields = {}));