CUST-110209: remove joboe logging from SDK and remove relocating of J…

…UL to avoid runtime failure when agent is not attached.
solarwinds · Aug 20, 2024 · 5a747d3 · 5a747d3
1 parent 2dacba9
commit 5a747d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/gradle/shadow.gradle b/gradle/shadow.gradle
@@ -17,8 +17,6 @@
 ext.relocatePackages = { shadowJar ->
   // Prevents conflict with other SLF4J instances. Important for premain.
   shadowJar.relocate 'org.slf4j', 'io.opentelemetry.javaagent.slf4j'
-  // rewrite dependencies calling Logger.getLogger
-  shadowJar.relocate 'java.util.logging.Logger', 'io.opentelemetry.javaagent.bootstrap.PatchLogger'
 
   // prevents conflict with library instrumentation, since these classes live in the bootstrap class loader
   shadowJar.relocate("io.opentelemetry.instrumentation", "io.opentelemetry.javaagent.shaded.instrumentation") {

diff --git a/solarwinds-otel-sdk/build.gradle b/solarwinds-otel-sdk/build.gradle
@@ -34,9 +34,7 @@ dependencies {
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:${versions.opentelemetryJavaagentAlpha}")
 
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions.opentelemetryJavaagent}")
-  implementation "com.solarwinds.joboe:logging:${versions.joboe}"
 
-  testImplementation project(path: ":bootstrap")
   testImplementation 'org.mockito:mockito-core:5.3.0'
   testImplementation 'org.mockito:mockito-junit-jupiter:5.3.0'
 

diff --git a/solarwinds-otel-sdk/src/main/java/com/solarwinds/api/ext/SolarwindsAgent.java b/solarwinds-otel-sdk/src/main/java/com/solarwinds/api/ext/SolarwindsAgent.java
@@ -16,15 +16,14 @@
 
 package com.solarwinds.api.ext;
 
-import com.solarwinds.joboe.logging.Logger;
-import com.solarwinds.joboe.logging.LoggerFactory;
 import com.solarwinds.opentelemetry.core.AgentState;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
 
 public class SolarwindsAgent {
   private SolarwindsAgent() {}
 
-  private static final Logger logger = LoggerFactory.getLogger();
+  private static final Logger logger = Logger.getLogger(SolarwindsAgent.class.getName());
 
   private static boolean agentAttached = false;
 
@@ -35,7 +34,7 @@ private SolarwindsAgent() {}
       agentAttached = true;
 
     } catch (ClassNotFoundException | NoClassDefFoundError | NoSuchMethodError e) {
-      logger.warn("The SolarWinds APM Agent is not available. The SDK will be no-op.");
+      logger.warning("The SolarWinds APM Agent is not available. The SDK will be no-op.");
     }
   }