feat(i18n): 번역 제공자 호출에 취소 제어와 시간 제한을 추가한다
This commit is contained in:
+3
@@ -47,6 +47,9 @@ class AwsLanguageProviderConfigurationTest {
|
||||
clients.forEach { client ->
|
||||
val configuration = client.serviceClientConfiguration()
|
||||
assertEquals(Region.AP_NORTHEAST_2, configuration.region())
|
||||
assertTrue(
|
||||
configuration.overrideConfiguration().executionInterceptors().any { it is AwsTranslationCallInterceptor }
|
||||
)
|
||||
assertTrue(configuration.credentialsProvider() is StaticCredentialsProvider)
|
||||
val credentials = (configuration.credentialsProvider() as StaticCredentialsProvider).resolveCredentials()
|
||||
assertEquals("test-access-key", credentials.accessKeyId())
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package kr.co.vividnext.sodalive.i18n.translation
|
||||
|
||||
import software.amazon.awssdk.thirdparty.jackson.dataformat.cbor.CBORFactory
|
||||
import java.io.ByteArrayOutputStream
|
||||
|
||||
fun awsTestHttpResponse(vararg fields: Pair<String, String>): ByteArray {
|
||||
val bytes = ByteArrayOutputStream()
|
||||
CBORFactory().createGenerator(bytes).use { writer ->
|
||||
writer.writeStartObject()
|
||||
fields.forEach { (key, value) -> writer.writeStringField(key, value) }
|
||||
writer.writeEndObject()
|
||||
}
|
||||
return bytes.toByteArray()
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package kr.co.vividnext.sodalive.i18n.translation
|
||||
|
||||
import com.sun.net.httpserver.HttpServer
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Assertions.assertThrows
|
||||
import org.junit.jupiter.api.DisplayName
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.springframework.test.util.ReflectionTestUtils
|
||||
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
|
||||
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
|
||||
import software.amazon.awssdk.regions.Region
|
||||
import software.amazon.awssdk.services.comprehend.ComprehendClient
|
||||
import java.net.InetSocketAddress
|
||||
import java.net.URI
|
||||
import java.util.concurrent.Callable
|
||||
import java.util.concurrent.CountDownLatch
|
||||
import java.util.concurrent.Executors
|
||||
import java.util.concurrent.TimeUnit
|
||||
import java.util.concurrent.atomic.AtomicBoolean
|
||||
import java.util.concurrent.atomic.AtomicInteger
|
||||
|
||||
class ControlledDetectionHttpIntegrationTest {
|
||||
@Test
|
||||
@DisplayName("관리자 감지의 실제 Comprehend 재시도도 취소 후 전송하지 않는다")
|
||||
fun shouldFenceComprehendHttpRetries() {
|
||||
val cancelled = AtomicBoolean()
|
||||
val calls = AtomicInteger()
|
||||
val server = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
|
||||
server.createContext("/") { exchange ->
|
||||
calls.incrementAndGet()
|
||||
cancelled.set(true)
|
||||
val body = awsTestHttpResponse("__type" to "InternalServerException")
|
||||
exchange.responseHeaders.set("Content-Type", "application/cbor")
|
||||
exchange.sendResponseHeaders(500, body.size.toLong())
|
||||
exchange.responseBody.use { it.write(body) }
|
||||
}
|
||||
server.start()
|
||||
try {
|
||||
ComprehendClient.builder().endpointOverride(URI("http://127.0.0.1:${server.address.port}"))
|
||||
.region(Region.AP_NORTHEAST_2)
|
||||
.credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("test", "test")))
|
||||
.overrideConfiguration { it.addExecutionInterceptor(AwsTranslationCallInterceptor()) }
|
||||
.build().use { client ->
|
||||
assertThrows(TranslationCallStopped::class.java) {
|
||||
AwsLanguageDetectionProvider(client).detect("source", TranslationCallControl({ !cancelled.get() }))
|
||||
}
|
||||
}
|
||||
assertEquals(1, calls.get())
|
||||
} finally { server.stop(0) }
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("Papago 관리자 감지는 HTTP read timeout이 있고 취소된 gate에서는 호출하지 않는다")
|
||||
fun shouldBoundPapagoDetectionAndDenyCancelledDispatch() {
|
||||
val calls = AtomicInteger()
|
||||
val release = CountDownLatch(1)
|
||||
val server = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
|
||||
server.createContext("/") { calls.incrementAndGet(); release.await(5, TimeUnit.SECONDS); it.close() }
|
||||
server.start()
|
||||
val executor = Executors.newSingleThreadExecutor()
|
||||
try {
|
||||
val service = PapagoLanguageDetectionProvider("test", "test", 100, 100)
|
||||
ReflectionTestUtils.setField(service, "papagoDetectUrl", "http://127.0.0.1:${server.address.port}/")
|
||||
assertThrows(TranslationCallStopped::class.java) { service.detect("source", TranslationCallControl({ false })) }
|
||||
assertEquals(0, calls.get())
|
||||
val result = executor.submit(
|
||||
Callable {
|
||||
assertThrows(org.springframework.web.client.ResourceAccessException::class.java) {
|
||||
service.detect("source", TranslationCallControl({ true }))
|
||||
}
|
||||
}
|
||||
)
|
||||
result.get(2, TimeUnit.SECONDS)
|
||||
assertEquals(1, calls.get())
|
||||
} finally { release.countDown(); executor.shutdownNow(); server.stop(0) }
|
||||
}
|
||||
}
|
||||
+188
@@ -0,0 +1,188 @@
|
||||
package kr.co.vividnext.sodalive.i18n.translation
|
||||
|
||||
import com.sun.net.httpserver.HttpServer
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Assertions.assertThrows
|
||||
import org.junit.jupiter.api.Assertions.assertTrue
|
||||
import org.junit.jupiter.api.DisplayName
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.springframework.test.util.ReflectionTestUtils
|
||||
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
|
||||
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
|
||||
import software.amazon.awssdk.regions.Region
|
||||
import software.amazon.awssdk.services.translate.TranslateClient
|
||||
import java.net.InetSocketAddress
|
||||
import java.net.URI
|
||||
import java.time.Duration
|
||||
import java.util.concurrent.Callable
|
||||
import java.util.concurrent.CountDownLatch
|
||||
import java.util.concurrent.Executors
|
||||
import java.util.concurrent.TimeUnit
|
||||
import java.util.concurrent.atomic.AtomicBoolean
|
||||
import java.util.concurrent.atomic.AtomicInteger
|
||||
|
||||
class ControlledProviderHttpIntegrationTest {
|
||||
@Test
|
||||
@DisplayName("제어 없는 일반 AWS 호출은 기존 SDK retry로 실패 뒤 성공한다")
|
||||
fun shouldPreserveOrdinarySdkRetries() {
|
||||
val calls = AtomicInteger()
|
||||
val server = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
|
||||
server.createContext("/") { exchange ->
|
||||
val first = calls.incrementAndGet() == 1
|
||||
exchange.requestBody.close()
|
||||
val body = if (first) {
|
||||
awsTestHttpResponse("__type" to "InternalServerException")
|
||||
} else {
|
||||
awsTestHttpResponse("TranslatedText" to "translated", "SourceLanguageCode" to "ko", "TargetLanguageCode" to "en")
|
||||
}
|
||||
exchange.responseHeaders.set("Content-Type", "application/cbor")
|
||||
exchange.sendResponseHeaders(if (first) 500 else 200, body.size.toLong())
|
||||
exchange.responseBody.use { it.write(body) }
|
||||
}
|
||||
server.start()
|
||||
try {
|
||||
TranslateClient.builder().endpointOverride(URI("http://127.0.0.1:${server.address.port}"))
|
||||
.region(Region.AP_NORTHEAST_2)
|
||||
.credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("test", "test")))
|
||||
.overrideConfiguration { it.addExecutionInterceptor(AwsTranslationCallInterceptor()) }
|
||||
.build().use {
|
||||
val result = AwsTranslationService(it).translate(TranslateRequest(listOf("source"), "ko", "en"))
|
||||
assertEquals(listOf("translated"), result.translatedText)
|
||||
}
|
||||
assertEquals(2, calls.get())
|
||||
} finally { server.stop(0) }
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("실제 AWS SDK retry는 취소 후 두 번째 HTTP 전송 전에 차단된다")
|
||||
fun shouldPreventSecondAwsSdkHttpRetryAfterCancel() {
|
||||
val cancelled = AtomicBoolean()
|
||||
val calls = AtomicInteger()
|
||||
val server = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
|
||||
server.createContext("/") { exchange ->
|
||||
calls.incrementAndGet()
|
||||
exchange.requestBody.close()
|
||||
cancelled.set(true)
|
||||
val body = awsTestHttpResponse("__type" to "InternalServerException", "message" to "test")
|
||||
exchange.responseHeaders.set("Content-Type", "application/cbor")
|
||||
exchange.sendResponseHeaders(500, body.size.toLong())
|
||||
exchange.responseBody.use { it.write(body) }
|
||||
}
|
||||
server.start()
|
||||
try {
|
||||
TranslateClient.builder().endpointOverride(URI("http://127.0.0.1:${server.address.port}"))
|
||||
.region(Region.AP_NORTHEAST_2)
|
||||
.credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("test", "test")))
|
||||
.overrideConfiguration { it.addExecutionInterceptor(AwsTranslationCallInterceptor()) }
|
||||
.build().use { client ->
|
||||
assertThrows(TranslationCallStopped::class.java) {
|
||||
AwsTranslationService(client).translate(
|
||||
TranslateRequest(
|
||||
listOf("source"),
|
||||
"ko",
|
||||
"en",
|
||||
callControl = TranslationCallControl({ !cancelled.get() })
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
assertEquals(1, calls.get())
|
||||
} finally { server.stop(0) }
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("Papago 실제 HTTP 첫 chunk 뒤 취소하면 다음 chunk는 전송하지 않는다")
|
||||
fun shouldPreventNextPapagoHttpChunkAfterCancel() {
|
||||
val cancelled = AtomicBoolean()
|
||||
val calls = AtomicInteger()
|
||||
val server = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
|
||||
server.createContext("/") { exchange ->
|
||||
calls.incrementAndGet()
|
||||
exchange.requestBody.close()
|
||||
cancelled.set(true)
|
||||
val body = """{"message":{"result":{"srcLangType":"ko","tarLangType":"en","translatedText":"first"}}}""".toByteArray()
|
||||
exchange.responseHeaders.set("Content-Type", "application/json")
|
||||
exchange.sendResponseHeaders(200, body.size.toLong())
|
||||
exchange.responseBody.use { it.write(body) }
|
||||
}
|
||||
server.start()
|
||||
try {
|
||||
val service = PapagoTranslationService("test", "test")
|
||||
ReflectionTestUtils.setField(service, "papagoTranslateUrl", "http://127.0.0.1:${server.address.port}/")
|
||||
assertThrows(TranslationCallStopped::class.java) {
|
||||
service.translate(
|
||||
TranslateRequest(
|
||||
listOf("a".repeat(5001)),
|
||||
"ko",
|
||||
"en",
|
||||
callControl = TranslationCallControl({ !cancelled.get() })
|
||||
)
|
||||
)
|
||||
}
|
||||
assertEquals(1, calls.get())
|
||||
} finally { server.stop(0) }
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("관리자 Papago read timeout은 로컬 서버가 응답을 보류해도 호출을 종결한다")
|
||||
fun shouldBoundPapagoAdminReadWithoutChangingOrdinaryTransport() {
|
||||
val release = CountDownLatch(1)
|
||||
val entered = CountDownLatch(1)
|
||||
val server = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
|
||||
server.createContext("/") {
|
||||
entered.countDown()
|
||||
release.await(5, TimeUnit.SECONDS)
|
||||
it.close()
|
||||
}
|
||||
server.start()
|
||||
val executor = Executors.newSingleThreadExecutor()
|
||||
try {
|
||||
val service = PapagoTranslationService("test", "test", 100, 100)
|
||||
ReflectionTestUtils.setField(service, "papagoTranslateUrl", "http://127.0.0.1:${server.address.port}/")
|
||||
val result = executor.submit(
|
||||
Callable {
|
||||
assertThrows(TranslationProviderFailed::class.java) {
|
||||
service.translate(
|
||||
TranslateRequest(listOf("source"), "ko", "en", callControl = TranslationCallControl({ true }))
|
||||
)
|
||||
}.message
|
||||
}
|
||||
)
|
||||
assertTrue(entered.await(2, TimeUnit.SECONDS))
|
||||
assertEquals("PROVIDER_FAILED", result.get(2, TimeUnit.SECONDS))
|
||||
} finally { release.countDown(); executor.shutdownNow(); server.stop(0) }
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("AWS 관리자 API timeout은 응답을 보류한 실제 HTTP 호출을 종결한다")
|
||||
fun shouldBoundAwsAdminApiCall() {
|
||||
val release = CountDownLatch(1)
|
||||
val server = HttpServer.create(InetSocketAddress("127.0.0.1", 0), 0)
|
||||
server.createContext("/") { release.await(5, TimeUnit.SECONDS); it.close() }
|
||||
server.start()
|
||||
val executor = Executors.newSingleThreadExecutor()
|
||||
try {
|
||||
TranslateClient.builder().endpointOverride(URI("http://127.0.0.1:${server.address.port}"))
|
||||
.region(Region.AP_NORTHEAST_2)
|
||||
.credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("test", "test")))
|
||||
.overrideConfiguration { it.addExecutionInterceptor(AwsTranslationCallInterceptor()) }
|
||||
.build().use { client ->
|
||||
val result = executor.submit(
|
||||
Callable {
|
||||
assertThrows(TranslationProviderFailed::class.java) {
|
||||
AwsTranslationService(client).translate(
|
||||
TranslateRequest(
|
||||
listOf("source"),
|
||||
"ko",
|
||||
"en",
|
||||
callControl = TranslationCallControl({ true }, Duration.ofMillis(150))
|
||||
)
|
||||
)
|
||||
}.message
|
||||
}
|
||||
)
|
||||
assertEquals("PROVIDER_FAILED", result.get(3, TimeUnit.SECONDS))
|
||||
}
|
||||
} finally { release.countDown(); executor.shutdownNow(); server.stop(0) }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user