Skip to content

fix jul logger methods mismatch #14531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 27, 2025
Merged

fix jul logger methods mismatch #14531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3511e0b
fix jul logger methods mismatch
xiangtianyu Aug 27, 2025
760d826
Merge branch 'main' into fix-jul-log
xiangtianyu Aug 27, 2025
62683f9
ignore final, only check is static of method
xiangtianyu Aug 27, 2025
c86e044
Merge branch 'main' into fix-jul-log
xiangtianyu Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/PatchLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
11 changes: 8 additions & 3 deletions javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/PatchLoggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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(
Expand All @@ -50,6 +52,7 @@ void testImplementsAllMethods() {
String methodName = method.getName();
MethodSignature builder = new MethodSignature();
builder.name = methodName;
builder.modifiers = method.getModifiers();
List<String> parameterTypes = new ArrayList<>();
for (Class<?> clazz : method.getParameterTypes()) {
parameterTypes.add(clazz.getName());
Expand Down Expand Up @@ -792,6 +795,7 @@ static class MethodSignature {
String name;
List<String> parameterTypes = new ArrayList<>();
String returnType;
int modifiers;

@Override
public boolean equals(@Nullable Object obj) {
Expand All @@ -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;
}
}
}