From c3e2eb322d7adb337065e0278fb9f2cbe38c4d72 Mon Sep 17 00:00:00 2001
From: Ben Donnelly <b.w.donnelly1@googlemail.com>
Date: Mon, 5 Feb 2024 21:50:36 +0000
Subject: [PATCH 1/3] fix(logging): update log config to remove junk logs

---
 .../main/java/com/intergral/deep/agent/logging/Logger.java  | 5 +++++
 .../intergral/deep/agent/tracepoint/inst/asm/Visitor.java   | 6 +++---
 agent/src/main/resources/deep_settings.properties           | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/agent/src/main/java/com/intergral/deep/agent/logging/Logger.java b/agent/src/main/java/com/intergral/deep/agent/logging/Logger.java
index fa705d7..13971ed 100644
--- a/agent/src/main/java/com/intergral/deep/agent/logging/Logger.java
+++ b/agent/src/main/java/com/intergral/deep/agent/logging/Logger.java
@@ -41,6 +41,11 @@ private Logger() {
    * @param settings the settings for deep
    */
   public static void configureLogging(final Settings settings) {
+    final java.util.logging.Logger loggerRelocated = java.util.logging.Logger.getLogger("com.intergral.deep.relocated");
+    loggerRelocated.setUseParentHandlers(false);
+    final Level relocatedLevel = settings.getSettingAs("logging.level.relocated", Level.class);
+    loggerRelocated.setLevel(relocatedLevel);
+
     final java.util.logging.Logger logger = java.util.logging.Logger.getLogger("com.intergral");
     logger.setUseParentHandlers(false);
     final ConsoleHandler handler = new ConsoleHandler();
diff --git a/agent/src/main/java/com/intergral/deep/agent/tracepoint/inst/asm/Visitor.java b/agent/src/main/java/com/intergral/deep/agent/tracepoint/inst/asm/Visitor.java
index 0a51715..deb2d2b 100644
--- a/agent/src/main/java/com/intergral/deep/agent/tracepoint/inst/asm/Visitor.java
+++ b/agent/src/main/java/com/intergral/deep/agent/tracepoint/inst/asm/Visitor.java
@@ -900,7 +900,7 @@ private void processLocalVariables(final Set<Label> seenLabels,
                 continue;
               }
               // map.put('var name', var)
-              LOGGER.debug("visitMethod {} {} Adding variable {}", classname, name, l.name);
+              LOGGER.trace("visitMethod {} {} Adding variable {}", classname, name, l.name);
               hook.add(new InsnNode(DUP)); // we need a ptr to our map
               hook.add(new LdcInsnNode(l.name)); // key
               hook.add(loadVariable(Type.getType(l.desc), l.index)); // value
@@ -912,7 +912,7 @@ private void processLocalVariables(final Set<Label> seenLabels,
                   false));
               hook.add(new InsnNode(POP)); // dont care about return
             } else {
-              LOGGER.debug("visitMethod {} {} Skipping variable {}", classname, name, l.name);
+              LOGGER.trace("visitMethod {} {} Skipping variable {}", classname, name, l.name);
             }
           }
         }
@@ -924,7 +924,7 @@ private void processLocalVariables(final Set<Label> seenLabels,
             // map.put('param name', param);
             final Type argumentType = argumentTypes[i];
             final String pramName = "param" + i;
-            LOGGER.debug("visitMethod {} {} Adding variable {}", classname, name, pramName);
+            LOGGER.trace("visitMethod {} {} Adding variable {}", classname, name, pramName);
             hook.add(new InsnNode(DUP)); // we need a ptr to our map
             hook.add(new LdcInsnNode(pramName)); // key
             hook.add(loadVariable(argumentType, i + 1)); // value
diff --git a/agent/src/main/resources/deep_settings.properties b/agent/src/main/resources/deep_settings.properties
index e286372..2e75c45 100644
--- a/agent/src/main/resources/deep_settings.properties
+++ b/agent/src/main/resources/deep_settings.properties
@@ -16,6 +16,7 @@
 #
 # the level of logging for all thing deep
 logging.level=OFF
+logging.level.relocated=OFF
 # an optional path to the file to log to (or JUL file handler patten)
 logging.path=
 # the interval between calls to poll for tracepoints

From 7b345ebec508ae66d2b8023c3621500b401e8b49 Mon Sep 17 00:00:00 2001
From: Ben Donnelly <b.w.donnelly1@googlemail.com>
Date: Tue, 6 Feb 2024 14:48:49 +0000
Subject: [PATCH 2/3] chore(build): update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 453adb5..35db860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # main - Unreleased
- - **[FEATURE]**: plugin: Add plugin for Otel [#87](https://github.com/intergral/deep/pull/87) [@Umaaz](https://github.com/Umaaz)
- - **[FEATURE]**: traces: Add apis for creating traces from tracepoints [#87](https://github.com/intergral/deep/pull/87) [@Umaaz](https://github.com/Umaaz)
- - **[BUGFIX]**: fix issue with SPI loading failing [#92](https://github.com/intergral/deep/pull/92) [@Umaaz](https://github.com/Umaaz)
- - **[BUGFIX]**: fix issue with method entry tracepoings [#91](https://github.com/intergral/deep/pull/91) [@Umaaz](https://github.com/Umaaz)
+- **[CHANGE]**: change log config to allow better control of logging [#103](https://github.com/intergral/deep/pull/103) [@Umaaz](https://github.com/Umaaz)
+- **[FEATURE]**: plugin: Add plugin for Otel [#87](https://github.com/intergral/deep/pull/87) [@Umaaz](https://github.com/Umaaz)
+- **[FEATURE]**: traces: Add apis for creating traces from tracepoints [#87](https://github.com/intergral/deep/pull/87) [@Umaaz](https://github.com/Umaaz)
+- **[BUGFIX]**: fix issue with SPI loading failing [#92](https://github.com/intergral/deep/pull/92) [@Umaaz](https://github.com/Umaaz)
+- **[BUGFIX]**: fix issue with method entry tracepoints [#91](https://github.com/intergral/deep/pull/91) [@Umaaz](https://github.com/Umaaz)
 
 # 1.1.4 (15/12/2023)
 - **[CHANGE]**: plugin: Add new API for registering plugins [#84](https://github.com/intergral/deep/pull/84) [@Umaaz](https://github.com/Umaaz) 

From ecc1be82b39aee71f05ed1c30566901fcbe11554 Mon Sep 17 00:00:00 2001
From: Ben Donnelly <ben_donnelly@intergral.com>
Date: Tue, 6 Feb 2024 14:51:40 +0000
Subject: [PATCH 3/3] chore(build): update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35db860..f5f6d4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 - **[CHANGE]**: change log config to allow better control of logging [#103](https://github.com/intergral/deep/pull/103) [@Umaaz](https://github.com/Umaaz)
 - **[FEATURE]**: plugin: Add plugin for Otel [#87](https://github.com/intergral/deep/pull/87) [@Umaaz](https://github.com/Umaaz)
 - **[FEATURE]**: traces: Add apis for creating traces from tracepoints [#87](https://github.com/intergral/deep/pull/87) [@Umaaz](https://github.com/Umaaz)
+- **[ENHANCEMENT]**: make checkstyle use regex for license check [#94](https://github.com/intergral/deep/pull/94) [@Umaaz](https://github.com/Umaaz)
 - **[BUGFIX]**: fix issue with SPI loading failing [#92](https://github.com/intergral/deep/pull/92) [@Umaaz](https://github.com/Umaaz)
 - **[BUGFIX]**: fix issue with method entry tracepoints [#91](https://github.com/intergral/deep/pull/91) [@Umaaz](https://github.com/Umaaz)