Skip to content

Upgrading ECS logging to 1.3.0 #2365

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Dec 22, 2021
Merged

Upgrading ECS logging to 1.3.0 #2365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d19d1d1
Upgrading ECS logging to 1.3.0
eyalkoren Dec 22, 2021
fa29ff5
Disabling Payara IT temporarily
eyalkoren Dec 22, 2021
adaf609
Merge remote-tracking branch 'upstream/master' into ecs-logging-upgrade
eyalkoren Dec 22, 2021
4154eda
Prepare CHANGELOG for 1.28.3
eyalkoren Dec 22, 2021
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
17 changes: 12 additions & 5 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,32 @@ 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]
===== Bug fixes
* 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

Expand Down
2 changes: 1 addition & 1 deletion ...st-latest/src/test/java/co/elastic/apm/agent/grpc/latest/testapp/generated/HelloGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-log-shader-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<properties>
<apm-agent-parent.base.dir>${project.basedir}/../..</apm-agent-parent.base.dir>
<version.ecs.logging>1.1.0</version.ecs.logging>
<version.ecs.logging>1.3.0</version.ecs.logging>
</properties>

<modules>
Expand Down
2 changes: 2 additions & 0 deletions ...s/application-server-integration-tests/src/test/java/co/elastic/apm/servlet/PayaraIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@
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;
import org.testcontainers.images.builder.ImageFromDockerfile;

import java.util.Arrays;

@Ignore
@RunWith(Parameterized.class)
public class PayaraIT extends AbstractServletContainerIntegrationTest {

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
<version.log4j>2.12.3</version.log4j>
<version.log4j2-ecs-layout>1.2.0</version.log4j2-ecs-layout>
<version.log4j2-ecs-layout>1.3.0</version.log4j2-ecs-layout>
<version.spring>5.0.15.RELEASE</version.spring>
<version.spring-boot>2.2.2.RELEASE</version.spring-boot>
<version.jetty-server>9.4.11.v20180605</version.jetty-server>
Expand Down