From 8b0f58b3c2816d66d9cffe3407c688fe6bed1dc7 Mon Sep 17 00:00:00 2001
From: "robin.bygrave" <robin.bygrave@eroad.com>
Date: Wed, 1 Nov 2023 15:20:18 +1300
Subject: [PATCH] Change loadMode to be 'safer' (for Grafana etc). e.g. change
 "(+lazy)" to "__lazy"

The loadMode ends up as a suffix to some query metrics.

For example "foo.findIt_baz(+lazy)", and the (+lazy) part isn't safe/friendly to tools
like Grafana. So change to instead of (+lazy) use __lazy.
---
 .../src/main/java/io/ebeaninternal/api/LoadBeanRequest.java   | 2 +-
 .../src/main/java/io/ebeaninternal/api/LoadManyRequest.java   | 2 +-
 .../java/io/ebeaninternal/server/core/DefaultBeanLoader.java  | 4 ++--
 .../io/ebeaninternal/server/loadcontext/DLoadBaseContext.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
index 112b7d51b..a3da85200 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadBeanRequest.java
@@ -111,7 +111,7 @@ public final class LoadBeanRequest extends LoadRequest {
   }
 
   private String mode() {
-    return lazy ? "+lazy" : loadBuffer.isCache() ? "+cache" : "+query";
+    return lazy ? "lazy" : loadBuffer.isCache() ? "cache" : "query";
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
index 248892d9c..dbf1c1bab 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
@@ -101,7 +101,7 @@ public final class LoadManyRequest extends LoadRequest {
     query.setLazyLoadForParents(many);
     many.addWhereParentIdIn(query, parentIdList(server), loadContext.isUseDocStore());
     query.setPersistenceContext(loadContext.persistenceContext());
-    query.setLoadDescription(lazy ? "+lazy" : "+query", description());
+    query.setLoadDescription(lazy ? "lazy" : "query", description());
     if (lazy) {
       query.setLazyLoadBatchSize(loadContext.batchSize());
     } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 320083f27..cc3966455 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -82,9 +82,9 @@ final class DefaultBeanLoader {
       // populate a new collection
       BeanCollection<?> emptyCollection = many.createEmpty(parentBean);
       many.setValue(parentBean, emptyCollection);
-      query.setLoadDescription("+refresh", null);
+      query.setLoadDescription("refresh", null);
     } else {
-      query.setLoadDescription("+lazy", null);
+      query.setLoadDescription("lazy", null);
     }
 
     query.select(parentDesc.idBinder().idSelect());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
index ca49bdcb3..a1a68dc2e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java
@@ -52,7 +52,7 @@ abstract class DLoadBaseContext {
   void setLabel(SpiQuery<?> query) {
     String label = parent.planLabel();
     if (label != null) {
-      query.setProfilePath(label, fullPath + "(" + query.loadMode() + ")", parent.profileLocation());
+      query.setProfilePath(label, fullPath + "__" + query.loadMode(), parent.profileLocation());
     }
   }