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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Guillaume Polaert 2017-06-02 16:33:21 +02:00
parent 312e3281c9 96d4f10c87
commit 09721bb8ca
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/README.md
View File

@ -93,7 +93,7 @@ When attached to an application the `dd-java-agent` automatically instruments th
| FWK | Versions | Comments |
| ------------- |:-------------:| ----- |
| OkHTTP | 3.x | HTTP client calls with [cross-process](http://opentracing.io/documentation/pages/api/cross-process-tracing.html) headers |
| Apache HTTP Client | 4.x |HTTP client calls with [cross-process](http://opentracing.io/documentation/pages/api/cross-process-tracing.html) headers|
| Apache HTTP Client | 4.3 + |HTTP client calls with [cross-process](http://opentracing.io/documentation/pages/api/cross-process-tracing.html) headers|
| AWS SDK | 1.x | Trace all client calls to any AWS service |
| Web Servlet Filters| Depending on server | See [Servers](#servers) section |

11
dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java
View File

@ -97,11 +97,14 @@ public class TraceAnnotationsManager {
}
}
}
StringWriter sw = new StringWriter();
try(PrintWriter pr = new PrintWriter(sw)){
transformer.removeScripts(new ArrayList<String>(rulesToRemove), pr);
if(!rulesToRemove.isEmpty()){
StringWriter sw = new StringWriter();
try(PrintWriter pr = new PrintWriter(sw)){
transformer.removeScripts(new ArrayList<String>(rulesToRemove), pr);
}
log.log(Level.INFO, sw.toString());
}
log.log(Level.INFO, sw.toString());
}
/**

5
dd-java-agent/src/main/resources/dd-trace-authorized-versions.yaml
View File

@ -3,7 +3,10 @@ okhttp:
valid_versions: 3\..*
httpclient:
key: apache http
valid_versions: 4\..*
valid_versions: 4\.[3|4|5]\..*
commons-httpclient:
key: apache http
valid_versions: none
aws-java-sdk:
key: aws
valid_versions: 1\..*