Skip to content

[8.x](backport #4269) [apm/otel] Add links to Elastic Distribution of OpenTelemetry PHP#4272

Merged
colleenmcginnis merged 2 commits into
8.xfrom
mergify/bp/8.x/pr-4269
Sep 18, 2024
Merged

[8.x](backport #4269) [apm/otel] Add links to Elastic Distribution of OpenTelemetry PHP#4272
colleenmcginnis merged 2 commits into
8.xfrom
mergify/bp/8.x/pr-4269

Conversation

@mergify

@mergify mergify Bot commented Sep 18, 2024

Copy link
Copy Markdown
Contributor

Add links to the Elastic Distribution of OpenTelemetry PHP in both stateful and serverless docs.

cc @estolfo @elastic/apm-agent-php


This is an automatic backport of pull request #4269 done by Mergify.

(cherry picked from commit 94c19e4)

# Conflicts:
#	docs/en/serverless/apm-agents/apm-agents-opentelemetry.mdx
@mergify mergify Bot requested a review from a team as a code owner September 18, 2024 17:43
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Sep 18, 2024
@mergify

mergify Bot commented Sep 18, 2024

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 94c19e4 has failed:

On branch mergify/bp/8.x/pr-4269
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 94c19e41.
  (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:   docs/en/observability/apm/open-telemetry.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/en/serverless/apm-agents/apm-agents-opentelemetry.mdx

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

@github-actions

Copy link
Copy Markdown
Contributor

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@colleenmcginnis colleenmcginnis enabled auto-merge (squash) September 18, 2024 20:39
@colleenmcginnis colleenmcginnis merged commit 0bd8742 into 8.x Sep 18, 2024
@colleenmcginnis colleenmcginnis deleted the mergify/bp/8.x/pr-4269 branch September 18, 2024 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant