-
Notifications
You must be signed in to change notification settings - Fork 525
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
docs: Add PHP agent information to shared docs #4740
docs: Add PHP agent information to shared docs #4740
Conversation
@SergeyKleyman, please see the questions in the description above. |
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪Steps errors |
OpenTracing bridge is definitely not planned for PHP Agent 1.0 and I'm not sure if it will ever be added especially considering that OpenTracing is superseded by OpenTelemetry. If we get requests from users we will reconsider it.
For PHP Agent 1.0 minimum supported APM Server version is 7.0. |
@elasticmachine, run elasticsearch-ci/docs |
Codecov Report
@@ Coverage Diff @@
## master #4740 +/- ##
=======================================
Coverage 76.81% 76.81%
=======================================
Files 166 166
Lines 10244 10244
=======================================
Hits 7869 7869
Misses 2375 2375
|
docs/guide/apm-data-model.asciidoc
Outdated
@@ -53,6 +53,7 @@ To configure the number of spans recorded per transaction, see the relevant Agen | |||
* Java: {apm-java-ref-v}/config-core.html#config-transaction-max-spans[`transaction_max_spans`] | |||
* .NET: {apm-dotnet-ref-v}/config-core.html#config-transaction-max-spans[`TransactionMaxSpans`] | |||
* Node.js: {apm-node-ref-v}/configuration.html#transaction-max-spans[`transactionMaxSpans`] | |||
* PHP: {apm-php-ref}/configuration-reference.html#config-transaction-max-spans[`transaction_max_spans`] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the difference between apm-<language>-ref
and apm-<language>-ref-v
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great catch! You're right, I should be using the -v
attribute, which stands for version
. The apm-<language>-ref
resolves from here. It permanently links to current
.
The apm-<language>-ref-v
resolves from here, using the additional attributes described here. It points to the current
version of the documentation as well, but allows us to pin agent versions to stack versions. This makes updating links as documentation evolves much easier.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in bc51362.
Co-authored-by: Sergey Kleyman <[email protected]>
…lli25/apm-server into add-php-agent-instructions
Thank you @SergeyKleyman! I'll wait for one of the @elastic/obs-docs writers to give final approval before merging this PR. |
|
||
2. Begin a new transaction using the agent's public API. For example, use {apm-php-ref-v}/public-api.html#api-elasticapm-class-begin-current-transaction[`ElasticApm::beginCurrentTransaction`] | ||
and pass the new `DistributedTracingData` object as a parameter. | ||
This will create a new transaction or span as a child of the incoming trace context. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not entirely correct - as name implies beginCurrentTransaction
is used to create a new transaction and not a span. I saw some other agents say something similar in this document (i.e., that distributed tracing context on the receiving side can be used to create a new span and not only a new transaction). I am not sure if it's correct for those agents or not - it might be worth making sure with the relevant teams. But for PHP agent distributed tracing context on the receiving side can be passed to create a new transaction but not a new span. A new spans can then be created as children of the new transaction (and the distributed tracing context will passed to them automatically by the new transaction). The confusion might be stemming from the fact that on the sending side the source of the distributed tracing context (that then is passed to the receiving side) can be either transaction or span whatever is the current entity at the point getDistributedTracingData
is invoked. That source of the distributed tracing context will then be considered to be the parent of the new transaction on the receiving side.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure if it's correct for those agents or not - it might be worth making sure with the relevant teams.
Thanks. The agent devs created that content for the most part, but I'll double-check just to be safe. I presume you may be correct and that we can do better with the wording here. I'll save that for a follow-up PR.
The confusion might be stemming from the fact that on the sending side the source of the distributed tracing context (that then is passed to the receiving side) can be either transaction or span whatever is the current entity at the point getDistributedTracingData is invoked.
Yes, that's very helpful. I'll fix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in c9b17b5. Will follow up with the other agents in a separate PR.
Co-authored-by: Sergey Kleyman <[email protected]>
Co-authored-by: Sergey Kleyman <[email protected]>
Co-authored-by: Sergey Kleyman <[email protected]> Co-authored-by: Sergey Kleyman <[email protected]>
Co-authored-by: Sergey Kleyman <[email protected]> Co-authored-by: Sergey Kleyman <[email protected]>
…chemas-to-agents * upstream/master: (111 commits) Introduce metricset.name (elastic#4857) processor/otel: test service.version handling (elastic#4853) docs: Add PHP agent information to shared docs (elastic#4740) Script for faster development workflow (elastic#4731) Update to elastic/beats@1b31c26 (elastic#4763) backport: add 7.12 to .backportrc.json (elastic#4807) backport: enable auto-merge on backport PRs (elastic#4777) Support for Node.js profiles (elastic#4728) docs: readds .NET link (elastic#4764) [DOCS] Fixes URLs on Secure communication with APM Agents page (elastic#4746) ci: set proper parameters for the tar step (elastic#4696) docs: add 7.11.1 release notes (elastic#4727) Disable sourcemap upload endpoint when data streams enabled (elastic#4735) Add service name to dataset field (elastic#4674) Update to elastic/beats@ba423212a660 (elastic#4733) sampling: require a default policy (elastic#4729) processor/otel: add unit test for span status (elastic#4734) Add support for consuming OTLP/gRPC metrics (elastic#4722) [apmpackage] Add config options supported in ESS (elastic#4690) Use the apm-server version everywhere* (elastic#4725) ...
…te-schema-json-1 * upstream/master: (111 commits) Introduce metricset.name (elastic#4857) processor/otel: test service.version handling (elastic#4853) docs: Add PHP agent information to shared docs (elastic#4740) Script for faster development workflow (elastic#4731) Update to elastic/beats@1b31c26 (elastic#4763) backport: add 7.12 to .backportrc.json (elastic#4807) backport: enable auto-merge on backport PRs (elastic#4777) Support for Node.js profiles (elastic#4728) docs: readds .NET link (elastic#4764) [DOCS] Fixes URLs on Secure communication with APM Agents page (elastic#4746) ci: set proper parameters for the tar step (elastic#4696) docs: add 7.11.1 release notes (elastic#4727) Disable sourcemap upload endpoint when data streams enabled (elastic#4735) Add service name to dataset field (elastic#4674) Update to elastic/beats@ba423212a660 (elastic#4733) sampling: require a default policy (elastic#4729) processor/otel: add unit test for span status (elastic#4734) Add support for consuming OTLP/gRPC metrics (elastic#4722) [apmpackage] Add config options supported in ESS (elastic#4690) Use the apm-server version everywhere* (elastic#4725) ...
Summary
This PR adds PHP agent information to the following documentation pages:
Observability Guide
APM Overview
traceparent
to outgoing requests, and one to receive the incoming context.What is the minimum supported APM Server version for 1.0?
- [ ] MetricsNo metrics documentation yet. Skipping for now.- [ ] OpenTracing BridgeNo OpenTracing bridge. Unplanned. Skipping for now.APM Server Reference
Related issues
For elastic/observability-docs#383.
Blocked by elastic/apm-agent-php#352. Docs ci will not pass until 352 is merged.