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
4,146 Commits 77 Branches 113 Tags 276 MiB
Commit Graph

4146 Commits

Author SHA1 Message Date
Trask Stalnaker 7ede895b53 Revert "Cache is not needed anymore" 
This reverts commit 166d951a10.
 2020-03-06 13:18:08 -08:00
Trask Stalnaker ea74337c10
Redo log capture instrumentation (#212) 
Make it clear that this is experimental option, as the specifics of log
capture will definitely change sometime in the future once there is an
agreed on OpenTelemetry spec for this.

Capture logs as spans, to avoid the limitations of current
implementation that captures them as events (no log capture when no
current span, and limited number of events per span).

Change the log instrumentation module names to just reflect the
underlying logger, e.g. "log4j-1.1" instead of "log4j-spans-1.1". This
way we don't end up with an entirely deprecated artifact once the
logging spec is worked out. The spans instrumentation now shares modules
with the MDC instrumentation, which I think is reasonable, as you pick
which one you want via configuration.
 2020-03-06 13:05:44 -08:00
Douglas Q Hawkins 3ff5b99cd6
Merge pull request #1285 from DataDog/dougqh/jar-file-collisions 
Avoid temporary Jar file collisions
 2020-03-06 15:14:25 -05:00
Tyler Benson aca4b9ece9
Merge pull request #1300 from DataDog/tyler/servlet-forward 
Stop creating a "top level" servlet span when in a forward/include situation
 2020-03-06 11:46:27 -08:00
Nikolay Martynov 98ea5a8e87
Merge pull request #1293 from DataDog/mar-kolya/scale-back-ignores 
Scale back ignores
 2020-03-06 14:34:08 -05:00
Nikolay Martynov 46b776f76a Include classloading instrumentation into all tests 
Classloading instrument core JDK classes so we should make sure this
doesn't have bad effects on other instrumentations.
 2020-03-06 13:50:56 -05:00
Nikolay Martynov 517ecca4c1 Remove explicit concurrent instrumentation dependencies 
Since we include concurrent instrumentation for all instrumentatin
projects now there is no point in including it in every instrumentation.
 2020-03-06 13:50:51 -05:00
Nikolay Martynov 2917034d29 Increase hystrix test timeout 2020-03-06 13:49:55 -05:00
Nikolay Martynov 51630ada62 Unignore `org.h2.util.Task` 2020-03-06 13:49:55 -05:00
Nikolay Martynov 4aac30826d Split Runnable and Callable instrumentations 
Otherwise `Runnable` may define `call` method leading to
instrumentation exception.
See `org.h2.util.Task` as an example.
 2020-03-06 13:49:55 -05:00
Nikolay Martynov 18f9c653b9 Exceptions for hppc 2020-03-06 13:49:55 -05:00
Nikolay Martynov a261fb4760 More spring exceptions 2020-03-06 13:49:55 -05:00
Nikolay Martynov 930c1fb4e9 One more exception for h2 2020-03-06 13:49:55 -05:00
Nikolay Martynov fd4257627d Do not ignore org.springframework.util.concurrent. 2020-03-06 13:49:55 -05:00
Nikolay Martynov 74161a5872 Add missng dots 2020-03-06 13:49:55 -05:00
Nikolay Martynov ab8b246553 Remove asm matchers - asm is already matched elsewhere 2020-03-06 13:49:55 -05:00
Nikolay Martynov a8c625b8f0 Fix google http client ignore matchers 2020-03-06 13:49:55 -05:00
Nikolay Martynov e301761dc2 Stop ignoring org.springframework.scheduling.annotation 
It has some runnables and it is not very big
 2020-03-06 13:49:55 -05:00
Nikolay Martynov 0d34aa2e96 Stop skipping cassandra core instrumentation 
Looks like it has lots of runnables sprinkled all over the place
 2020-03-06 13:49:55 -05:00
Nikolay Martynov c1c9ffa571 Fix couchbase ignores 2020-03-06 13:49:55 -05:00
Nikolay Martynov 839deb779d Add java-concurrent as a dependency to all instrumentations 2020-03-06 13:49:55 -05:00
Tyler Benson caabb55ed2
Merge pull request #1301 from DataDog/tyler/grpc 
Fix grpc tests with java-concurrent.
 2020-03-06 10:48:03 -08:00
Tyler Benson 6b8edd52a3
Merge pull request #213 from trask/dd-merge 
Merge changes from dd-trace-java 0.45.0
 2020-03-06 10:46:08 -08:00
Trask Stalnaker 5c3912ccda
Remove accidentally merged file (#214) 2020-03-06 10:40:02 -08:00
Tyler Benson 7c73546ba1 One more change. 
This should fix the issues in latestDepTest.
 2020-03-06 09:56:19 -08:00
Tyler Benson 206fbb944c Fix comments 
[skip ci]
 2020-03-06 09:24:50 -08:00
Tyler Benson 2e86ca2141 disable async propagation for InProcess communication. 2020-03-06 09:20:00 -08:00
Laplie Anderson 6ebc571ef3
Merge pull request #1299 from DataDog/landerson/commons-httpclient 
Add commons-httpclient integration
 2020-03-06 11:50:37 -05:00
Laplie Anderson 5538021ea6 classLoaderHasNoResources -> hasClassesNamed 2020-03-06 10:51:35 -05:00
Laplie Anderson a7a7501f40 Rename to commons-httpclient-2 2020-03-06 10:47:41 -05:00
Laplie Anderson 66e14d9256 Surprisingly, everything works with 2.0 2020-03-06 10:47:41 -05:00
Laplie Anderson d99c2ad240 Remove aws-sdk check 2020-03-06 10:47:41 -05:00
Laplie Anderson c13436d5e4 Add commons-httpclient integration 2020-03-06 10:47:41 -05:00
Trask Stalnaker b2db595430 Merge tag 'v0.45.0' into dd-merge 2020-03-05 21:49:39 -08:00
Trask Stalnaker 9ff1fca3fd
Rename a few modules (#207) 
* Rename classloading module to class-loader

* Rename datastax-cassandra module to cassandra

* Rename reactor-core module to reactor

* Rename cdi module to cdi-testing

* Rename aws-java-sdk module to aws-sdk

* Rename class-loader module to java-class-loader
 2020-03-05 20:21:50 -08:00
Tyler Benson ca043a67b5
Merge pull request #1298 from DataDog/tyler/classloader-matcher 
ClassLoader matcher cleanup
 2020-03-05 20:00:09 -08:00
Tyler Benson cea0bc8a52 Fix grpc tests with java-concurrent. 2020-03-05 19:59:21 -08:00
Trask Stalnaker 7370202340
Properly close() the FileReader for Config (#210) 
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
 2020-03-05 16:03:43 -08:00
Tyler Benson 7bf85dbb97 Restrict dispatcher instrumentation to 2 arguments 
To reduce risk of duplicate spans when delegating to a 2+ arg method.
 2020-03-05 16:01:53 -08:00
Tyler Benson d25ace6627
Merge pull request #1292 from DataDog/tyler/add-test-retrys 
Attempt to improve test reliability
 2020-03-05 14:40:41 -08:00
Trask Stalnaker 2f1b802aad
Rename mongo modules (#206) 
* Rename mongo modules

* Update tracer name
 2020-03-05 14:18:45 -08:00
Tyler Benson b1f8787ae5 Add a couple more... 2020-03-05 13:52:16 -08:00
Trask Stalnaker 5ecdeba977
Rename jax-rs-* modules (#208) 2020-03-05 13:42:17 -08:00
Tyler Benson 2802009e01 Stop creating a "top level" servlet span when in a forward/include situation. 
Effectively reverting 6703bd96bb

The expectation is that these are not really separate external requests, but a semantic way of processing a single request.
 2020-03-05 12:52:13 -08:00
Tyler Benson cb782fdd0e Fix muzzle for trace-annotation. 2020-03-05 12:00:18 -08:00
Tyler Benson 74ea734f81 Add additional classLoaderMatchers. 2020-03-05 10:45:59 -08:00
Tyler Benson 372ba221d2 Invert the classloader matcher to remove the double negative. 2020-03-05 10:14:33 -08:00
Trask Stalnaker f91549e799
Simplify some tests by using runUnderTrace (#204) 2020-03-05 09:50:41 -08:00
Laplie Anderson 0f65b4db76
Merge pull request #1286 from DataDog/landerson/play-streaming 
Fix Play-ws stream() bug
 2020-03-05 10:42:54 -05:00
Tyler Benson ee5cf2cf24 Attempt to improve test reliability 
Add timeouts (to avoid a gradle level timeout) and retries (since we're doing it manually anyway).

I realize this is a band aid...
 2020-03-04 19:02:41 -08:00