Skip to content

Use a thread-safe synchronized weak hash map #203

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 2 commits into from
Jan 25, 2018
Merged

Use a thread-safe synchronized weak hash map #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
839ed9f
Use a thread-safe synchronized weak hash map.
Jan 23, 2018
d731789
Remove copy-paste from spring and trace instrumentation
Jan 25, 2018
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
7 changes: 5 additions & 2 deletions ...tion/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import datadog.trace.agent.tooling.Instrumenter;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
import lombok.Data;
Expand All @@ -22,8 +23,10 @@

@AutoService(Instrumenter.class)
public final class ConnectionInstrumentation implements Instrumenter {
public static final Map<Connection, DBInfo> connectionInfo = new WeakHashMap<>();
public static final Map<PreparedStatement, String> preparedStatements = new WeakHashMap<>();
public static final Map<Connection, DBInfo> connectionInfo =
Collections.synchronizedMap(new WeakHashMap<Connection, DBInfo>());
public static final Map<PreparedStatement, String> preparedStatements =
Collections.synchronizedMap(new WeakHashMap<PreparedStatement, String>());

@Override
public AgentBuilder instrument(final AgentBuilder agentBuilder) {
Expand Down
4 changes: 0 additions & 4 deletions ...g-web/src/main/java/datadog/trace/instrumentation/springweb/SpringWebInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,13 @@
import datadog.trace.api.DDTags;
import io.opentracing.Scope;
import io.opentracing.util.GlobalTracer;
import java.sql.PreparedStatement;
import java.util.Map;
import java.util.WeakHashMap;
import javax.servlet.http.HttpServletRequest;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.asm.Advice;
import org.springframework.web.servlet.HandlerMapping;

@AutoService(Instrumenter.class)
public final class SpringWebInstrumentation implements Instrumenter {
public static final Map<PreparedStatement, String> preparedStatements = new WeakHashMap<>();

@Override
public AgentBuilder instrument(final AgentBuilder agentBuilder) {
Expand Down
4 changes: 0 additions & 4 deletions ...n/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,12 @@
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import java.lang.reflect.Method;
import java.sql.PreparedStatement;
import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.asm.Advice;

@AutoService(Instrumenter.class)
public final class TraceAnnotationInstrumentation implements Instrumenter {
public static final Map<PreparedStatement, String> preparedStatements = new WeakHashMap<>();

@Override
public AgentBuilder instrument(final AgentBuilder agentBuilder) {
Expand Down
8 changes: 6 additions & 2 deletions dd-java-agent/tooling/src/main/java/datadog/trace/agent/tooling/ClassLoaderMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package datadog.trace.agent.tooling;

import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
import net.bytebuddy.matcher.ElementMatcher;

Expand Down Expand Up @@ -46,7 +48,8 @@ public boolean matches(final ClassLoader target) {
public static class ClassLoaderHasClassMatcher
extends ElementMatcher.Junction.AbstractBase<ClassLoader> {

private final WeakHashMap<ClassLoader, Boolean> cache = new WeakHashMap<>();
private final Map<ClassLoader, Boolean> cache =
Collections.synchronizedMap(new WeakHashMap<ClassLoader, Boolean>());

private final String[] names;

Expand Down Expand Up @@ -80,7 +83,8 @@ public boolean matches(final ClassLoader target) {
public static class ClassLoaderHasClassWithFieldMatcher
extends ElementMatcher.Junction.AbstractBase<ClassLoader> {

private final WeakHashMap<ClassLoader, Boolean> cache = new WeakHashMap<>();
private final Map<ClassLoader, Boolean> cache =
Collections.synchronizedMap(new WeakHashMap<ClassLoader, Boolean>());

private final String className;
private final String fieldName;
Expand Down