NH-57065: automagically set otel log exporting configs when enabled

solarwinds · Jul 3, 2024 · 6297c2c · 6297c2c
1 parent aef1de6
commit 6297c2c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/benchmark/src/test/java/io/opentelemetry/containers/CollectorContainer.java b/benchmark/src/test/java/io/opentelemetry/containers/CollectorContainer.java
@@ -30,10 +30,6 @@ public static GenericContainer<?> build(Network network) {
         .withNetworkAliases("collector")
         .withLogConsumer(new Slf4jLogConsumer(logger))
         .withExposedPorts(COLLECTOR_PORT, COLLECTOR_HEALTH_CHECK_PORT)
-        .waitingFor(
-            Wait.forHttp("/health")
-                .forPort(COLLECTOR_HEALTH_CHECK_PORT)
-                .withReadTimeout(Duration.ofMinutes(5)))
         .withCopyFileToContainer(
             MountableFile.forClasspathResource("collector.yaml"), "/etc/otel.yaml")
         .withCommand("--config /etc/otel.yaml");

diff --git a/smoke-tests/netty-test/build.gradle.kts b/smoke-tests/netty-test/build.gradle.kts
@@ -1,4 +1,7 @@
-import groovy.json.JsonSlurper
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonPrimitive
 import java.net.URI
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
@@ -26,6 +29,12 @@ plugins {
     id("de.undercouch.download") version "5.5.0"
 }
 
+buildscript {
+  dependencies {
+    classpath("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
+  }
+}
+
 group = "com.solarwinds"
 version = "unspecified"
 
@@ -57,12 +66,14 @@ fun getAgentUrlFromGitRelease(): String {
     .GET().build()
 
   val httpResponse = httpClient.send(request, HttpResponse.BodyHandlers.ofString())
-  val payload = JsonSlurper().parseText(httpResponse.body()) as List<Map<String, Any?>>
+  val payload = Json.decodeFromString<JsonArray>(httpResponse.body())
 
   // The latest release is assumed to be the first item in the list
-  val latest = payload[0]
-  val assets = latest["assets"] as List<Map<String, *>>
-  return assets[0]["url"] as String
+  val latest = payload[0] as JsonObject
+  val assets = latest["assets"] as JsonArray
+  val asset = assets[0] as JsonObject
+  println(asset)
+  return asset["url"]!!.jsonPrimitive.content
 }
 
 application {