Skip to content

Commit dc698f2

Browse files
authored
fix jul logger methods mismatch (#14531)
1 parent bfa81e7 commit dc698f2

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/PatchLogger.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,15 +344,15 @@ public static PatchLogger getGlobal() {
344344
return global;
345345
}
346346

347-
public static void setFilter(Filter filter) {}
347+
public void setFilter(Filter filter) {}
348348

349-
public static Filter getFilter() {
349+
public Filter getFilter() {
350350
return null;
351351
}
352352

353-
public static void setUseParentHandlers(boolean useParentHandlers) {}
353+
public void setUseParentHandlers(boolean useParentHandlers) {}
354354

355-
public static boolean getUseParentHandlers() {
355+
public boolean getUseParentHandlers() {
356356
return true;
357357
}
358358

javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/PatchLoggerTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import static org.mockito.Mockito.when;
1313

1414
import java.lang.reflect.Method;
15+
import java.lang.reflect.Modifier;
1516
import java.util.ArrayList;
1617
import java.util.HashSet;
1718
import java.util.List;
@@ -31,6 +32,7 @@ void testImplementsAllMethods() {
3132
for (Method method : PatchLogger.class.getMethods()) {
3233
MethodSignature methodSignature = new MethodSignature();
3334
methodSignature.name = method.getName();
35+
methodSignature.modifiers = method.getModifiers();
3436
for (Class<?> clazz : method.getParameterTypes()) {
3537
String parameterType = clazz.getName();
3638
methodSignature.parameterTypes.add(
@@ -50,6 +52,7 @@ void testImplementsAllMethods() {
5052
String methodName = method.getName();
5153
MethodSignature builder = new MethodSignature();
5254
builder.name = methodName;
55+
builder.modifiers = method.getModifiers();
5356
List<String> parameterTypes = new ArrayList<>();
5457
for (Class<?> clazz : method.getParameterTypes()) {
5558
parameterTypes.add(clazz.getName());
@@ -792,6 +795,7 @@ static class MethodSignature {
792795
String name;
793796
List<String> parameterTypes = new ArrayList<>();
794797
String returnType;
798+
int modifiers;
795799

796800
@Override
797801
public boolean equals(@Nullable Object obj) {
@@ -804,18 +808,19 @@ public boolean equals(@Nullable Object obj) {
804808
MethodSignature other = (MethodSignature) obj;
805809
return Objects.equals(name, other.name)
806810
&& Objects.equals(parameterTypes, other.parameterTypes)
807-
&& Objects.equals(returnType, other.returnType);
811+
&& Objects.equals(returnType, other.returnType)
812+
&& Modifier.isStatic(modifiers) == Modifier.isStatic(other.modifiers);
808813
}
809814

810815
@Override
811816
public int hashCode() {
812-
return Objects.hash(name, parameterTypes, returnType);
817+
return Objects.hash(name, parameterTypes, returnType, Modifier.isStatic(modifiers));
813818
}
814819

815820
@Override
816821
public String toString() {
817822
String params = parameterTypes.stream().reduce((a, b) -> a + ", " + b).orElse("");
818-
return name + "(" + params + ")" + returnType;
823+
return Modifier.toString(modifiers) + " " + name + "(" + params + ")" + returnType;
819824
}
820825
}
821826
}

0 commit comments

Comments
 (0)