chore: Publish v5.0.0 (#139)

Author: github-actions[bot]

code/src/README.md

@@ -0,0 +1,14 @@
+# Welcome to the rapid-sdk SDK!
+
+## Usage
+```xml
+<dependency>
+    <groupId>com.expediagroup</groupId>
+    <artifactId>rapid-sdk</artifactId>
+    <version>5.0.0</version>
+</dependency>
+```
+
+## License
+
+This project is licensed under the Apache License v2.0 - see the [LICENSE](LICENSE) for details.

code/src/main/kotlin/com/expediagroup/sdk/core/client/Client.kt

@@ -50,11 +50,20 @@ import io.ktor.client.engine.HttpClientEngine
 import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.request
+import okhttp3.Dispatcher
+
+// Create a Dispatcher with limits
+val dispatcher =
+    Dispatcher().apply {
+        maxRequests = 10000 // Maximum number of concurrent requests
+        maxRequestsPerHost = 1000
+    }
 
 val DEFAULT_HTTP_CLIENT_ENGINE: HttpClientEngine =
     OkHttp.create {
         config {
             eventListener(OkHttpEventListener)
+            dispatcher(dispatcher)
         }
     }
 

code/src/main/kotlin/com/expediagroup/sdk/core/client/Environment.kt

@@ -22,7 +22,7 @@ import io.ktor.client.request.HttpRequestBuilder
 import io.ktor.http.HttpHeaders
 
 interface EnvironmentProvider {
-    fun HttpRequestBuilder.appendHeaders(transactionId: TransactionId = TransactionId())
+    fun HttpRequestBuilder.appendHeaders(extraHeaders: Map<String, String> = mapOf(HeaderKey.TRANSACTION_ID to TransactionId().dequeue().toString()))
 }
 
 class DefaultEnvironmentProvider(
@@ -35,11 +35,11 @@ class DefaultEnvironmentProvider(
     private val userAgent = "expediagroup-sdk-java-$namespace/${properties["sdk-version"]!!} (Java $javaVersion; $operatingSystemName $operatingSystemVersion)"
 
     @Suppress("MemberVisibilityCanBePrivate")
-    override fun HttpRequestBuilder.appendHeaders(transactionId: TransactionId) {
+    override fun HttpRequestBuilder.appendHeaders(extraHeaders: Map<String, String>) {
         with(headers) {
             append(HttpHeaders.UserAgent, userAgent)
             append(HeaderKey.X_SDK_TITLE, properties["sdk-title"]!!)
-            append(HeaderKey.TRANSACTION_ID, transactionId.dequeue().toString())
+            extraHeaders.forEach { (key, value) -> append(key, value) }
         }
     }
 }

code/src/main/kotlin/com/expediagroup/sdk/core/plugin/logging/ExpediaGroupJsonFieldFilter.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2022 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.expediagroup.sdk.core.plugin.logging
+
+import com.ebay.ejmask.core.BaseFilter
+
+internal class ExpediaGroupJsonFieldFilter(maskedFields: Array<String>) : BaseFilter(
+    ExpediaGroupJsonFieldPatternBuilder::class.java,
+    *maskedFields
+)

code/src/main/kotlin/com/expediagroup/sdk/core/plugin/logging/ExpediaGroupJsonFieldPatternBuilder.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 Expedia, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.expediagroup.sdk.core.plugin.logging
+
+import com.ebay.ejmask.extenstion.builder.json.JsonFieldPatternBuilder
+import com.expediagroup.sdk.core.constant.LoggingMessage.OMITTED
+
+internal class ExpediaGroupJsonFieldPatternBuilder : JsonFieldPatternBuilder() {
+    override fun buildReplacement(
+        visibleCharacters: Int,
+        vararg fieldNames: String?
+    ): String = "\"$1$2$OMITTED\""
+}

code/src/main/kotlin/com/expediagroup/sdk/core/plugin/logging/ExpediaGroupLogger.kt

@@ -21,6 +21,8 @@ import com.expediagroup.sdk.core.constant.LoggingMessage.LOGGING_PREFIX
 import org.slf4j.Logger
 
 internal class ExpediaGroupLogger(private val logger: Logger, private val client: Client? = null) : Logger by logger {
+    private val mask = LogMasker(getMaskedBodyFieldFilters())
+
     override fun info(msg: String) {
         if (logger.isInfoEnabled) {
             logger.info(decorate(msg))
@@ -39,7 +41,12 @@ internal class ExpediaGroupLogger(private val logger: Logger, private val client
         }
     }
 
-    private fun decorate(msg: String): String = "$LOGGING_PREFIX ${mask(msg, getMaskedBodyFields())}"
+    private fun decorate(msg: String): String = "$LOGGING_PREFIX ${mask(msg)}"
 
     private fun getMaskedBodyFields(): Set<String> = client?.getLoggingMaskedFieldsProvider()?.getMaskedBodyFields() ?: LogMaskingFields.DEFAULT_MASKED_BODY_FIELDS
+
+    private fun getMaskedBodyFieldFilters(): Iterable<ExpediaGroupJsonFieldFilter> =
+        listOf(
+            ExpediaGroupJsonFieldFilter(getMaskedBodyFields().toTypedArray())
+        )
 }

code/src/main/kotlin/com/expediagroup/sdk/core/plugin/logging/LogMasker.kt

@@ -15,28 +15,18 @@
  */
 package com.expediagroup.sdk.core.plugin.logging
 
-import com.expediagroup.sdk.core.constant.LogMaskingRegex.NUMBER_FIELD_REGEX
-import com.expediagroup.sdk.core.constant.LoggingMessage.OMITTED
-import com.expediagroup.sdk.core.constant.provider.LogMaskingRegexProvider.getMaskedFieldsRegex
+import com.ebay.ejmask.core.BaseFilter
+import com.ebay.ejmask.core.EJMask
+import com.ebay.ejmask.core.EJMaskInitializer
+import com.ebay.ejmask.core.util.LoggerUtil
 
-internal fun mask(
-    message: String,
-    maskedBodyFields: Set<String>
-): String = masks.fold(message) { acc, mask -> mask.mask(acc, maskedBodyFields) }
+internal class LogMasker(
+    filters: Iterable<BaseFilter>
+) : (String) -> String {
+    init {
+        LoggerUtil.register { _, _, _ -> /* disable logging */ }
+        filters.forEach { EJMaskInitializer.addFilter(it) }
+    }
 
-internal fun interface Mask {
-    fun getRegex(maskedBodyFields: Set<String>): Regex
-
-    fun mask(
-        string: String,
-        maskedBodyFields: Set<String>
-    ): String = string.replace(this.getRegex(maskedBodyFields)) { maskSubstring(it.value) }
-
-    fun maskSubstring(string: String) = OMITTED
+    override fun invoke(message: String): String = EJMask.mask(message)
 }
-
-internal val masks: List<Mask> =
-    listOf(
-        Mask(::getMaskedFieldsRegex),
-        Mask { NUMBER_FIELD_REGEX }
-    )