Skip to content

Commit 895c21e

Browse files
committed
added upgrading docs for 4.x (#326)
closes #326
1 parent 7ea4219 commit 895c21e

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

docs/index.asciidoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endif::[]
2222
[[framework-support]]
2323
The Elastic APM Python Agent comes with support for the following frameworks:
2424

25-
* <<django-support,Django>> 1.8 - 2.0
25+
* <<django-support,Django>> 1.8 - 2.1
2626
* <<flask-support,Flask>> 0.10+
2727

2828
For other frameworks and custom Python code, the agent exposes a set of <<api,APIs>> for integration.
@@ -42,4 +42,5 @@ include::./sanitizing-data.asciidoc[Sanitizing Data]
4242
include::./run-tests-locally.asciidoc[Run Tests Locally]
4343

4444
include::./api.asciidoc[API documentation]
45+
include::./upgrading.asciidoc[Upgrading from previous versions]
4546
include::./tuning.asciidoc[Tuning and Overhead considerations]

docs/upgrading.asciidoc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[[upgrading]]
2+
== Upgrading
3+
4+
Upgrades between minor versions of the agent, like from 3.1 to 3.2 are always backwards compatible.
5+
Upgrades that involve a major version bump often come with some backwards incompatible changes.
6+
7+
We highly recommend to always pin the version of `elastic-apm` in your `requirements.txt` or `Pipfile`.
8+
This avoids automatic upgrades to potentially incompatible versions.
9+
10+
[[upgrading-4.x]]
11+
=== Upgrading to version 4 of the agent
12+
13+
4.0 of the Elastic APM Python Agent comes with several backwards incompatible changes.
14+
15+
[[upgrading-4.x-apm-server]]
16+
==== APM Server 6.5 required
17+
This version of the agent is *only compatible with APM Server 6.5+*.
18+
To upgrade, we recommend to first upgrade APM Server, and then the agent.
19+
APM Server 6.5+ is backwards compatible with versions 2.x and 3.x of the agent.
20+
21+
[[upgrading-4.x-configuration]]
22+
==== Configuration options
23+
24+
Several configuration options have been removed, or renamed
25+
26+
* `flush_interval` has been removed
27+
* the `flush_interval` and `max_queue_size` settings have been removed.
28+
* new settings introduced: `api_request_time` and `api_request_size`.
29+
* Some settings now require a unit for duration or size. See <<config-format-size, size format>> and <<config-format-duration, duration format>>.
30+
31+
[[upgrading-4.x-processors]]
32+
==== Processors
33+
34+
The method to write processors for sanitizing events has been changed.
35+
It will now be called for every type of event (transactions, spans and errors),
36+
unless the event types are limited using a decorator.
37+
See <<sanitizing-data, Sanitizing data>> for more information.

0 commit comments

Comments
 (0)