Skip to content
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

Jump to bottom

Log4j2 JsonLayout support #1559

Merged
merged 15 commits into from
Oct 31, 2023
Merged

Log4j2 JsonLayout support #1559

merged 15 commits into from
Oct 31, 2023

Commits on Oct 20, 2023

  1. Split log4j2 into two modules

    @jasonjkeller
    jasonjkeller committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    3fc5cf1 View commit details
    Browse the repository at this point in the history

  2. Cleanup and fix test

    @jasonjkeller
    jasonjkeller committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    e2af13d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into NR-155391-json-layout-support

    @jasonjkeller
    jasonjkeller authored Oct 20, 2023
    Configuration menu
    Copy the full SHA
    07076bb View commit details
    Browse the repository at this point in the history

  4. Prototype two potential approaches to support adding linking metadata… 

    … to Log4j2 JsonLayout
    @jasonjkeller
    jasonjkeller committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    924efff View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2023

  1. Remove AbstractJacksonLayout instrumentation. Split instrumentation i… 

    …nto two modules to support log4j 2.6-2.14 and 2.15+
    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    9dde58e View commit details
    Browse the repository at this point in the history

  2. Update copyright headers

    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    2f06bce View commit details
    Browse the repository at this point in the history

  3. Add comments

    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    418cb19 View commit details
    Browse the repository at this point in the history

  4. Prevent log4j2 instrumentation from adding NR-LINKING metadata if it … 

    …was already added by other logger instrumentation (e.g. JUL).
    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    f1307cf View commit details
    Browse the repository at this point in the history

  5. Insert NR-LINKING metadata within closing parenthesis

    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    e6139d2 View commit details
    Browse the repository at this point in the history

  6. Refactor to use new approach with AbstractJacksonLayout

    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    9540366 View commit details
    Browse the repository at this point in the history

  7. Add support for local decorating when using log4j2 async appenders

    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    4ebba2a View commit details
    Browse the repository at this point in the history

  8. Fix comment

    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    2dfa0f0 View commit details
    Browse the repository at this point in the history

  9. Address PR feedback

    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    d82dc8d View commit details
    Browse the repository at this point in the history

  10. Fix some things

    @jasonjkeller
    jasonjkeller committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    2ea3563 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Rename apache-log4j-2 module to apache-log4j-2.11

    @jasonjkeller
    jasonjkeller committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    02f5527 View commit details
    Browse the repository at this point in the history