Removing "Modified by SignalFx"
Removing "Modified by SignalFx" comments, since our integration is current the same.
Added a comment to SpringJpaTest explaining the differences.
MODIFY
dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java
dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringDataDecorator.java
-// Modifed by SignalFx
package datadog.trace.instrumentation.springdata;
import datadog.trace.agent.decorator.OrmClientDecorator;

MODIFY
dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringDataInstrumentation.java
dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringDataInstrumentation.java
-// Modified by SignalFx
package datadog.trace.instrumentation.springdata;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;

MODIFY
dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringDataProxyInstrumentation.java
dd-java-agent/instrumentation/spring-data/src/main/java/datadog/trace/instrumentation/springdata/SpringDataProxyInstrumentation.java
-// Modified by SignalFx
package datadog.trace.instrumentation.springdata;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
@@ -67,7 +66,7 @@ public final class SpringDataProxyInstrumentation extends Instrumenter.Default {
public static class ProxyAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static Scope startSpan(
- @Advice.Argument(value = 1, readOnly = false) Method invokedMethod) {
+ @Advice.Argument(value = 1, readOnly = false) final Method invokedMethod) {
final Class<?> clazz = invokedMethod.getDeclaringClass();
// getting a proxy's target during type matching doesn't appear possible,
// so we manually check the target method's class here. As more spring functionality is
@@ -77,7 +76,7 @@ public final class SpringDataProxyInstrumentation extends Instrumenter.Default {
return null;
}
- boolean isPublic = Modifier.isPublic(invokedMethod.getModifiers());
+ final boolean isPublic = Modifier.isPublic(invokedMethod.getModifiers());
if (!isPublic) {
return null;
}

MODIFY
dd-java-agent/instrumentation/spring-data/src/test/groovy/SpringJpaTest.groovy
dd-java-agent/instrumentation/spring-data/src/test/groovy/SpringJpaTest.groovy
-// Modified by SignalFx
import datadog.trace.agent.test.AgentTestRunner
import io.opentracing.tag.Tags
import org.springframework.context.annotation.AnnotationConfigApplicationContext
@@ -7,7 +6,7 @@ import spring.Customer
import spring.CustomerRepository
import spring.PersistenceConfig
-
+// Modified from signalfx version because of differences in JDBC integration
class SpringJpaTest extends AgentTestRunner {
@Shared

MODIFY
dd-java-agent/instrumentation/spring-data/src/test/java/spring/Customer.java
dd-java-agent/instrumentation/spring-data/src/test/java/spring/Customer.java
-// Modified by SignalFx
package spring;
import javax.persistence.Entity;

MODIFY
dd-java-agent/instrumentation/spring-data/src/test/java/spring/CustomerRepository.java
dd-java-agent/instrumentation/spring-data/src/test/java/spring/CustomerRepository.java
-// Modified by SignalFx
package spring;
import java.util.List;

MODIFY
dd-java-agent/instrumentation/spring-data/src/test/java/spring/PersistenceConfig.java
dd-java-agent/instrumentation/spring-data/src/test/java/spring/PersistenceConfig.java
-// Modifed by SignalFx
package spring;
import javax.sql.DataSource;

Removing "Modified by SignalFx"

Removing "Modified by SignalFx" comments, since our integration is current the same.

Added a comment to SpringJpaTest explaining the differences.