Skip to content

Commit 66a8fa9

Browse files
malte-hansenmalte-hansen
committed
Convert application instance ID to string
1 parent d5d52b7 commit 66a8fa9

File tree

12 files changed

+45
-45
lines changed

12 files changed

+45
-45
lines changed

‎src/integrationTest/java/net/explorviz/span/api/LandscapeResourceIt.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ void testLoadAllStructureSpans() {
4343

4444
final PersistenceSpan differentTokenSpan = new PersistenceSpan(
4545
UUID.randomUUID(), gitCommitChecksum, "123L", "", "1L", startEarly,
46-
endEarly, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class.myMethod()", "847",
46+
endEarly, "nodeIp", "host-name", "app-name", "java", "0", "net.explorviz.Class.myMethod()", "847",
4747
"iamapod", "iamanode", "iamanamespace", "iamadeployment");
4848

4949
final String duplicateMethodName = "myMethodName()";
5050
final String otherMethodName = "myOtherMethodName()";
5151

5252
final PersistenceSpan firstOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum,
53-
"123L", "", "1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", 0,
53+
"123L", "", "1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", "0",
5454
"net.explorviz.Class." + duplicateMethodName, "847",
5555
"iamapod", "iamanode", "iamanamespace", "iamadeployment");
5656

5757
final PersistenceSpan secondOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum,
58-
"789L", "", "3L", startLate, endLate, "nodeIp", "host-name", "app-name", "java", 0,
58+
"789L", "", "3L", startLate, endLate, "nodeIp", "host-name", "app-name", "java", "0",
5959
"net.explorviz.Class." + duplicateMethodName, "847",
6060
"iamapod", "iamanode", "iamanamespace", "iamadeployment");
6161

6262
final PersistenceSpan otherSpan = new PersistenceSpan(uuidExpected, "456L", gitCommitChecksum,
63-
"0L", "", startExpected, endExpected, "nodeIp", "host-name", "app-name", "java", 0,
63+
"0L", "", startExpected, endExpected, "nodeIp", "host-name", "app-name", "java", "0",
6464
"net.explorviz.Class." + otherMethodName, "321",
6565
"iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
6666

@@ -108,24 +108,24 @@ void testLoadStructureSpansByTimeRange() {
108108

109109
final PersistenceSpan differentTokenSpan = new PersistenceSpan(
110110
UUID.randomUUID(), gitCommitChecksum, "123L", "", "1L", startEarly,
111-
endEarly, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class.myMethod()", "847",
111+
endEarly, "nodeIp", "host-name", "app-name", "java", "0", "net.explorviz.Class.myMethod()", "847",
112112
"iamapod", "iamanode", "iamanamespace", "iamadeployment");
113113

114114
final String duplicateMethodName = "myMethodName()";
115115
final String otherMethodName = "myOtherMethodName()";
116116

117117
final PersistenceSpan firstOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum,
118-
"123L", "", "1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", 0,
118+
"123L", "", "1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", "0",
119119
"net.explorviz.Class." + duplicateMethodName, "847",
120120
"iamapod", "iamanode", "iamanamespace", "iamadeployment");
121121

122122
final PersistenceSpan secondOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum,
123-
"789L", "", "3L", startLate, endLate, "nodeIp", "host-name", "app-name", "java", 0,
123+
"789L", "", "3L", startLate, endLate, "nodeIp", "host-name", "app-name", "java", "0",
124124
"net.explorviz.Class." + duplicateMethodName, "847",
125125
"iamapod", "iamanode", "iamanamespace", "iamadeployment");
126126

127127
final PersistenceSpan otherSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum, "456L",
128-
"", "2L", startExpected, endExpected, "nodeIp", "host-name", "app-name", "java", 0,
128+
"", "2L", startExpected, endExpected, "nodeIp", "host-name", "app-name", "java", "0",
129129
"net.explorviz.Class." + otherMethodName, "321",
130130
"iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
131131

@@ -163,22 +163,22 @@ void testLoadTracesByTimeRange() {
163163

164164
final PersistenceSpan differentTokenSpan = new PersistenceSpan(
165165
UUID.randomUUID(), gitCommitChecksum, "123L", "", "1L", startEarly,
166-
endEarly, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class.myMethod()",
166+
endEarly, "nodeIp", "host-name", "app-name", "java", "0", "net.explorviz.Class.myMethod()",
167167
"847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
168168

169169
final String duplicateMethodName = "myMethodName()";
170170
final String otherMethodName = "myOtherMethodName()";
171171

172172
final PersistenceSpan firstOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum,
173-
"123L", "", "1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", 0,
173+
"123L", "", "1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", "0",
174174
"net.explorviz.Class." + duplicateMethodName, "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
175175

176176
final PersistenceSpan secondOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum,
177-
"789L", "", "3L", startLate, endLate, "nodeIp", "host-name", "app-name", "java", 0,
177+
"789L", "", "3L", startLate, endLate, "nodeIp", "host-name", "app-name", "java", "0",
178178
"net.explorviz.Class." + duplicateMethodName, "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
179179

180180
final PersistenceSpan otherSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum, "456L",
181-
"", "2L", startExpected, endExpected, "nodeIp", "host-name", "app-name", "java", 0,
181+
"", "2L", startExpected, endExpected, "nodeIp", "host-name", "app-name", "java", "0",
182182
"net.explorviz.Class." + otherMethodName, "321", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
183183

184184
spanProcessor.accept(differentTokenSpan);

‎src/integrationTest/java/net/explorviz/span/api/TimestampResourceIt.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void testLoadAllTimestampsForToken() {
4242
final UUID uuidExpected = UUID.randomUUID();
4343

4444
final PersistenceSpan differentTokenSpan = new PersistenceSpan(UUID.randomUUID(), gitCommitChecksum, "123L", "",
45-
"1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", 0,
45+
"1L", startEarly, endEarly, "nodeIp", "host-name", "app-name", "java", "0",
4646
"net.explorviz.Class.myMethod()", "847",
4747
"iamapod", "iamanode", "iamanamespace", "iamadeployment");
4848

@@ -51,17 +51,17 @@ void testLoadAllTimestampsForToken() {
5151

5252
final PersistenceSpan firstOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum, "123L", "", "1L",
5353
startEarly, endEarly,
54-
"nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class." + duplicateMethodName, "847",
54+
"nodeIp", "host-name", "app-name", "java", "0", "net.explorviz.Class." + duplicateMethodName, "847",
5555
"iamapod", "iamanode", "iamanamespace", "iamadeployment");
5656

5757
final PersistenceSpan secondOccurenceSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum, "789L", "", "3L",
5858
startLate, endLate,
59-
"nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class." + duplicateMethodName, "847",
59+
"nodeIp", "host-name", "app-name", "java", "0", "net.explorviz.Class." + duplicateMethodName, "847",
6060
"iamapod", "iamanode", "iamanamespace", "iamadeployment");
6161

6262
final PersistenceSpan otherSpan = new PersistenceSpan(uuidExpected, gitCommitChecksum, "456L", "0L", "",
6363
startExpected,
64-
endExpected, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class." + otherMethodName,
64+
endExpected, "nodeIp", "host-name", "app-name", "java", "0", "net.explorviz.Class." + otherMethodName,
6565
"321", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
6666

6767
spanProcessor.accept(differentTokenSpan);
@@ -115,7 +115,7 @@ void testLoadNewerTimestampsForToken() {
115115
final UUID uuidExpected = UUID.randomUUID();
116116

117117
final PersistenceSpan firstSpanOfFirstBucket = new PersistenceSpan(uuidExpected, gitCommitChecksum, "0123L", "",
118-
"1L", firstBucketStart, firstBucketEnd, "nodeIp", "host-name", "app-name", "java", 0,
118+
"1L", firstBucketStart, firstBucketEnd, "nodeIp", "host-name", "app-name", "java", "0",
119119
"net.explorviz.Class.myMethod()", "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
120120

121121
final String duplicateMethodName = "myMethodName()";
@@ -124,18 +124,18 @@ void testLoadNewerTimestampsForToken() {
124124
final PersistenceSpan firstSpanOfSecondBuckec = new PersistenceSpan(uuidExpected, gitCommitChecksum, "123L", "",
125125
"1L", secondBucketStart,
126126
secondBucketEnd,
127-
"nodeIp", "host-name", "app-name", "java", 0,
127+
"nodeIp", "host-name", "app-name", "java", "0",
128128
"net.explorviz.Class." + duplicateMethodName, "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
129129

130130
final PersistenceSpan firstSpanOfThirdBucket = new PersistenceSpan(uuidExpected, gitCommitChecksum, "789L", "",
131131
"3L", thirdBucketStart,
132132
thirdBucketEnd,
133-
"nodeIp", "host-name", "app-name", "java", 0,
133+
"nodeIp", "host-name", "app-name", "java", "0",
134134
"net.explorviz.Class." + duplicateMethodName, "847", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
135135

136136
final PersistenceSpan secondSpanOfSecondBucket = new PersistenceSpan(uuidExpected, gitCommitChecksum, "456L", "0L",
137137
"", secondBucketStart,
138-
secondBucketEnd, "nodeIp", "host-name", "app-name", "java", 0,
138+
secondBucketEnd, "nodeIp", "host-name", "app-name", "java", "0",
139139
"net.explorviz.Class." + otherMethodName,
140140
"321", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
141141

@@ -180,7 +180,7 @@ void testLoadAllTimestampsForTokenAndCommit() {
180180
final String expectedCommit = "testCommit";
181181

182182
final PersistenceSpan firstSpanOfFirstBucket = new PersistenceSpan(uuidExpected, "notTestCommit-1", "0123L", "",
183-
"1L", firstBucketStart, firstBucketEnd, "nodeIp", "host-name", "app-name", "java", 0,
183+
"1L", firstBucketStart, firstBucketEnd, "nodeIp", "host-name", "app-name", "java", "0",
184184
"net.explorviz.Class.myMethod()", "847",
185185
"iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
186186

@@ -190,20 +190,20 @@ void testLoadAllTimestampsForTokenAndCommit() {
190190
final PersistenceSpan firstSpanOfSecondBuckec = new PersistenceSpan(uuidExpected, expectedCommit, "123L", "", "1L",
191191
secondBucketStart,
192192
secondBucketEnd,
193-
"nodeIp", "host-name", "app-name", "java", 0,
193+
"nodeIp", "host-name", "app-name", "java", "0",
194194
"net.explorviz.Class." + duplicateMethodName, "847",
195195
"iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
196196

197197
final PersistenceSpan firstSpanOfThirdBucket = new PersistenceSpan(uuidExpected, "notTestCommit-2", "789L", "",
198198
"3L", thirdBucketStart,
199199
thirdBucketEnd,
200-
"nodeIp", "host-name", "app-name", "java", 0,
200+
"nodeIp", "host-name", "app-name", "java", "0",
201201
"net.explorviz.Class." + duplicateMethodName, "847",
202202
"iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
203203

204204
final PersistenceSpan secondSpanOfSecondBucket = new PersistenceSpan(uuidExpected, "notTestCommit-2", "456L", "0L",
205205
"", secondBucketStart,
206-
secondBucketEnd, "nodeIp", "host-name", "app-name", "java", 0,
206+
secondBucketEnd, "nodeIp", "host-name", "app-name", "java", "0",
207207
"net.explorviz.Class." + otherMethodName,
208208
"321", "iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
209209

@@ -244,7 +244,7 @@ void testLoadNewerTimestampsForTokenAndCommit() {
244244
final String expectedCommit = "testCommit";
245245

246246
final PersistenceSpan firstSpanOfFirstBucket = new PersistenceSpan(uuidExpected, expectedCommit, "0123L", "",
247-
"1L", firstBucketStart, firstBucketEnd, "nodeIp", "host-name", "app-name", "java", 0,
247+
"1L", firstBucketStart, firstBucketEnd, "nodeIp", "host-name", "app-name", "java", "0",
248248
"net.explorviz.Class.myMethod()", "847",
249249
"iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
250250

@@ -254,20 +254,20 @@ void testLoadNewerTimestampsForTokenAndCommit() {
254254
final PersistenceSpan firstSpanOfSecondBuckec = new PersistenceSpan(uuidExpected, expectedCommit, "123L", "", "1L",
255255
secondBucketStart,
256256
secondBucketEnd,
257-
"nodeIp", "host-name", "app-name", "java", 0,
257+
"nodeIp", "host-name", "app-name", "java", "0",
258258
"net.explorviz.Class." + duplicateMethodName, "847",
259259
"iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
260260

261261
final PersistenceSpan firstSpanOfThirdBucket = new PersistenceSpan(uuidExpected, expectedCommit, "789L", "", "3L",
262262
thirdBucketStart,
263263
thirdBucketEnd,
264-
"nodeIp", "host-name", "app-name", "java", 0,
264+
"nodeIp", "host-name", "app-name", "java", "0",
265265
"net.explorviz.Class." + duplicateMethodName, "847",
266266
"iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");
267267

268268
final PersistenceSpan secondSpanOfSecondBucket = new PersistenceSpan(uuidExpected, expectedCommit, "456L", "0L", "",
269269
secondBucketStart + 1000,
270-
secondBucketEnd + 1000, "nodeIp", "host-name", "app-name", "java", 0,
270+
secondBucketEnd + 1000, "nodeIp", "host-name", "app-name", "java", "0",
271271
"net.explorviz.Class." + otherMethodName,
272272
"321",
273273
"iamnotapod", "iamnotanode", "iamnotanamespace", "iamnotadeployment");

‎src/integrationTest/java/net/explorviz/span/persistence/TraceLoaderIt.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ void testLoadTracesByTimeRange() {
4545

4646
final PersistenceSpan earlySpan = new PersistenceSpan(landscapeToken, gitCommitChecksum, "123L", "", "1L",
4747
startEarly,
48-
endEarly, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class.myMethod()",
48+
endEarly, "nodeIp", "host-name", "app-name", "java", "0", "net.explorviz.Class.myMethod()",
4949
"847", "iamapod", "iamanode", "iamanamespace", "iamadeployment");
5050

5151
final PersistenceSpan expectedSpan = new PersistenceSpan(landscapeToken, gitCommitChecksum, "456L", "", "2L",
5252
startExpected,
53-
endExpected, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class.myMethod()",
53+
endExpected, "nodeIp", "host-name", "app-name", "java", "0", "net.explorviz.Class.myMethod()",
5454
"847", "iamapod", "iamanode", "iamanamespace", "iamadeployment");
5555

5656
final PersistenceSpan lateSpan = new PersistenceSpan(landscapeToken, gitCommitChecksum, "789L", "", "3L", startLate,
57-
endLate, "nodeIp", "host-name", "app-name", "java", 0, "net.explorviz.Class.myMethod()",
57+
endLate, "nodeIp", "host-name", "app-name", "java", "0", "net.explorviz.Class.myMethod()",
5858
"847", "iamapod", "iamanode", "iamanamespace", "iamadeployment");
5959

6060
spanProcessor.accept(earlySpan);

‎src/main/java/net/explorviz/span/hash/HashHelper.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ private val HIGHWAY_HASH_KEY = longArrayOf(
1616
landscapeToken: UUID,
1717
nodeIpAddress: String,
1818
applicationName: String,
19-
applicationInstance: Long,
19+
applicationInstance: String,
2020
methodFqn: String,
2121
k8sPodName: String?,
2222
k8sNodeName: String?,
@@ -29,7 +29,7 @@ private val HIGHWAY_HASH_KEY = longArrayOf(
2929
hash.update(
3030
landscapeToken.mostSignificantBits,
3131
landscapeToken.leastSignificantBits,
32-
applicationInstance,
32+
0L,
3333
0L
3434
)
3535

‎src/main/java/net/explorviz/span/landscape/Application.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
public record Application(
66
String name,
77
String language,
8-
int instanceId, // TODO: Deviation from frontend, expects `String instanceId`
8+
String instanceId,
99
List<Package> packages
1010
) {
1111

‎src/main/java/net/explorviz/span/landscape/assembler/impl/AssemblyUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public static Optional<Node> findNode(final Landscape landscape, final String ip
4242
* @return an optional that contains the app if it is included in the node, and is empty otherwise
4343
*/
4444
public static Optional<Application> findApplication(final Node node, final String name,
45-
final int instance) {
45+
final String instance) {
4646
for (final Application a : node.applications()) {
47-
if (a.instanceId() == instance && a.name().equals(name)) {
47+
if (a.instanceId().equals(instance) && a.name().equals(name)) {
4848
return Optional.of(a);
4949
}
5050
}

‎src/main/java/net/explorviz/span/landscape/assembler/impl/DefaultLandscapeAssembler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private Optional<K8sConstructs> getK8sConstructsForRecord(final LandscapeRecord
131131

132132

133133
final String applicationName = record.applicationName();
134-
final int applicationInstance = record.applicationInstance();
134+
final String applicationInstance = record.applicationInstance();
135135
final String applicationLanguage = record.applicationLanguage();
136136
var app = pod.applications().stream()
137137
.filter(
@@ -151,7 +151,7 @@ private Application getApplicationForRecord(final LandscapeRecord record, final
151151

152152
// Find application in node or insert new
153153
final String applicationName = record.applicationName();
154-
final int applicationInstance = record.applicationInstance();
154+
final String applicationInstance = record.applicationInstance();
155155
final String applicationLanguage = record.applicationLanguage();
156156
final Optional<Application> foundApp =
157157
AssemblyUtils.findApplication(node, applicationName, applicationInstance);

‎src/main/java/net/explorviz/span/landscape/loader/LandscapeRecord.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public record LandscapeRecord(
1212
String hostName,
1313
String applicationName,
1414
String applicationLanguage,
15-
int applicationInstance,
15+
String applicationInstance,
1616
String packageName,
1717
String className,
1818
String methodName,
@@ -29,7 +29,7 @@ public static LandscapeRecord fromRow(final Row row) {
2929
final String hostName = row.getString("host_name");
3030
final String applicationName = row.getString("application_name");
3131
final String applicationLanguage = row.getString("application_language");
32-
final int applicationInstance = row.getInt("application_instance");
32+
final String applicationInstance = row.getString("application_instance");
3333
final String methodFqn = row.getString("method_fqn");
3434
final long timeSeen = row.getLong("time_seen");
3535
final String k8sPodName = row.getString("k8s_pod_name");

‎src/main/java/net/explorviz/span/persistence/PersistenceSpan.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public record PersistenceSpan(
1414
String hostName,
1515
String applicationName,
1616
String applicationLanguage,
17-
int applicationInstance,
17+
String applicationInstance,
1818
String methodFqn,
1919
String methodHash,
2020
String k8sPodName,

‎src/main/java/net/explorviz/span/persistence/SpanConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public PersistenceSpan apply(final Span span) {
3232
final String nodeIpAddress = span.getHostIpAddress();
3333
final String nodeHostName = span.getHostname();
3434
final String applicationName = span.getAppName();
35-
final int applicationInstance = Integer.parseInt(span.getAppInstanceId());
35+
final String applicationInstance = span.getAppInstanceId();
3636
final String applicationLanguage = span.getAppLanguage();
3737
final String methodFqn = span.getFullyQualifiedOperationName();
3838
final String k8sPodName = span.getK8sPodName();

0 commit comments

Comments
 (0)