Merge pull request #2455 from atlanhq/CSA-390

fix(adls): swap Azure HTTP transport from Netty to OkHttp (CSA-390)

Author: cmgrote

gradle/libs.versions.toml

@@ -26,6 +26,7 @@ angus-mail = "2.0.5"
 pkl = "0.31.1"
 adls = "12.26.3"
 azure = "1.18.2"
+azure-core-http-okhttp = "1.13.4"
 guava = "33.6.0-jre"
 openlineage = "1.46.0"
 kotlin = "2.3.20"
@@ -57,6 +58,7 @@ gcs = { module = "com.google.cloud:google-cloud-storage" }
 gcs-control = { module = "com.google.cloud:google-cloud-storage-control" }
 adls = { module = "com.azure:azure-storage-file-datalake", version.ref = "adls" }
 azure-identity = { module = "com.azure:azure-identity", version.ref = "azure" }
+azure-core-http-okhttp = { module = "com.azure:azure-core-http-okhttp", version.ref = "azure-core-http-okhttp" }
 system-stubs = { module = "uk.org.webcompere:system-stubs-testng", version.ref = "system-stubs" }
 fastcsv = { module = "de.siegmar:fastcsv", version.ref = "fastcsv" }
 apache-poi = { module = "org.apache.poi:poi", version.ref = "poi" }

package-toolkit/runtime/build.gradle.kts

@@ -25,8 +25,13 @@ dependencies {
     api(libs.awssdk.sts)
     api(platform(libs.gcs.bom))
     api(libs.gcs)
-    api(libs.azure.identity)
-    api(libs.adls)
+    api(libs.azure.identity) {
+        exclude(group = "com.azure", module = "azure-core-http-netty")
+    }
+    api(libs.adls) {
+        exclude(group = "com.azure", module = "azure-core-http-netty")
+    }
+    api(libs.azure.core.http.okhttp)
     implementation(libs.sqlite)
     implementation(libs.simple.java.mail)
     implementation(libs.log4j.core) // This gives us the OOTB-log4j appenders (that we MUST have for pattern-handling)
@@ -189,7 +194,7 @@ tasks {
             include(dependency("com.microsoft.azure:msal4j-persistence-extension:.*"))
             include(dependency("net.java.dev.jna:jna:.*"))
             include(dependency("net.java.dev.jna:jna-platform:.*"))
-            include(dependency("com.azure:azure-core-http-netty:.*"))
+            include(dependency("com.azure:azure-core-http-okhttp:.*"))
             include(dependency("com.azure:azure-core:.*"))
             include(dependency("com.azure:azure-json:.*"))
             include(dependency("com.azure:azure-storage-blob:.*"))

package-toolkit/runtime/src/main/kotlin/com/atlan/pkg/objectstore/ADLSSync.kt

@@ -2,6 +2,7 @@
    Copyright 2023 Atlan Pte. Ltd. */
 package com.atlan.pkg.objectstore
 
+import com.azure.core.http.okhttp.OkHttpAsyncHttpClientBuilder
 import com.azure.identity.ClientSecretCredentialBuilder
 import com.azure.storage.blob.BlobContainerClient
 import com.azure.storage.blob.BlobContainerClientBuilder
@@ -36,18 +37,21 @@ class ADLSSync(
     private val blobContainerClient: BlobContainerClient?
 
     init {
+        val httpClient = OkHttpAsyncHttpClientBuilder().build()
         if (tenantId.isNotBlank() && clientId.isNotBlank()) {
             logger.info { "Authenticating to ADLS using provided tenant and client IDs and secrets." }
             val credential =
                 ClientSecretCredentialBuilder()
                     .tenantId(tenantId)
                     .clientId(clientId)
                     .clientSecret(clientSecret)
+                    .httpClient(httpClient)
                     .build()
             adlsClient =
                 DataLakeServiceClientBuilder()
                     .endpoint("https://$accountName.dfs.core.windows.net")
                     .credential(credential)
+                    .httpClient(httpClient)
                     .buildClient()
             blobContainerClient = null
         } else {
@@ -61,6 +65,7 @@ class ADLSSync(
                     .endpoint("https://$accountName.blob.core.windows.net")
                     .credential(credential)
                     .containerName(containerName)
+                    .httpClient(httpClient)
                     .buildClient()
             adlsClient = null
         }