open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply doubled-check locking + same approach to attributes definition for netty-4.1

This commit is contained in:
Luca Abbati 2019-07-22 11:15:33 +02:00
parent 5921ed3ed1
commit 3817e76130
No known key found for this signature in database
GPG Key ID: 74DBB952D9BA17F2
3 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMap.java
View File

@ -107,9 +107,13 @@ public interface WeakMap<K, V> {
}
@Override
public synchronized V getOrCreate(K key, ValueSupplier<V> supplier) {
public V getOrCreate(K key, ValueSupplier<V> supplier) {
if (!map.containsKey(key)) {
map.put(key, supplier.get());
synchronized (this) {
if (!map.containsKey(key)) {
map.put(key, supplier.get());
}
}
}
return map.get(key);

6
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/WeakMapSuppliers.java
View File

@ -179,7 +179,11 @@ class WeakMapSuppliers {
@Override
public V getOrCreate(K key, ValueSupplier<V> supplier) {
if (!map.containsKey(key)) {
map.put(key, supplier.get());
synchronized (this) {
if (!map.containsKey(key)) {
map.put(key, supplier.get());
}
}
}
return map.get(key);

43
dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java
View File

@ -1,23 +1,58 @@
package datadog.trace.instrumentation.netty41;
import datadog.trace.bootstrap.WeakMap;
import datadog.trace.context.TraceScope;
import datadog.trace.instrumentation.netty41.client.HttpClientTracingHandler;
import datadog.trace.instrumentation.netty41.server.HttpServerTracingHandler;
import io.netty.util.AttributeKey;
import io.opentracing.Span;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class AttributeKeys {
private static final WeakMap<ClassLoader, Map<String, AttributeKey<?>>> map =
WeakMap.Implementation.DEFAULT.get();
private static final WeakMap.ValueSupplier<Map<String, AttributeKey<?>>> mapSupplier =
new WeakMap.ValueSupplier<Map<String, AttributeKey<?>>>() {
@Override
public Map<String, AttributeKey<?>> get() {
return new ConcurrentHashMap<>();
}
};
public static final AttributeKey<TraceScope.Continuation>
PARENT_CONNECT_CONTINUATION_ATTRIBUTE_KEY =
AttributeKey.valueOf("datadog.trace.instrumentation.netty41.parent.connect.continuation");
PARENT_CONNECT_CONTINUATION_ATTRIBUTE_KEY =
attributeKey("datadog.trace.instrumentation.netty41.parent.connect.continuation");
/**
* This constant is copied over to datadog.trace.instrumentation.ratpack.server.TracingHandler, so
* if this changes, that must also change.
*/
public static final AttributeKey<Span> SERVER_ATTRIBUTE_KEY =
AttributeKey.valueOf(HttpServerTracingHandler.class.getName() + ".span");
attributeKey(HttpServerTracingHandler.class.getName() + ".span");
public static final AttributeKey<Span> CLIENT_ATTRIBUTE_KEY =
AttributeKey.valueOf(HttpClientTracingHandler.class.getName() + ".span");
attributeKey(HttpClientTracingHandler.class.getName() + ".span");
/**
* Generate an attribute key or reuse the one existing in the global app map. This implementation
* creates attributes only once even if the current class is loaded by several class loaders and
* prevents an issue with Apache Atlas project were this class loaded by multiple class loaders,
* while the Attribute class is loaded by a third class loader and used internally for the
* cassandra driver.
*/
private static <T> AttributeKey<T> attributeKey(String key) {
Map<String, AttributeKey<?>> classLoaderMap =
map.getOrCreate(AttributeKey.class.getClassLoader(), mapSupplier);
if (classLoaderMap.containsKey(key)) {
return (AttributeKey<T>) classLoaderMap.get(key);
}
final AttributeKey<T> value = AttributeKey.valueOf(key);
classLoaderMap.put(key, value);
return value;
}
}