diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/PatchLogger.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/PatchLogger.java index 50cde71479c8..0d1d52e1d02f 100644 --- a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/PatchLogger.java +++ b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/PatchLogger.java @@ -344,15 +344,15 @@ public static PatchLogger getGlobal() { return global; } - public static void setFilter(Filter filter) {} + public void setFilter(Filter filter) {} - public static Filter getFilter() { + public Filter getFilter() { return null; } - public static void setUseParentHandlers(boolean useParentHandlers) {} + public void setUseParentHandlers(boolean useParentHandlers) {} - public static boolean getUseParentHandlers() { + public boolean getUseParentHandlers() { return true; } diff --git a/javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/PatchLoggerTest.java b/javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/PatchLoggerTest.java index a14f4adcd6fb..99357056d8d0 100644 --- a/javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/PatchLoggerTest.java +++ b/javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/PatchLoggerTest.java @@ -12,6 +12,7 @@ import static org.mockito.Mockito.when; import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -31,6 +32,7 @@ void testImplementsAllMethods() { for (Method method : PatchLogger.class.getMethods()) { MethodSignature methodSignature = new MethodSignature(); methodSignature.name = method.getName(); + methodSignature.modifiers = method.getModifiers(); for (Class clazz : method.getParameterTypes()) { String parameterType = clazz.getName(); methodSignature.parameterTypes.add( @@ -50,6 +52,7 @@ void testImplementsAllMethods() { String methodName = method.getName(); MethodSignature builder = new MethodSignature(); builder.name = methodName; + builder.modifiers = method.getModifiers(); List parameterTypes = new ArrayList<>(); for (Class clazz : method.getParameterTypes()) { parameterTypes.add(clazz.getName()); @@ -792,6 +795,7 @@ static class MethodSignature { String name; List parameterTypes = new ArrayList<>(); String returnType; + int modifiers; @Override public boolean equals(@Nullable Object obj) { @@ -804,18 +808,19 @@ public boolean equals(@Nullable Object obj) { MethodSignature other = (MethodSignature) obj; return Objects.equals(name, other.name) && Objects.equals(parameterTypes, other.parameterTypes) - && Objects.equals(returnType, other.returnType); + && Objects.equals(returnType, other.returnType) + && Modifier.isStatic(modifiers) == Modifier.isStatic(other.modifiers); } @Override public int hashCode() { - return Objects.hash(name, parameterTypes, returnType); + return Objects.hash(name, parameterTypes, returnType, Modifier.isStatic(modifiers)); } @Override public String toString() { String params = parameterTypes.stream().reduce((a, b) -> a + ", " + b).orElse(""); - return name + "(" + params + ")" + returnType; + return Modifier.toString(modifiers) + " " + name + "(" + params + ")" + returnType; } } }