Skip to content

Commit 8e21a95

Browse files
committed
Merge remote-tracking branch 'remotes/origin/main' into feat-batch-mode
2 parents e2f4ed7 + 41a771f commit 8e21a95

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

arex-agent-core/src/main/java/io/arex/agent/instrumentation/BaseAgentInstaller.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,10 @@ private void createDumpDirectory() {
145145
} else {
146146
mkdir = bytecodeDumpPath.mkdirs();
147147
}
148+
if (mkdir) {
149+
System.setProperty(TypeWriter.DUMP_PROPERTY, bytecodeDumpPath.getPath());
150+
}
148151
LOGGER.info("[arex] bytecode dump path exists: {}, mkdir: {}, path: {}", exists, mkdir, bytecodeDumpPath.getPath());
149-
System.setProperty(TypeWriter.DUMP_PROPERTY, bytecodeDumpPath.getPath());
150152
} catch (Exception e) {
151153
LOGGER.warn("[arex] Failed to create directory to instrumented bytecode: ", e);
152154
}

arex-instrumentation-api/src/main/java/io/arex/inst/runtime/config/listener/SerializeSkipInfoListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ private void buildSkipInfos(String configSkipInfo) {
6969
// Split the string into key and value
7070
String[] keyValue = pair.split(":");
7171
// Set the value in the SerializerSkipInfo object
72-
if (keyValue[0].contains("fullClassName")) {
72+
if (keyValue[0].contains("fullClassName") && keyValue.length > 1) {
7373
className = keyValue[1];
74-
} else if (keyValue[0].contains("fieldName")) {
74+
} else if (keyValue[0].contains("fieldName") && keyValue.length > 1) {
7575
fieldNameTemp = keyValue[1];
7676
}
7777
}

arex-instrumentation-foundation/src/main/java/io/arex/foundation/services/ConfigService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void loadAgentConfig() {
8686
}
8787
ConfigManager.INSTANCE.updateConfigFromService(configResponse.getBody());
8888
} catch (Throwable e) {
89-
LOGGER.warn("[AREX] Load agent config error, pause recording. exception message: {}", e.getMessage());
89+
LOGGER.warn("[AREX] Load agent config error, pause recording. exception message: {}", e.getMessage(), e);
9090
ConfigManager.INSTANCE.setConfigInvalid();
9191
}
9292
}

arex-instrumentation/redis/arex-lettuce-v5/src/main/java/io/arex/inst/lettuce/v5/LettuceModuleInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class LettuceModuleInstrumentation extends ModuleInstrumentation {
2020
public LettuceModuleInstrumentation() {
2121
super("lettuce-v5", ModuleDescription.builder()
22-
.name("lettuce.core").supportFrom(ComparableVersion.of("5.0")).supportTo(ComparableVersion.of("5.9")).build());
22+
.name("lettuce.core").supportFrom(ComparableVersion.of("5.0")).supportTo(ComparableVersion.of("6.0.9.RELEASE")).build());
2323
}
2424

2525
@Override

arex-instrumentation/redis/arex-lettuce-v6/src/main/java/io/arex/inst/lettuce/v6/LettuceModuleInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class LettuceModuleInstrumentation extends ModuleInstrumentation {
2020
public LettuceModuleInstrumentation() {
2121
super("lettuce-v6", ModuleDescription.builder()
22-
.name("lettuce.core").supportFrom(ComparableVersion.of("6.0")).build());
22+
.name("lettuce.core").supportFrom(ComparableVersion.of("6.1")).build());
2323
}
2424

2525
@Override

0 commit comments

Comments
 (0)