Commit Graph

3736 Commits

Author SHA1 Message Date
Tyler Benson e05c892271 Begin 0.42.0 2020-01-14 11:11:06 -08:00
Trask Stalnaker de0f3fc3c1
Fix muzzle build (#53)
* Adjust version compatibility to only 2.x

They recently released 3.0.0 which is not compatible with our instrumentation.

* Also update latestDepTest ranges.

Co-authored-by: Tyler Benson <tylerbenson@gmail.com>
2020-01-14 10:56:00 -08:00
Tyler Benson 7fabcaaecb Version 0.41.0 2020-01-14 10:48:14 -08:00
Trask Stalnaker 64fd99862a
Use OpenTelemetry API (#51)
* Remove dd-trace-ot

* Remove disableShadowRelocate

* Remove GlobalTracer and ScopeListener

* Comment out instr depending on activeScope

* OpenTelemetry implementation

* Update instrumentation tests to pass

* Update test infrastruture

* Update spring-webflux instrumentation

* Update jax-rs-annotation instrumentation

* Fix ratpack failing test
2020-01-13 16:51:36 -08:00
Tyler Benson a52a1420db
Merge pull request #1165 from DataDog/tyler/servlet
Add servlet integrations for request and response dispatch back in.
2020-01-13 13:17:29 -08:00
Tyler Benson d42e72b683
Merge pull request #1171 from DataDog/tyler/bb-filter
Remove more declared method filtering for optimization
2020-01-13 13:05:28 -08:00
Tyler Benson ef6cd9c52c
Merge pull request #1170 from DataDog/tyler/couchbase
Adjust version compatibility to only 2.x
2020-01-13 13:04:57 -08:00
Tyler Benson 5fe26f004b Remove more declared method filtering for optimization
Same logic that was applied in #1169
2020-01-13 12:52:41 -08:00
Nikolay Martynov 6bf1e159b0
Merge pull request #1167 from DataDog/mar-kolya/upgrade-jmxfetch
Upgrade jmxfetch to latest version
2020-01-13 15:45:12 -05:00
Tyler Benson 77cdd210c6 Also update latestDepTest ranges. 2020-01-13 12:31:38 -08:00
Nikolay Martynov cb7faee63f Remove logging config from jmxfetch setup
It already uses slf4j
2020-01-13 15:23:04 -05:00
Tyler Benson 603155f56f
Merge pull request #1169 from DataDog/tyler/remove-filter
Optimize HasSuperMethodMatcher logic
2020-01-13 12:11:27 -08:00
Tyler Benson a0f0d45c74 Adjust version compatibility to only 2.x
They recently released 3.0.0 which is not compatible with our instrumentation.
2020-01-13 12:10:57 -08:00
Nikolay Martynov dcc5726797 Fix jmxfetch log level and log location config
Looks like this got lost in b505c60543
2020-01-13 15:05:45 -05:00
Nikolay Martynov d96d8e3c71 Upgrade gradle 2020-01-13 14:46:06 -05:00
Nikolay Martynov d55d13e239 Exclude some dependencies from jmxfetch 2020-01-13 14:45:19 -05:00
Tyler Benson 3eecb03fe2
Merge pull request #1168 from DataDog/tyler/fix-grpc-trace-header
Fixing GRPC `-bin` header unmarshalling
2020-01-13 11:37:54 -08:00
Nikolay Martynov 8b5d89501b Upgrade jmxfetch to latest version 2020-01-13 14:19:03 -05:00
Tyler Benson 25397fd128 Fix formatting and add test. 2020-01-13 11:18:45 -08:00
Bruce Yu 13b84416b9 Blacklisting headers with -bin suffixes in GrpcExtractAdapter 2020-01-13 11:18:45 -08:00
Tyler Benson 49425e9963 Move request-response linking to main servlet advice
servlet-service is off by default, so we can't rely on it being called there.
2020-01-13 10:48:35 -08:00
Tyler Benson e440eba9a1 Enable Servlet request and response dispatcher instrumentation by default.
Change config for Servlet Filter and Service and JDBC DataSource instrumentation so it must be explicitly enabled (won't be enabled by accident if all of servlet is enabled).
2020-01-10 13:51:21 -08:00
Tyler Benson 43fbf28035 Revert "Remove experimental jdbc and servlet integrations until further evaluation"
This reverts commit 2432a92230.
2020-01-10 12:53:24 -08:00
Tyler Benson 6b9c92eefa
Merge pull request #1164 from DataDog/tyler/jdbc-error-handling
Better error handling for getClientInfo in JDBCDecorator
2020-01-09 09:20:46 -08:00
Tyler Benson 7cb24f35c0 Better error handling for getClientInfo in JDBCDecorator
An exception there caused a span to be created but then never finished.
2020-01-08 15:10:54 -08:00
Trask Stalnaker 426b01c7e7
Remove continuation support (#49)
* Remove continuation

* Remove continuation cancel

* Move TraceScope to Agent API

* Remove unnecessary method

* Remove TraceScope

* Remove activeScope

* Fix continuation comments

* Remove AgentScope.Continuation

* Partial revert of "Remove activeScope"
2020-01-07 18:45:08 -08:00
Tyler Benson 5e8af8439a Optimize HasSuperMethodMatcher logic
Instead of filtering then iterating, just iterate through everything and apply filter inline.

This will help avoid allocation for filter iterator and improve if early match is found.
2020-01-07 17:10:01 -08:00
Trask Stalnaker 555c232ea4
Missed merge from dd-trace-java (#47) 2020-01-06 17:10:31 -08:00
Tyler Benson 8500dbc2ba
Merge pull request #1156 from DataDog/tyler/ddagentwriter-split
Split DDAgentWriter into smaller classes
2020-01-03 11:19:28 -08:00
Tyler Benson c370705259
Merge pull request #46 from open-telemetry/otel-dd-merged
Merge changes from dd-trace-java 0.40.0
2020-01-03 10:54:51 -08:00
Tyler Benson 03dd908fdb
Merge pull request #1158 from DataDog/tyler/aws-1-tagging
Add various tags for AWS SDK v1.x
2020-01-03 08:38:56 -08:00
Tyler Benson 4947dc3bd3 Add various tags for AWS SDK v1.x
This brings it inline with the v2 instrumentation.
2020-01-02 13:23:30 -08:00
Tyler Benson dacafe4217
Merge pull request #1157 from DataDog/pawel/rmi-add-client-and-server-info-to-decorators
[rmi] add instrumentation names to client and server decorators, remove default client service name
2020-01-02 11:41:40 -08:00
Tyler Benson e84e6eb25d Merge changes from dd-trace-java 0.40.0
https://github.com/DataDog/dd-trace-java/releases/tag/v0.40.0

# Conflicts:
#	dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
#	dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
#	dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy
#	dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy
#	dd-java-agent/instrumentation/google-http-client/src/test/groovy/AbstractGoogleHttpClientTest.groovy
#	dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy
#	dd-java-agent/instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy
#	dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy
#	dd-java-agent/instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy
#	dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
#	dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
#	dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy
#	dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy
#	dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/SpringBootBasedTest.groovy
#	dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy
#	dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
#	dd-trace-api/src/main/java/datadog/trace/api/Config.java
#	dd-trace-ot/src/main/java/datadog/opentracing/DDSpan.java
#	dd-trace-ot/src/main/java/datadog/opentracing/decorators/DDDecoratorsFactory.java
#	dd-trace-ot/src/main/java/datadog/trace/common/writer/DDAgentWriter.java
#	dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy
#	dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy
2020-01-02 08:28:06 -08:00
Laplie Anderson 6b6554996a
Merge pull request #1155 from DataDog/landerson/muzzle-scan-classloader-matcher
Add classloader matcher to muzzle scan
2019-12-30 10:12:59 -05:00
Pawel Chojnacki bbaf7278a6 [rmi] remove rmi client service name 2019-12-24 11:59:29 +01:00
Pawel Chojnacki a4b0dcbc9f [rmi] add instrumentation names to client and server decorators 2019-12-23 19:05:34 +01:00
Tyler Benson ab33ed4a02 Begin 0.41.0 2019-12-23 10:04:47 -08:00
Tyler Benson b8210ceea5 Version 0.40.0 2019-12-23 09:33:30 -08:00
Pawel Chojnacki 65c701dd51
Merge pull request #1128 from DataDog/pawel/add_rmi_support
Add RMI support
2019-12-23 14:38:46 +01:00
Pawel Chojnacki f71ba14016 [rmi] use simple thread local for propagating context
+ add more documentation
2019-12-23 13:25:14 +01:00
Tyler Benson 9020b74128
Merge pull request #1147 from DataDog/tyler/kafka-async
Add async propagation flags for kafka consumer.
2019-12-20 14:55:36 -08:00
Tyler Benson 0a89f2a57c Extract DDAgentResponseListener from DDApi.
Reduce references to DDApi
2019-12-20 14:49:31 -08:00
Tyler Benson 24e2fe6da7 Move DDApi and rename to DDAgentApi
Reduce visibility back to what it was before refactoring.
2019-12-20 14:36:45 -08:00
Tyler Benson 84f9d80258 Extract TraceSerializingDisruptor class from DDAgentWriter 2019-12-20 14:22:32 -08:00
Tyler Benson 97ed587547 Extract TraceConsumer from DDAgentWriter
Unfortunately this required making some things public that were previously private or package visible.  I expect this to be temporary.
2019-12-20 14:17:33 -08:00
Tyler Benson 8fdd30d3ed Make TraceConsumer a static class 2019-12-20 13:41:09 -08:00
Tyler Benson 2ea76494f8 Extract DisruptorEvent and EventTranslator classes from DDAgentWriter 2019-12-20 13:40:38 -08:00
Laplie Anderson f181fa721f Add classloader matcher to muzzle scan 2019-12-20 16:17:08 -05:00
Laplie Anderson 00f9e310be
Merge pull request #1154 from DataDog/landerson/jax-rs-client-lazy-builder
JAX-RS ClientBuilder thread safety
2019-12-20 16:15:37 -05:00