save message body and username when handling invocations

jadevogt · Sep 17, 2023 · 93f7c3d · 93f7c3d
1 parent 0ff7cc6
commit 93f7c3d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>best.tigers</groupId>
     <artifactId>tigersbot</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <properties>
         <maven.compiler.source>19</maven.compiler.source>
         <maven.compiler.target>19</maven.compiler.target>

diff --git a/src/main/java/best/tigers/tigersbot/handlers/GptHandler.java b/src/main/java/best/tigers/tigersbot/handlers/GptHandler.java
@@ -26,18 +26,10 @@ public void handle(Message message) {
             return;
         }
         if (message.text().startsWith("/gpt4 ")) {
-            var span = ElasticApm.currentTransaction().startSpan("external", "openai", "chatcompletion");
-            try {
-                showTypingIndicator();
-                var prompt = message.text().split("/gpt4 ")[1].strip();
-                var completion = completionService.getAdvancedCompletion(prompt, message.from().username());
-                sendReplyMessage(message, completion);
-            } catch (Throwable e) {
-                span.captureException(e);
-                throw e;
-            } finally {
-                span.end();
-            }
+            showTypingIndicator();
+            var prompt = message.text().split("/gpt4 ")[1].strip();
+            var completion = completionService.getAdvancedCompletion(prompt, message.from().username());
+            sendReplyMessage(message, completion);
             return;
         }
         if (message.text().startsWith("/pissed ")) {

diff --git a/src/main/java/best/tigers/tigersbot/services/BotService.java b/src/main/java/best/tigers/tigersbot/services/BotService.java
@@ -59,6 +59,8 @@ private void processUpdate(Update update) {
                 try (Scope scope = transaction.activate()){
                     transaction.setName(handler.getClass().getSimpleName());
                     transaction.setType(Transaction.TYPE_REQUEST);
+                    transaction.setLabel("username", message.from().username());
+                    transaction.setLabel("message_body", message.text());
                     handler.handle(message);
                 } catch (Throwable e) {
                     transaction.captureException(e);

diff --git a/src/main/java/best/tigers/tigersbot/services/ImagesService.java b/src/main/java/best/tigers/tigersbot/services/ImagesService.java
@@ -37,11 +37,14 @@ public String getImage(String query) {
         var span = ElasticApm.currentTransaction().startSpan("external", "googleimages", "query");
         try {
             span.setName("Get Google Image");
+            span.setLabel("image_query", query);
             var conn = getConnection(query);
             if (conn == null) {
                 return "";
             }
-            return getImageLink(conn);
+            String imageLink = getImageLink(conn);
+            span.setLabel("image_link", imageLink);
+            return imageLink;
         } catch (Throwable e) {
             span.captureException(e);
             throw e;