open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update instrumentation package names, A-J (#266)

This commit is contained in:
Trask Stalnaker 2020-03-23 11:22:54 -07:00 committed by GitHub
parent c82baecb9d
commit 68bafd6e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
118 changed files with 162 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/auto/instrumentation/commonshttpclient/CommonsHttpClientDecorator.java → instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/v2_0/CommonsHttpClientDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.commonshttpclient; package io.opentelemetry.auto.instrumentation.apachehttpclient.v2_0;
import io.opentelemetry.OpenTelemetry; import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator; import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator;

8
instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/auto/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java → instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/v2_0/CommonsHttpClientInstrumentation.java
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.commonshttpclient; package io.opentelemetry.auto.instrumentation.apachehttpclient.v2_0;
import static io.opentelemetry.auto.instrumentation.commonshttpclient.CommonsHttpClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.apachehttpclient.v2_0.CommonsHttpClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.commonshttpclient.CommonsHttpClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.apachehttpclient.v2_0.CommonsHttpClientDecorator.TRACER;
import static io.opentelemetry.auto.instrumentation.commonshttpclient.HttpHeadersInjectAdapter.SETTER; import static io.opentelemetry.auto.instrumentation.apachehttpclient.v2_0.HttpHeadersInjectAdapter.SETTER;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;
import static io.opentelemetry.trace.Span.Kind.CLIENT; import static io.opentelemetry.trace.Span.Kind.CLIENT;

2
instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/auto/instrumentation/commonshttpclient/HttpHeadersInjectAdapter.java → instrumentation/apache-httpclient/apache-httpclient-2.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/v2_0/HttpHeadersInjectAdapter.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.commonshttpclient; package io.opentelemetry.auto.instrumentation.apachehttpclient.v2_0;
import io.opentelemetry.context.propagation.HttpTextFormat; import io.opentelemetry.context.propagation.HttpTextFormat;
import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.Header;

2
instrumentation/apache-httpclient/apache-httpclient-2.0/src/test/groovy/CommonsHttpClientTest.groovy
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import io.opentelemetry.auto.instrumentation.commonshttpclient.CommonsHttpClientDecorator import io.opentelemetry.auto.instrumentation.apachehttpclient.v2_0.CommonsHttpClientDecorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
import org.apache.commons.httpclient.HttpClient import org.apache.commons.httpclient.HttpClient
import org.apache.commons.httpclient.HttpMethod import org.apache.commons.httpclient.HttpMethod

2
instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java → instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/v4_0/ApacheHttpClientDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.apachehttpclient; package io.opentelemetry.auto.instrumentation.apachehttpclient.v4_0;
import io.opentelemetry.OpenTelemetry; import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator; import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator;

8
instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java → instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentation.java
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.apachehttpclient; package io.opentelemetry.auto.instrumentation.apachehttpclient.v4_0;
import static io.opentelemetry.auto.instrumentation.apachehttpclient.ApacheHttpClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.apachehttpclient.v4_0.ApacheHttpClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.apachehttpclient.ApacheHttpClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.apachehttpclient.v4_0.ApacheHttpClientDecorator.TRACER;
import static io.opentelemetry.auto.instrumentation.apachehttpclient.HttpHeadersInjectAdapter.SETTER; import static io.opentelemetry.auto.instrumentation.apachehttpclient.v4_0.HttpHeadersInjectAdapter.SETTER;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static io.opentelemetry.trace.Span.Kind.CLIENT; import static io.opentelemetry.trace.Span.Kind.CLIENT;

2
instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java → instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/v4_0/HostAndRequestAsHttpUriRequest.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.apachehttpclient; package io.opentelemetry.auto.instrumentation.apachehttpclient.v4_0;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;

2
instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java → instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/io/opentelemetry/auto/instrumentation/apachehttpclient/v4_0/HttpHeadersInjectAdapter.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.apachehttpclient; package io.opentelemetry.auto.instrumentation.apachehttpclient.v4_0;
import io.opentelemetry.context.propagation.HttpTextFormat; import io.opentelemetry.context.propagation.HttpTextFormat;
import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.methods.HttpUriRequest;

2
instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import io.opentelemetry.auto.instrumentation.apachehttpclient.ApacheHttpClientDecorator import io.opentelemetry.auto.instrumentation.apachehttpclient.v4_0.ApacheHttpClientDecorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
import org.apache.http.HttpResponse import org.apache.http.HttpResponse
import org.apache.http.client.ResponseHandler import org.apache.http.client.ResponseHandler

2
instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientTest.groovy
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import io.opentelemetry.auto.instrumentation.apachehttpclient.ApacheHttpClientDecorator import io.opentelemetry.auto.instrumentation.apachehttpclient.v4_0.ApacheHttpClientDecorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
import org.apache.http.HttpHost import org.apache.http.HttpHost
import org.apache.http.HttpRequest import org.apache.http.HttpRequest

2
instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSClientInstrumentation.java → instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/AWSClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v0; package io.opentelemetry.auto.instrumentation.awssdk.v1_11;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.declaresField; import static net.bytebuddy.matcher.ElementMatchers.declaresField;

6
instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AWSHttpClientInstrumentation.java → instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/AWSHttpClientInstrumentation.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v0; package io.opentelemetry.auto.instrumentation.awssdk.v1_11;
import static io.opentelemetry.auto.instrumentation.aws.v0.OnErrorDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.awssdk.v1_11.OnErrorDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.aws.v0.RequestMeta.SPAN_SCOPE_PAIR_CONTEXT_KEY; import static io.opentelemetry.auto.instrumentation.awssdk.v1_11.RequestMeta.SPAN_SCOPE_PAIR_CONTEXT_KEY;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isAbstract; import static net.bytebuddy.matcher.ElementMatchers.isAbstract;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;

2
instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/AwsSdkClientDecorator.java → instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/AwsSdkClientDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v0; package io.opentelemetry.auto.instrumentation.awssdk.v1_11;
import com.amazonaws.AmazonWebServiceRequest; import com.amazonaws.AmazonWebServiceRequest;
import com.amazonaws.AmazonWebServiceResponse; import com.amazonaws.AmazonWebServiceResponse;

2
instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java → instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/OnErrorDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v0; package io.opentelemetry.auto.instrumentation.awssdk.v1_11;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.BaseDecorator; import io.opentelemetry.auto.bootstrap.instrumentation.decorator.BaseDecorator;

2
instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestInstrumentation.java → instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/RequestInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v0; package io.opentelemetry.auto.instrumentation.awssdk.v1_11;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;

2
instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/RequestMeta.java → instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/RequestMeta.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v0; package io.opentelemetry.auto.instrumentation.awssdk.v1_11;
import com.amazonaws.handlers.HandlerContextKey; import com.amazonaws.handlers.HandlerContextKey;
import io.opentelemetry.auto.instrumentation.api.SpanWithScope; import io.opentelemetry.auto.instrumentation.api.SpanWithScope;

4
instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/TracingRequestHandler.java → instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v1_11/TracingRequestHandler.java
View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v0; package io.opentelemetry.auto.instrumentation.awssdk.v1_11;
import static io.opentelemetry.auto.instrumentation.aws.v0.RequestMeta.SPAN_SCOPE_PAIR_CONTEXT_KEY; import static io.opentelemetry.auto.instrumentation.awssdk.v1_11.RequestMeta.SPAN_SCOPE_PAIR_CONTEXT_KEY;
import static io.opentelemetry.trace.Span.Kind.CLIENT; import static io.opentelemetry.trace.Span.Kind.CLIENT;
import com.amazonaws.AmazonWebServiceRequest; import com.amazonaws.AmazonWebServiceRequest;

2
instrumentation/aws-sdk/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AbstractAwsClientInstrumentation.java → instrumentation/aws-sdk/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v2_2/AbstractAwsClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v2; package io.opentelemetry.auto.instrumentation.awssdk.v2_2;
import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.auto.tooling.Instrumenter;

2
instrumentation/aws-sdk/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsClientInstrumentation.java → instrumentation/aws-sdk/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v2_2/AwsClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v2; package io.opentelemetry.auto.instrumentation.awssdk.v2_2;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;

4
instrumentation/aws-sdk/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/aws/v2/AwsHttpClientInstrumentation.java → instrumentation/aws-sdk/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v2_2/AwsHttpClientInstrumentation.java
View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v2; package io.opentelemetry.auto.instrumentation.awssdk.v2_2;
import static io.opentelemetry.auto.instrumentation.aws.v2.TracingExecutionInterceptor.ScopeHolder.CURRENT; import static io.opentelemetry.auto.instrumentation.awssdk.v2_2.TracingExecutionInterceptor.ScopeHolder.CURRENT;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/aws-sdk/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/aws/v2/AwsSdkClientDecorator.java → instrumentation/aws-sdk/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/awssdk/v2_2/AwsSdkClientDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v2; package io.opentelemetry.auto.instrumentation.awssdk.v2_2;
import io.opentelemetry.OpenTelemetry; import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator; import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator;

6
instrumentation/aws-sdk/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/aws/v2/TracingExecutionInterceptor.java → instrumentation/aws-sdk/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.aws.v2; package io.opentelemetry.auto.instrumentation.awssdk.v2_2;
import static io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator.DEFAULT_SPAN_NAME; import static io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator.DEFAULT_SPAN_NAME;
import static io.opentelemetry.auto.instrumentation.aws.v2.AwsSdkClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.awssdk.v2_2.AwsSdkClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.aws.v2.AwsSdkClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.awssdk.v2_2.AwsSdkClientDecorator.TRACER;
import static io.opentelemetry.trace.Span.Kind.CLIENT; import static io.opentelemetry.trace.Span.Kind.CLIENT;
import io.opentelemetry.context.Scope; import io.opentelemetry.context.Scope;

2
instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientDecorator.java → instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/CassandraClientDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.datastax.cassandra; package io.opentelemetry.auto.instrumentation.cassandra;
import com.datastax.driver.core.Host; import com.datastax.driver.core.Host;
import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.ResultSet;

2
instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java → instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/CassandraClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.datastax.cassandra; package io.opentelemetry.auto.instrumentation.cassandra;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;

4
instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java → instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/TracingSession.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.datastax.cassandra; package io.opentelemetry.auto.instrumentation.cassandra;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static io.opentelemetry.auto.instrumentation.datastax.cassandra.CassandraClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.cassandra.CassandraClientDecorator.DECORATE;
import static io.opentelemetry.trace.Span.Kind.CLIENT; import static io.opentelemetry.trace.Span.Kind.CLIENT;
import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.BoundStatement;

2
instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseBucketInstrumentation.java → instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_0/CouchbaseBucketInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.couchbase.client; package io.opentelemetry.auto.instrumentation.couchbase.v2_0;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;

2
instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseClientDecorator.java → instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_0/CouchbaseClientDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.couchbase.client; package io.opentelemetry.auto.instrumentation.couchbase.v2_0;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator; import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;

2
instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseClusterInstrumentation.java → instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_0/CouchbaseClusterInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.couchbase.client; package io.opentelemetry.auto.instrumentation.couchbase.v2_0;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;

4
instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseOnSubscribe.java → instrumentation/couchbase/couchbase-2.0/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_0/CouchbaseOnSubscribe.java
View File

@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.couchbase.client; package io.opentelemetry.auto.instrumentation.couchbase.v2_0;
import static io.opentelemetry.auto.instrumentation.couchbase.client.CouchbaseClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.couchbase.v2_0.CouchbaseClientDecorator.DECORATE;
import static io.opentelemetry.trace.Span.Kind.CLIENT; import static io.opentelemetry.trace.Span.Kind.CLIENT;
import io.opentelemetry.auto.instrumentation.api.Tags; import io.opentelemetry.auto.instrumentation.api.Tags;

2
instrumentation/couchbase/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseCoreInstrumentation.java → instrumentation/couchbase/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_6/CouchbaseCoreInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.couchbase.client; package io.opentelemetry.auto.instrumentation.couchbase.v2_6;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;

2
instrumentation/couchbase/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/client/CouchbaseNetworkInstrumentation.java → instrumentation/couchbase/couchbase-2.6/src/main/java/io/opentelemetry/auto/instrumentation/couchbase/v2_6/CouchbaseNetworkInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.couchbase.client; package io.opentelemetry.auto.instrumentation.couchbase.v2_6;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;

2
instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy
View File

@ -21,7 +21,7 @@ import io.dropwizard.testing.ConfigOverride
import io.dropwizard.testing.DropwizardTestSupport import io.dropwizard.testing.DropwizardTestSupport
import io.opentelemetry.auto.instrumentation.api.MoreTags import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.Tags import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.jaxrs2.JaxRsAnnotationsDecorator import io.opentelemetry.auto.instrumentation.jaxrs.v2_0.JaxRsAnnotationsDecorator
import io.opentelemetry.auto.test.asserts.TraceAssert import io.opentelemetry.auto.test.asserts.TraceAssert
import io.opentelemetry.auto.test.base.HttpServerTest import io.opentelemetry.auto.test.base.HttpServerTest
import io.opentelemetry.auto.test.utils.PortUtils import io.opentelemetry.auto.test.utils.PortUtils

2
instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/auto/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java → instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/auto/instrumentation/dropwizardviews/DropwizardViewInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.dropwizard.view; package io.opentelemetry.auto.instrumentation.dropwizardviews;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;

2
instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java → instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/rest/v5_0/Elasticsearch5RestClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch5; package io.opentelemetry.auto.instrumentation.elasticsearch.rest.v5_0;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.TRACER;

2
instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/RestResponseListener.java → instrumentation/elasticsearch/elasticsearch-rest-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/rest/v5_0/RestResponseListener.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch5; package io.opentelemetry.auto.instrumentation.elasticsearch.rest.v5_0;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;

2
instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java → instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/rest/v6_4/Elasticsearch6RestClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch6_4; package io.opentelemetry.auto.instrumentation.elasticsearch.rest.v6_4;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.TRACER;

2
instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6_4/RestResponseListener.java → instrumentation/elasticsearch/elasticsearch-rest-6.4/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/rest/v6_4/RestResponseListener.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch6_4; package io.opentelemetry.auto.instrumentation.elasticsearch.rest.v6_4;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE;

2
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java → instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v2_0/Elasticsearch2TransportClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch2; package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v2_0;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER;

2
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch2/TransportActionListener.java → instrumentation/elasticsearch/elasticsearch-transport-2.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v2_0/TransportActionListener.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch2; package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v2_0;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;

2
instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java → instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v5_0/Elasticsearch5TransportClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch5; package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v5_0;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER;

2
instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5/TransportActionListener.java → instrumentation/elasticsearch/elasticsearch-transport-5.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v5_0/TransportActionListener.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch5; package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v5_0;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;

2
instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java → instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v5_3/Elasticsearch53TransportClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch5_3; package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v5_3;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER;

2
instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch5_3/TransportActionListener.java → instrumentation/elasticsearch/elasticsearch-transport-5.3/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v5_3/TransportActionListener.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch5_3; package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v5_3;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;

2
instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java → instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v6_0/Elasticsearch6TransportClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch6; package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v6_0;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.TRACER;

2
instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch6/TransportActionListener.java → instrumentation/elasticsearch/elasticsearch-transport-6.0/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/transport/v6_0/TransportActionListener.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.elasticsearch6; package io.opentelemetry.auto.instrumentation.elasticsearch.transport.v6_0;
import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE;

2
instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/AbstractHibernateInstrumentation.java → instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v3_3/AbstractHibernateInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3; package io.opentelemetry.auto.instrumentation.hibernate.v3_3;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;

2
instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/CriteriaInstrumentation.java → instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v3_3/CriteriaInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3; package io.opentelemetry.auto.instrumentation.hibernate.v3_3;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java → instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v3_3/QueryInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3; package io.opentelemetry.auto.instrumentation.hibernate.v3_3;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java → instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v3_3/SessionFactoryInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3; package io.opentelemetry.auto.instrumentation.hibernate.v3_3;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER;

2
instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/SessionInstrumentation.java → instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v3_3/SessionInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3; package io.opentelemetry.auto.instrumentation.hibernate.v3_3;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.hibernate.SessionMethodUtils.SCOPE_ONLY_METHODS; import static io.opentelemetry.auto.instrumentation.hibernate.SessionMethodUtils.SCOPE_ONLY_METHODS;

2
instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/TransactionInstrumentation.java → instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v3_3/TransactionInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3; package io.opentelemetry.auto.instrumentation.hibernate.v3_3;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/AbstractHibernateInstrumentation.java → instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v4_0/AbstractHibernateInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0; package io.opentelemetry.auto.instrumentation.hibernate.v4_0;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;

2
instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/CriteriaInstrumentation.java → instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v4_0/CriteriaInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0; package io.opentelemetry.auto.instrumentation.hibernate.v4_0;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java → instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v4_0/QueryInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0; package io.opentelemetry.auto.instrumentation.hibernate.v4_0;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java → instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v4_0/SessionFactoryInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0; package io.opentelemetry.auto.instrumentation.hibernate.v4_0;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER;

2
instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/SessionInstrumentation.java → instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v4_0/SessionInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0; package io.opentelemetry.auto.instrumentation.hibernate.v4_0;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.hibernate.SessionMethodUtils.SCOPE_ONLY_METHODS; import static io.opentelemetry.auto.instrumentation.hibernate.SessionMethodUtils.SCOPE_ONLY_METHODS;

2
instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/TransactionInstrumentation.java → instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v4_0/TransactionInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0; package io.opentelemetry.auto.instrumentation.hibernate.v4_0;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java → instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v4_3/ProcedureCallInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_3; package io.opentelemetry.auto.instrumentation.hibernate.v4_3;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;

2
instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java → instrumentation/hibernate/hibernate-4.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/v4_3/SessionInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.hibernate.core.v4_3; package io.opentelemetry.auto.instrumentation.hibernate.v4_3;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.hasInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.hasInterface;

2
instrumentation/http-url-connection/src/main/java/io/opentelemetry/auto/instrumentation/http_url_connection/HeadersInjectAdapter.java → instrumentation/http-url-connection/src/main/java/io/opentelemetry/auto/instrumentation/httpurlconnection/HeadersInjectAdapter.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.http_url_connection; package io.opentelemetry.auto.instrumentation.httpurlconnection;
import io.opentelemetry.context.propagation.HttpTextFormat; import io.opentelemetry.context.propagation.HttpTextFormat;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;

2
instrumentation/http-url-connection/src/main/java/io/opentelemetry/auto/instrumentation/http_url_connection/HttpUrlConnectionDecorator.java → instrumentation/http-url-connection/src/main/java/io/opentelemetry/auto/instrumentation/httpurlconnection/HttpUrlConnectionDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.http_url_connection; package io.opentelemetry.auto.instrumentation.httpurlconnection;
import io.opentelemetry.OpenTelemetry; import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator; import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator;

8
instrumentation/http-url-connection/src/main/java/io/opentelemetry/auto/instrumentation/http_url_connection/HttpUrlConnectionInstrumentation.java → instrumentation/http-url-connection/src/main/java/io/opentelemetry/auto/instrumentation/httpurlconnection/HttpUrlConnectionInstrumentation.java
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.http_url_connection; package io.opentelemetry.auto.instrumentation.httpurlconnection;
import static io.opentelemetry.auto.instrumentation.http_url_connection.HeadersInjectAdapter.SETTER; import static io.opentelemetry.auto.instrumentation.httpurlconnection.HeadersInjectAdapter.SETTER;
import static io.opentelemetry.auto.instrumentation.http_url_connection.HttpUrlConnectionDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.httpurlconnection.HttpUrlConnectionDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.http_url_connection.HttpUrlConnectionDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.httpurlconnection.HttpUrlConnectionDecorator.TRACER;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;
import static io.opentelemetry.trace.Span.Kind.CLIENT; import static io.opentelemetry.trace.Span.Kind.CLIENT;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

6
instrumentation/http-url-connection/src/main/java/io/opentelemetry/auto/instrumentation/http_url_connection/UrlInstrumentation.java → instrumentation/http-url-connection/src/main/java/io/opentelemetry/auto/instrumentation/httpurlconnection/UrlInstrumentation.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.http_url_connection; package io.opentelemetry.auto.instrumentation.httpurlconnection;
import static io.opentelemetry.auto.instrumentation.http_url_connection.HttpUrlConnectionDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.httpurlconnection.HttpUrlConnectionDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.http_url_connection.HttpUrlConnectionDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.httpurlconnection.HttpUrlConnectionDecorator.TRACER;
import static io.opentelemetry.trace.Span.Kind.CLIENT; import static io.opentelemetry.trace.Span.Kind.CLIENT;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.is; import static net.bytebuddy.matcher.ElementMatchers.is;

2
instrumentation/http-url-connection/src/test/groovy/HttpUrlConnectionResponseCodeOnlyTest.groovy
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import io.opentelemetry.auto.instrumentation.http_url_connection.HttpUrlConnectionDecorator import io.opentelemetry.auto.instrumentation.httpurlconnection.HttpUrlConnectionDecorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
class HttpUrlConnectionResponseCodeOnlyTest extends HttpClientTest { class HttpUrlConnectionResponseCodeOnlyTest extends HttpClientTest {

2
instrumentation/http-url-connection/src/test/groovy/HttpUrlConnectionTest.groovy
View File

@ -16,7 +16,7 @@
import io.opentelemetry.auto.config.Config import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.Tags import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.http_url_connection.HttpUrlConnectionDecorator import io.opentelemetry.auto.instrumentation.httpurlconnection.HttpUrlConnectionDecorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
import spock.lang.Ignore import spock.lang.Ignore
import spock.lang.Requires import spock.lang.Requires

2
instrumentation/http-url-connection/src/test/groovy/HttpUrlConnectionUseCachesFalseTest.groovy
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import io.opentelemetry.auto.instrumentation.http_url_connection.HttpUrlConnectionDecorator import io.opentelemetry.auto.instrumentation.httpurlconnection.HttpUrlConnectionDecorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
class HttpUrlConnectionUseCachesFalseTest extends HttpClientTest { class HttpUrlConnectionUseCachesFalseTest extends HttpClientTest {

2
instrumentation/http-url-connection/src/test/groovy/SpringRestTemplateTest.groovy
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import io.opentelemetry.auto.instrumentation.http_url_connection.HttpUrlConnectionDecorator import io.opentelemetry.auto.instrumentation.httpurlconnection.HttpUrlConnectionDecorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
import org.springframework.http.HttpEntity import org.springframework.http.HttpEntity
import org.springframework.http.HttpHeaders import org.springframework.http.HttpHeaders

2
instrumentation/http-url-connection/src/test/groovy/UrlConnectionTest.groovy
View File

@ -18,7 +18,7 @@ import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecor
import io.opentelemetry.auto.config.Config import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.Tags import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.http_url_connection.UrlInstrumentation import io.opentelemetry.auto.instrumentation.httpurlconnection.UrlInstrumentation
import io.opentelemetry.auto.test.AgentTestRunner import io.opentelemetry.auto.test.AgentTestRunner
import static io.opentelemetry.auto.test.utils.ConfigUtils.withConfigOverride import static io.opentelemetry.auto.test.utils.ConfigUtils.withConfigOverride

2
instrumentation/java-class-loader/src/main/java/io/opentelemetry/auto/instrumentation/classloader/ClassLoaderInstrumentation.java → instrumentation/java-class-loader/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.classloader; package io.opentelemetry.auto.instrumentation.javaclassloader;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/AbstractExecutorInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/AbstractExecutorInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static net.bytebuddy.matcher.ElementMatchers.any; import static net.bytebuddy.matcher.ElementMatchers.any;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/AkkaExecutorInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/AkkaExecutorInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.bootstrap.instrumentation.java.concurrent.AdviceUtils.TRACER; import static io.opentelemetry.auto.bootstrap.instrumentation.java.concurrent.AdviceUtils.TRACER;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/AkkaForkJoinTaskInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/AkkaForkJoinTaskInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/CallableInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/CallableInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/FutureInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/FutureInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/JavaExecutorInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/JavaExecutorInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.bootstrap.instrumentation.java.concurrent.AdviceUtils.TRACER; import static io.opentelemetry.auto.bootstrap.instrumentation.java.concurrent.AdviceUtils.TRACER;
import static net.bytebuddy.matcher.ElementMatchers.nameMatches; import static net.bytebuddy.matcher.ElementMatchers.nameMatches;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/JavaForkJoinTaskInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/JavaForkJoinTaskInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/NonStandardExecutorInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/NonStandardExecutorInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/RunnableInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/RunnableInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaExecutorInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/ScalaExecutorInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.bootstrap.instrumentation.java.concurrent.AdviceUtils.TRACER; import static io.opentelemetry.auto.bootstrap.instrumentation.java.concurrent.AdviceUtils.TRACER;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ScalaForkJoinTaskInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/ScalaForkJoinTaskInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;

2
instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/java/concurrent/ThreadPoolExecutorInstrumentation.java → instrumentation/java-concurrent/src/main/java/io/opentelemetry/auto/instrumentation/javaconcurrent/ThreadPoolExecutorInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.java.concurrent; package io.opentelemetry.auto.instrumentation.javaconcurrent;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isConstructor; import static net.bytebuddy.matcher.ElementMatchers.isConstructor;

2
instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/InjectAdapter.java → instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v1_1/InjectAdapter.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs; package io.opentelemetry.auto.instrumentation.jaxrsclient.v1_1;
import io.opentelemetry.context.propagation.HttpTextFormat; import io.opentelemetry.context.propagation.HttpTextFormat;
import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.MultivaluedMap;

2
instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Decorator.java → instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Decorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs.v1; package io.opentelemetry.auto.instrumentation.jaxrsclient.v1_1;
import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientRequest;
import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse;

8
instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java → instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v1_1/JaxRsClientV1Instrumentation.java
View File

@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs.v1; package io.opentelemetry.auto.instrumentation.jaxrsclient.v1_1;
import static io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpServerDecorator.SPAN_ATTRIBUTE; import static io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpServerDecorator.SPAN_ATTRIBUTE;
import static io.opentelemetry.auto.instrumentation.jaxrs.v1.InjectAdapter.SETTER; import static io.opentelemetry.auto.instrumentation.jaxrsclient.v1_1.InjectAdapter.SETTER;
import static io.opentelemetry.auto.instrumentation.jaxrs.v1.JaxRsClientV1Decorator.DECORATE; import static io.opentelemetry.auto.instrumentation.jaxrsclient.v1_1.JaxRsClientV1Decorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.jaxrs.v1.JaxRsClientV1Decorator.TRACER; import static io.opentelemetry.auto.instrumentation.jaxrsclient.v1_1.JaxRsClientV1Decorator.TRACER;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;

2
instrumentation/jaxrs-client/jaxrs-client-1.1/src/test/groovy/JaxRsClientV1Test.groovy
View File

@ -17,7 +17,7 @@ import com.sun.jersey.api.client.Client
import com.sun.jersey.api.client.ClientResponse import com.sun.jersey.api.client.ClientResponse
import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter
import com.sun.jersey.api.client.filter.LoggingFilter import com.sun.jersey.api.client.filter.LoggingFilter
import io.opentelemetry.auto.instrumentation.jaxrs.v1.JaxRsClientV1Decorator import io.opentelemetry.auto.instrumentation.jaxrsclient.v1_1.JaxRsClientV1Decorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
import spock.lang.Shared import spock.lang.Shared

6
instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/connection_error/jersey/JerseyClientConnectionErrorInstrumentation.java → instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v2_0/JerseyClientConnectionErrorInstrumentation.java
View File

@ -13,17 +13,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.connection_error.jersey; package io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0;
import static io.opentelemetry.auto.instrumentation.jaxrs.JaxRsClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0.JaxRsClientDecorator.DECORATE;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.returns; import static net.bytebuddy.matcher.ElementMatchers.returns;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import io.opentelemetry.auto.instrumentation.jaxrs.ClientTracingFilter;
import io.opentelemetry.auto.instrumentation.jaxrs.JaxRsClientDecorator;
import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.auto.tooling.Instrumenter;
import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Span;
import java.util.HashMap; import java.util.HashMap;

6
instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/src/main/java/io/opentelemetry/auto/instrumentation/connection_error/resteasy/ResteasyClientConnectionErrorInstrumentation.java → instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v2_0/ResteasyClientConnectionErrorInstrumentation.java
View File

@ -13,17 +13,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.connection_error.resteasy; package io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0;
import static io.opentelemetry.auto.instrumentation.jaxrs.JaxRsClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0.JaxRsClientDecorator.DECORATE;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.returns; import static net.bytebuddy.matcher.ElementMatchers.returns;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import io.opentelemetry.auto.instrumentation.jaxrs.ClientTracingFilter;
import io.opentelemetry.auto.instrumentation.jaxrs.JaxRsClientDecorator;
import io.opentelemetry.auto.tooling.Instrumenter; import io.opentelemetry.auto.tooling.Instrumenter;
import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Span;
import java.util.HashMap; import java.util.HashMap;

2
instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/ClientTracingFeature.java → instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v2_0/ClientTracingFeature.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs; package io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0;
import javax.ws.rs.core.Feature; import javax.ws.rs.core.Feature;
import javax.ws.rs.core.FeatureContext; import javax.ws.rs.core.FeatureContext;

8
instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/ClientTracingFilter.java → instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v2_0/ClientTracingFilter.java
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs; package io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0;
import static io.opentelemetry.auto.instrumentation.jaxrs.InjectAdapter.SETTER; import static io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0.InjectAdapter.SETTER;
import static io.opentelemetry.auto.instrumentation.jaxrs.JaxRsClientDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0.JaxRsClientDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.jaxrs.JaxRsClientDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0.JaxRsClientDecorator.TRACER;
import static io.opentelemetry.trace.Span.Kind.CLIENT; import static io.opentelemetry.trace.Span.Kind.CLIENT;
import io.opentelemetry.context.Scope; import io.opentelemetry.context.Scope;

2
instrumentation/jaxrs-client/jaxrs-client-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1/InjectAdapter.java → instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v2_0/InjectAdapter.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs.v1; package io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0;
import io.opentelemetry.context.propagation.HttpTextFormat; import io.opentelemetry.context.propagation.HttpTextFormat;
import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.MultivaluedMap;

2
instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/JaxRsClientDecorator.java → instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v2_0/JaxRsClientDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs; package io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0;
import io.opentelemetry.OpenTelemetry; import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator; import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator;

2
instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/JaxRsClientInstrumentation.java → instrumentation/jaxrs-client/jaxrs-client-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrsclient/v2_0/JaxRsClientInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs; package io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;

2
instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/JaxRsClientAsyncTest.groovy
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import io.opentelemetry.auto.instrumentation.jaxrs.JaxRsClientDecorator import io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0.JaxRsClientDecorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
import org.glassfish.jersey.client.JerseyClientBuilder import org.glassfish.jersey.client.JerseyClientBuilder

2
instrumentation/jaxrs-client/jaxrs-client-2.0/src/test/groovy/JaxRsClientTest.groovy
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import io.opentelemetry.auto.instrumentation.jaxrs.JaxRsClientDecorator import io.opentelemetry.auto.instrumentation.jaxrsclient.v2_0.JaxRsClientDecorator
import io.opentelemetry.auto.test.base.HttpClientTest import io.opentelemetry.auto.test.base.HttpClientTest
import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl import org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl
import org.glassfish.jersey.client.JerseyClientBuilder import org.glassfish.jersey.client.JerseyClientBuilder

2
instrumentation/jaxrs/jaxrs-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsDecorator.java → instrumentation/jaxrs/jaxrs-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1_0/JaxRsAnnotationsDecorator.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs1; package io.opentelemetry.auto.instrumentation.jaxrs.v1_0;
import static io.opentelemetry.auto.bootstrap.WeakMap.Provider.newWeakMap; import static io.opentelemetry.auto.bootstrap.WeakMap.Provider.newWeakMap;

6
instrumentation/jaxrs/jaxrs-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java → instrumentation/jaxrs/jaxrs-1.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v1_0/JaxRsAnnotationsInstrumentation.java
View File

@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs1; package io.opentelemetry.auto.instrumentation.jaxrs.v1_0;
import static io.opentelemetry.auto.instrumentation.jaxrs1.JaxRsAnnotationsDecorator.DECORATE; import static io.opentelemetry.auto.instrumentation.jaxrs.v1_0.JaxRsAnnotationsDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.jaxrs1.JaxRsAnnotationsDecorator.TRACER; import static io.opentelemetry.auto.instrumentation.jaxrs.v1_0.JaxRsAnnotationsDecorator.TRACER;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed; import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.hasSuperMethod; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.hasSuperMethod;
import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.safeHasSuperType; import static io.opentelemetry.auto.tooling.bytebuddy.matcher.AgentElementMatchers.safeHasSuperType;

2
instrumentation/jaxrs/jaxrs-1.0/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy
View File

@ -15,7 +15,7 @@
*/ */
import io.opentelemetry.auto.bootstrap.WeakMap import io.opentelemetry.auto.bootstrap.WeakMap
import io.opentelemetry.auto.instrumentation.api.Tags import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.jaxrs1.JaxRsAnnotationsDecorator import io.opentelemetry.auto.instrumentation.jaxrs.v1_0.JaxRsAnnotationsDecorator
import io.opentelemetry.auto.test.AgentTestRunner import io.opentelemetry.auto.test.AgentTestRunner
import javax.ws.rs.DELETE import javax.ws.rs.DELETE

2
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java → instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v2_0/JerseyRequestContextInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs2; package io.opentelemetry.auto.instrumentation.jaxrs.v2_0;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import io.opentelemetry.auto.instrumentation.api.SpanWithScope; import io.opentelemetry.auto.instrumentation.api.SpanWithScope;

2
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java → instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v2_0/Resteasy30RequestContextInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs2; package io.opentelemetry.auto.instrumentation.jaxrs.v2_0;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import io.opentelemetry.auto.instrumentation.api.SpanWithScope; import io.opentelemetry.auto.instrumentation.api.SpanWithScope;

2
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java → instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs/v2_0/Resteasy31RequestContextInstrumentation.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.opentelemetry.auto.instrumentation.jaxrs2; package io.opentelemetry.auto.instrumentation.jaxrs.v2_0;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import io.opentelemetry.auto.instrumentation.api.SpanWithScope; import io.opentelemetry.auto.instrumentation.api.SpanWithScope;

Some files were not shown because too many files have changed in this diff Show More