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

Refine HTTP client instrumentation versions + finner logging

This commit is contained in:
renaudboutet 2017-06-01 18:38:08 +02:00
parent 470ddac5fb
commit a48ff4c3c9
4 changed files with 13 additions and 7 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 | | FWK | Versions | Comments |
| ------------- |:-------------:| ----- | | ------------- |:-------------:| ----- |
| OkHTTP | 3.x | HTTP client calls with [cross-process](http://opentracing.io/documentation/pages/api/cross-process-tracing.html) headers | | 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 | | AWS SDK | 1.x | Trace all client calls to any AWS service |
| Web Servlet Filters| Depending on server | See [Servers](#servers) section | | Web Servlet Filters| Depending on server | See [Servers](#servers) section |

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

@ -97,12 +97,15 @@ public class TraceAnnotationsManager {
} }
} }
} }
if(!rulesToRemove.isEmpty()){
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
try(PrintWriter pr = new PrintWriter(sw)){ try(PrintWriter pr = new PrintWriter(sw)){
transformer.removeScripts(new ArrayList<String>(rulesToRemove), pr); transformer.removeScripts(new ArrayList<String>(rulesToRemove), pr);
} }
log.log(Level.INFO, sw.toString()); log.log(Level.INFO, sw.toString());
} }
}
/** /**
* This method loads any OpenTracing Agent rules (otarules.btm) found as resources * This method loads any OpenTracing Agent rules (otarules.btm) found as resources

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

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

2
dd-trace-examples/dropwizard-mongo-client/pom.xml
View File

@ -14,7 +14,7 @@
<properties> <properties>
<!-- Datadog version --> <!-- Datadog version -->
<dd-trace.version>0.0.3-SNAPSHOT</dd-trace.version> <dd-trace.version>0.0.3</dd-trace.version>
</properties> </properties>