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.

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

[8.0] otlp: Add beta support to receive logs (backport #6768) #6832

Merged
merged 2 commits into from
Dec 7, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2021

This is an automatic backport of pull request #6768 done by Mergify.
Cherry-pick of 5e5623e has failed:

On branch mergify/bp/8.0/pr-6768
Your branch is up to date with 'origin/8.0'.

You are currently cherry-picking commit 5e5623e1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   apmpackage/apm/changelog.yml
	modified:   apmpackage/apm/data_stream/app_logs/fields/ecs.yml
	modified:   beater/otlp/grpc.go
	modified:   beater/otlp/grpc_test.go
	modified:   docs/open-telemetry.asciidoc
	modified:   model/apmevent.go
	modified:   model/error.go
	modified:   model/error_test.go
	modified:   model/event.go
	modified:   model/log.go
	modified:   model/modeldecoder/rumv3/decoder.go
	modified:   model/modeldecoder/rumv3/metadata_test.go
	modified:   model/modeldecoder/v2/decoder.go
	modified:   model/modeldecoder/v2/metadata_test.go
	modified:   model/modelprocessor/culprit_test.go
	modified:   model/modelprocessor/errormessage_test.go
	modified:   model/modelprocessor/excludefromgrouping_test.go
	modified:   model/modelprocessor/groupingkey_test.go
	modified:   model/modelprocessor/libraryframe_test.go
	new file:   processor/otel/logs.go
	new file:   processor/otel/logs_test.go
	modified:   processor/otel/traces.go
	modified:   sourcemap/processor_test.go
	new file:   systemtest/approvals/TestOTLPGRPCLogs.approved.json
	modified:   systemtest/go.mod
	modified:   systemtest/go.sum
	modified:   systemtest/otlp_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Adds support to receive OTLP logs on the GRPC receiver. This feature is
_beta_ and should be used sparsely until the OTel spec declares it as
stable.

Signed-off-by: Marc Lopez Rubio <[email protected]>
(cherry picked from commit 5e5623e)

# Conflicts:
#	changelogs/head.asciidoc
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Dec 7, 2021
@mergify mergify bot assigned marclop Dec 7, 2021
@marclop marclop enabled auto-merge (squash) December 7, 2021 05:47
@marclop marclop removed the conflicts There is a conflict in the backported pull request label Dec 7, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Dec 7, 2021

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@marclop marclop merged commit df87e76 into 8.0 Dec 7, 2021
@mergify mergify bot deleted the mergify/bp/8.0/pr-6768 branch December 7, 2021 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants