Merge branch 'master' into es-rest-client-indy

Author: felixbarny

CHANGELOG.asciidoc

@@ -35,6 +35,10 @@ endif::[]
 user to configure an arbitrary agent version that will be downloaded from maven and attached - {pull}1959[#1959]
 * Add extra check to detect improper agent setup - {pull}2076[#2076]
 
+[float]
+===== Performance improvements
+* Reduce GC time overhead caused by WeakReferences {pull}2086[2086]
+
 [float]
 ===== Bug fixes
 * Fix failure to parse some forms of the `Implementation-Version` property from jar manifest files - {pull}1931[#1931]
@@ -44,7 +48,7 @@ user to configure an arbitrary agent version that will be downloaded from maven
 
 [float]
 ===== Refactorings
-* Migrate several plugins to indy dispatcher {pull}2087[#2087], {pull}2088[#2088]
+* Migrate several plugins to indy dispatcher {pull}2087[#2087], {pull}2088[#2088], {pull}2090[#2090]
 
 [[release-notes-1.x]]
 === Java Agent version 1.x

apm-agent-plugins/apm-grpc/apm-grpc-plugin/src/test/java/co/elastic/apm/agent/grpc/AbstractGrpcClientInstrumentationTest.java

@@ -26,6 +26,7 @@
 import co.elastic.apm.agent.impl.transaction.Transaction;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -155,6 +156,7 @@ void clientStreamingCallShouldBeIgnored() {
  }
 
  @Test
+ @Disabled // disabled for now as it's flaky on CI
  void serverStreamingCallShouldBeIgnored() {
  String s = app.sayHelloServerStreaming("alice", 5);
  assertThat(s)

apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/StatementInstrumentation.java

@@ -336,4 +336,29 @@ public static void onAfterExecute(@Advice.This Statement statement,
 
  }
 
+ /**
+ * Instruments:
+ * <ul>
+ * <li>{@link Statement#close()}</li>
+ * </ul>
+ */
+ public static class CloseStatementInstrumentation extends StatementInstrumentation {
+
+ private static final JdbcHelper helper = JdbcHelper.get();
+
+ public CloseStatementInstrumentation(ElasticApmTracer tracer) {
+ super(
+ named("close")
+ .and(takesArguments(0))
+ .and(isPublic())
+ );
+ }
+
+ @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+ public static void onBeforeClose(@Advice.This Statement statement) {
+ if (statement instanceof PreparedStatement) {
+ helper.removeSqlForStatement(statement);
+ }
+ }
+ }
 }

apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/helper/JdbcHelper.java

@@ -213,6 +213,10 @@ private static void markNotSupported(JdbcFeature feature, Class<?> type, SQLExce
  }
  }
 
+ public void removeSqlForStatement(Statement statement) {
+ statementSqlMap.remove(statement);
+ }
+
  /**
  * Represent JDBC features for which availability has to be checked at runtime
  */

apm-agent-plugins/apm-jdbc-plugin/src/main/resources/META-INF/services/co.elastic.apm.agent.sdk.ElasticApmInstrumentation

@@ -5,3 +5,4 @@ co.elastic.apm.agent.jdbc.StatementInstrumentation$ExecuteUpdateNoQueryInstrumen
 co.elastic.apm.agent.jdbc.StatementInstrumentation$AddBatchInstrumentation
 co.elastic.apm.agent.jdbc.StatementInstrumentation$ExecuteBatchInstrumentation
 co.elastic.apm.agent.jdbc.StatementInstrumentation$ExecutePreparedStatementInstrumentation
+co.elastic.apm.agent.jdbc.StatementInstrumentation$CloseStatementInstrumentation

apm-agent-plugins/apm-jdbc-plugin/src/test/java/co/elastic/apm/agent/jdbc/AbstractJdbcInstrumentationTest.java

@@ -305,6 +305,9 @@ private void testPreparedStatementUpdate(PreparedStatementExecutor<Number> state
  reporter.reset();
  // unique key violation
  assertThatThrownBy(() -> statementConsumer.withStatement(statement)).isInstanceOf(SQLException.class);
+ int mappedStatements = JdbcGlobalState.statementSqlMap.approximateSize();
+ statement.close();
+ assertThat(JdbcGlobalState.statementSqlMap.approximateSize()).isLessThan(mappedStatements);
  Span span = assertSpanRecorded(insert, false, -1);
  assertThat(span.getOutcome()).isEqualTo(Outcome.FAILURE);
  }

apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/src/test/java/co/elastic/apm/agent/redis/jedis/Jedis2InstrumentationTest.java renamed to apm-agent-plugins/apm-redis-plugin/apm-jedis-2-tests/src/test/java/co/elastic/apm/agent/jedis/Jedis2InstrumentationTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package co.elastic.apm.agent.redis.jedis;
+package co.elastic.apm.agent.jedis;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/src/test/java/co/elastic/apm/agent/redis/jedis/Jedis3InstrumentationTest.java renamed to apm-agent-plugins/apm-redis-plugin/apm-jedis-3-tests/src/test/java/co/elastic/apm/agent/jedis/Jedis3InstrumentationTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package co.elastic.apm.agent.redis.jedis;
+package co.elastic.apm.agent.jedis;
 
 class Jedis3InstrumentationTest extends Jedis2InstrumentationTest {
 

apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/src/main/java/co/elastic/apm/agent/redis/jedis/JedisInstrumentation.java renamed to apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/src/main/java/co/elastic/apm/agent/jedis/JedisInstrumentation.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package co.elastic.apm.agent.redis.jedis;
+package co.elastic.apm.agent.jedis;
 
 import co.elastic.apm.agent.bci.TracerAwareInstrumentation;
 import co.elastic.apm.agent.impl.transaction.Span;
@@ -41,21 +41,23 @@
 
 public class JedisInstrumentation extends TracerAwareInstrumentation {
 
- @Advice.OnMethodEnter(suppress = Throwable.class)
- private static void beforeSendCommand(@Advice.This(typing = Assigner.Typing.DYNAMIC) BinaryJedis thiz,
-  @Advice.Local("span") Span span,
- @Advice.Origin("#m") String method) {
- span = RedisSpanUtils.createRedisSpan(method);
+ @Nullable
+ @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+ public static Object beforeSendCommand(@Advice.This(typing = Assigner.Typing.DYNAMIC) BinaryJedis thiz,
+  @Advice.Origin("#m") String method) {
+ Span span = RedisSpanUtils.createRedisSpan(method);
  if (span != null) {
  span.getContext().getDestination()
  .withAddress(thiz.getClient().getHost())
  .withPort(thiz.getClient().getPort());
  }
+ return span;
  }
 
- @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
- private static void afterSendCommand(@Nullable @Advice.Local("span") Span span,
- @Nullable @Advice.Thrown Throwable thrown) {
+ @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
+ public static void afterSendCommand(@Nullable @Advice.Enter Object spanObj,
+ @Nullable @Advice.Thrown Throwable thrown) {
+ Span span = (Span) spanObj;
  if (span != null) {
  span.captureException(thrown)
  .deactivate()
@@ -84,8 +86,4 @@ public Collection<String> getInstrumentationGroupNames() {
  return Arrays.asList("redis", "jedis");
  }
 
- @Override
- public boolean indyPlugin() {
- return false;
- }
 }

apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/src/main/java/co/elastic/apm/agent/redis/jedis/JedisSpanNameInstrumentation.java renamed to apm-agent-plugins/apm-redis-plugin/apm-jedis-plugin/src/main/java/co/elastic/apm/agent/jedis/JedisSpanNameInstrumentation.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package co.elastic.apm.agent.redis.jedis;
+package co.elastic.apm.agent.jedis;
 
 import co.elastic.apm.agent.bci.TracerAwareInstrumentation;
 import co.elastic.apm.agent.impl.transaction.AbstractSpan;
@@ -42,15 +42,13 @@
  */
 public class JedisSpanNameInstrumentation extends TracerAwareInstrumentation {
 
- @Advice.OnMethodEnter
- private static void setSpanNameToRedisProtocolCommand(@Advice.Argument(1) Object command) {
- if (tracer != null) {
- AbstractSpan<?> active = tracer.getActive();
- if (active instanceof Span) {
- Span activeSpan = (Span) active;
- if ("redis".equals(activeSpan.getSubtype())) {
- activeSpan.withName(command.toString());
- }
+ @Advice.OnMethodEnter(inline = false)
+ public static void setSpanNameToRedisProtocolCommand(@Advice.Argument(1) Object command) {
+ AbstractSpan<?> active = tracer.getActive();
+ if (active instanceof Span) {
+ Span activeSpan = (Span) active;
+ if ("redis".equals(activeSpan.getSubtype())) {
+ activeSpan.withName(command.toString());
  }
  }
  }
@@ -74,8 +72,4 @@ public Collection<String> getInstrumentationGroupNames() {
  return Arrays.asList("redis", "jedis");
  }
 
- @Override
- public boolean indyPlugin() {
- return false;
- }
 }