From d19d1d1bbdc6d28023c120534fea5f7b5f46773b Mon Sep 17 00:00:00 2001 From: eyalkoren <41850454+eyalkoren@users.noreply.github.com> Date: Wed, 22 Dec 2021 11:24:58 +0200 Subject: [PATCH 1/3] Upgrading ECS logging to 1.3.0 --- .../apm/agent/grpc/latest/testapp/generated/HelloGrpc.java | 2 +- apm-agent-plugins/apm-log-shader-plugin/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/src/test/java/co/elastic/apm/agent/grpc/latest/testapp/generated/HelloGrpc.java b/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/src/test/java/co/elastic/apm/agent/grpc/latest/testapp/generated/HelloGrpc.java index 5a741ec92e..34434e2021 100644 --- a/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/src/test/java/co/elastic/apm/agent/grpc/latest/testapp/generated/HelloGrpc.java +++ b/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/src/test/java/co/elastic/apm/agent/grpc/latest/testapp/generated/HelloGrpc.java @@ -23,7 +23,7 @@ /** */ @javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.42.1)", + value = "by gRPC proto compiler (version 1.43.1)", comments = "Source: rpc.proto") @io.grpc.stub.annotations.GrpcGenerated public final class HelloGrpc { diff --git a/apm-agent-plugins/apm-log-shader-plugin/pom.xml b/apm-agent-plugins/apm-log-shader-plugin/pom.xml index d04c3e58d0..791d4155a0 100644 --- a/apm-agent-plugins/apm-log-shader-plugin/pom.xml +++ b/apm-agent-plugins/apm-log-shader-plugin/pom.xml @@ -14,7 +14,7 @@ ${project.basedir}/../.. - 1.1.0 + 1.3.0 diff --git a/pom.xml b/pom.xml index b1b90f3cb3..2152ea762c 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ (https://nvd.nist.gov/vuln/detail/CVE-2020-9488#vulnCurrentDescriptionTitle), the SMTP appender is excluded from the build and not packaged into the agent artifacts --> 2.12.2 - 1.2.0 + 1.3.0 5.0.15.RELEASE 2.2.2.RELEASE 9.4.11.v20180605 From fa29ff5e2a20dc5e7e7481e3756854739cd74cbe Mon Sep 17 00:00:00 2001 From: eyalkoren <41850454+eyalkoren@users.noreply.github.com> Date: Wed, 22 Dec 2021 12:46:58 +0200 Subject: [PATCH 2/3] Disabling Payara IT temporarily --- .../src/test/java/co/elastic/apm/servlet/PayaraIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/PayaraIT.java b/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/PayaraIT.java index 4089887e85..32a92bb34d 100644 --- a/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/PayaraIT.java +++ b/integration-tests/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/PayaraIT.java @@ -23,6 +23,7 @@ import co.elastic.apm.servlet.tests.JsfApplicationServerTestApp; import co.elastic.apm.servlet.tests.ServletApiTestApp; import co.elastic.apm.servlet.tests.TestApp; +import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.testcontainers.containers.GenericContainer; @@ -30,6 +31,7 @@ import java.util.Arrays; +@Ignore @RunWith(Parameterized.class) public class PayaraIT extends AbstractServletContainerIntegrationTest { From 4154eda28374d2a22b9b6686b889c50ff5c456d0 Mon Sep 17 00:00:00 2001 From: eyalkoren <41850454+eyalkoren@users.noreply.github.com> Date: Wed, 22 Dec 2021 12:53:35 +0200 Subject: [PATCH 3/3] Prepare CHANGELOG for 1.28.3 --- CHANGELOG.asciidoc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 117c7070ae..008debc248 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -20,15 +20,25 @@ endif::[] === Unreleased +[[release-notes-1.28.4]] +==== 1.28.4 - YYYY/MM/DD + +[float] +===== Bug fixes + +[[release-notes-1.x]] +=== Java Agent version 1.x + [[release-notes-1.28.3]] -==== 1.28.3 - YYYY/MM/DD +==== 1.28.3 - 2021/12/22 [float] ===== Dependency updates * Update Log4j to 2.12.3 +* Update ecs-logging-java to 1.3.0 [float] -===== Breaking changes +===== Potentially breaking changes * If the agent cannot discover a service name, it now uses `unknown-java-service` instead of `my-service` - {pull}2325[#2325] [float] @@ -36,9 +46,6 @@ endif::[] * Gracefully handle JDBC drivers which don't support `Connection#getCatalog` - {pull}2340[#2340] * Fix using JVM keystore options for communication with APM Server - {pull}2362[#2362] -[[release-notes-1.x]] -=== Java Agent version 1.x - [[release-notes-1.28.2]] ==== 1.28.2 - 2021/12/16