Commit Graph

44 Commits

Author SHA1 Message Date
Lauri Tulmin 93e0667816
Improve disableShadowRelocate (#9715)
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2023-10-20 10:34:00 +03:00
Lauri Tulmin 3e84ede05c
Fix warning in build script (#9717) 2023-10-19 17:43:26 +02:00
Lauri Tulmin 2dc77a2613
Synchronize shadow rules in muzzle check gradle plugin with the ones … (#8871) 2023-07-05 09:52:39 -07:00
jason plumb a455fc5700
Fix up a few kotlin build warnings (#8152)
I noticed some kotlin deprecation warnings in the build output, so I
thought I would try and fix them up.

Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
2023-03-29 08:55:35 +00:00
Lauri Tulmin f5f83fdeb8
Reduce memory usage for ClassLoaderHasClassesNamedMatcher (#7866)
See
https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7698
This is an attempt to reduce memory usage for
`ClassLoaderHasClassesNamedMatcher`. Instead of having each matcher keep
a `Map<ClassLoader, Boolean>` we can have one `Map<ClassLoader, BitSet>`
where each matcher uses one bit in the `BitSet`. Alternatively
`Map<ClassLoader, Set<ClassLoaderHasClassesNamedMatcher>>` where set
contains matchers that match for given class loader would also work well
because these matchers usually don't match so we can expect to have only
a few elements in the set.
2023-03-17 18:42:55 +02:00
dependabot[bot] 6741c95bb8
Bump byteBuddyVersion from 1.12.20 to 1.12.22 (#7568) 2023-01-17 19:43:03 -08:00
Mateusz Rzeszutek 59f00dfc64
Remove remaining context class loader mentions (#7419)
Continuation of #7391
2022-12-14 10:21:41 -08:00
Trask Stalnaker 51f0e17a63
Temporarily limit instrumentation to exclude Spring 6 (#7202)
Tracking issue to support Spring 6 #7203
2022-11-16 22:36:48 +00:00
jack-berg 97f036c3e5
Stop relocating :instrumentation:resources:library (#7136)
Per the discussion in the today's SIG and this
[comment](https://github.com/open-telemetry/opentelemetry-java/issues/4919#issuecomment-1305774636).

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-11-15 22:37:17 +00:00
Mateusz Rzeszutek 47cbdf3d60
Revert removing the mavenCentral repo from the muzzle check plugin (#6937)
Fixes #6932 
Replaces #6933 

@aaron-ai I finally understood what you meant in #6796 after seeing your
PR - initially I thought you were talking about some custom extension,
that's outside of this repository.
I added back the maven central fallback to the muzzle check plugin:
after investigating a bit, I found out that the repositories defined in
`settings.dependencyResolutionManagement` are not propagated at all (no
matter whether it's `afterEvaluate` or not) to the
`project.repositories`, and that the gradle issue
https://github.com/gradle/gradle/issues/17295 is still valid.
2022-10-21 14:42:53 +02:00
Mateusz Rzeszutek 0e84d10e58
Fix Restlet v2 `Message#getAttributes` calls (#6796)
Fixes #6563
2022-10-05 13:29:05 -07:00
Mateusz Rzeszutek 8b2b3281fe
Encapsulate logging (#6543)
* Encapsulate actual logging implementation better

* Apply suggestions from code review

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

* code review comments

* revert to the old slf4j package name

* spotless

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-09-12 13:22:26 -07:00
Trask Stalnaker 701ed54311
Use "class loader" instead of "classloader" consistently in docs and comments (#6236)
* Use "class loader" consistently instead of classloader

* Java comments too

* Fix bad merge
2022-06-30 14:57:07 -07:00
Trask Stalnaker d3be07eb1a
Better muzzle instrumentation exclusion (#6044)
* Better muzzle instrumentation exclusion

* set
2022-05-18 11:15:57 -07:00
Trask Stalnaker 9828aa5e12
Maybe fix (#5966)
* Make muzzle work

* Revert unrelated change

* Maybe fix

* fix

* Add comment
2022-05-04 10:34:38 -07:00
Trask Stalnaker d17a0d7d9a
Instrument SpanKey directly (#5933)
* Instrument SpanKey directly

* feedback

* Make muzzle work

* Revert unrelated change
2022-05-03 14:56:33 -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
Trask Stalnaker 25856b8531
Muzzle CI experiment (#5594)
* Muzzle CI experiment

* Fix class loader leak

* --max-workers=4

* Concurrent jobs

* Update .github/workflows/muzzle.yml

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>

* Simpler

* Add link to comment

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
2022-03-18 09:57:02 -07:00
Lauri Tulmin 2ebe912fe4
GraphQL java instrumentation (#5583)
* GraphQL Java Initial Commit

* [WIP] First steps for GraphQL instrumentation, totally not ready

[skip ci]

* GraphQL Java instrumentation

* address review comments

* Apply suggestions from code review

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>

* review feedback

* scope handling

* Apply suggestions from code review

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

* use spotless:off

* trigger build

* review comments

Co-authored-by: Jordie <xd@jrdie.nl>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-03-17 08:55:45 -07:00
Jordie 29702d537e
Spelling/grammar fix in MuzzleGradlePluginUtil.kt (#5142) 2022-01-17 10:33:41 -08:00
Trask Stalnaker eea7c0f1dc
Fix publishing gradle plugins (#5132) 2022-01-17 18:33:26 +01:00
Anuraag Agrawal 478800e5de
Update byte buddy (#5037) 2022-01-07 20:30:08 +09:00
Anuraag Agrawal 46a885c4e8
Set bytebuddy task's classFileVersion (#5036) 2022-01-07 20:29:55 +09:00
Trask Stalnaker 47aacd3318
Add java.util.logging javaagent instrumentation (#4941)
* java.util.logging

* Update instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentationModule.java

* sync

* Update instrumentation/java-util-logging/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>

* Remove unused code

* Simplification

* Remove JBoss logger instrumentation

* Spotless

* Unroll

* Remove unused dependency

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
2021-12-20 12:36:30 -08:00
Trask Stalnaker 08d626d3cc
Add muzzle option to override version limit (#4942) 2021-12-20 16:11:30 +02:00
Trask Stalnaker 9950c488c8
Fix example extension build (#4875)
* Fix example extension build

* Add CI to keep from breaking
2021-12-12 12:14:21 -08:00
Anuraag Agrawal 458ebc5e55
Small cleanups to conventions projects. (#4839) 2021-12-09 14:55:09 -08:00
Trask Stalnaker 3801bb38cc
Run muzzle check against OpenTelemetry API instrumentation (bridge) (#4797)
* Run muzzle check against bridge

* Simplify

* Renames
2021-12-06 11:58:01 -08:00
Nikita Salnikov-Tarnovski 99e82d70fa
Make gradle cache work when used from different locations (#4794) 2021-12-04 19:55:30 +02:00
Lauri Tulmin 0cfc71c3c6
Support kafka streams 3 (#4236)
* Support kafka streams 3

* make thread local wider so it would work on all kafka-streams versions

* Move classes used by multiple instrumentations into bootstrap module to ensure that everybody uses the same copy of them

* spotless

* allow project as muzzle extra dependency

* add comment

* fix merge
2021-10-05 09:43:00 -07:00
Nikita Salnikov-Tarnovski f788d84e35
Remove muzzle from gradleplugins (#4183)
* Include gradle-plugins as a composite build

* Make gradle-plugins project independent from the main one

* Delete old ClassRef and friends

* Fixes

* Polish

* Polish

* Simplify
2021-09-24 15:59:03 +03:00
Mateusz Rzeszutek 74c1f55e35
Allow adding multiple ContextStore fields to one key class, part 3 (#4110) 2021-09-14 08:08:36 +02:00
Trask Stalnaker 62c604f2f5
Format java files in standalone projects (#4105) 2021-09-13 16:16:25 +09:00
Trask Stalnaker b7241cedd0
Support source sets output dirs in muzzle (#3980) 2021-08-26 22:09:59 -07:00
Trask Stalnaker 184aa37c71
Versioned helper resources, part 3 (#3891) 2021-08-23 16:45:49 -07:00
Mateusz Rzeszutek 421fec4cfe
Bump gradle-plugins to 0.4 (and fix one more thing in ReferencesPrinter) (#3818)
* Bump gradle-plugins to 0.4 (and fix one more thing in ReferencesPrinter)

* Use context class loader

* func -> action
2021-08-11 16:06:54 +02:00
Mateusz Rzeszutek bebb877017
Fix printMuzzleReferences gradle task (#3808)
* Fix printMuzzleReferences gradle task

* suppress SystemOut warnings

* bump gradle-plugins version
2021-08-10 12:10:29 -07:00
Nikita Salnikov-Tarnovski a167c5c2b1
Correctly use muzzleTooling configuration to allow for external additions (#3743) 2021-08-02 21:59:21 +03:00
Nikita Salnikov-Tarnovski b14e28513f
Muzzle classloading hell (#3708)
* Running muzzle check from the correct classloader

* Apply suggestions from code review

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-07-30 10:06:15 +03:00
Nikita Salnikov-Tarnovski 6a2ee3255a
Extract muzzle check plugin (#3657)
* Extract muzzle check plugin
2021-07-26 12:37:14 +03:00
Nikita Salnikov-Tarnovski c6f9bef90e
Use published muzzle generation plugin (#3639)
* Use published muzzle generation plugin
2021-07-22 11:46:49 +03:00
Nikita Salnikov-Tarnovski d71c63dbce
Use published muzzle code gen plugin (#3620) 2021-07-19 22:16:06 -07:00
Nikita Salnikov-Tarnovski 2077d23a62
Rename muzzle code gen plugin (#3592) 2021-07-15 20:29:50 -07:00
Nikita Salnikov-Tarnovski cbfd7e1a02
Trying to extract codegen plugin (#3521)
* Muzzle code generation moved to a separate plugin
* Restored old MuzzleCodeGenerationPlugin to use until the new one is published
* The simplest dependency management possible

Co-authored-by: Anuraag Agrawal <aanuraag@amazon.co.jp>
2021-07-14 17:08:47 +03:00