Skip to content

Commit f35e2e6

Browse files
tylerbensontylerbenson
committed
Remove various warnings and other cleanup
Also upgrade some plugins.
1 parent 7c4d42e commit f35e2e6

50 files changed

Lines changed: 160 additions & 111 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dd-java-agent-ittests/src/test/java/datadog/trace/agent/test/IntegrationTestUtils.java‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static ClassLoader getAgentClassLoader() {
3939
classloaderField = tracingAgentClass.getDeclaredField("AGENT_CLASSLOADER");
4040
classloaderField.setAccessible(true);
4141
return (ClassLoader) classloaderField.get(null);
42-
} catch (Exception e) {
42+
} catch (final Exception e) {
4343
throw new IllegalStateException(e);
4444
} finally {
4545
if (null != classloaderField) {
@@ -141,29 +141,19 @@ public static String getResourceName(final String className) {
141141
return className.replace('.', '/') + ".class";
142142
}
143143

144-
public static String[] getBootstrapPackagePrefixes() {
145-
try {
146-
Field f =
147-
getAgentClassLoader()
148-
.loadClass("datadog.trace.agent.tooling.Utils")
149-
.getField("BOOTSTRAP_PACKAGE_PREFIXES");
150-
return (String[]) f.get(null);
151-
} catch (Exception e) {
152-
e.printStackTrace();
153-
}
154-
return null;
144+
public static String[] getBootstrapPackagePrefixes() throws Exception {
145+
final Field f =
146+
getAgentClassLoader()
147+
.loadClass("datadog.trace.agent.tooling.Utils")
148+
.getField("BOOTSTRAP_PACKAGE_PREFIXES");
149+
return (String[]) f.get(null);
155150
}
156151

157-
public static String[] getAgentPackagePrefixes() {
158-
try {
159-
Field f =
160-
getAgentClassLoader()
161-
.loadClass("datadog.trace.agent.tooling.Utils")
162-
.getField("AGENT_PACKAGE_PREFIXES");
163-
return (String[]) f.get(null);
164-
} catch (Exception e) {
165-
e.printStackTrace();
166-
}
167-
return null;
152+
public static String[] getAgentPackagePrefixes() throws Exception {
153+
final Field f =
154+
getAgentClassLoader()
155+
.loadClass("datadog.trace.agent.tooling.Utils")
156+
.getField("AGENT_PACKAGE_PREFIXES");
157+
return (String[]) f.get(null);
168158
}
169159
}

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/CallDepthThreadLocalMap.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ public class CallDepthThreadLocalMap {
1414
private static final ThreadLocal<Map<Object, CallDepthThreadLocalMap>> INSTANCES =
1515
new ThreadLocal<>();
1616

17-
public static CallDepthThreadLocalMap get(Object o) {
17+
private static final ThreadLocal<AtomicInteger> tls = new ThreadLocal<>();
18+
19+
public static CallDepthThreadLocalMap get(final Object o) {
1820
if (INSTANCES.get() == null) {
1921
INSTANCES.set(new WeakHashMap<Object, CallDepthThreadLocalMap>());
2022
}
@@ -24,8 +26,6 @@ public static CallDepthThreadLocalMap get(Object o) {
2426
return INSTANCES.get().get(o);
2527
}
2628

27-
private final ThreadLocal<AtomicInteger> tls = new ThreadLocal<>();
28-
2929
private CallDepthThreadLocalMap() {}
3030

3131
public int incrementCallDepth() {

‎dd-java-agent/agent-tooling/agent-tooling.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ dependencies {
44
compile project(':dd-java-agent:agent-bootstrap')
55
compile deps.bytebuddy
66
compile deps.bytebuddyagent
7-
compile deps.autoservice
7+
annotationProcessor deps.autoservice
8+
implementation deps.autoservice
89

910
compileOnly project(':dd-trace-ot')
1011

‎dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ abstract class Configurable implements Instrumenter {
1818
protected final boolean enabled;
1919

2020
public Configurable(final String instrumentationName, final String... additionalNames) {
21-
this.instrumentationNames = new HashSet(Arrays.asList(additionalNames));
21+
this.instrumentationNames = new HashSet<>(Arrays.asList(additionalNames));
2222
instrumentationNames.add(instrumentationName);
2323

2424
// If default is enabled, we want to enable individually,

‎dd-java-agent/instrumentation/apache-httpclient-4.3/apache-httpclient-4.3.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,6 @@ dependencies {
3131

3232
compile deps.bytebuddy
3333
compile deps.opentracing
34+
annotationProcessor deps.autoservice
35+
implementation deps.autoservice
3436
}

‎dd-java-agent/instrumentation/aws-sdk/aws-sdk.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ dependencies {
3333

3434
compile deps.bytebuddy
3535
compile deps.opentracing
36-
compile deps.autoservice
36+
annotationProcessor deps.autoservice
37+
implementation deps.autoservice
3738

3839
testCompile project(':dd-java-agent:testing')
3940
// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.

‎dd-java-agent/instrumentation/aws-sdk/src/main/java/datadog/trace/instrumentation/aws/SpanDecorator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class SpanDecorator {
3333
private static final Map<String, String> SERVICE_NAMES = new ConcurrentHashMap<>();
3434
private static final Map<Class, String> OPERATION_NAMES = new ConcurrentHashMap<>();
3535

36-
static void onRequest(final Request request, final Span span) {
36+
static void onRequest(final Request<?> request, final Span span) {
3737
Tags.COMPONENT.set(span, COMPONENT_NAME);
3838
Tags.HTTP_METHOD.set(span, request.getHttpMethod().name());
3939
Tags.HTTP_URL.set(span, request.getEndpoint().toString());
@@ -52,9 +52,9 @@ static void onRequest(final Request request, final Span span) {
5252

5353
try {
5454
final StringBuilder params = new StringBuilder("{");
55-
final Map<String, List<Object>> requestParams = request.getParameters();
55+
final Map<String, List<String>> requestParams = request.getParameters();
5656
boolean firstKey = true;
57-
for (final Entry<String, List<Object>> entry : requestParams.entrySet()) {
57+
for (final Entry<String, List<String>> entry : requestParams.entrySet()) {
5858
if (!firstKey) {
5959
params.append(",");
6060
}

‎dd-java-agent/instrumentation/classloaders/classloaders.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ dependencies {
66

77
compile deps.bytebuddy
88
compile deps.opentracing
9-
compile deps.autoservice
9+
annotationProcessor deps.autoservice
10+
implementation deps.autoservice
1011

1112
testCompile project(':dd-java-agent:testing')
1213
}

‎dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ dependencies {
3333

3434
compile deps.bytebuddy
3535
compile deps.opentracing
36+
annotationProcessor deps.autoservice
37+
implementation deps.autoservice
3638

3739
testCompile project(':dd-java-agent:testing')
3840
testCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'

‎dd-java-agent/instrumentation/java-concurrent/akka-testing/src/main/scala/AkkaActors.scala‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
import akka.actor.{Actor, ActorLogging, ActorRef, ActorSystem, Props}
2+
import akka.pattern.ask
3+
import akka.util.Timeout
14
import datadog.trace.api.Trace
25
import datadog.trace.context.TraceScope
3-
import akka.pattern.ask
46
import io.opentracing.util.GlobalTracer
57

68
import scala.concurrent.duration._
7-
import akka.actor.{Actor, ActorLogging, ActorRef, ActorSystem, Props}
8-
import akka.routing.Broadcast
9-
import akka.util.Timeout
109

1110
// ! == send-message
1211
object AkkaActors {
@@ -84,7 +83,6 @@ class Receiver extends Actor with ActorLogging {
8483
def receive = {
8584
case Greeting(greeting) => {
8685
AkkaActors.tracedChild(greeting)
87-
"done"
8886
}
8987

9088
}

0 commit comments

Comments
 (0)