Skip to content

Fix stack locator calc location on JDK 9 #109

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 1 commit into from
Sep 4, 2017
+53 −5
Merged

Fix stack locator calc location on JDK 9 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 2 deletions log4j-api-java9/src/main/java/org/apache/logging/log4j/util/StackLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,12 @@ public Stack<Class<?>> getCurrentStackTrace() {
}

public StackTraceElement calcLocation(final String fqcnOfLogger) {
return stackWalker.walk(s -> s.dropWhile(f -> f.getClassName().equals(fqcnOfLogger)).
dropWhile(f -> f.getClassName().equals(fqcnOfLogger)).findFirst()).get().toStackTraceElement();
return stackWalker.walk(
s -> s.dropWhile(f -> !f.getClassName().equals(fqcnOfLogger)) // drop the top frames until we reach the logger
.dropWhile(f -> f.getClassName().equals(fqcnOfLogger)) // drop the logger frames
.findFirst())
.get()
.toStackTraceElement();
}

public StackTraceElement getStackTraceElement(final int depth) {
Expand Down
50 changes: 47 additions & 3 deletions log4j-api-java9/src/test/java/org/apache/logging/log4j/util/StackLocatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,17 @@
*/
package org.apache.logging.log4j.util;

import java.util.Stack;

import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.BlockJUnit4ClassRunner;
import org.junit.runners.ParentRunner;
import static org.junit.Assert.*;

import java.util.Stack;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;

@RunWith(BlockJUnit4ClassRunner.class)
public class StackLocatorTest {
Expand Down Expand Up @@ -91,6 +94,47 @@ public void testLocateClass() {
assertEquals("Incorrect class", this.getClass(), clazz);
}

private final class Foo {

private StackTraceElement foo() {
return new Bar().bar();
}

}

private final class Bar {

private StackTraceElement bar() {
return baz();
}

private StackTraceElement baz() {
return quux();
}

}

private StackTraceElement quux() {
return stackLocator.calcLocation("org.apache.logging.log4j.util.StackLocatorTest$Bar");
}

@Test
public void testCalcLocation() {
/*
* We are setting up a stack trace that looks like:
* - org.apache.logging.log4j.util.StackLocatorTest#quux(line:118)
* - org.apache.logging.log4j.util.StackLocatorTest$Bar#baz(line:112)
* - org.apache.logging.log4j.util.StackLocatorTest$Bar#bar(line:108)
* - org.apache.logging.log4j.util.StackLocatorTest$Foo(line:100)
*
* We are pretending that org.apache.logging.log4j.util.StackLocatorTest$Bar is the logging class, and
* org.apache.logging.log4j.util.StackLocatorTest$Foo is where the log line emanated.
*/
final StackTraceElement element = new Foo().foo();
assertEquals("org.apache.logging.log4j.util.StackLocatorTest$Foo", element.getClassName());
assertEquals(100, element.getLineNumber());
}

class ClassLocator {

public Class<?> locateClass() {
Expand Down