Skip to content

Loading ConnectionMetaData from the agent class loader #1864

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 3 commits into from
Jun 24, 2021
Merged

Loading ConnectionMetaData from the agent class loader #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
430b8d7
Loading ConnectionMetaData from the agent class loader
eyalkoren Jun 15, 2021
dc097ea
update changelog
SylvainJuge Jun 24, 2021
6467d4f
Merge branch 'master' of github.com:elastic/apm-agent-java into jdbc-…
SylvainJuge Jun 24, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ for exit spans - {pull}1788[#1788]
* Fix `ListenerExecutionFailedException` when using Spring AMQP's ReplyTo container - {pull}1872[#1872]
* Enabling log ECS reformatting when using Logback configured with `LayoutWrappingEncoder` and a pattern layout - {pull}1879[#1879]
* Fix NPE with Webflux + context propagation headers - {pull}1871[1871]
* Fix `ClassCastException` with `ConnnectionMetaData` and multiple classloaders - {pull}1864[#1864]

[[release-notes-1.x]]
=== Java Agent version 1.x
Expand Down
2 changes: 2 additions & 0 deletions ...ns/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/ConnectionMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package co.elastic.apm.agent.jdbc.helper;

import co.elastic.apm.agent.sdk.state.GlobalState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -32,6 +33,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@GlobalState
public class ConnectionMetaData {

private static final Logger logger = LoggerFactory.getLogger(ConnectionMetaData.class);
Expand Down
1 change: 0 additions & 1 deletion ...nt-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import java.util.concurrent.Callable;

import static co.elastic.apm.agent.jdbc.helper.JdbcGlobalState.metaDataMap;
import static co.elastic.apm.agent.jdbc.helper.JdbcGlobalState.metadataSupported;
import static co.elastic.apm.agent.jdbc.helper.JdbcGlobalState.statementSqlMap;

public class JdbcHelper {
Expand Down