Skip to content

Ship logs via intake API#2694

Merged
SylvainJuge merged 44 commits intoelastic:mainfrom
felixbarny:send-logs
Jan 13, 2023
Merged

Ship logs via intake API#2694
SylvainJuge merged 44 commits intoelastic:mainfrom
felixbarny:send-logs

Conversation

@felixbarny
Copy link
Member

@felixbarny felixbarny commented Jul 4, 2022 •
edited by SylvainJuge
Loading

What does this PR do?

Implements sending logs directly from APM agent to APM server.

Checklist

  • This is an enhancement of existing features, or a new feature in existing plugins
    • I have updated CHANGELOG.asciidoc
    • I have added tests that prove my fix is effective or that my feature works
    • Added an API method or config option? Document in which version this will be introduced
    • I have made corresponding changes to the documentation
@felixbarny
Ship logs via intake API
f91eadc 
Uses an imaginary `log` event that's not actually available in the intake API
@ghost
Copy link

ghost commented Jul 4, 2022 •
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 preview

Expand to view the summary

Build stats

  • Start Time: 2023-01-13T14:10:49.696+0000

  • Duration: 64 min 1 sec

Test stats 🧪

Test Results
Failed 0
Passed 3410
Skipped 42
Total 3452

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run benchmark tests : Run the benchmark tests.

  • run jdk compatibility tests : Run the JDK Compatibility tests.

  • run integration tests : Run the Agent Integration tests.

  • run end-to-end tests : Run the APM-ITs.

  • run windows tests : Build & tests on windows.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)
@felixbarny felixbarny mentioned this pull request Jul 25, 2022
Closed
@SylvainJuge
Copy link
Member

SylvainJuge commented Sep 9, 2022

Now that APM server support for logs intake is merged (elastic/apm-server#9068), this should not be blocked anymore
@felixbarny felixbarny mentioned this pull request Sep 12, 2022
Merged
1 task
@felixbarny
Copy link
Member Author

felixbarny commented Sep 12, 2022

Unfortunately, we're still kinda blocked as most of the fields used by ECS loggers, such as log.level are not supported yet.
@SylvainJuge SylvainJuge mentioned this pull request Sep 28, 2022
Closed
@AlexanderWert AlexanderWert linked an issue Sep 28, 2022 that may be closed by this pull request
[META 693] Send logs through APM Agents #2811
Closed
@SylvainJuge SylvainJuge mentioned this pull request Oct 17, 2022
Merged
2 tasks
@SylvainJuge SylvainJuge self-assigned this Dec 5, 2022
@SylvainJuge SylvainJuge mentioned this pull request Dec 7, 2022
Merged
8 tasks
@SylvainJuge SylvainJuge marked this pull request as ready for review December 14, 2022 14:07
@github-actions
Copy link

github-actions bot commented Dec 14, 2022

/test
@SylvainJuge SylvainJuge mentioned this pull request Dec 14, 2022
Merged
4 tasks
JonasKunz
JonasKunz reviewed Dec 15, 2022
View reviewed changes
Copy link
Contributor

@JonasKunz JonasKunz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work, can't wait to see this in action!
Haven't had a look at the tests yet, I'll do so in the next iteration.
JonasKunz
JonasKunz approved these changes Jan 13, 2023
View reviewed changes
Copy link
Contributor

@JonasKunz JonasKunz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work!
@SylvainJuge SylvainJuge merged commit 5fad53b into elastic:main Jan 13, 2023
v1v added a commit that referenced this pull request Jan 25, 2023
@v1v
Merge remote-tracking branch 'upstream/main' into feature/use-github-…
1469de7 
…actions

* upstream/main: (76 commits)
  Bump version.byte-buddy from 1.12.20 to 1.12.21 (#2953)
  Fix instrumentation for WebFlux with Spring 6.x (#2936)
  Fix SQS instrumentation within messaging transactions (#2979)
  Add test for unsampled Transaction (#2950)
  clarify about dropped requests for sampling in documentation (#2957)
  Doc add first stack trace detail (#2978)
  SpanBuilder.addLink is supported, so delete wrong comment (#2975)
  [doc] document log sending (#2929)
  Fix agent log sending (#2974)
  Bump version.aws.sdk from 2.19.8 to 2.19.18 in /apm-agent-plugins (#2973)
  test: synchronizing gherkin specs (#2965)
  Bump aws-java-sdk from 1.12.353 to 1.12.376 in /apm-agent-plugins (#2944)
  Fixed AgentOverheadMetricsTest flakyness (#2918)
  Fix AWS instrumentation destination.service.resource handling (#2947)
  [doc] restructure logs doc (#2916)
  Junit5 test with dependencies runner (#2962)
  Set service target for non-sampled ES client spans (#2959)
  Send logs via intake API (#2694)
  [doc] setup with docker image (#2956)
  Increase CI build timeout (#2955)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-java

3 participants

@felixbarny @SylvainJuge @JonasKunz