From 7c64f8c3161c52c22e3de593e75f89a5c3a22707 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 10 Feb 2020 12:01:25 -0500 Subject: [PATCH 1/3] [docs] Update 1.13.0 release notes --- CHANGELOG.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index f147ec72d4..3f473ff5e5 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -20,6 +20,9 @@ endif::[] === Unreleased +[[release-notes-1.x]] +=== Java Agent version 1.x + [[release-notes-1.13.0]] ==== 1.13.0 (Next) @@ -46,9 +49,6 @@ for more details) - {pull}1009[#1009] * JMS should propagate traceparent header when transactions are not sampled {pull}999[#999] * Spans are not closed if JDBC implementation does not support `getUpdateCount` {pull}1008[#1008] -[[release-notes-1.x]] -=== Java Agent version 1.x - [[release-notes-1.12.0]] ==== 1.12.0 - 2019/11/21 From d6946d4b85de157f43f4de4d69e09a6efd14bacc Mon Sep 17 00:00:00 2001 From: eyalkoren <41850454+eyalkoren@users.noreply.github.com> Date: Mon, 10 Feb 2020 20:05:57 +0200 Subject: [PATCH 2/3] Update CHANGELOG.asciidoc --- CHANGELOG.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 3f473ff5e5..0fa512dd5c 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -24,7 +24,7 @@ endif::[] === Java Agent version 1.x [[release-notes-1.13.0]] -==== 1.13.0 (Next) +==== 1.13.0 - 2020/02/11 [float] ===== Features @@ -34,7 +34,7 @@ endif::[] * Instrument log4j Logger#error(String, Throwable) ({pull}919[#919]) Automatically captures exceptions when calling `logger.error("message", exception)` * Add instrumentation for external process execution through `java.lang.Process` and Apache `commons-exec` - {pull}903[#903] * Add `destination` fields to exit span contexts - {pull}976[#976] -* Removed `context.message.topic.name` field. - {pull}993[#993] +* Removed `context.message.topic.name` field - {pull}993[#993] * Add Kafka support, currently marked as `incubating` (off by default), until binary traceparent header is implemented - {pull}981[#981] * Add support for binary `traceparent` header format (see the https://github.com/elastic/apm/blob/master/docs/agent-development.md#Binary-Fields[spec] for more details) - {pull}1009[#1009] From 4223befefd453a70b250db92607049faf3c3c2d1 Mon Sep 17 00:00:00 2001 From: eyalkoren <41850454+eyalkoren@users.noreply.github.com> Date: Mon, 10 Feb 2020 21:06:53 +0200 Subject: [PATCH 3/3] Update the Kafka bullet --- CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 0fa512dd5c..3d2de86ee9 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -35,7 +35,7 @@ endif::[] * Add instrumentation for external process execution through `java.lang.Process` and Apache `commons-exec` - {pull}903[#903] * Add `destination` fields to exit span contexts - {pull}976[#976] * Removed `context.message.topic.name` field - {pull}993[#993] -* Add Kafka support, currently marked as `incubating` (off by default), until binary traceparent header is implemented - {pull}981[#981] +* Add support for Kafka clients - {pull}981[#981] * Add support for binary `traceparent` header format (see the https://github.com/elastic/apm/blob/master/docs/agent-development.md#Binary-Fields[spec] for more details) - {pull}1009[#1009] * Add support for log correlation for log4j and log4j2, even when not used in combination with slf4j.