Commit Graph

137 Commits

Author SHA1 Message Date
jack-berg 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
Trask Stalnaker 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
Jean Bisutti 429f083cf7
Add marker attribute for Log4j 2 (#6680)
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2022-09-22 09:54:37 -07:00
Trask Stalnaker 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
Trask Stalnaker 9fe3761731
Document upper version limits (#6436) 2022-08-08 10:08:40 -07:00
Mateusz Rzeszutek 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
Mateusz Rzeszutek 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
Mateusz Rzeszutek 6a0ca530b7
Instrumentation API changes: VirtualField (#6017)
* Instrumentation API changes: VirtualField

* change class name in string constant
2022-05-12 11:17:24 -07:00
Trask Stalnaker 246364d2fc
Support older log4j2 versions in the javaagent (#5979) 2022-05-05 12:40:54 -07:00
Trask Stalnaker 400bd5af3f
Update log4j package names (#5978) 2022-05-05 08:39:21 -07:00
Mateusz Rzeszutek 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
Mateusz Rzeszutek b702a9d4d1
Fix logging instrumentation to pass Context instead of Span (#5881) 2022-04-19 12:24:10 -07:00
Trask Stalnaker 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
Mateusz Rzeszutek 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
Anuraag Agrawal 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
Mateusz Rzeszutek 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
Anuraag Agrawal 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
Lauri Tulmin 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
Trask Stalnaker b0e4be0e5f
Capture logback formatted message (#5497) 2022-03-04 13:10:55 +02:00
Trask Stalnaker 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
Trask Stalnaker 627f5d3e1c
Add experimental thread attributes for logs (#5474) 2022-03-02 09:06:08 -08:00
Armin Ruech 640e95df1c
Update Log4j appender example to follow the spec (#5443) 2022-02-24 08:32:01 -08:00
Marc Pichler db20a5344f
Fix artifactID in log4j-context-data-2.16 documentation (#5310) 2022-02-04 08:56:58 -08:00
Trask Stalnaker 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.

* Just get it working

* Clearer error message

* versions

* Apply almost everywhere

* feedback

* Always at the end of javadoc

* Fix test

* Missed (at least) one

* No longer internal

* Fix NPE

* Spotless

* Convert awslambda Java test to JUnit 5 so can reduce visibility

* Reduce visibility

* Rename the check

* More

* Move into errorprone-convention

* Fix UserExcludedClassesConfigurerTest
2022-02-01 17:54:57 -08:00
Trask Stalnaker 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
Trask Stalnaker 477f7163f0
Some testLatestDeps cleanup (#5226) 2022-01-26 09:27:53 -08:00
Trask Stalnaker a5e0696af2
Improve log4j ContextDataProvider injection (#5216) 2022-01-26 09:26:49 -08:00
jack-berg 48f8031baa
Fix log4j appender docs (#5192) 2022-01-20 14:08:41 -08:00
Mateusz Rzeszutek 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
jason plumb 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
Trask Stalnaker 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
Lauri Tulmin c6fe6b8252
Fix flaky log4j appender test (#5062) 2022-01-10 09:16:15 -08:00
Anuraag Agrawal 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
Trask Stalnaker 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
Trask Stalnaker 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
Trask Stalnaker 39a9a2f8e2
Fix codenarc (#4969)
* Fix codenarc

* Fix violations
2021-12-22 16:15:38 -08:00
Trask Stalnaker 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
Trask Stalnaker 88121c1583
Rename log4j-thread-context modules to log4j-context-data (#4957) 2021-12-21 11:40:03 -08:00
Trask Stalnaker 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
Trask Stalnaker b5df9bab83
Add log4j 1.2 appender javaagent instrumentation (#4943)
* log4j1

* review feedback

* final
2021-12-20 12:28:05 -08:00
Trask Stalnaker 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
Trask Stalnaker 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
Trask Stalnaker 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
Lauri Tulmin 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
Trask Stalnaker 6776a7e181
Fix log4j library-autoconfigure publishing (#4928) 2021-12-17 08:59:18 -08:00
Trask Stalnaker dba6e429e4
Cross test log4j javaagent instrumentation (#4918) 2021-12-16 08:48:02 -08:00
Trask Stalnaker 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
Trask Stalnaker b01efec0fd
Split out log4j appender (#4907) 2021-12-15 10:02:40 -08:00
Trask Stalnaker a9980cd014
Rename autoconfigure modules (#4779) 2021-12-01 22:03:12 -08:00
jack-berg 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