Merge pull request #1149 from atlanhq/FT-864

Force consistent versions of open telemetry dependencies
atlanhq · Dec 13, 2024 · b578c42 · b578c42
2 parents 25338d2 + c7fcf7f
commit b578c42
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,6 +35,8 @@ configurations.all {
             libs.commons.io,
             libs.jetty.http,
             libs.netty.common,
+            libs.otel.sdk,
+            libs.otel.exporter,
         )
     }
 }
diff --git a/buildSrc/src/main/kotlin/com.atlan.kotlin-custom-package.gradle.kts b/buildSrc/src/main/kotlin/com.atlan.kotlin-custom-package.gradle.kts
@@ -94,6 +94,8 @@ configurations.all {
             versionCatalogs.named("libs").findLibrary("guava").orElseThrow(::AssertionError),
             versionCatalogs.named("libs").findLibrary("commons-compress").orElseThrow(::AssertionError),
             versionCatalogs.named("libs").findLibrary("commons-io").orElseThrow(::AssertionError),
+            versionCatalogs.named("libs").findLibrary("otel-sdk").orElseThrow(::AssertionError),
+            versionCatalogs.named("libs").findLibrary("otel-exporter").orElseThrow(::AssertionError),
         )
     }
 }

diff --git a/buildSrc/src/main/kotlin/com.atlan.kotlin.gradle.kts b/buildSrc/src/main/kotlin/com.atlan.kotlin.gradle.kts
@@ -43,6 +43,8 @@ configurations.all {
             versionCatalogs.named("libs").findLibrary("guava").orElseThrow(::AssertionError),
             versionCatalogs.named("libs").findLibrary("commons-compress").orElseThrow(::AssertionError),
             versionCatalogs.named("libs").findLibrary("commons-io").orElseThrow(::AssertionError),
+            versionCatalogs.named("libs").findLibrary("otel-sdk").orElseThrow(::AssertionError),
+            versionCatalogs.named("libs").findLibrary("otel-exporter").orElseThrow(::AssertionError),
         )
     }
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,20 +1,20 @@
 [versions]
 jackson = "2.18.2"
 slf4j = "2.0.16"
-elasticsearch = "8.16.1"
+elasticsearch = "8.17.0"
 freemarker = "2.3.33"
 classgraph = "4.8.179"
 testng = "7.10.2"
 log4j = "2.24.2"
 wiremock = "3.10.0"
 jnanoid = "2.0.0"
-awssdk = "2.29.32"
+awssdk = "2.29.33"
 gcs = "26.51.0"
 system-stubs = "2.1.7"
 fastcsv = "3.4.0"
 poi = "5.3.0"
 parsson = "1.1.7"
-simplejavamail = "8.12.3"
+simplejavamail = "8.12.4"
 swagger = "2.1.24"
 jsonpath = "2.9.0"
 commons-compress = "1.27.1"
@@ -32,8 +32,8 @@ kotlin-mu = "3.0.5"
 rocksdb = "9.7.3"
 jetty = "12.0.16"
 netty = "4.1.115.Final"
-otel = "1.44.1"
-otel-appender = "2.10.0-alpha"
+otel = "1.42.1"
+otel-appender = "1.33.6-alpha"
 
 [libraries]
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }