Commit Graph

488 Commits

Author SHA1 Message Date
Anuraag Agrawal a4ea1c9db2
Update to OTel 1.1.0 (#2744)
* Update to OTel 1.1.0

* Use transform safe logger

* Finish

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-04-08 16:01:16 +09:00
Trask Stalnaker b39348d640
Add -Werror flag to the build (#2712)
* Add -Werror to the build

* Add to javadoc also

* Run javadoc

* Change from "check javadoc" to "build"

* Fix javadoc warnings
2021-04-06 10:01:10 +03:00
jack-berg 035b3f42f7
Fix build and documentation typos related to autoconfigure SPI. (#2719) 2021-04-05 18:22:34 -07:00
Anuraag Agrawal cc47da585b
New Instrumenter API (#2596)
* Instrumenter

* Spotless

* More instrumenter

* More

* Instrumenter API

* New Instrumenter API - InstrumenterBuilder (#20)

* New Instrumenter API - InstrumenterBuilder

* New Instrumenter API - InstrumenterBuilder - code review comments

* Start doccing

* Docs

* Most tests

* Last test

* Stick with current hostName lookup for now

* Update testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy

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

* New Instrumenter API - code review comments (#21)

* Doc

* Checkstyle

* Cleanups

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-04-05 15:45:07 +09:00
Mateusz Rzeszutek 1406855bb7
Revert "Prevent duplicate telemetry when using both library and auto instrumentation (#2661)" (#2689) 2021-04-01 16:11:15 -07:00
Mateusz Rzeszutek 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
Anuraag Agrawal 08d8d4c57d
Flag off enableStrictContext for now. (#2676) 2021-03-31 20:24:14 +09:00
Mateusz Rzeszutek 052c9ab703
Remove unnecessary libs from testSets test classpath (#2654) 2021-03-30 10:01:35 +02:00
Anuraag Agrawal dcd316da7a
Enable strict context check and fix some context issues. (#2637)
* Enable strict context check and fix some context issues.

* Drift

* Drift and cache

* Exclude grizzly include akka

* Grizzly, scala

* ForkJoin worker

* webflux comment, grizzly typo

* Give up on akka for now

* threadpool

* Fallback on grizzly, wait for completion in executor cancellation tests

* Hystrix

* ratpack

* Cleanups
2021-03-29 08:08:11 +03:00
Anuraag Agrawal 79d7e88e53
Use Caffeine for weak maps (#2601)
* Caffeine weakmap

* Use Caffeine for weak maps

* Drift

* Drift

* Remove weak-lock-free

* Update licenses

* Fix bug

* Restore weaklockfree

* Clean

* Fixes

* Inline expunction

* Synchronized

* More comment

* Fix shading

* Executor

* computeIfAbsent and delete unused.

* Fix license report
2021-03-24 17:12:26 +09:00
Nikita Salnikov-Tarnovski d79f90492a
Make sure muzzle build-time check actually validates anything (#2599)
* Check if muzzle build-time check actually validates anything

* Force class files generation before muzzle

* Apply muzzle only to javaagent projects

* Apply muzzle only to javaagent projects

* More fixes

* More fixes

* PR review comments

* polish

* Exclude "broken" version

* Polish

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-03-23 14:12:01 +02:00
Nikita Salnikov-Tarnovski fc39d87c82
Remove JCenter which is about to be sunset (#2387)
* Remove JCenter which is about to be sunset

* Fallback to JCenter for muzzle

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Remove debug logs

* polish
2021-03-19 23:21:52 +02:00
Mateusz Rzeszutek ae23b97ec4
Move and rename NetPeerUtils (#2548)
* Move and rename NetPeerUtils

* Rename NetPeerUtils to NetPeerAttributes; inject instance instead of using a global var
* Rename SpanAttributeSetter to AttributeSetter (might be used to set on AttributesBuilder in the future, who knows)
* Deprecate default BaseTracer constructor: library instrumentations are supposed to inject all dependencies, the javaagent should explicitly pass globals

* fix compilation failure

* Remove peer.service customization from library instrumentation
2021-03-16 13:50:19 +01:00
Mateusz Rzeszutek f3ba2302eb
Remove unnecessary libs from the javaagent shadowJar (#2566)
* Remove unnecessary libs from the javaagent shadowJar

And make it a bit lighter: 36 MB -> 21 MB

* Apply code review comments

* Remove unnecessary kotlin exclusion
2021-03-16 10:47:05 +01:00
Nikita Salnikov-Tarnovski ae236a646c
Update Gradle to 6.8.3 (#2561) 2021-03-11 22:12:30 -08:00
Anuraag Agrawal 27d3cc5e57
Update to OTel 1.0.1 (#2558) 2021-03-11 18:18:20 +09:00
Mateusz Rzeszutek 97fa9932d4
Remove unnecessary libs from javaagent test classpath (#2545)
* Remove unnecessary libs from javaagent test classpath

All `javaagent` & `library` modules are now filtered out: for instance, `hibernate-3.3:javaagent` tests no longer have `hibernate-common:javaagent` on classpath (previously they had).

Honestly this is kind of hacky, but I don't know gradle enough to solve that "properly" - maybe it is possible to filter out all `implementation` libraries from the classpath?

* spotless
2021-03-11 15:56:24 +09:00
Mateusz Rzeszutek 3dff44874f
Fix RestTemplateInterceptor so that it calls endExceptionally() on exception (#2516) 2021-03-08 09:36:47 -08:00
Anuraag Agrawal 2adb1e080c
Use new version of publish / staging plugin which has merged the two projects. (#2519) 2021-03-08 20:18:28 +09:00
Anuraag Agrawal 94872b1ced
Move DB helpers to instrumentation-api (#2511)
* Move DB helpers to instrumentation-api

* Fix gradle config

* Remove legacy
2021-03-08 12:32:36 +09:00
Trask Stalnaker 5162c023bc
Updates to thread propagation debug property (#2500) 2021-03-05 11:02:36 -08:00
Anuraag Agrawal d7f8967ff6
Add a caching API based on caffeine for use from instrumentation, not just javaagent (#2477)
* Add caching API

* Finish

* javadoc

* Extract dep

* git add

* Drift

* Spotbugs

* checkstyle

* Fix package

* Test Caffeine patch
2021-03-05 17:57:23 +09:00
Anuraag Agrawal 35e415c7d1
Add shadowJar as input to test task. (#2504) 2021-03-05 12:18:17 +09:00
Jakub Wach 9a5bc66329
AWS SDK - SNS to SQS tracing propagation test (#2483) 2021-03-04 13:33:22 -08:00
Trask Stalnaker 0abc492bc3
Rename more properties (#2486)
* Rename more props to experimental

* Rename more properties

* Rename .internal to .testing

* Revert changes to examples distro

* Move chunk.new-trace to experimental

* Fix unrelated build issue
2021-03-04 11:20:47 -08:00
Trask Stalnaker 475830789c
Update to otel-java 1.0.0 (#2431)
* Update to otel-java 1.0.0

* Fix test

* Fix another test

* Fix another test

* Fix hibernate tests

* Fix spring-data tests

* Spotless
2021-02-28 11:15:27 -08:00
Mateusz Rzeszutek 90350ba6d5
Remove unnecessary muzzle log configuration in tests (#2411) 2021-02-25 18:57:35 +01:00
Anuraag Agrawal 000df967ce
Update to SDK 0.17.0 (#2338)
* Update to SDK 0.17.0

* Finish

* ottrace
2021-02-19 15:51:55 +09:00
Anuraag Agrawal cf9bfa2373
Publish a BOM (#2339) 2021-02-19 15:29:07 +09:00
Trask Stalnaker 59c9b544d1
Bring back debug logging under class file transform (#2236)
* Bring back debug logging under class file transform

* spotless

* Feedback

* Rename to TransformSafeLogger
2021-02-16 12:37:17 +09:00
Anuraag Agrawal 66f5554a2b
Mark all non-javaagent artifacts as -alpha version. (#2286) 2021-02-15 16:49:37 -08:00
Mateusz Rzeszutek a74f60b3f8
Add JUnit 5 extensions for instrumentation testing (#2241)
* Add JUnit 5 extensions for instrumentation testing

* Fix kafka tests

* RepeatedTest
2021-02-12 12:57:08 +01:00
Trask Stalnaker c91bff41cb
Add comment about extension shading (#2235) 2021-02-10 09:39:33 +02:00
Mateusz Rzeszutek 49206212cf
Refactor AgentTestRunner: extract a common interface, convert to Java class (#2223) 2021-02-09 09:21:05 -08:00
Anuraag Agrawal 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
Mateusz Rzeszutek e51692b3fd
Move setting test properties to instrumentation.gradle (from AgentTestRunner) (#2205)
I think that they might have been not noticed by the javaagent when set in the AgentTestRunner
2021-02-06 13:17:00 +09:00
Anuraag Agrawal e2d0dd7d4c
Filter out library jar from tests since it's shadowed into the agent … (#2179)
* Filter out library jar from tests since it's shadowed into the agent / agent-testing jar.

* More precision
2021-02-04 15:23:35 +09:00
Gábor Lipták 5bf9f34caa
Bring org.testcontainers to 1.15.1 (#2178)
Signed-off-by: Gábor Lipták <gliptak@gmail.com>
2021-02-03 08:01:04 +02:00
Anuraag Agrawal 49194ff444
Don't hardcode agent-for-testing archive filename so it can be publis… (#2146)
* Don't hardcode agent-for-testing archive filename so it can be published.

* Fix accidental

* afterEvaluate
2021-02-01 14:33:27 +09:00
Anuraag Agrawal 1ebb58a596
Update to SDK 0.15.0 (#2137)
* Update to SDK 0.15.0

* Fix lightstep test
2021-01-29 21:30:22 +09:00
Mateusz Rzeszutek 328c6832a2
Publish agent-for-testing and testing-common (#2133) 2021-01-29 08:39:30 +01:00
Mateusz Rzeszutek 20dadc1b6d
Replace two JavaCC lexers with a single JFlex one (#2113) 2021-01-26 14:03:11 -08:00
Nikita Salnikov-Tarnovski 2d683d4289
No more gradle warnings (#2103) 2021-01-26 08:24:18 +02:00
jason plumb 7122c4b2a5
Rename "normalize" to "sanitize" (#2087)
* rename SqlNormalizer to SqlSanitizer (more descriptive).

* rename normalize to sanitize.

* rename in comments and messages

* rename in variable to sanitized

* rename normalized -> sanitized in tests

* fixed broken tests

* rename variable.

Co-authored-by: Anuraag Agrawal <aanuraag@amazon.co.jp>
2021-01-22 15:49:24 +09:00
Anuraag Agrawal c6cc263c6e
Use SDK Autoconfigure module (#2077)
* Use sdk autoconfigure

* Finish

* Finish

* Group exporters

* Update smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy

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

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-01-20 14:31:49 +09:00
Anuraag Agrawal 97b8712e3b
Remove jaeger-thrift from agent distribution (#2073)
* Remove jaeger-thrift from agent distribution

* Update test
2021-01-19 16:08:01 +09:00
Mateusz Rzeszutek 660f0e5225
Remove testing-common dependency on guava (#2062)
* Remove testing-common dependency on guava

* Use nano time

* Add guava dep to opentelemetry-api-metrics
2021-01-19 12:07:27 +09:00
Anuraag Agrawal 999f3112a4
Disable shadowPublish for instrumentation projects (#2068) 2021-01-18 15:29:25 +09:00
Anuraag Agrawal afdde0355b
Update to OTel 0.14.1 (#2059)
* Update SDK dependency to 0.14.1

* WIP

* Finish

* Cleanup
2021-01-18 13:02:04 +09:00
jason plumb 7957293038
update auto-service from rc3 to rc7 (a 3 year difference!) (#2053) 2021-01-15 08:52:49 +09:00
Trask Stalnaker b97135725c
Change gitter links to github discussions (#1977) 2021-01-05 08:58:06 +09:00
Anuraag Agrawal 8d74baa2e4
Run tests with javaagent. (#1643)
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-01-04 13:13:24 -08:00
Anuraag Agrawal 76d1f07423
Update to released SDK 0.13.1 (#1936) 2020-12-18 14:12:30 +09:00
Anuraag Agrawal 4da56b4746
Don't compare requested version to current version since we always want to override our default of Java 11 (#1934) 2020-12-18 13:17:50 +09:00
Anuraag Agrawal f0a6c6d772
Update SDK dependency to 0.13.0-SNAPSHOT. (#1924)
* Update SDK dependency to 0.13.0-SNAPSHOT.

* Update smoke tests

* Fix formatting

* Spot
2020-12-17 18:20:59 +09:00
jason plumb 4c8b8a77fb
Add exporter factory for JaegerThriftSpanExporter (#1868)
* add exporter factory for JaegerThriftSpanExporter

* add smoke test
2020-12-14 13:02:51 -08:00
Anuraag Agrawal 993c5808e2
Ignore Implementation-Version for runtime up-to-date checks like tests. (#1879) 2020-12-10 19:02:13 +09:00
Anuraag Agrawal a2842dc4dc
Tweak publishing settings (#1877) 2020-12-10 17:06:52 +09:00
Anuraag Agrawal 5f942d874e
Actually set POM description. (#1861) 2020-12-09 17:35:42 +09:00
Anuraag Agrawal d7183ebbdc
Add a simple description to POM. (#1857)
* Add a simple description to POM.

* Update build.gradle
2020-12-09 14:08:57 +09:00
Anuraag Agrawal 78f1899735
Create nexus staging repo in beginning of build instead of relying on auto routing. (#1854) 2020-12-09 10:11:24 +09:00
Anuraag Agrawal 3b8827b8ab
Update to SDK 0.12.0 (#1830)
* Update to SDK 0.12.0

* Update error message to the current world.

* Bump referenced smoke test versions

* fixes

* dependency hell

* Suppress unused call

* Bump missed smoke tests

* Bump image, bump smoke tests gRPC version
2020-12-07 17:16:47 +09:00
Anuraag Agrawal f9df981b2e
Switch publishing release target to sonatype. (#1823)
* Switch publishing targets to sonatype.

* Continue with jfrog

* typo
2020-12-04 12:41:01 +09:00
Mateusz Rzeszutek 3c1a09109f
Use sdk-extensions/resources in the agent (#1809)
* Use sdk-extensions/resources in the agent

* Add smoke test, fix dropwizard test
2020-12-01 16:03:51 -08:00
Trask Stalnaker a3d11c0262
Rename auto annotations to ext annotations (#1799) 2020-11-29 21:04:55 -08:00
Trask Stalnaker 26f254b10d
Create javaagent dirs for all instrumentations, part 2 (#1794) 2020-11-28 22:26:49 -08:00
Anuraag Agrawal cc07597ef4
Configure maven-publish for uploading to bintray instead of bintray p… (#1789)
* Configure maven-publish for uploading to bintray instead of bintray plugin.

* Snapshots too
2020-11-28 17:23:02 +09:00
Anuraag Agrawal f9671e70af
Sign artifacts in build instead of in bintray. (#1778) 2020-11-28 15:39:52 +09:00
Anuraag Agrawal 31f1a73d59
Upgrade build plugin versions. (#1774) 2020-11-26 18:16:14 +09:00
Anuraag Agrawal 91a9e1885e
Replace java test version rule with property. (#1769)
* Replace java test version rule with property.

* Fix enabled check

* Update java.gradle
2020-11-26 16:53:20 +09:00
Anuraag Agrawal 822be11dbc
Use Kotlin context element in agent instrumentation (#1618)
* Use SDK helper

* Revert unintended.
2020-11-25 18:45:00 +09:00
Anuraag Agrawal c202c9c9e6
Update to Gradle 6.7.1 (#1760) 2020-11-25 17:36:30 +09:00
Trask Stalnaker 0c5c4caaa4
Rename java-concurrent and java-classloader instrumentation modules (#1733)
* Rename java-concurrent instrumentation to executors

* Rename java-classloader to classloaders
2020-11-23 17:49:10 -08:00
Trask Stalnaker 5f7d1706c2
Remove special CI build dir (#1738)
* Remove special CI build dir

* Add isCI directly to spotbugs.gradle
2020-11-23 15:41:45 +02:00
Ago Allikmaa e5f0779d1a
ByteBuddy tasks no longer resolve dependencies at config time. (#1715) 2020-11-20 19:24:52 -08:00
Anuraag Agrawal 7bfb6b6dbd
Update to SDK 0.11.0 (#1690) 2020-11-19 19:37:49 -08:00
Trask Stalnaker d183692699
Enable checkstyle type var naming rule (#1666) 2020-11-19 11:00:31 -08:00
Nikita Salnikov-Tarnovski bd52a5f428
Remove scala from runtime dependencies (#1694) 2020-11-19 20:05:02 +02:00
Trask Stalnaker 2e51003900
Enable checkstyle overload method ordering rule for Google Java Style (#1656) 2020-11-17 14:41:14 -08:00
Trask Stalnaker b35c0b28cc
Java 7 and CircleCI cleanup (#1654)
* Java 7 and CircleCI cleanup

* Bring back and increment version instead
2020-11-17 10:36:23 +02:00
Trask Stalnaker 6d5ec329d6
Enable checkstyle for google style guide (#1641) 2020-11-16 18:46:59 -08:00
Anuraag Agrawal d435da4638
Update to Gradle 6.7 and use new toolchains feature for testing on Ja… (#1627)
* Update to Gradle 6.7 and use new toolchains feature for testing on Java versions.

* Update docs

* Add back sum

* Use GitHub test JDK for toolchain.

* Use maxJavaVersionForTests for default test version when set.

* Fix RMI

* Fix configs

* Go back to rule

* Extract variable for default Java version.
2020-11-16 10:29:36 +02:00
Ago Allikmaa 995e2caee0
Update ByteBuddy to 1.10.18, adjust to new ByteBuddy gradle plugin (#1596)
* Adjust for use with ByteBuddy 1.10.18

* Fix language choices for ByteBuddy transformation.

* Remove no longer used MuzzleCodeGenerationPlugin$NoOp
2020-11-12 12:34:06 +02:00
Nikita Salnikov-Tarnovski 7f012c585d
Update publish.gradle (#1611)
Do not automatically publish to Bintray after upload
2020-11-10 15:04:24 +02:00
Anuraag Agrawal 3d21c26632
Update to SDK 0.10.0 (#1564) 2020-11-05 13:17:47 -08:00
Anuraag Agrawal d9e978c8d8
Update to latest snapshot (#1560) 2020-11-05 20:49:32 +09:00
Anuraag Agrawal e1c7baab42
Upgrade to latest SDK snapshot (#1549) 2020-11-05 17:45:59 +09:00
Jakub Wach 049358e81b
apache camel 2.20.x instrumentation (#1397)
* apache camel 2.20.x instrumentation

* removed instrumentation advice from helper classes

* code review #1

* code review #2 / experimental server name update

* code review changes / new tests, improved direct, new license header

* rebase changes

* code review changes

* code review changes, REST tests added

* changes after rebase to newest master

* code review changes

* code review

* code review

* rebase to master
2020-11-03 11:42:33 +02:00
Anuraag Agrawal a528daee52
Update to latest snapshot (#1544) 2020-11-03 17:08:17 +09:00
Anuraag Agrawal 5d2cb459df
Update to latest SDK snapshot (#1539) 2020-11-02 16:07:53 +09:00
Anuraag Agrawal 7132757792
Update to latest snapshot (#1532) 2020-11-01 16:19:12 +09:00
Anuraag Agrawal c6eee70660
Update to latest snapshot. (#1524) 2020-10-29 18:54:09 -07:00
Anuraag Agrawal fd03a4b1e1
Replace ContextStore for context bridge with a custom context storage… (#1493)
* Replace ContextStore for context bridge with a custom context storage provider.

* Handle context mapping at storage layer.

* Cleanup

* Add interop test

* Small comment

* No threads

* Groovy
2020-10-29 15:42:50 +09:00
Anuraag Agrawal a2dccf2316
Update to latest SDK snapshot. (#1479) 2020-10-26 19:29:46 -07:00
Anuraag Agrawal f6ad05b8e3
Update to latest SDK snapshot (#1384)
* Update to latest SDK snapshot

* Use published snapshot

* Fixes

* Cleans

* spotless

* Most

* Clean

* Merge

* Temporarily remove context interop

* WIP

* Prepare for intercepting propagated span

* Bump SDK

* IDE updates

* Lots

* compileJava

* Done?

* bar

* Spot

* drugs

* Groovy--

* green for me

* Spot

* Remove grpc import

* Scrub
2020-10-25 15:14:32 +09:00
Mateusz Rzeszutek 50990a7c17
Cassandra instrumentations should store normalised CQL queries as db.statement (#1427)
* Move `DbSystem` to package `...instrumentation.api.db`
* Move `SqlNormalizer` to `javaagent-api`  package ...api.db.normalizer
* Refactor Cassandra tests so that they use testcontainers (and run on Java 11)
* Implement Cassandra statement normalization
2020-10-22 17:56:06 +02:00
Ioannis Mavroukakis 9b91236775
ensure all published artifacts have a groupId (#1438)
* ensure all published artifacts have a groupId

* put exporters in to the javaagent group

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

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-10-22 13:33:16 +03:00
Nikita Salnikov-Tarnovski 7d77b2dc37
Prefer mavenCentral over jcenter (#1440)
* Prefer mavenCentral over jcenter

* Skip broken version for muzzle
2020-10-21 18:59:29 +03:00
Nikita Salnikov-Tarnovski 15e0b2ff32
Run build without warnings (#1387) 2020-10-15 16:10:22 -07:00
Mateusz Rzeszutek ee0e0a9697
Muzzle improvements: docs, javadocs, renamings and minor refactoring (#1379) 2020-10-14 16:49:51 -07:00