From 8d282754d6754b562bed9b517b0ea18a9e749045 Mon Sep 17 00:00:00 2001
From: CleverChuk <chubiyke@gmail.com>
Date: Wed, 10 May 2023 11:31:39 -0400
Subject: [PATCH] - release-0.15.5

---
 build.gradle                                               | 4 ++--
 .../opentelemetry/extensions/AppOpticsAgentListener.java   | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 01e32ac4..4ba6877b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,8 +27,8 @@ subprojects {
                 opentelemetryJavaagent: "1.25.0",
                 bytebuddy             : "1.12.10",
                 guava                 : "30.1-jre",
-                appopticsCore         : "7.8.4",
-                agent                 : "0.15.4", // the custom distro agent version
+                appopticsCore         : "7.8.5",
+                agent                 : "0.15.5", // the custom distro agent version
                 autoservice           : "1.0.1",
         ]
         versions.appopticsMetrics = "${versions.appopticsCore}" // they share the same version now
diff --git a/custom/src/main/java/com/appoptics/opentelemetry/extensions/AppOpticsAgentListener.java b/custom/src/main/java/com/appoptics/opentelemetry/extensions/AppOpticsAgentListener.java
index df8ab71b..d12d5731 100644
--- a/custom/src/main/java/com/appoptics/opentelemetry/extensions/AppOpticsAgentListener.java
+++ b/custom/src/main/java/com/appoptics/opentelemetry/extensions/AppOpticsAgentListener.java
@@ -9,10 +9,7 @@
 import com.tracelytics.joboe.config.ConfigProperty;
 import com.tracelytics.joboe.config.InvalidConfigException;
 import com.tracelytics.joboe.config.ProfilerSetting;
-import com.tracelytics.joboe.rpc.Client;
-import com.tracelytics.joboe.rpc.ClientException;
-import com.tracelytics.joboe.rpc.ClientLoggingCallback;
-import com.tracelytics.joboe.rpc.RpcClientManager;
+import com.tracelytics.joboe.rpc.*;
 import com.tracelytics.joboe.settings.SettingsManager;
 import com.tracelytics.logging.Logger;
 import com.tracelytics.logging.LoggerFactory;
@@ -239,7 +236,7 @@ public void run() {
                 if (EventImpl.getEventReporter() != null) {
                     EventImpl.getEventReporter().close(); //close event reporter properly to give it chance to send out pending events in queue
                 }
-                RpcClientManager.closeAllManagers(); //close all rpc client, this should flush out all messages or stop immediately (if not connected)
+                ClientManagerProvider.closeAllManagers(); //close all rpc client, this should flush out all messages or stop immediately (if not connected)
             }
         };