Skip to content

Commit fe8f24d

Browse files
authored
fix version-file encoding (#1733)
1 parent 731c824 commit fe8f24d

File tree

2 files changed

+4
-2
lines changed
  • inspectit-ocelot-agent/src/main/java/rocks/inspectit/ocelot/agent
  • inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core

2 files changed

+4
-2
lines changed

inspectit-ocelot-agent/src/main/java/rocks/inspectit/ocelot/agent/AgentJars.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.nio.channels.FileChannel;
77
import java.nio.channels.FileLock;
88
import java.nio.channels.OverlappingFileLockException;
9+
import java.nio.charset.StandardCharsets;
910
import java.nio.file.Files;
1011
import java.nio.file.Path;
1112
import java.nio.file.Paths;
@@ -226,7 +227,7 @@ private static boolean isRecyclingEnabled() {
226227
private static String getAgentVersion() {
227228
if(agentVersion == null) {
228229
try (InputStream is = AgentJars.class.getResourceAsStream(AGENT_VERSION_INFORMATION_FILE)) {
229-
BufferedReader reader = new BufferedReader(new InputStreamReader(is));
230+
BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
230231
agentVersion = reader.readLine();
231232
} catch (Exception e) {
232233
System.err.println("Could not read agent version information file");

inspectit-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/AgentImpl.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.io.InputStreamReader;
1919
import java.lang.instrument.Instrumentation;
2020
import java.net.URLClassLoader;
21+
import java.nio.charset.StandardCharsets;
2122
import java.util.Optional;
2223

2324
/**
@@ -124,7 +125,7 @@ private void logOpenTelemetryClassLoader() {
124125
*/
125126
private void readVersionInformation() {
126127
try (InputStream inputStream = AgentImpl.class.getResourceAsStream(AGENT_VERSION_INFORMATION_FILE)) {
127-
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
128+
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
128129
agentVersion = reader.readLine();
129130
openTelemetryVersion = reader.readLine();
130131
agentBuildDate = reader.readLine();

0 commit comments

Comments
 (0)