From 3fdcd007d4a1d1b5b5a75fd6be4cc6037f67c959 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Tue, 19 Nov 2024 11:39:56 -0500 Subject: [PATCH 1/8] branch for integ testing --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 785cab54b6c..af27b84ac1e 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ [apache-badge]: https://img.shields.io/badge/License-Apache%202.0-blue.svg [apache-url]: LICENSE +branch for integ testing + ## Getting Started - [SDK Product Page](https://aws.amazon.com/sdk-for-swift/) From 0edfd11884183f77d57da5fe7d0935c9987eeb9c Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Tue, 19 Nov 2024 13:19:23 -0500 Subject: [PATCH 2/8] re-enable transcribe tests --- .../TranscribeStreamingTests.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift index fefad9cefae..b81b594f0d9 100644 --- a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift +++ b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift @@ -25,14 +25,12 @@ final class TranscribeStreamingTests: XCTestCase { // code: 2087, message: "Stream acquisition failed because stream manager failed to acquire a connection" // // Disable this test on the CRT client until these failures can be investigated & corrected. - #if !os(Linux) && !os(Windows) func test_25xConcurrent_streamTranscription() async throws { // By default the TranscribeStreaming service allows 25 concurrent transcriptions. // More than that (which can happen when multiple test runs are being performed) will result // in throttling / resource exceeded errors, which may be retried (see retry logic below.) try await repeatConcurrently(count: 25, test: attempt) } - #endif // MARK: - Private / implementation methods From 0a28aeab73fc4c30c666074bff8d2aed676c3f76 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Tue, 19 Nov 2024 13:20:37 -0500 Subject: [PATCH 3/8] remove readme test --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index af27b84ac1e..785cab54b6c 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ [apache-badge]: https://img.shields.io/badge/License-Apache%202.0-blue.svg [apache-url]: LICENSE -branch for integ testing - ## Getting Started - [SDK Product Page](https://aws.amazon.com/sdk-for-swift/) From 445c8df58fcae27909da2169016e9c53868cd295 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Tue, 19 Nov 2024 14:47:52 -0500 Subject: [PATCH 4/8] get rid of comment --- .../TranscribeStreamingTests.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift index b81b594f0d9..b294cd8e11e 100644 --- a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift +++ b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift @@ -23,8 +23,6 @@ final class TranscribeStreamingTests: XCTestCase { // such as: // code: 2058, message: "The connection has closed or is closing." // code: 2087, message: "Stream acquisition failed because stream manager failed to acquire a connection" - // - // Disable this test on the CRT client until these failures can be investigated & corrected. func test_25xConcurrent_streamTranscription() async throws { // By default the TranscribeStreaming service allows 25 concurrent transcriptions. // More than that (which can happen when multiple test runs are being performed) will result From c3b7b3bbcc42c454dfe770439bf978d1d666734b Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Wed, 20 Nov 2024 12:43:51 -0500 Subject: [PATCH 5/8] initalize logging to trace error --- .../TranscribeStreamingTests.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift index b294cd8e11e..15a25937f32 100644 --- a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift +++ b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift @@ -10,6 +10,7 @@ import AWSIntegrationTestUtils import Foundation import AWSTranscribeStreaming import protocol AWSClientRuntime.AWSServiceError +import AwsCommonRuntimeKit final class TranscribeStreamingTests: XCTestCase { @@ -24,6 +25,7 @@ final class TranscribeStreamingTests: XCTestCase { // code: 2058, message: "The connection has closed or is closing." // code: 2087, message: "Stream acquisition failed because stream manager failed to acquire a connection" func test_25xConcurrent_streamTranscription() async throws { + try Logger.initialize(target: .standardOutput, level: .trace) // By default the TranscribeStreaming service allows 25 concurrent transcriptions. // More than that (which can happen when multiple test runs are being performed) will result // in throttling / resource exceeded errors, which may be retried (see retry logic below.) From 4c7d8247db3b642395e625eb9c3952b0e1308336 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Wed, 20 Nov 2024 14:03:27 -0500 Subject: [PATCH 6/8] remove unnecessary log level --- .../TranscribeStreamingTests.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift index 15a25937f32..bd97b39ca59 100644 --- a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift +++ b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift @@ -25,7 +25,6 @@ final class TranscribeStreamingTests: XCTestCase { // code: 2058, message: "The connection has closed or is closing." // code: 2087, message: "Stream acquisition failed because stream manager failed to acquire a connection" func test_25xConcurrent_streamTranscription() async throws { - try Logger.initialize(target: .standardOutput, level: .trace) // By default the TranscribeStreaming service allows 25 concurrent transcriptions. // More than that (which can happen when multiple test runs are being performed) will result // in throttling / resource exceeded errors, which may be retried (see retry logic below.) From c4307c543308a5dbf9b9caf97435133bf2a94271 Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Fri, 22 Nov 2024 11:30:04 -0500 Subject: [PATCH 7/8] add CRT error as retryable --- .../AWSClientRuntime/Retry/AWSRetryErrorInfoProvider.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Retry/AWSRetryErrorInfoProvider.swift b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Retry/AWSRetryErrorInfoProvider.swift index ac794885b16..6233b76e683 100644 --- a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Retry/AWSRetryErrorInfoProvider.swift +++ b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Retry/AWSRetryErrorInfoProvider.swift @@ -45,6 +45,7 @@ public enum AWSRetryErrorInfoProvider: RetryErrorInfoProvider { private static let transientCRTErrorCodes: [Int32] = [ 2058, // httpConnectionClosed 2070, // httpServerClosed + 2087, // AWS_ERROR_HTTP_STREAM_MANAGER_CONNECTION_ACQUIRE_FAILURE ] // HTTP status codes that the Retry Behavior 2.0 specification say should be treated as transient errors. From cba8fb31b9879a794887abc5c7da787c7c028e4b Mon Sep 17 00:00:00 2001 From: David Yaffe Date: Fri, 22 Nov 2024 11:32:28 -0500 Subject: [PATCH 8/8] cleanup --- .../TranscribeStreamingTests.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift index bd97b39ca59..b294cd8e11e 100644 --- a/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift +++ b/IntegrationTests/Services/AWSTranscribeStreamingIntegrationTests/TranscribeStreamingTests.swift @@ -10,7 +10,6 @@ import AWSIntegrationTestUtils import Foundation import AWSTranscribeStreaming import protocol AWSClientRuntime.AWSServiceError -import AwsCommonRuntimeKit final class TranscribeStreamingTests: XCTestCase {