Skip to content

Eliminate log4j shaders dependency in slf4j#1723

Merged
eyalkoren merged 3 commits intoelastic:masterfrom
eyalkoren:log4j2-shading-fix
Mar 30, 2021
Merged

Eliminate log4j shaders dependency in slf4j#1723
eyalkoren merged 3 commits intoelastic:masterfrom
eyalkoren:log4j2-shading-fix

Conversation

@eyalkoren
Copy link
Contributor

@eyalkoren eyalkoren commented Mar 30, 2021 •
edited by zube bot
Loading

What does this PR do?

Fixes #1721
Closes #1722

Checklist

  • This is a bugfix
    • I have updated CHANGELOG.asciidoc
    • I have added tests that would fail without this fix
    • I have tested manually that this fixes a scenario that would otherwise fail
@ghost
Copy link

ghost commented Mar 30, 2021 •
edited by ghost
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #1723 updated

  • Start Time: 2021-03-30T06:37:29.240+0000

  • Duration: 53 min 4 sec

  • Commit: aa11e01

Test stats 🧪

Test Results
Failed 0
Passed 1912
Skipped 19
Total 1931

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1912
Skipped 19
Total 1931

@eyalkoren eyalkoren merged commit 31951f6 into elastic:master Mar 30, 2021
@eyalkoren eyalkoren deleted the log4j2-shading-fix branch March 30, 2021 08:00
@tobiasstadler
Copy link
Contributor

tobiasstadler commented Mar 30, 2021

Thank You!
@eyalkoren
Copy link
Contributor Author

eyalkoren commented Mar 30, 2021

No, thank YOU! 😊
If you have the time to verify the combined fixes on a real app, that would be great.
You can download a snapshot build from the CI now (even if you are not trying it now, it will soon be gone), or once the next snapshot is uploaded to maven.
@tobiasstadler
Copy link
Contributor

tobiasstadler commented Mar 30, 2021

I can confirm the my (simple) use case works after your change.
v1v added a commit to v1v/apm-agent-java that referenced this pull request Apr 7, 2021
@v1v
Merge branch 'feature/java-stable-tag' of github.com:v1v/apm-agent-ja…
af224b9 
…va into feature/java-stable-tag

* 'feature/java-stable-tag' of github.com:v1v/apm-agent-java: (534 commits)
  Added Support for JBoss Logging to the log correlation plugin (elastic#1737)
  Removing improper RabbitMQ reference from instrumentation class (elastic#1745)
  Loading Advice classes lazily when required (elastic#1736)
  add support for ibm JVMs (elastic#1739)
  Adds circuit breaker to app deployment in load pipeline (elastic#1731)
  Bump json-schema-validator from 1.0.50 to 1.0.51 (elastic#1732)
  Bump java-driver-core from 4.10.0 to 4.11.0 (elastic#1733)
  Cassandra instrumentation (elastic#1712)
  Build apm-agent-attach-cli before application-server-integration-tests (elastic#1729)
  Fix thread pool method matchers (elastic#1717)
  Always use English locale when formatting doubles (elastic#1727) (elastic#1728)
  feat: grab locust metrics on load tests (elastic#1724)
  log readonly msg errors only in debug (elastic#1715)
  feat: use metricbeat to grab host metrics (elastic#1718)
  Eliminate log4j shaders dependency in slf4j (elastic#1723)
  Fix log correlation for log4j2 (elastic#1720)
  Allowing more time for the test
  Bump json-schema-validator from 1.0.49 to 1.0.50 (elastic#1711)
  Fix master build and print URL on connection error
  Attacher improvements (elastic#1667)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-java

2 participants

@eyalkoren @tobiasstadler