71b3e3e027
Library doc cleanup ( #6948 )
...
Related to #6947 , but just cleans up the library module doc that already
existed (mostly for uniformity). Does not introduce any new doc.
2022-10-24 10:26:21 -07:00
aeac361816
Upgrade to otel java 1.19.0 ( #6757 )
...
Working PR to capture all the changes required to update to otel java
1.19.0. The new log API force allows
`:instrumentation-appender-api-internal` and
`:instrumentation-appender-sdk-internal`, but necessitates a decent
amount of refactoring as a result.
The PR points at the `1.19.0-SNAPSHOT`, which I'll update upon
publication.
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2022-10-12 09:19:37 -07:00
5e2df2b81f
Run integration tests against Java 19 ( #6690 )
...
Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2022-09-24 12:31:15 -07:00
429f083cf7
Add marker attribute for Log4j 2 ( #6680 )
...
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2022-09-22 09:54:37 -07:00
faa99b2eeb
Update SDK to 1.17.0 ( #6467 )
...
* Update SDK to 1.17.0
* Fix
* Update licenses
* Spotless
* license
2022-08-12 17:10:46 -07:00
9fe3761731
Document upper version limits ( #6436 )
2022-08-08 10:08:40 -07:00
257009f944
InstrumentationConfig part 5: library logging appenders ( #6321 )
...
* InstrumentationConfig part 5: library logging appenders
* Logback
* remove log4j hackery
* fix tests
* Remove unused
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-07-18 14:28:26 -07:00
e7887ac929
Idea: deprecate `Config`, add agent-only `InstrumentationConfig` ( #6264 )
...
* Idea: deprecate Config, add agent-only InstrumentationConfig
* fix
* fix camel test
* fix external-annotation tests
2022-07-08 16:20:49 +02:00
6a0ca530b7
Instrumentation API changes: VirtualField ( #6017 )
...
* Instrumentation API changes: VirtualField
* change class name in string constant
2022-05-12 11:17:24 -07:00
246364d2fc
Support older log4j2 versions in the javaagent ( #5979 )
2022-05-05 12:40:54 -07:00
400bd5af3f
Update log4j package names ( #5978 )
2022-05-05 08:39:21 -07:00
d919f84cf8
Merge javaagent-instrumentation-api into javaagent-extension-api ( #5936 )
...
* Merge javaagent-instrumentation-api into javaagent-extension-api
* remove some leftover references to javaagent-instrumentation-api
* add missing instrumentation-api to distro example
2022-04-28 20:11:15 -07:00
b702a9d4d1
Fix logging instrumentation to pass Context instead of Span ( #5881 )
2022-04-19 12:24:10 -07:00
85061691fe
Bump log4j version for library instrumentation to 2.17 ( #5849 )
...
* Bump log4j library version to 2.17
* muzzle
2022-04-19 12:11:10 -07:00
7c760acea6
Move some classes out of `javaagent-instrumentation-api` ( #5841 )
...
* Move concurrent instrumentation utils out from javaagent-instrumentation-api
* Move AgentLogEmitterProvider, InstrumentedTaskClasses and OpenTelemetrySdkAccess out of javaagent-instrumentation-api
2022-04-15 12:09:28 -07:00
e58d39d4ad
Update to OTel 1.13 ( #5799 )
...
* Update to OTel 1.13
* Fix test
* Foo
* Fix app server test and start yak shaving
* Yak
* Yak
* groovy fail
* Yak
* GROOVY
* yak farm
2022-04-13 13:16:32 +03:00
519024485c
Move Cache and related classes to internal package ( #5759 )
...
* Move Cache and related classes to internal package
* fix imports
2022-04-06 18:12:11 -07:00
14372adb68
Migrate Guava tests to Java ( #5668 )
...
* Migrate Guava tests to Java
* Update instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/ListenableFutureTest.java
Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
* Workaround inline mock issue
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
2022-03-24 14:14:09 +09:00
e9c1efece2
Update to Groovy 4 ( #5532 )
...
* Update to Groovy 4
* exclude spock from grails tests, update comment
* Update instrumentation/grails-3.0/javaagent/build.gradle.kts
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-03-09 15:07:41 -08:00
b0e4be0e5f
Capture logback formatted message ( #5497 )
2022-03-04 13:10:55 +02:00
4a8d6d552e
Add log4j 1.2 appender MDC capture ( #5475 )
...
* Add log4j 1.2 appender MDC capture
* Spotless
2022-03-02 09:56:01 -08:00
627f5d3e1c
Add experimental thread attributes for logs ( #5474 )
2022-03-02 09:06:08 -08:00
640e95df1c
Update Log4j appender example to follow the spec ( #5443 )
2022-02-24 08:32:01 -08:00
db20a5344f
Fix artifactID in log4j-context-data-2.16 documentation ( #5310 )
2022-02-04 08:56:58 -08:00
1077258263
Add InternalJavadoc custom error prone check ( #5277 )
...
* Add InternalJavadoc custom error prone check
* Add example usage
* Move to conventions
* Revert "Move to conventions"
This reverts commit d8a8209b59
2022-02-01 17:54:57 -08:00
022914139e
test latest deps cleanup ( #5269 )
...
* test latest deps cleanup
* Revert currently irrelevant change
* Update instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts
Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
2022-02-01 09:49:07 -08:00
477f7163f0
Some testLatestDeps cleanup ( #5226 )
2022-01-26 09:27:53 -08:00
a5e0696af2
Improve log4j ContextDataProvider injection ( #5216 )
2022-01-26 09:26:49 -08:00
48f8031baa
Fix log4j appender docs ( #5192 )
2022-01-20 14:08:41 -08:00
4f29770f73
Remove old TraceUtils and use InstrumentationTestRunner#run*Span() (almost) everywhere ( #5160 )
...
* Remove old TraceUtils and use InstrumentationTestRunner#run*Span() (almost) everywhere
* Fix HTTP server tests
* Fix compilation failure
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-01-18 13:42:53 -08:00
963b5cc087
Connect AgentLogEmitterProvider global during OpenTelemetryInstaller ( #5088 )
...
* during install, hook up the log emitter provider for instrumentation to use.
* spotless
* Fix tests
* Default instrumentation name to ROOT when logger name null/empty
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-01-13 08:31:02 -08:00
f7da97bd9d
Move appender api to internal ( #5080 )
...
* rename artifacts and packages
* Library users shouldn't need to use internal
* Update docs
* Rename in order to simplify HelperClassPredicate
* Spotless
* Move AgentLogEmitterProvider to javaagent-instrumentation-api
2022-01-12 08:38:28 -08:00
c6fe6b8252
Fix flaky log4j appender test ( #5062 )
2022-01-10 09:16:15 -08:00
f6bcd76219
Update errorprone ( #5016 )
...
* Update errorprone
* gwt
* Remove unnecessary final
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-01-06 14:21:56 -08:00
07ce0b5909
Support log4j map messages ( #4966 )
...
* Support log4j map messages
* Cache attribute keys
* Review
* Add tests
* Fix test
* Codenarc
* Better tests
* Remove sysout
2022-01-06 12:02:12 -08:00
1d453debe3
Update log4j instrumentation docs ( #4915 )
...
* Update log4j instrumentation docs for 1.10.0 release
* More log4j doc changes for 0.10.0
* Updates for #4937
* Fix log4j documentation
* Update instrumentation/log4j/log4j-2.16/library/README.md
Co-authored-by: jack-berg <jberg@newrelic.com>
2022-01-04 20:55:36 -08:00
39a9a2f8e2
Fix codenarc ( #4969 )
...
* Fix codenarc
* Fix violations
2021-12-22 16:15:38 -08:00
5bc64a1b8b
Capture log4j2 context data (mdc) attributes ( #4959 )
...
* Capture log4j2 context data (mdc) attributes
* Spotless
* Remove system.out.println
* Switch to allow-list
* Spotless
2021-12-22 10:16:45 -08:00
88121c1583
Rename log4j-thread-context modules to log4j-context-data ( #4957 )
2021-12-21 11:40:03 -08:00
0302e9b921
Add log4j2 appender javaagent instrumentation ( #4944 )
...
* log4j2
* Spotless
* Target 2.16 for javaagent instrumentation and share
* review feedback
* Add comment
* Remove unnecessary configuration
* Fix comment
2021-12-20 12:28:29 -08:00
b5df9bab83
Add log4j 1.2 appender javaagent instrumentation ( #4943 )
...
* log4j1
* review feedback
* final
2021-12-20 12:28:05 -08:00
5d2cc7eed3
Rename (and move around) log4j instrumentation modules ( #4937 )
...
* Rename to log4j-thread-context
* Rename to log4j-mdc-1.2
* move
* update
* subdir
2021-12-19 19:58:37 -08:00
a76c35e33f
Minor log4j instrumentation updates ( #4938 )
...
* Minor log4j instrumentation updates
* Remove duplicate line
* Use semantic attributes for exceptions
2021-12-19 19:32:46 -08:00
cc9d2877c9
Add a logging appender API ( #4917 )
...
* Add logging appender api
* noop
* Add global
* drift
* Feedback
* compileOnly
* fix
* fix
* Rename instrumentation-appender-api to instrumentation-api-appender
* Rename package
* Optimization
* Split out instrumentation-sdk-appender
* Fix
* Update instrumentation-api-appender/src/main/java/io/opentelemetry/instrumentation/api/appender/LogEmitter.java
Co-authored-by: jason plumb <75337021+breedx-splk@users.noreply.github.com>
* Fix
* Fix
* Fix
* Fix sdk-appender package name
Co-authored-by: jason plumb <75337021+breedx-splk@users.noreply.github.com>
2021-12-17 16:09:32 -08:00
1d5b03d3b5
Fix flaky log4j test ( #4931 )
...
* Fix flaky log4j test
* Update instrumentation/log4j/log4j-2.16/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_16/OpenTelemetryAppenderConfigTest.java
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-12-17 14:04:34 -08:00
6776a7e181
Fix log4j library-autoconfigure publishing ( #4928 )
2021-12-17 08:59:18 -08:00
dba6e429e4
Cross test log4j javaagent instrumentation ( #4918 )
2021-12-16 08:48:02 -08:00
88f11d0525
Update log4j library base version ( #4914 )
...
* Update log4j-2.7 javaagent instrumentation to match up through 2.15.0
* Rename log4j 2.13.2 to 2.16
* Update one more location
2021-12-15 20:47:26 -08:00
b01efec0fd
Split out log4j appender ( #4907 )
2021-12-15 10:02:40 -08:00
a9980cd014
Rename autoconfigure modules ( #4779 )
2021-12-01 22:03:12 -08:00
5c36ed3d23
Prototype Log4j2 Appender ( #4375 )
...
* WIP
* Use Log SDK snapshot
* Update to 1.9.0 release, refine
* Remove appenders from common log config
* Respond to PR feedback
* Update readme
* Switch to compileOnly log sdk dependency, use logger name as instrumentation name
* Switch to minimalist LogEvent mapping
* PR feedback
* PR feedback
2021-11-29 09:46:32 -08:00
1b37df7afd
Move common testing modules to match convention a bit better(?) ( #4451 )
...
* Rename jsf modules to match convention
* Couchbase too
* Mongo too
* Play WS too
* Log4j too
* Elasticsearch too
* JAX-RS too
* JAX-WS sort of
* Spotless
* empty commit
2021-10-21 12:41:28 -07:00
dafc97f96e
Simplify gradle files ( #4292 )
2021-10-04 21:53:35 -07:00
c11b96e4d0
Make it possible to use InstrumentationContext (now VirtualField) fro… ( #4218 )
...
* Make it possible to use InstrumentationContext (now VirtualField) from library instrumentation
* fix tests
* fix javadocs
* fix some more tests
* code review comments
* setIfNull, computeIfNull
2021-10-01 11:13:11 +02:00
d90d7c80f3
Use new HelperResourceBuilder ( #3976 )
...
* Use new HelperResourceBuilder
* Use latest to avoid merge conflict
2021-08-27 09:48:16 -07:00
20c72f3e98
Format kotlin gradle files ( #3942 )
...
* Add ktlint for kotlinGradle
* ktlint fails on wildcard imports
* Auto-format kotlin gradle files
2021-08-25 13:43:57 +09:00
d3b62de8a5
Replace most uses of TraceUtils with testRunner runWithSpan. ( #3582 )
2021-07-15 10:30:34 -07:00
9b56fc9051
Clean up AgentElementMatchers ( #3527 )
...
* Clean up AgentElementMatchers
* remove a TODO
* moved method
2021-07-09 10:02:21 +03:00
761b9c280b
Migrate instrumentation gradle files to kotlin ( #3414 )
...
* Migrate instrumentation gradle files to kotlin
* Convert
* Muzzle
2021-06-28 17:27:12 +09:00
785dc6adf2
Rename build files to build.gradle ( #3409 )
...
* Rename build files to build.gradle
* Rename smoke-tests
* Fix already broken
2021-06-25 16:10:31 +09:00
deb0e255cf
Use plugins block everywhere for applying plugins ( #3386 )
...
* Use plugins block everywhere for applying plugins
* Actually it's library instrumentation
2021-06-24 11:13:35 +09:00
80f43b7a6a
Migrate javaagent-instrumentation to plugin ( #3328 )
...
* Migrate instrumentation.gradle to plugin
* Migrate usages
* Remove old
* Fix
* Revert example
* afterEvaluate
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-06-17 23:13:14 +09:00
b7bfbf0cc6
Migrate instrumentation-library / common to plugins ( #3320 )
2021-06-15 11:54:48 -07:00
224dc51e93
Migrate java.gradle to conventions plugin ( #3289 )
...
* Migrate java.gradle to convention plugin.
* Switch to java-conventions
* Remove old file
* Fix
* Fix merge
* Missing paragraph
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-06-15 08:10:39 +09:00
4c80c62ce7
Add unused to remaining advice classes ( #3280 )
...
* Add unused to remaining advice classes
* Add newlines for visual separation
2021-06-14 11:12:02 +09:00
84cc044ddf
Migrate remaining test client calls to Armeria and remove testing-com… ( #3250 )
2021-06-11 11:51:23 -07:00
b9e856b4bf
small fix - proper log4j MDC test pattern ( #3218 )
2021-06-07 12:28:36 -07:00
c3dedbb64e
Enable all errorprone checks ( #3155 )
...
* Enable all errorprone checks
* Fixes
* Finish
* Finish
* Add flag to disable error prone
2021-06-01 17:41:08 +09:00
c1c052318b
Move more type instrumentations to top-level classes ( #3118 )
2021-05-28 17:24:19 -07:00
ed88cca533
Migrate from spotbugs to errorprone ( #3122 )
...
* Migrate from spotbugs to errorprone
* Fix hashtable
* try-with-resources
* Fix from merge
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-05-28 14:23:40 -07:00
c358a35414
Use dependency management pattern for dependency versions ( #3113 )
...
* Use dependency management pattern for dependency versions.
* Add groovy bom too
* Update dependencyManagement/dependencyManagement.gradle.kts
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-05-28 11:32:08 +09:00
6fb3ec0501
Do not use arrays in InstrumentationModule ( #3057 )
...
* Do not use arrays in InstrumentationModule
* add missing cast
2021-05-24 13:51:07 +02:00
bb8f515083
Refactor TypeInstrumentation#transformers() method ( #3019 )
...
* Refactor TypeInstrumentation#transformers() method part 1
Add TypeInstrumentation and its implementations
* Refactor TypeInstrumentation#transformers() method part 2
Use the new method in all existing TypeInstrumentation implementations
* Drift
* Spotless
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-05-18 09:50:26 +02:00
95c16c4a3c
Start migrating Muzzle plugin to Java ( #2996 )
2021-05-15 16:22:05 +09:00
fe41885ee6
Switch to colon notation for dependencies. ( #2994 )
...
* Switch to colon notation for dependencies.
* Even more cleanup
* Revert mistake
2021-05-15 15:31:06 +09:00
6a84c2b2ec
Remove unnecessary generic type args ( #2937 )
...
* Remove unnecessary generic type args
* Revert one
2021-05-10 12:18:30 +09:00
9c7fae3b04
Extract javaagent-extension-api from tooling & spi ( #2879 )
2021-05-06 23:30:25 -07:00
9bd028f767
Remove unnecessary genericness ( #2797 )
2021-04-14 00:01:28 -07:00
078603caf5
Generate InstrumentationModule#contextStore() with muzzle ( #2775 )
2021-04-13 20:05:01 -07:00
9926288342
Clarify empty type instrumentations ( #2740 )
...
* Add comment for EmptyTypeInstrumentation
* Clarify use of empty type instrumentations
2021-04-07 10:03:24 +03:00
92f1223aee
Remove unnecessary skipVersions ( #2671 )
...
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-04-01 19:02:20 -07:00
1406855bb7
Revert "Prevent duplicate telemetry when using both library and auto instrumentation ( #2661 )" ( #2689 )
2021-04-01 16:11:15 -07:00
30434696ae
Prevent duplicate telemetry when using both library and auto instrumentation ( #2661 )
...
* Prevent duplicate telemetry when using both library and auto instrumentation
* Add unit test
* Fix Oshi tests
* Fix couchbase 3.1 tests
2021-03-31 10:57:04 -07:00
0f32ed42a4
Instrument log4j to include bugfix of contextdataprovider mechanism. ( #2407 )
...
* Instrument log4j to include bugfix of contextdataprovider mechanism.
* Add regression test
* Update smoke test
* Update instrumentation/log4j/log4j-2.13.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_13_2/BugFixingInstrumentation.java
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-02-26 09:20:55 +09:00
fc4d640e1a
Update log4j & logback library instrumentation README ( #2369 )
2021-02-22 16:47:12 +02:00
f127a972dc
Add 'trace_flags' to logging MDC ( #2312 )
...
* Add 'trace_flags' to logging MDC
* Remove 'sampled' flag
* Rename MDC keys to the current logging spec convention: trace_id instead of traceId
* Fix smoke tests
2021-02-18 16:47:26 +09:00
54e9cd5d5f
Update MDC docs to reflect log spec naming ( #2303 )
2021-02-17 14:52:10 +02:00
fc410706d0
Update to Sdk 0.16.0 ( #2221 )
...
* Update to 0.16.0-SNAPSHOT
* Finish
* Finish
* Update to 0.16.0
* Finish
2021-02-09 18:00:54 +09:00
93b3a3b289
testing-common refactoring: replace direct AgentTestRunner usage with… ( #2134 )
...
* testing-common refactoring: replace direct AgentTestRunner usage with spock spec
* Updated instrumentation docs
* Fix reactor-core library tests
ReactorCoreTest was getting a tracer from GlobalOpenTelemetry before LibraryTestTrait had a change to initialize the SDK
2021-02-01 11:32:25 +01:00
077d8b64f6
Move common matchers to tooling/bytebuddy/matcher and ignore matchers to tooling/matcher ( #1965 )
2021-01-10 12:35:53 -08:00
cd58ac816e
Muzzle should add SPI classes defined in helperResourceNames as references ( #1918 )
2020-12-16 21:54:04 -08:00
ca76c80820
Hardcode expected values in tests ( #1803 )
...
* DEFAULT_SPAN_NAME
* TEMP_DESTINATION_NAME
* LoggingContextConstants
* Remove unnecessary dependencies
* Hardcode expected normalized queries in tests
* Spotless
2020-11-30 09:16:59 +02:00
26f254b10d
Create javaagent dirs for all instrumentations, part 2 ( #1794 )
2020-11-28 22:26:49 -08:00
41bd489a77
Format groovy files ( #1793 )
2020-11-28 21:22:14 -08:00
5f263644da
Create javaagent dirs for all instrumentations ( #1668 )
...
* Create javaagent dirs for all instrumentation
* Add note about kotlin coroutine library instrumentation
* Feedback
2020-11-28 21:04:16 -08:00
9a64a628ea
Make instrumentations non final ( #1752 )
...
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-11-26 11:22:25 -08:00
50c8ab499d
Remove no longer needed helperClassNames() methods ( #1755 )
2020-11-24 20:50:32 -08:00
cea28356c6
Remove some no longer needed muzzleCheck() methods ( #1660 )
...
* Remove some no longer needed muzzleCheck() methods
And add muzzle references to log4j 2.13.2 instrumentation
2020-11-17 14:40:33 -08:00
1a23ac3027
Standardize instrumentation names in InstrumentationModules ( #1648 )
...
* Standardize instrumentation names in InstrumentationModules
* rename gradle modules:
* vertx-3.0 to vertx-web-3.0
* spark-web-framework-2.3 to spark-2.3
* add JavaDoc describing the naming rules to InstrumentationModule
2020-11-17 13:30:28 -08:00
6d5ec329d6
Enable checkstyle for google style guide ( #1641 )
2020-11-16 18:46:59 -08:00
Trask Stalnaker
jack-berg
Jean Bisutti
Mateusz Rzeszutek
Anuraag Agrawal
Lauri Tulmin
Armin Ruech
Marc Pichler
jason plumb
Lauri Tulmin
Anuraag Agrawal
Jakub Wach
Pavol Loffay