Skip to content

Commit d7469e9

Browse files
authored
Merge pull request #175 from grafana/cleanup
fix: Minor QoL clean up
2 parents 1cc00a1 + 32f2f77 commit d7469e9

File tree

7 files changed

+37
-11
lines changed

7 files changed

+37
-11
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/.idea/
2+
/.vscode/
23

34
# Ignore Gradle project-specific cache directory
45
.gradle

Diff for: agent/src/main/java/io/pyroscope/javaagent/impl/PyroscopeExporter.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.pyroscope.javaagent.impl;
22

3-
import io.pyroscope.http.Format;
43
import io.pyroscope.javaagent.EventType;
54
import io.pyroscope.javaagent.Snapshot;
65
import io.pyroscope.javaagent.api.Exporter;

Diff for: async-profiler-context/src/main/java/io/pyroscope/labels/Ref.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ public Ref(T val, Long id) {
1616
public boolean equals(Object o) {
1717
if (this == o) return true;
1818
if (o == null || getClass() != o.getClass()) return false;
19-
Ref<T> valueRef = (Ref<T>) o;
19+
20+
Ref<?> valueRef = (Ref<?>) o;
2021
return id.equals(valueRef.id);
2122
}
2223

Diff for: async-profiler-context/src/main/java/io/pyroscope/labels/io/pyroscope/PyroscopeAsyncProfiler.java

-6
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,14 @@
22

33
import one.profiler.AsyncProfiler;
44

5-
import java.io.BufferedReader;
6-
import java.io.File;
75
import java.io.FileNotFoundException;
86
import java.io.IOException;
97
import java.io.InputStream;
10-
import java.io.InputStreamReader;
118
import java.nio.charset.StandardCharsets;
129
import java.nio.file.Files;
1310
import java.nio.file.Path;
1411
import java.nio.file.Paths;
1512
import java.nio.file.StandardCopyOption;
16-
import java.util.ArrayList;
17-
import java.util.Arrays;
18-
import java.util.List;
1913

2014
public class PyroscopeAsyncProfiler {
2115
static final String libraryPath;

Diff for: async-profiler-context/src/test/java/io/pyroscope/labels/LabelsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ void stressTest() throws InterruptedException {
225225
}
226226
e.shutdown();
227227
e.awaitTermination(100, TimeUnit.SECONDS);
228-
Snapshot res = Pyroscope.LabelsWrapper.dump();
228+
Pyroscope.LabelsWrapper.dump();
229229
assertEquals(0, ScopedContext.context.get().id);
230230
assertEquals(0, RefCounted.strings.valueToRef.size());
231231
assertEquals(0, RefCounted.contexts.valueToRef.size());
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package io.pyroscope.labels;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
import static org.junit.jupiter.api.Assertions.assertEquals;
6+
import static org.junit.jupiter.api.Assertions.assertFalse;
7+
import static org.junit.jupiter.api.Assertions.assertTrue;
8+
9+
public class RefTest {
10+
@Test
11+
void testCreateRef() {
12+
Ref<String> ref = new Ref<>("test", 1L);
13+
assertEquals("test", ref.val);
14+
assertEquals(1L, ref.id);
15+
assertEquals(1L, ref.refCount.get());
16+
}
17+
18+
@Test
19+
@SuppressWarnings("unlikely-arg-type")
20+
void testEquals() {
21+
Ref<String> ref1 = new Ref<>("test", 1L);
22+
assertTrue(ref1.equals(ref1));
23+
assertFalse(ref1.equals(null));
24+
assertFalse(ref1.equals(new Integer(3)));
25+
assertTrue(ref1.equals(new Ref<Integer>(3, 1L))); // We don't compare the value types.
26+
}
27+
28+
@Test
29+
void testHashCode() {
30+
Ref<String> ref1 = new Ref<>("test", 1L);
31+
assertEquals(1, ref1.hashCode());
32+
}
33+
}

Diff for: demo/src/main/java/Fib.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11

2-
import java.util.HashMap;
3-
import java.util.Map;
42
import java.util.concurrent.ExecutorService;
53
import java.util.concurrent.Executors;
64

0 commit comments

Comments
 (0)