Mateusz Rzeszutek
37531a0720
Fill additional db.* attributes on DataSource#getConnection() ( #8966 )
2023-07-19 16:06:16 -07:00
Shelby Huang
2ebed6c466
Fix the shardingsphere display the error tag #8109 ( #8110 )
...
Adding shardingsphere related classes to the
`JdbcIgnoredTypesConfigurer` allows the actual execution of the
statement to be captured
2023-03-23 09:19:20 +01:00
Fran Pregernik
1d3752f21b
Allow JDBC autoinstrumentation to use a custom OpenTelemetry instance to be more DI (e.g. Spring Boot) friendly ( #7697 )
...
Related to issue
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/7677
2023-02-08 17:46:13 +01:00
dependabot[bot]
789b66d455
Bump spotless-plugin-gradle from 6.12.0 to 6.12.1 ( #7500 )
...
Bumps [spotless-plugin-gradle](https://github.com/diffplug/spotless )
from 6.12.0 to 6.12.1.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="718a504c12
"><code>718a504</code></a>
Published gradle/6.12.1</li>
<li><a
href="c13acee213
"><code>c13acee</code></a>
Published lib/2.31.1</li>
<li><a
href="552aabf876
"><code>552aabf</code></a>
fix(deps): update dependency com.facebook:ktfmt to v0.42 (<a
href="https://github-redirect.dependabot.com/diffplug/spotless/issues/1421 ">#1421</a>)</li>
<li><a
href="4063e9f6d1
"><code>4063e9f</code></a>
Add support for KtLint 0.48.0 (<a
href="https://github-redirect.dependabot.com/diffplug/spotless/issues/1432 ">#1432</a>
fixes <a
href="https://github-redirect.dependabot.com/diffplug/spotless/issues/1430 ">#1430</a>)</li>
<li><a
href="062e835846
"><code>062e835</code></a>
Bump changelogs.</li>
<li><a
href="8f7e00594d
"><code>8f7e005</code></a>
spotlessApply</li>
<li><a
href="9a8ccae9ec
"><code>9a8ccae</code></a>
Bump default ktfmt 0.41 -> 0.42</li>
<li><a
href="fb4277d2b1
"><code>fb4277d</code></a>
Merge branch 'main-ktlint-0.48.0' into renovate/ver_ktfmt</li>
<li><a
href="b44d70d00a
"><code>b44d70d</code></a>
Move changelog entries to the correct release.</li>
<li><a
href="b3d8e89002
"><code>b3d8e89</code></a>
spotlessApply for 2023</li>
<li>Additional commits viewable in <a
href="https://github.com/diffplug/spotless/compare/gradle/6.12.0...gradle/6.12.1 ">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores )
You can trigger a rebase of this PR by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2023-01-03 09:58:06 +00:00
Trask Stalnaker
238042afca
Remove scala from dependency management ( #7296 )
...
Will close #7216 after this is merged and that PR is rebased.
I tested and it does bring a few more scala versions into Intellij
without this, but scala is an odd case.
2022-11-29 07:55:35 -08:00
Mateusz Rzeszutek
f50f1fed3b
Fix instrumentation-api-semconv packages ( #6590 )
...
* Fix instrumentation-api-semconv packages
* Move test
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-09-12 14:51:27 -07:00
Trask Stalnaker
fe9c583cd3
Fix new jdbc javaagent config ( #6492 )
...
* Fix new jdbc javaagent config
* Fix
2022-08-19 13:01:57 -07:00
Trask Stalnaker
9564dbb23d
JDBC-specific sanitizer property ( #6472 )
2022-08-17 09:21:36 -07:00
Trask Stalnaker
68a9f20eb3
Enable PrivateConstructorForUtilityClass errorprone check ( #6427 )
...
* PrivateConstructorForUtilityClass
* Advice
* More advice
* More
* More advice
* More
* Spotless
* Fix
* Fix
* Fix
* A better solution
* Revert
* More
* Fix
* Spotless
* Fix
2022-08-10 11:30:22 +03:00
Trask Stalnaker
11a057594e
Fix db.system for SAP Hana and remove unnecessary code ( #6401 )
...
* Remove unnecessary code
* Remove unnecessary code
* Fix tests
2022-08-02 11:16:38 -07:00
Mateusz Rzeszutek
82b39b1012
Rename `newInstrumenter()` into `buildInstrumenter()` ( #6363 )
...
* Rename newInstrumenter() into buildInstrumenter()
* spotless
2022-07-25 12:02:46 -07:00
Mateusz Rzeszutek
b917b3bf9c
Use ConfigProperties instead of Config in the agent code ( #6322 )
...
* Use ConfigProperties instead of Config in the agent code
* Fix merge conflict
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-07-18 19:04:48 -07:00
Mateusz Rzeszutek
8d1ba17d29
InstrumentationConfig part 4: DB sanitization ( #6317 )
...
* InstrumentationConfig part 4: DB sanitization
* fix couchbase unit tests
* code review comments
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-07-15 21:47:33 -07:00
Mateusz Rzeszutek
3af56e7d22
InstrumentationConfig part 3: HTTP headers and peer service mappings ( #6302 )
2022-07-15 14:52:52 -07:00
Mateusz Rzeszutek
b23db97a28
Use ConfigProperties in javaagent SPIs ( #6285 )
...
* Use ConfigProperties in javaagent SPIs
* remove deprecated
* errorprone
* fix javaagent build
* fix javaagent-tooling tests
* spotless
2022-07-12 08:41:01 +02:00
Lauri Tulmin
b4a1e2e9ee
Fix ClassCastException in JDBC instrumentation ( #6088 )
...
* Move DbInfo to boot loader
* add comment
* add test
* spelling
2022-06-16 12:09:24 -07:00
Lauri Tulmin
1c388d46fc
Revert workaround for a spock bug ( #6154 )
2022-06-13 13:12:45 -07:00
Trask Stalnaker
2f4d2ab679
Ignore known problematic jdbc wrappers ( #5967 )
2022-05-03 12:16:17 -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
47f2732aae
Split out DbClientAttributesGetter and SqlClientAttributesGetter ( #5354 )
...
* Split out DbClientAttributesGetter and SqlClientAttributesGetter
* code review comments
2022-03-04 09:58:04 -08:00
jason plumb
c5c0a2bcdf
NetClientAttributesAdapter - favor composition over inheritance ( #5030 )
...
* first pass at separating NetAttributesAdapter interface and make NetClientAttributesExtractor concrete
* rename the implementations extractor -> adapter
* hide constructor and make factory method
* rename to client and add javadoc
* spotless
* finish javadoc thought
* rebase
* renamed NetClientAttributesAdapter to NetClientAttributesGetter
* fix lettuce
* code review comments
* code review comments -- renaming for consistency
* adapter -> getter
* fix ratpack
* adapter -> getter
2022-01-20 10:51:13 -08:00
Trask Stalnaker
ce4cef76f9
Clean up groovy assertions ( #4805 )
2021-12-05 23:23:58 -08:00
Martin
d314d76fce
rename `newBuilder()` to `builder()` ( #4475 )
...
* rename `newBuilder()` to `builder()`
* rename `newBuilder()` to `builder()`
2021-10-22 20:50:43 -07:00
Lauri Tulmin
9b8ab5eeec
Migrate to spock 2 ( #4458 )
...
* Migrate to spock 2
* Fix smoke test suites
* address review comments
* review comment
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-10-22 08:40:58 -07:00
Nikita Salnikov-Tarnovski
a48bd9de3f
Move PeerServiceAttributesExtractor from javaagent api to instrumentation api ( #4235 )
...
* Move PeerServiceAttributesExtractor from javaagent api to instrumentation api
* spotless
2021-10-06 12:42:55 -07:00
Lauri Tulmin
95651a4f1b
Intern db info ( #4263 )
2021-10-03 19:47:40 -07:00
Mateusz Rzeszutek
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
Matthew Ho
6967484a97
Update groovy import order to match default IntelliJ ( #1708 ) ( #4047 )
...
* Update groovy import order to match default IntelliJ (#1708 )
* organized imports for .groovy files to follow default IntelliJ import settings
* updated intellij-setup.md
* Spotless
* drift
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-09-11 11:53:08 -07:00
Lauri Tulmin
b61113fef6
JDBC: use ContextStore when running as agent ( #3987 )
...
* JDBC: use ContextStore when running as agent
* address review comments
* use singular
2021-08-27 14:14:40 -07:00
Anuraag Agrawal
e0cb216610
Remove remaining usages of basic span asserts ( #3616 )
2021-07-19 10:09:44 -07:00
Anuraag Agrawal
f5ce4c03f8
Inline basic usages of basicSpan ( #3583 )
...
* Inline basic usages of basicSpan
* spock
2021-07-18 21:15:51 +03:00
Anuraag Agrawal
d3b62de8a5
Replace most uses of TraceUtils with testRunner runWithSpan. ( #3582 )
2021-07-15 10:30:34 -07:00
Mateusz Rzeszutek
9b56fc9051
Clean up AgentElementMatchers ( #3527 )
...
* Clean up AgentElementMatchers
* remove a TODO
* moved method
2021-07-09 10:02:21 +03:00
Trask Stalnaker
b304cc2912
Deprecate CallDepth.reset() and get() ( #3511 )
...
* Deprecate CallDepth.reset() and get()
* Don't pass CallDepth around
2021-07-07 09:24:50 -07:00
Mateusz Rzeszutek
c5ba5c3a71
Use local variable for passing CallDepth between advice enter/exit me… ( #3504 )
...
* Use local variable for passing CallDepth between advice enter/exit methods
* fix broken call depth tracking
* checkstyle
* fix javadocs
2021-07-06 12:05:14 -07:00
Mateusz Rzeszutek
b9fcb6b498
Reduce CallDepth classes' API surface ( #3497 )
2021-07-06 09:24:19 +02:00
Alexey Zhokhov
ed02aff7b5
OpenTelemetry JDBC instrumentation library ( #3367 )
...
* Added jdbc library with ported version of OpenTracing JDBC Instrumentation.
* Gradle 7.1.
* Revert "Gradle 7.1."
This reverts commit e3df35b0
* Code style fixes.
* Code style fixes.
* Moved some JDBC utilities classes to the library module.
* javax.annotation.Nullable -> org.checkerframework.checker.nullness.qual.Nullable
* Build fix.
* Spotless fixes.
* Cache prepared statements.
* Cache connection info.
* Tracing for JDBC statement and prepared statement.
* Added some API dependencies.
* Fixed ending the span.
* Removed proxy usage.
* Cleanup.
* Implemented datasource with tracing support.
* Renamed Tracing prefix with OpenTelemetry.
* Renamed Tracing prefix with OpenTelemetry.
* Moved utilities classes to io.opentelemetry.instrumentation.jdbc.internal subpackage.
* Build fix.
* Build fix.
* Cleanup.
* Moved some shared classes to instrumentation-api module.
* Code review fixes.
* Make OpenTelemetryDriver final.
* Spotless fixes.
* Moved test classes from javaagent-unit-tests module to library module.
* Removed javaagent-unit-tests module.
* Covered OpenTelemetryDriver with tests.
* Cleanup.
* Covered OpenTelemetryDataSource with tests.
* Covered OpenTelemetryConnection with tests.
* Revert TestPreparedStatement.
* Added README.
* Build fix.
* Checkstyle fixes.
* Spotless fixes.
* Rename to build.gradle
* Fix build.gradle format.
* INSTANCE package scope.
* Documented OpenTelemetryDataSource usage.
* Renamed CheckedCallable to ThrowingSupplier.
* Update instrumentation/jdbc/library/README.md
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Update instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver.java
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Update instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver.java
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Update instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver.java
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Update instrumentation/jdbc/library/README.md
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Update instrumentation/jdbc/library/README.md
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Update instrumentation/jdbc/library/README.md
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Removed javaagent-api module usage.
* Removed useless checking.
* Moved javaagent test classes to testing module.
* Move common JDBC test classes to testing module.
* Spotless fixes.
* Code format.
* Moved PeerServiceAttributesExtractor back to javaagent-api module.
* Rename JavaAgentJdbcSingletons to JdbcSingletons.
* Fixed JdbcSingletons import.
* Cleanup.
* Codenarc fixes.
* Update instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver.java
Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
* Update instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver.java
Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
* Parse InstrumentationVersion.VERSION.
* Store major and minor version in private static fields.
* Make the datasource way a preferred way.
* Removed interceptor mode.
* Rename build.gradle -> build.gradle.kts.
* Switch to Gradle Kotlin DSL.
Co-authored-by: Anuraag Agrawal <aanuraag@amazon.co.jp>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
2021-07-01 10:35:07 -07:00
Mateusz Rzeszutek
15ed01d4fc
Change all instrumentation names to io.opentelemetry.{libName}-{libVersion} ( #3411 )
...
* Change all instrumentation names to io.opentelemetry.{libName}-{libVersion}
* minumum supported version
2021-06-30 15:34:36 +02:00
Anuraag Agrawal
761b9c280b
Migrate instrumentation gradle files to kotlin ( #3414 )
...
* Migrate instrumentation gradle files to kotlin
* Convert
* Muzzle
2021-06-28 17:27:12 +09:00
Anuraag Agrawal
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
Anuraag Agrawal
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
Anuraag Agrawal
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
Mateusz Rzeszutek
2f528e4166
Rename *Instrumenters to *Singletons ( #3335 )
2021-06-16 10:12:37 -07:00
Trask Stalnaker
62f1f49bcd
Intellij cleanup (Java and Groovy) ( #3285 )
...
* Intellij cleanup
* Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java
Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
* Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractorTest.java
Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
* Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractorTest.java
Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
* Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java
Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
* Update instrumentation/spring/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateInterceptorTest.java
Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
* Use glassfish version that supports lambdas
Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
2021-06-14 10:23:01 -07:00
Trask Stalnaker
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
Trask Stalnaker
e9c3df6dac
Static factory method ordering ( #3206 )
2021-06-07 15:29:30 -07:00
Trask Stalnaker
a78ed4c420
Rename some extractor request/response params ( #3202 )
2021-06-07 11:41:47 -07:00
Anuraag Agrawal
2436499a09
Update to Errorprone 2.7 ( #3181 )
...
* Update to errorprone 2.7
* ToString
* Finish
2021-06-04 10:40:55 +09:00
Mateusz Rzeszutek
5e4c5684e6
Moved jdbc-datasource instrumentation to Instrumenter API ( #3160 )
2021-06-02 23:45:11 -07:00
Anuraag Agrawal
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