Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/api.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ except ValueError:
* `exc_info`: A `(type, value, traceback)` tuple as returned by https://docs.python.org/3/library/sys.html#sys.exc_info[`sys.exc_info()`]. If not provided, it will be captured automatically.
* `date`: A `datetime.datetime` object representing the occurrence time of the error. If left empty, it defaults to `datetime.datetime.utcnow()`.
* `context`: A dictionary with contextual information. This dictionary must follow the
{apm-guide-ref}/events-api.html#events-api-errors[Context] schema definition.
{apm-guide-ref}/api-error.html[Context] schema definition.
* `custom`: A dictionary of custom data you want to attach to the event.
* `handled`: A boolean to indicate if this exception was handled or not.

Expand Down Expand Up @@ -112,7 +112,7 @@ client.capture_message(param_message={
* `date`: A `datetime.datetime` object representing the occurrence time of the error.
If left empty, it defaults to `datetime.datetime.utcnow()`.
* `context`: A dictionary with contextual information. This dictionary must follow the
{apm-guide-ref}/events-api.html#events-api-errors[Context] schema definition.
{apm-guide-ref}/api-events.html#events-api-errors[Context] schema definition.
* `custom`: A dictionary of custom data you want to attach to the event.

Returns the id of the message as a string.
Expand Down Expand Up @@ -395,7 +395,7 @@ Supported frameworks will automatically attach information about the HTTP reques
You can attach further data using this function.

TIP: Before using custom context, ensure you understand the different types of
{apm-guide-ref}/metadata.html[metadata] that are available.
{apm-guide-ref}/data-model-metadata.html[metadata] that are available.

Example:

Expand Down Expand Up @@ -528,7 +528,7 @@ NOTE: `asyncio` is only supported for Python 3.7+.
Attach labels to the the current transaction and errors.

TIP: Before using custom labels, ensure you understand the different types of
{apm-guide-ref}/metadata.html[metadata] that are available.
{apm-guide-ref}/data-model-metadata.html[metadata] that are available.

Example:

Expand Down
2 changes: 1 addition & 1 deletion docs/configuration.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ behavior by setting this to `True`.
| `ELASTIC_APM_USE_ELASTIC_TRACEPARENT_HEADER` | `USE_ELASTIC_TRACEPARENT_HEADER` | `True`
|============

To enable {apm-guide-ref}/distributed-tracing.html[distributed tracing],
To enable {apm-guide-ref}/apm-distributed-tracing.html[distributed tracing],
the agent sets a number of HTTP headers to outgoing requests made with <<automatic-instrumentation-http,instrumented HTTP libraries>>.
These headers (`traceparent` and `tracestate`) are defined in the https://www.w3.org/TR/trace-context-1/[W3C Trace Context] specification.

Expand Down
5 changes: 2 additions & 3 deletions docs/opentelemetry.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ using the OpenTelemetry API. This allows users to utilize the Elastic APM agent'
automatic instrumentations, while keeping custom instrumentations vendor neutral.

If a span is created while there is no transaction active, it will result in an
Elastic APM {apm-guide-ref}/transactions.html[`Transaction`]. Inner spans
are mapped to Elastic APM {apm-guide-ref}/transaction-spans.html[`Span`].
Elastic APM {apm-guide-ref}/data-model-transactions.html[`Transaction`]. Inner spans
are mapped to Elastic APM {apm-guide-ref}/data-model-spans.html[`Span`].

[float]
[[opentelemetry-getting-started]]
Expand Down Expand Up @@ -74,4 +74,3 @@ Additionally, due to implementation details, the global context API only works
when a span is included in the activated context, and tokens are not used.
Instead, the global context works as a stack, and when a context is detached the
previously-active context will automatically be activated.