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

Remove span.type attribute (#262)

This commit is contained in:
Trask Stalnaker 2020-03-20 13:05:00 -07:00 committed by GitHub
parent 4921fecdb1
commit 8700b2eb33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
140 changed files with 48 additions and 952 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/BaseDecorator.java
View File

@ -30,16 +30,10 @@ public abstract class BaseDecorator {
protected BaseDecorator() {}
protected abstract String getSpanType();
protected abstract String getComponentName();
public Span afterStart(final Span span) {
assert span != null;
final String spanType = getSpanType();
if (spanType != null) {
span.setAttribute(MoreTags.SPAN_TYPE, spanType);
}
final String component = getComponentName();
if (component != null) {
span.setAttribute(Tags.COMPONENT, component);

6
agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpClientDecorator.java
View File

@ -17,7 +17,6 @@ package io.opentelemetry.auto.bootstrap.instrumentation.decorator;
import io.opentelemetry.auto.config.Config;
import io.opentelemetry.auto.instrumentation.api.MoreTags;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Status;
@ -40,11 +39,6 @@ public abstract class HttpClientDecorator<REQUEST, RESPONSE> extends ClientDecor
protected abstract Integer status(RESPONSE response);
@Override
protected String getSpanType() {
return SpanTypes.HTTP_CLIENT;
}
@Override
protected String service() {
return null;

6
agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpServerDecorator.java
View File

@ -17,7 +17,6 @@ package io.opentelemetry.auto.bootstrap.instrumentation.decorator;
import io.opentelemetry.auto.config.Config;
import io.opentelemetry.auto.instrumentation.api.MoreTags;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Status;
@ -40,11 +39,6 @@ public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE> extends
protected abstract Integer status(RESPONSE response);
@Override
protected String getSpanType() {
return SpanTypes.HTTP_SERVER;
}
public String spanNameForRequest(final REQUEST request) {
if (request == null) {
return DEFAULT_SPAN_NAME;

1
agent-bootstrap/src/main/java/io/opentelemetry/auto/instrumentation/api/MoreTags.java
View File

@ -16,7 +16,6 @@
package io.opentelemetry.auto.instrumentation.api;
public class MoreTags {
public static final String SPAN_TYPE = "span.type";
public static final String SERVICE_NAME = "service.name";
public static final String RESOURCE_NAME = "resource.name";
public static final String DB_STATEMENT = "sql.query";

37
agent-bootstrap/src/main/java/io/opentelemetry/auto/instrumentation/api/SpanTypes.java
View File

@ -1,37 +0,0 @@
/*
* Copyright 2020, OpenTelemetry Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.opentelemetry.auto.instrumentation.api;
public class SpanTypes {
public static final String HTTP_CLIENT = "http";
public static final String HTTP_SERVER = "web";
@Deprecated public static final String WEB_SERVLET = HTTP_SERVER;
public static final String RPC = "rpc";
public static final String CACHE = "cache";
public static final String SQL = "sql";
public static final String MONGO = "mongodb";
public static final String CASSANDRA = "cassandra";
public static final String COUCHBASE = "db"; // Using generic for now.
public static final String REDIS = "redis";
public static final String MEMCACHED = "memcached";
public static final String ELASTICSEARCH = "elasticsearch";
public static final String HIBERNATE = "hibernate";
public static final String MESSAGE_CLIENT = "queue";
public static final String MESSAGE_CONSUMER = "queue";
public static final String MESSAGE_PRODUCER = "queue";
}

6
agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy
View File

@ -34,7 +34,6 @@ class BaseDecoratorTest extends AgentSpecification {
decorator.afterStart(span)
then:
1 * span.setAttribute(MoreTags.SPAN_TYPE, decorator.getSpanType())
1 * span.setAttribute(Tags.COMPONENT, "test-component")
_ * span.setAttribute(_, _) // Want to allow other calls from child implementations.
0 * _
@ -130,11 +129,6 @@ class BaseDecoratorTest extends AgentSpecification {
def newDecorator() {
return new BaseDecorator() {
@Override
protected String getSpanType() {
return "test-type"
}
@Override
protected String getComponentName() {
return "test-component"

6
agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy
View File

@ -35,7 +35,6 @@ class ClientDecoratorTest extends BaseDecoratorTest {
1 * span.setAttribute(MoreTags.SERVICE_NAME, serviceName)
}
1 * span.setAttribute(Tags.COMPONENT, "test-component")
1 * span.setAttribute(MoreTags.SPAN_TYPE, decorator.getSpanType())
_ * span.setAttribute(_, _) // Want to allow other calls from child implementations.
0 * _
@ -64,11 +63,6 @@ class ClientDecoratorTest extends BaseDecoratorTest {
return serviceName
}
@Override
protected String getSpanType() {
return "test-type"
}
@Override
protected String getComponentName() {
return "test-component"

6
agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy
View File

@ -39,7 +39,6 @@ class DatabaseClientDecoratorTest extends ClientDecoratorTest {
}
1 * span.setAttribute(Tags.COMPONENT, "test-component")
1 * span.setAttribute(Tags.DB_TYPE, "test-db")
1 * span.setAttribute(MoreTags.SPAN_TYPE, "test-type")
0 * _
where:
@ -132,11 +131,6 @@ class DatabaseClientDecoratorTest extends ClientDecoratorTest {
return "test-component"
}
@Override
protected String getSpanType() {
return "test-type"
}
@Override
protected String dbType() {
return "test-db"

6
agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/OrmClientDecoratorTest.groovy
View File

@ -79,12 +79,6 @@ class OrmClientDecoratorTest extends DatabaseClientDecoratorTest {
return "test-service"
}
@Override
protected String getSpanType() {
return "test-type"
}
@Override
protected String getComponentName() {
return "test-component"

7
agent-bootstrap/src/test/groovy/io/opentelemetry/auto/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy
View File

@ -16,7 +16,6 @@
package io.opentelemetry.auto.bootstrap.instrumentation.decorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.trace.Span
@ -31,7 +30,6 @@ class ServerDecoratorTest extends BaseDecoratorTest {
then:
1 * span.setAttribute(Tags.COMPONENT, "test-component")
1 * span.setAttribute(MoreTags.SPAN_TYPE, decorator.getSpanType())
0 * _
}
@ -47,11 +45,6 @@ class ServerDecoratorTest extends BaseDecoratorTest {
def newDecorator() {
return new ServerDecorator() {
@Override
protected String getSpanType() {
return "test-type"
}
@Override
protected String getComponentName() {
return "test-component"

4
instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy
View File

@ -18,8 +18,6 @@ import akka.stream.javadsl.Source
import akka.stream.testkit.TestSubscriber.Probe
import akka.stream.testkit.javadsl.TestSink
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpServerDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import play.inject.guice.GuiceApplicationBuilder
@ -81,7 +79,6 @@ class LagomTest extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "akka-http-server"
"$Tags.HTTP_URL" "ws://localhost:${server.port()}/echo"
"$Tags.HTTP_METHOD" "GET"
@ -118,7 +115,6 @@ class LagomTest extends AgentTestRunner {
spanKind SERVER
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "akka-http-server"
"$Tags.HTTP_URL" "ws://localhost:${server.port()}/error"
"$Tags.HTTP_METHOD" "GET"

3
instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
View File

@ -21,8 +21,6 @@ import akka.http.javadsl.model.headers.RawHeader
import akka.stream.ActorMaterializer
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.instrumentation.akkahttp.AkkaHttpClientDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.base.HttpClientTest
import spock.lang.Shared
@ -79,7 +77,6 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest {
spanKind CLIENT
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "akka-http-client"
errorTags(NullPointerException)
}

2
instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
View File

@ -15,7 +15,6 @@
*/
import io.opentelemetry.auto.instrumentation.akkahttp.AkkaHttpServerDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.asserts.TraceAssert
import io.opentelemetry.auto.test.base.HttpServerTest
@ -60,7 +59,6 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<Object>
parent()
}
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" component
"$Tags.HTTP_URL" { it == "${endpoint.resolve(address)}" || it == "${endpoint.resolveWithoutFragment(address)}" }
"$Tags.HTTP_METHOD" method

5
instrumentation/aws-sdk/aws-sdk-1.11/src/main/java/io/opentelemetry/auto/instrumentation/aws/v0/OnErrorDecorator.java
View File

@ -20,11 +20,6 @@ import io.opentelemetry.auto.bootstrap.instrumentation.decorator.BaseDecorator;
public class OnErrorDecorator extends BaseDecorator {
public static final OnErrorDecorator DECORATE = new OnErrorDecorator();
@Override
protected String getSpanType() {
return null;
}
@Override
protected String getComponentName() {
return "java-aws-sdk";

8
instrumentation/aws-sdk/aws-sdk-1.11/src/test/groovy/AWSClientTest.groovy
View File

@ -45,7 +45,6 @@ import com.amazonaws.services.sqs.model.CreateQueueRequest
import com.amazonaws.services.sqs.model.SendMessageRequest
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import org.apache.http.conn.HttpHostConnectException
@ -158,7 +157,6 @@ class AWSClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "$service.$operation"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$Tags.HTTP_URL" "$server.address/"
"$Tags.HTTP_METHOD" "$method"
@ -178,7 +176,6 @@ class AWSClientTest extends AgentTestRunner {
errored false
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -249,7 +246,6 @@ class AWSClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "$service.$operation"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$Tags.HTTP_URL" "http://localhost:${UNUSABLE_PORT}/"
"$Tags.HTTP_METHOD" "$method"
@ -269,7 +265,6 @@ class AWSClientTest extends AgentTestRunner {
errored true
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" UNUSABLE_PORT
@ -312,7 +307,6 @@ class AWSClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "S3.HeadBucket"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$Tags.HTTP_URL" "https://s3.amazonaws.com/"
"$Tags.HTTP_METHOD" "HEAD"
@ -357,7 +351,6 @@ class AWSClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "S3.GetObject"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$Tags.HTTP_URL" "$server.address/"
"$Tags.HTTP_METHOD" "GET"
@ -380,7 +373,6 @@ class AWSClientTest extends AgentTestRunner {
errored true
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port

8
instrumentation/aws-sdk/aws-sdk-1.11/src/test_before_1_11_106/groovy/AWSClientTest.groovy
View File

@ -32,7 +32,6 @@ import com.amazonaws.services.s3.AmazonS3Client
import com.amazonaws.services.s3.S3ClientOptions
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import org.apache.http.conn.HttpHostConnectException
@ -121,7 +120,6 @@ class AWSClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "$service.$operation"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$Tags.HTTP_URL" "$server.address/"
"$Tags.HTTP_METHOD" "$method"
@ -141,7 +139,6 @@ class AWSClientTest extends AgentTestRunner {
errored false
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -194,7 +191,6 @@ class AWSClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "$service.$operation"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$Tags.HTTP_URL" "http://localhost:${UNUSABLE_PORT}/"
"$Tags.HTTP_METHOD" "$method"
@ -214,7 +210,6 @@ class AWSClientTest extends AgentTestRunner {
errored true
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" UNUSABLE_PORT
@ -257,7 +252,6 @@ class AWSClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "S3.GetObject"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$Tags.HTTP_URL" "https://s3.amazonaws.com/"
"$Tags.HTTP_METHOD" "GET"
@ -303,7 +297,6 @@ class AWSClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "S3.GetObject"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$Tags.HTTP_URL" "$server.address/"
"$Tags.HTTP_METHOD" "GET"
@ -322,7 +315,6 @@ class AWSClientTest extends AgentTestRunner {
errored true
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port

7
instrumentation/aws-sdk/aws-sdk-2.2/src/test/groovy/AwsClientTest.groovy
View File

@ -15,7 +15,6 @@
*/
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
@ -99,7 +98,6 @@ class AwsClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "$service.$operation"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -129,7 +127,6 @@ class AwsClientTest extends AgentTestRunner {
errored false
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -205,7 +202,6 @@ class AwsClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "$service.$operation"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -238,7 +234,6 @@ class AwsClientTest extends AgentTestRunner {
errored false
parent()
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "netty-client"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -322,7 +317,6 @@ class AwsClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "java-aws-sdk"
"$MoreTags.RESOURCE_NAME" "S3.GetObject"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "java-aws-sdk"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -342,7 +336,6 @@ class AwsClientTest extends AgentTestRunner {
errored true
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpclient"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port

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

@ -19,7 +19,6 @@ import com.datastax.driver.core.Host;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Session;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Span;
public class CassandraClientDecorator extends DatabaseClientDecorator<Session> {
@ -35,11 +34,6 @@ public class CassandraClientDecorator extends DatabaseClientDecorator<Session> {
return "java-cassandra";
}
@Override
protected String getSpanType() {
return SpanTypes.CASSANDRA;
}
@Override
protected String dbType() {
return "cassandra";

2
instrumentation/cassandra-3.0/src/test/groovy/CassandraClientTest.groovy
View File

@ -17,7 +17,6 @@ import com.datastax.driver.core.Cluster
import com.datastax.driver.core.Session
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.asserts.TraceAssert
@ -134,7 +133,6 @@ class CassandraClientTest extends AgentTestRunner {
}
tags {
"$MoreTags.SERVICE_NAME" renameService && keyspace ? keyspace : "cassandra"
"$MoreTags.SPAN_TYPE" SpanTypes.CASSANDRA
"$Tags.COMPONENT" "java-cassandra"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"

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

@ -16,7 +16,6 @@
package io.opentelemetry.auto.instrumentation.couchbase.client;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
class CouchbaseClientDecorator extends DatabaseClientDecorator {
public static final CouchbaseClientDecorator DECORATE = new CouchbaseClientDecorator();
@ -31,11 +30,6 @@ class CouchbaseClientDecorator extends DatabaseClientDecorator {
return "couchbase-client";
}
@Override
protected String getSpanType() {
return SpanTypes.COUCHBASE;
}
@Override
protected String dbType() {
return "couchbase";

2
instrumentation/couchbase/couchbase-2.0/src/test/groovy/util/AbstractCouchbaseTest.groovy
View File

@ -27,7 +27,6 @@ import com.couchbase.mock.CouchbaseMock
import com.couchbase.mock.http.query.QueryServer
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.asserts.TraceAssert
@ -135,7 +134,6 @@ abstract class AbstractCouchbaseTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "couchbase"
"$MoreTags.RESOURCE_NAME" name
"$MoreTags.SPAN_TYPE" SpanTypes.COUCHBASE
"$Tags.COMPONENT" "couchbase-client"
"$Tags.DB_TYPE" "couchbase"
if (bucketName != null) {

2
instrumentation/couchbase/couchbase-2.6/src/test/groovy/CouchbaseSpanUtil.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.asserts.TraceAssert
import io.opentelemetry.sdk.trace.SpanData
@ -37,7 +36,6 @@ class CouchbaseSpanUtil {
tags {
"$MoreTags.SERVICE_NAME" "couchbase"
"$MoreTags.RESOURCE_NAME" name
"$MoreTags.SPAN_TYPE" SpanTypes.COUCHBASE
"$Tags.COMPONENT" "couchbase-client"
// Because of caching, not all requests hit the server so these tags may be absent

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

@ -20,7 +20,6 @@ import io.dropwizard.setup.Environment
import io.dropwizard.testing.ConfigOverride
import io.dropwizard.testing.DropwizardTestSupport
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.jaxrs2.JaxRsAnnotationsDecorator
import io.opentelemetry.auto.test.asserts.TraceAssert
@ -106,7 +105,6 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport> {
childOf((SpanData) parent)
tags {
"$MoreTags.RESOURCE_NAME" "${this.testResource().simpleName}.${endpoint.name().toLowerCase()}"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" JaxRsAnnotationsDecorator.DECORATE.getComponentName()
if (endpoint == EXCEPTION) {
errorTags(Exception, EXCEPTION.body)
@ -129,7 +127,6 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport> {
}
tags {
"$MoreTags.RESOURCE_NAME" "$method ${endpoint == PATH_PARAM ? "/path/{id}/param" : endpoint.resolvePath(address).path}"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" component
"$MoreTags.NET_PEER_IP" { it == null || it == "127.0.0.1" } // Optional
"$MoreTags.NET_PEER_PORT" Long

6
instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchRestClientDecorator.java
View File

@ -18,7 +18,6 @@ package io.opentelemetry.auto.instrumentation.elasticsearch;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;
import io.opentelemetry.auto.instrumentation.api.MoreTags;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Tracer;
@ -41,11 +40,6 @@ public class ElasticsearchRestClientDecorator extends DatabaseClientDecorator {
return "elasticsearch-java";
}
@Override
protected String getSpanType() {
return SpanTypes.ELASTICSEARCH;
}
@Override
protected String dbType() {
return "elasticsearch";

6
instrumentation/elasticsearch/elasticsearch-common/src/main/java/io/opentelemetry/auto/instrumentation/elasticsearch/ElasticsearchTransportClientDecorator.java
View File

@ -18,7 +18,6 @@ package io.opentelemetry.auto.instrumentation.elasticsearch;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;
import io.opentelemetry.auto.instrumentation.api.MoreTags;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Tracer;
@ -39,11 +38,6 @@ public class ElasticsearchTransportClientDecorator extends DatabaseClientDecorat
return "elasticsearch-java";
}
@Override
protected String getSpanType() {
return SpanTypes.ELASTICSEARCH;
}
@Override
protected String dbType() {
return "elasticsearch";

3
instrumentation/elasticsearch/elasticsearch-rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -16,7 +16,6 @@
import groovy.json.JsonSlurper
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -102,7 +101,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" httpPort
@ -116,7 +114,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
spanKind CLIENT
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpasyncclient"
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"

3
instrumentation/elasticsearch/elasticsearch-rest-5.0/src/test/groovy/Elasticsearch5RestClientTest.groovy
View File

@ -16,7 +16,6 @@
import groovy.json.JsonSlurper
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -106,7 +105,6 @@ class Elasticsearch5RestClientTest extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" httpPort
@ -120,7 +118,6 @@ class Elasticsearch5RestClientTest extends AgentTestRunner {
spanKind CLIENT
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpasyncclient"
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"

3
instrumentation/elasticsearch/elasticsearch-rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -16,7 +16,6 @@
import groovy.json.JsonSlurper
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -106,7 +105,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" httpPort
@ -120,7 +118,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
spanKind CLIENT
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpasyncclient"
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"

3
instrumentation/elasticsearch/elasticsearch-rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -16,7 +16,6 @@
import groovy.json.JsonSlurper
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -102,7 +101,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" httpPort
@ -116,7 +114,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
spanKind CLIENT
childOf span(0)
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "apache-httpasyncclient"
"$Tags.HTTP_URL" "_cluster/health"
"$Tags.HTTP_METHOD" "GET"

9
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -93,7 +92,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -121,7 +119,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -185,7 +182,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "CreateIndexAction"
@ -201,7 +197,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -216,7 +211,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -235,7 +229,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -251,7 +244,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -267,7 +259,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"

9
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -104,7 +103,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -135,7 +133,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -207,7 +204,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -226,7 +222,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -244,7 +239,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -266,7 +260,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -282,7 +275,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -302,7 +294,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"

12
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy
View File

@ -16,7 +16,6 @@
package springdata
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import org.springframework.context.ApplicationContext
@ -59,7 +58,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"
@ -91,7 +89,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -107,7 +104,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -123,7 +119,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -150,7 +145,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -181,7 +175,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -198,7 +191,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -217,7 +209,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -247,7 +238,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "DeleteAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "DeleteAction"
@ -264,7 +254,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -283,7 +272,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"

10
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy
View File

@ -16,7 +16,6 @@
package springdata
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -100,7 +99,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -153,7 +151,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "CreateIndexAction"
@ -169,7 +166,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -184,7 +180,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"
@ -201,7 +196,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -217,7 +211,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -233,7 +226,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -252,7 +244,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"
@ -333,7 +324,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"

9
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/Elasticsearch2NodeClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -93,7 +92,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -121,7 +119,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -185,7 +182,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "CreateIndexAction"
@ -201,7 +197,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -216,7 +211,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "local"
"$MoreTags.NET_PEER_IP" "0.0.0.0"
@ -238,7 +232,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "local"
"$MoreTags.NET_PEER_IP" "0.0.0.0"
@ -257,7 +250,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -273,7 +265,6 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "local"
"$MoreTags.NET_PEER_IP" "0.0.0.0"

10
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/Elasticsearch2TransportClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -105,7 +104,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "127.0.0.1"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -137,7 +135,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterStatsAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "127.0.0.1"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -169,7 +166,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -241,7 +237,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "127.0.0.1"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -260,7 +255,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "127.0.0.1"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -278,7 +272,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "127.0.0.1"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -300,7 +293,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -316,7 +308,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "127.0.0.1"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -336,7 +327,6 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "127.0.0.1"
"$MoreTags.NET_PEER_IP" "127.0.0.1"

12
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy
View File

@ -16,7 +16,6 @@
package springdata
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import org.springframework.context.ApplicationContext
@ -59,7 +58,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"
@ -91,7 +89,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "local"
"$MoreTags.NET_PEER_IP" "0.0.0.0"
@ -110,7 +107,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -126,7 +122,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -153,7 +148,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "local"
"$MoreTags.NET_PEER_IP" "0.0.0.0"
@ -187,7 +181,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "local"
"$MoreTags.NET_PEER_IP" "0.0.0.0"
@ -207,7 +200,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -226,7 +218,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "local"
"$MoreTags.NET_PEER_IP" "0.0.0.0"
@ -259,7 +250,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "DeleteAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "local"
"$MoreTags.NET_PEER_IP" "0.0.0.0"
@ -279,7 +269,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -298,7 +287,6 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"

10
instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy
View File

@ -16,7 +16,6 @@
package springdata
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -100,7 +99,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -153,7 +151,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "CreateIndexAction"
@ -169,7 +166,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -184,7 +180,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"
@ -201,7 +196,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "local"
"$MoreTags.NET_PEER_IP" "0.0.0.0"
@ -220,7 +214,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -236,7 +229,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -255,7 +247,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"
@ -335,7 +326,6 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"

9
instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5NodeClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -99,7 +98,6 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -127,7 +125,6 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -192,7 +189,6 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "CreateIndexAction"
@ -208,7 +204,6 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -223,7 +218,6 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -242,7 +236,6 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -262,7 +255,6 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -277,7 +269,6 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"

8
instrumentation/elasticsearch/elasticsearch-transport-5.0/src/test/groovy/Elasticsearch5TransportClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -111,7 +110,6 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" String
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -142,7 +140,6 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -214,7 +211,6 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" String
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -233,7 +229,6 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" String
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -255,7 +250,6 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -270,7 +264,6 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" String
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -294,7 +287,6 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" String
"$MoreTags.NET_PEER_IP" "127.0.0.1"

9
instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -99,7 +98,6 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -127,7 +125,6 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -192,7 +189,6 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "CreateIndexAction"
@ -208,7 +204,6 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -223,7 +218,6 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -242,7 +236,6 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -263,7 +256,6 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -278,7 +270,6 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"

8
instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -111,7 +110,6 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -142,7 +140,6 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -214,7 +211,6 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -233,7 +229,6 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -255,7 +250,6 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -270,7 +264,6 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -295,7 +288,6 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"

12
instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
View File

@ -16,7 +16,6 @@
package springdata
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.sdk.trace.SpanData
@ -102,7 +101,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"
@ -146,7 +144,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -167,7 +164,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -181,7 +177,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -221,7 +216,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -264,7 +258,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -285,7 +278,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -317,7 +309,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -360,7 +351,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "DeleteAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "DeleteAction"
@ -380,7 +370,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -413,7 +402,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"

10
instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy
View File

@ -17,7 +17,6 @@ package springdata
import com.google.common.collect.ImmutableSet
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -119,7 +118,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -172,7 +170,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "CreateIndexAction"
@ -188,7 +185,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -203,7 +199,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"
@ -220,7 +215,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -241,7 +235,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -256,7 +249,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "RefreshAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "RefreshAction"
@ -275,7 +267,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"
@ -356,7 +347,6 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "SearchAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "SearchAction"

8
instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6NodeClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -96,7 +95,6 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "ClusterHealthAction"
@ -124,7 +122,6 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -188,7 +185,6 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "CreateIndexAction"
@ -204,7 +200,6 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -223,7 +218,6 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "IndexAction"
@ -244,7 +238,6 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -259,7 +252,6 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"

8
instrumentation/elasticsearch/elasticsearch-transport-6.0/src/test/groovy/Elasticsearch6TransportClientTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -108,7 +107,6 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "ClusterHealthAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -139,7 +137,6 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "GetAction"
@ -211,7 +208,6 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "CreateIndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -230,7 +226,6 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -252,7 +247,6 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "PutMappingAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$Tags.DB_TYPE" "elasticsearch"
"elasticsearch.action" "PutMappingAction"
@ -267,7 +261,6 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "IndexAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -292,7 +285,6 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "elasticsearch"
"$MoreTags.RESOURCE_NAME" "GetAction"
"$MoreTags.SPAN_TYPE" SpanTypes.ELASTICSEARCH
"$Tags.COMPONENT" "elasticsearch-java"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_IP" "127.0.0.1"

3
instrumentation/finatra-2.9/src/test/groovy/FinatraServerTest.groovy
View File

@ -18,7 +18,6 @@ import com.twitter.util.Await
import com.twitter.util.Closable
import com.twitter.util.Duration
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.finatra.FinatraDecorator
import io.opentelemetry.auto.test.asserts.TraceAssert
@ -95,7 +94,6 @@ class FinatraServerTest extends HttpServerTest<HttpServer> {
childOf(parent as SpanData)
tags {
"$MoreTags.RESOURCE_NAME" "FinatraController"
"$MoreTags.SPAN_TYPE" "web"
"$Tags.COMPONENT" FinatraDecorator.DECORATE.getComponentName()
// Finatra doesn't propagate the stack trace or exception to the instrumentation
@ -119,7 +117,6 @@ class FinatraServerTest extends HttpServerTest<HttpServer> {
}
tags {
"$MoreTags.RESOURCE_NAME" "$method ${endpoint == PATH_PARAM ? "/path/:id/param" : endpoint.resolvePath(address).path}"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" component
"$MoreTags.NET_PEER_PORT" Long
"$MoreTags.NET_PEER_IP" { it == null || it == "127.0.0.1" } // Optional

6
instrumentation/geode-1.4/src/main/java/io/opentelemetry/auto/instrumentation/geode/GeodeDecorator.java
View File

@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.geode;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Tracer;
import org.apache.geode.cache.Region;
@ -47,11 +46,6 @@ public class GeodeDecorator extends DatabaseClientDecorator<Region> {
return "apache-geode";
}
@Override
protected String getSpanType() {
return SpanTypes.CACHE;
}
@Override
protected String getComponentName() {
return "apache-geode-client";

4
instrumentation/geode-1.4/src/test/groovy/PutGetTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import org.apache.geode.cache.client.ClientCacheFactory
@ -133,7 +132,6 @@ class PutGetTest extends AgentTestRunner {
spanKind CLIENT
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.CACHE
"$Tags.COMPONENT" "apache-geode-client"
"$MoreTags.SERVICE_NAME" "apache-geode"
"$Tags.DB_TYPE" "geode"
@ -145,7 +143,6 @@ class PutGetTest extends AgentTestRunner {
spanKind CLIENT
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.CACHE
"$Tags.COMPONENT" "apache-geode-client"
"$MoreTags.SERVICE_NAME" "apache-geode"
"$Tags.DB_TYPE" "geode"
@ -157,7 +154,6 @@ class PutGetTest extends AgentTestRunner {
spanKind CLIENT
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.CACHE
"$Tags.COMPONENT" "apache-geode-client"
"$MoreTags.SERVICE_NAME" "apache-geode"
"$Tags.DB_TYPE" "geode"

2
instrumentation/google-http-client-1.19/src/test/groovy/AbstractGoogleHttpClientTest.groovy
View File

@ -18,7 +18,6 @@ import com.google.api.client.http.HttpRequest
import com.google.api.client.http.HttpResponse
import com.google.api.client.http.javanet.NetHttpTransport
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.googlehttpclient.GoogleHttpClientDecorator
import io.opentelemetry.auto.test.base.HttpClientTest
@ -77,7 +76,6 @@ abstract class AbstractGoogleHttpClientTest extends HttpClientTest {
spanKind CLIENT
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "google-http-client"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" Long

6
instrumentation/grpc-1.5/src/main/java/io/opentelemetry/auto/instrumentation/grpc/client/GrpcClientDecorator.java
View File

@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.grpc.client;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.ClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Status;
import io.opentelemetry.trace.Tracer;
@ -32,11 +31,6 @@ public class GrpcClientDecorator extends ClientDecorator {
return "grpc-client";
}
@Override
protected String getSpanType() {
return SpanTypes.RPC;
}
@Override
protected String service() {
return null;

6
instrumentation/grpc-1.5/src/main/java/io/opentelemetry/auto/instrumentation/grpc/server/GrpcServerDecorator.java
View File

@ -18,7 +18,6 @@ package io.opentelemetry.auto.instrumentation.grpc.server;
import io.grpc.Status;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.ServerDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Tracer;
@ -27,11 +26,6 @@ public class GrpcServerDecorator extends ServerDecorator {
public static final Tracer TRACER =
OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.grpc-1.5");
@Override
protected String getSpanType() {
return SpanTypes.RPC;
}
@Override
protected String getComponentName() {
return "grpc-server";

3
instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy
View File

@ -22,7 +22,6 @@ import io.grpc.Server
import io.grpc.ServerBuilder
import io.grpc.stub.StreamObserver
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -121,7 +120,6 @@ class GrpcStreamingTest extends AgentTestRunner {
parent()
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.RPC
"$MoreTags.RPC_SERVICE" "Greeter"
"$Tags.COMPONENT" "grpc-client"
"$MoreTags.NET_PEER_NAME" "localhost"
@ -145,7 +143,6 @@ class GrpcStreamingTest extends AgentTestRunner {
childOf span(0)
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.RPC
"$MoreTags.RPC_SERVICE" "Greeter"
"$Tags.COMPONENT" "grpc-server"
"$MoreTags.NET_PEER_IP" "127.0.0.1"

7
instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
View File

@ -25,7 +25,6 @@ import io.grpc.StatusRuntimeException
import io.grpc.stub.StreamObserver
import io.opentelemetry.auto.common.exec.CommonTaskExecutor
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -98,7 +97,6 @@ class GrpcTest extends AgentTestRunner {
}
}
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.RPC
"$MoreTags.RPC_SERVICE" "Greeter"
"$Tags.COMPONENT" "grpc-client"
"$MoreTags.NET_PEER_NAME" "localhost"
@ -119,7 +117,6 @@ class GrpcTest extends AgentTestRunner {
}
}
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.RPC
"$MoreTags.RPC_SERVICE" "Greeter"
"$Tags.COMPONENT" "grpc-server"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
@ -175,7 +172,6 @@ class GrpcTest extends AgentTestRunner {
parent()
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.RPC
"$MoreTags.RPC_SERVICE" "Greeter"
"$Tags.COMPONENT" "grpc-client"
"status.code" "${status.code.name()}"
@ -197,7 +193,6 @@ class GrpcTest extends AgentTestRunner {
}
}
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.RPC
"$Tags.COMPONENT" "grpc-server"
"$MoreTags.RPC_SERVICE" "Greeter"
"status.code" "${status.code.name()}"
@ -263,7 +258,6 @@ class GrpcTest extends AgentTestRunner {
parent()
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.RPC
"$MoreTags.RPC_SERVICE" "Greeter"
"$Tags.COMPONENT" "grpc-client"
"status.code" "UNKNOWN"
@ -284,7 +278,6 @@ class GrpcTest extends AgentTestRunner {
}
}
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.RPC
"$Tags.COMPONENT" "grpc-server"
"$MoreTags.RPC_SERVICE" "Greeter"
"$MoreTags.NET_PEER_IP" "127.0.0.1"

5
instrumentation/hibernate/hibernate-3.3/src/test/groovy/CriteriaTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import org.hibernate.Criteria
import org.hibernate.Session
@ -46,7 +45,6 @@ class CriteriaTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -56,7 +54,6 @@ class CriteriaTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -66,7 +63,6 @@ class CriteriaTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -81,7 +77,6 @@ class CriteriaTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}

12
instrumentation/hibernate/hibernate-3.3/src/test/groovy/QueryTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import org.hibernate.Query
import org.hibernate.Session
@ -51,7 +50,6 @@ class QueryTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -62,7 +60,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
"$Tags.DB_STATEMENT" queryMethodName == "iterate" ? null : String
}
@ -72,7 +69,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -87,7 +83,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -101,7 +96,6 @@ class QueryTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -112,7 +106,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
"$Tags.DB_STATEMENT" queryMethodName == "iterate" ? null : String
}
@ -123,7 +116,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -182,7 +174,6 @@ class QueryTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -193,7 +184,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "from Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -203,7 +193,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -218,7 +207,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}

35
instrumentation/hibernate/hibernate-3.3/src/test/groovy/SessionTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import org.hibernate.LockMode
import org.hibernate.MappingException
@ -63,7 +62,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -74,7 +72,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -83,7 +80,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -98,7 +94,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -144,7 +139,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -155,7 +149,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -165,7 +158,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -174,7 +166,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(2)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -229,7 +220,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -240,7 +230,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -250,7 +239,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -265,7 +253,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -274,7 +261,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(3)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -326,7 +312,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -337,7 +322,6 @@ class SessionTest extends AbstractHibernateTest {
errored(true)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
errorTags(MappingException, "Unknown entity: java.lang.Long")
}
@ -348,7 +332,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -382,7 +365,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -393,7 +375,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -403,7 +384,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -412,7 +392,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(2)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -474,7 +453,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -485,7 +463,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "$resource"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
"$Tags.DB_STATEMENT" String
}
@ -495,7 +472,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -510,7 +486,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -560,7 +535,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -571,7 +545,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -582,7 +555,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -592,7 +564,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -602,7 +573,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(4)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -617,7 +587,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(4)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -632,7 +601,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -643,7 +611,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -653,7 +620,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -664,7 +630,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}

5
instrumentation/hibernate/hibernate-4.0/src/test/groovy/CriteriaTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import org.hibernate.Criteria
import org.hibernate.Session
@ -46,7 +45,6 @@ class CriteriaTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -56,7 +54,6 @@ class CriteriaTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -66,7 +63,6 @@ class CriteriaTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -81,7 +77,6 @@ class CriteriaTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}

12
instrumentation/hibernate/hibernate-4.0/src/test/groovy/QueryTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import org.hibernate.Query
import org.hibernate.Session
@ -51,7 +50,6 @@ class QueryTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -62,7 +60,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
"$Tags.DB_STATEMENT" queryMethodName == "iterate" ? null : String
}
@ -72,7 +69,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -87,7 +83,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -101,7 +96,6 @@ class QueryTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -112,7 +106,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
"$Tags.DB_STATEMENT" queryMethodName == "iterate" ? null : String
}
@ -123,7 +116,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -182,7 +174,6 @@ class QueryTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -193,7 +184,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "from Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -203,7 +193,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -218,7 +207,6 @@ class QueryTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}

32
instrumentation/hibernate/hibernate-4.0/src/test/groovy/SessionTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import org.hibernate.LockMode
import org.hibernate.MappingException
@ -63,7 +62,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -74,7 +72,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -83,7 +80,6 @@ class SessionTest extends AbstractHibernateTest {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -98,7 +94,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -158,7 +153,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -169,7 +163,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -179,7 +172,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -194,7 +186,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -203,7 +194,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(3)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -255,7 +245,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -266,7 +255,6 @@ class SessionTest extends AbstractHibernateTest {
errored(true)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
errorTags(MappingException, "Unknown entity: java.lang.Long")
}
@ -277,7 +265,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -311,7 +298,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -322,7 +308,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" resource
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -332,7 +317,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -341,7 +325,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(2)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -403,7 +386,6 @@ class SessionTest extends AbstractHibernateTest {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -414,7 +396,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "$resource"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
"$Tags.DB_STATEMENT" String
}
@ -424,7 +405,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -439,7 +419,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -489,7 +468,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -500,7 +478,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -511,7 +488,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -521,7 +497,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -531,7 +506,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(4)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -546,7 +520,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(4)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -561,7 +534,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -572,7 +544,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -582,7 +553,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(8)
tags {
"$MoreTags.SERVICE_NAME" "h2"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "h2"
"$Tags.DB_INSTANCE" "db1"
@ -597,7 +567,6 @@ class SessionTest extends AbstractHibernateTest {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -608,7 +577,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "Value"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}

8
instrumentation/hibernate/hibernate-4.3/src/test/groovy/ProcedureCallTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import org.hibernate.Session
@ -89,7 +88,6 @@ class ProcedureCallTest extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -100,7 +98,6 @@ class ProcedureCallTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "TEST_PROC"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -110,7 +107,6 @@ class ProcedureCallTest extends AgentTestRunner {
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb"
"$Tags.DB_INSTANCE" "test"
@ -125,7 +121,6 @@ class ProcedureCallTest extends AgentTestRunner {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -160,7 +155,6 @@ class ProcedureCallTest extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}
@ -172,7 +166,6 @@ class ProcedureCallTest extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.RESOURCE_NAME" "TEST_PROC"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
errorTags(SQLGrammarException, "could not prepare statement")
}
@ -183,7 +176,6 @@ class ProcedureCallTest extends AgentTestRunner {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
"$MoreTags.SPAN_TYPE" SpanTypes.HIBERNATE
"$Tags.COMPONENT" "java-hibernate"
}
}

8
instrumentation/hibernate/hibernate-4.3/src/test/groovy/SpringJpaTest.groovy
View File

@ -50,7 +50,6 @@ class SpringJpaTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb"
"$Tags.DB_INSTANCE" "test"
@ -79,7 +78,6 @@ class SpringJpaTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb"
"$Tags.DB_INSTANCE" "test"
@ -96,7 +94,6 @@ class SpringJpaTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb"
"$Tags.DB_INSTANCE" "test"
@ -122,7 +119,6 @@ class SpringJpaTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb"
"$Tags.DB_INSTANCE" "test"
@ -138,7 +134,6 @@ class SpringJpaTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb"
"$Tags.DB_INSTANCE" "test"
@ -164,7 +159,6 @@ class SpringJpaTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb"
"$Tags.DB_INSTANCE" "test"
@ -188,7 +182,6 @@ class SpringJpaTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb"
"$Tags.DB_INSTANCE" "test"
@ -204,7 +197,6 @@ class SpringJpaTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "hsqldb"
"$MoreTags.SPAN_TYPE" "sql"
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" "hsqldb"
"$Tags.DB_INSTANCE" "test"

6
instrumentation/hibernate/hibernate-common/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/HibernateDecorator.java
View File

@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.hibernate;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.OrmClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Tracer;
import java.lang.annotation.Annotation;
import java.util.HashSet;
@ -36,11 +35,6 @@ public class HibernateDecorator extends OrmClientDecorator {
return "hibernate";
}
@Override
protected String getSpanType() {
return SpanTypes.HIBERNATE;
}
@Override
protected String getComponentName() {
return "java-hibernate";

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

@ -28,7 +28,6 @@ import com.google.auto.service.AutoService;
import io.opentelemetry.auto.bootstrap.InternalJarURLHandler;
import io.opentelemetry.auto.config.Config;
import io.opentelemetry.auto.instrumentation.api.MoreTags;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.auto.tooling.Instrumenter;
import io.opentelemetry.context.Scope;
@ -88,7 +87,6 @@ public class UrlInstrumentation extends Instrumenter.Default {
protocol = protocol != null ? protocol : "url";
final Span span = TRACER.spanBuilder(protocol + ".request").setSpanKind(CLIENT).startSpan();
span.setAttribute(MoreTags.SPAN_TYPE, SpanTypes.HTTP_CLIENT);
span.setAttribute(Tags.COMPONENT, COMPONENT);
try (final Scope scope = TRACER.withSpan(span)) {

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

@ -15,7 +15,6 @@
*/
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.http_url_connection.HttpUrlConnectionDecorator
import io.opentelemetry.auto.test.base.HttpClientTest
@ -110,7 +109,6 @@ class HttpUrlConnectionTest extends HttpClientTest {
tags {
"$MoreTags.SERVICE_NAME" renameService ? "localhost" : null
"$MoreTags.RESOURCE_NAME" "GET $url.path"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "http-url-connection"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -127,7 +125,6 @@ class HttpUrlConnectionTest extends HttpClientTest {
tags {
"$MoreTags.SERVICE_NAME" renameService ? "localhost" : null
"$MoreTags.RESOURCE_NAME" "GET $url.path"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "http-url-connection"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -192,7 +189,6 @@ class HttpUrlConnectionTest extends HttpClientTest {
tags {
"$MoreTags.SERVICE_NAME" renameService ? "localhost" : null
"$MoreTags.RESOURCE_NAME" "GET $url.path"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "http-url-connection"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -209,7 +205,6 @@ class HttpUrlConnectionTest extends HttpClientTest {
tags {
"$MoreTags.SERVICE_NAME" renameService ? "localhost" : null
"$MoreTags.RESOURCE_NAME" "GET $url.path"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "http-url-connection"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -259,7 +254,6 @@ class HttpUrlConnectionTest extends HttpClientTest {
tags {
"$MoreTags.SERVICE_NAME" renameService ? "localhost" : null
"$MoreTags.RESOURCE_NAME" "GET $url.path"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "http-url-connection"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port
@ -325,7 +319,6 @@ class HttpUrlConnectionTest extends HttpClientTest {
tags {
"$MoreTags.SERVICE_NAME" renameService ? "localhost" : null
"$MoreTags.RESOURCE_NAME" "POST $url.path"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "http-url-connection"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" server.address.port

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

@ -17,7 +17,6 @@ import io.opentelemetry.auto.bootstrap.AgentClassLoader
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.http_url_connection.UrlInstrumentation
import io.opentelemetry.auto.test.AgentTestRunner
@ -62,7 +61,6 @@ class UrlConnectionTest extends AgentTestRunner {
errored true
tags {
"$MoreTags.SERVICE_NAME" renameService ? "localhost" : null
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" "http-url-connection"
"$MoreTags.NET_PEER_NAME" "localhost"
"$MoreTags.NET_PEER_PORT" UNUSABLE_PORT
@ -113,7 +111,6 @@ class UrlConnectionTest extends AgentTestRunner {
childOf span(0)
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_CLIENT
"$Tags.COMPONENT" UrlInstrumentation.COMPONENT
"$MoreTags.NET_PEER_PORT" 80
// FIXME: These tags really make no sense for non-http connections, why do we set them?

5
instrumentation/hystrix-1.4/src/main/java/io/opentelemetry/auto/instrumentation/hystrix/HystrixDecorator.java
View File

@ -23,11 +23,6 @@ import io.opentelemetry.trace.Span;
public class HystrixDecorator extends BaseDecorator {
public static final HystrixDecorator DECORATE = new HystrixDecorator();
@Override
protected String getSpanType() {
return null;
}
@Override
protected String getComponentName() {
return "hystrix";

2
instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
@ -49,7 +48,6 @@ class SlickTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" SlickUtils.Driver()
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" SlickUtils.Driver()
"$Tags.DB_INSTANCE" SlickUtils.Db()

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

@ -21,7 +21,6 @@ import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.WeakMap;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.BaseDecorator;
import io.opentelemetry.auto.instrumentation.api.MoreTags;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.auto.tooling.ClassHierarchyIterable;
import io.opentelemetry.trace.Span;
@ -41,11 +40,6 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator {
public static final Tracer TRACER =
OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jaxrs-1.0");
@Override
protected String getSpanType() {
return null;
}
@Override
protected String getComponentName() {
return "jax-rs-controller";
@ -56,8 +50,6 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator {
final String resourceName = getPathResourceName(target, method);
updateParent(parent, resourceName);
span.setAttribute(MoreTags.SPAN_TYPE, SpanTypes.HTTP_SERVER);
// When jax-rs is the root, we want to name using the path, otherwise use the class/method.
final boolean isRootScope = !parent.getContext().isValid();
if (isRootScope && !resourceName.isEmpty()) {

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

@ -48,7 +48,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
operationName "jax-rs.request"
tags {
"$MoreTags.RESOURCE_NAME" "POST /a"
"$MoreTags.SPAN_TYPE" "web"
"$Tags.COMPONENT" "jax-rs-controller"
}
}
@ -79,7 +78,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
childOf span(0)
tags {
"$MoreTags.RESOURCE_NAME" "${className}.call"
"$MoreTags.SPAN_TYPE" "web"
"$Tags.COMPONENT" "jax-rs-controller"
}
}

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

@ -15,7 +15,6 @@
*/
import io.dropwizard.testing.junit.ResourceTestRule
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import org.junit.ClassRule
@ -58,7 +57,6 @@ class JerseyTest extends AgentTestRunner {
operationName "jax-rs.request"
tags {
"$MoreTags.RESOURCE_NAME" controllerName
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "jax-rs-controller"
}
}

8
instrumentation/jaxrs/jaxrs-2.0/src/main/java/io/opentelemetry/auto/instrumentation/jaxrs2/JaxRsAnnotationsDecorator.java
View File

@ -21,7 +21,6 @@ import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.WeakMap;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.BaseDecorator;
import io.opentelemetry.auto.instrumentation.api.MoreTags;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.auto.tooling.ClassHierarchyIterable;
import io.opentelemetry.trace.Span;
@ -50,11 +49,6 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator {
private final WeakMap<Class, Map<Method, String>> resourceNames = newWeakMap();
@Override
protected String getSpanType() {
return null;
}
@Override
protected String getComponentName() {
return "jax-rs-controller";
@ -66,8 +60,6 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator {
final String resourceName = getPathResourceName(target, method);
updateParent(parent, resourceName);
span.setAttribute(MoreTags.SPAN_TYPE, SpanTypes.HTTP_SERVER);
// When jax-rs is the root, we want to name using the path, otherwise use the class/method.
final boolean isRootScope = !parent.getContext().isValid();
if (isRootScope && !resourceName.isEmpty()) {

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

@ -48,7 +48,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
operationName "jax-rs.request"
tags {
"$MoreTags.RESOURCE_NAME" "POST /a"
"$MoreTags.SPAN_TYPE" "web"
"$Tags.COMPONENT" "jax-rs-controller"
}
}
@ -79,7 +78,6 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
childOf span(0)
tags {
"$MoreTags.RESOURCE_NAME" "${className}.call"
"$MoreTags.SPAN_TYPE" "web"
"$Tags.COMPONENT" "jax-rs-controller"
}
}

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

@ -15,7 +15,6 @@
*/
import io.dropwizard.testing.junit.ResourceTestRule
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import org.jboss.resteasy.core.Dispatcher
@ -85,7 +84,6 @@ abstract class JaxRsFilterTest extends AgentTestRunner {
operationName abort ? "jax-rs.request.abort" : "jax-rs.request"
tags {
"$MoreTags.RESOURCE_NAME" controllerName
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "jax-rs-controller"
}
}

5
instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/DataSourceDecorator.java
View File

@ -29,9 +29,4 @@ public class DataSourceDecorator extends BaseDecorator {
protected String getComponentName() {
return "java-jdbc-connection";
}
@Override
protected String getSpanType() {
return null;
}
}

6
instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCDecorator.java
View File

@ -20,7 +20,6 @@ import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientD
import io.opentelemetry.auto.bootstrap.instrumentation.jdbc.DBInfo;
import io.opentelemetry.auto.bootstrap.instrumentation.jdbc.JDBCConnectionUrlParser;
import io.opentelemetry.auto.instrumentation.api.MoreTags;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.auto.instrumentation.api.Tags;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Tracer;
@ -47,11 +46,6 @@ public class JDBCDecorator extends DatabaseClientDecorator<DBInfo> {
return "java-jdbc"; // Overridden by onStatement and onPreparedStatement
}
@Override
protected String getSpanType() {
return SpanTypes.SQL;
}
@Override
protected String dbType() {
return "jdbc";

11
instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy
View File

@ -18,7 +18,6 @@ import com.zaxxer.hikari.HikariConfig
import com.zaxxer.hikari.HikariDataSource
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import org.apache.derby.jdbc.EmbeddedDataSource
@ -199,7 +198,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" renameService ? dbName.toLowerCase() : driver
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-statement"
"$Tags.DB_TYPE" driver
"$Tags.DB_INSTANCE" dbName.toLowerCase()
@ -258,7 +256,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" driver
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" driver
"$Tags.DB_INSTANCE" dbName.toLowerCase()
@ -309,7 +306,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" driver
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" driver
"$Tags.DB_INSTANCE" dbName.toLowerCase()
@ -360,7 +356,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" driver
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" driver
"$Tags.DB_INSTANCE" dbName.toLowerCase()
@ -411,7 +406,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" driver
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-statement"
"$Tags.DB_TYPE" driver
"$Tags.DB_INSTANCE" dbName.toLowerCase()
@ -465,7 +459,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" driver
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" driver
"$Tags.DB_INSTANCE" dbName.toLowerCase()
@ -531,7 +524,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" driver
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
if (prepareStatement) {
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
} else {
@ -643,7 +635,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" database
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-statement"
"$Tags.DB_TYPE" database
"$Tags.DB_STATEMENT" query
@ -706,7 +697,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" dbType
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" dbType
"$Tags.DB_INSTANCE" dbName.toLowerCase()
@ -724,7 +714,6 @@ class JDBCInstrumentationTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" dbType
"$MoreTags.SPAN_TYPE" SpanTypes.SQL
"$Tags.COMPONENT" "java-jdbc-prepared_statement"
"$Tags.DB_TYPE" dbType
"$Tags.DB_INSTANCE" dbName.toLowerCase()

6
instrumentation/jedis/jedis-1.4/src/main/java/io/opentelemetry/auto/instrumentation/jedis/JedisClientDecorator.java
View File

@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.jedis;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Tracer;
import redis.clients.jedis.Protocol;
@ -37,11 +36,6 @@ public class JedisClientDecorator extends DatabaseClientDecorator<Protocol.Comma
return "redis-command";
}
@Override
protected String getSpanType() {
return SpanTypes.REDIS;
}
@Override
protected String dbType() {
return "redis";

6
instrumentation/jedis/jedis-1.4/src/test/groovy/JedisClientTest.groovy
View File

@ -15,7 +15,6 @@
*/
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -72,7 +71,6 @@ class JedisClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "SET"
@ -97,7 +95,6 @@ class JedisClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "SET"
@ -110,7 +107,6 @@ class JedisClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "GET"
@ -135,7 +131,6 @@ class JedisClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "SET"
@ -148,7 +143,6 @@ class JedisClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "RANDOMKEY"

6
instrumentation/jedis/jedis-3.0/src/main/java/io/opentelemetry/auto/instrumentation/jedis30/JedisClientDecorator.java
View File

@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.jedis30;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Tracer;
import redis.clients.jedis.commands.ProtocolCommand;
@ -37,11 +36,6 @@ public class JedisClientDecorator extends DatabaseClientDecorator<ProtocolComman
return "redis-command";
}
@Override
protected String getSpanType() {
return SpanTypes.REDIS;
}
@Override
protected String dbType() {
return "redis";

6
instrumentation/jedis/jedis-3.0/src/test/groovy/Jedis30ClientTest.groovy
View File

@ -15,7 +15,6 @@
*/
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -72,7 +71,6 @@ class Jedis30ClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "SET"
@ -97,7 +95,6 @@ class Jedis30ClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "SET"
@ -110,7 +107,6 @@ class Jedis30ClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "GET"
@ -135,7 +131,6 @@ class Jedis30ClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "SET"
@ -148,7 +143,6 @@ class Jedis30ClientTest extends AgentTestRunner {
spanKind CLIENT
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-command"
"$Tags.DB_TYPE" "redis"
"$Tags.DB_STATEMENT" "RANDOMKEY"

2
instrumentation/jetty-8.0/src/test/groovy/JettyHandlerTest.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.instrumentation.jetty8.JettyDecorator
import io.opentelemetry.auto.test.asserts.TraceAssert
@ -140,7 +139,6 @@ class JettyHandlerTest extends HttpServerTest<Server> {
}
tags {
"$MoreTags.RESOURCE_NAME" "$method $handlerName"
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" component
"$MoreTags.NET_PEER_IP" { it == null || it == "127.0.0.1" } // Optional
"$MoreTags.NET_PEER_PORT" Long

5
instrumentation/jms-1.1/src/latestDepTest/groovy/JMS2Test.groovy
View File

@ -15,7 +15,6 @@
*/
import com.google.common.io.Files
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.asserts.TraceAssert
@ -187,7 +186,6 @@ class JMS2Test extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "jms"
"$MoreTags.SPAN_TYPE" SpanTypes.MESSAGE_PRODUCER
"$Tags.COMPONENT" "jms"
"span.origin.type" HornetQMessageConsumer.name
}
@ -222,7 +220,6 @@ class JMS2Test extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "jms"
"$MoreTags.SPAN_TYPE" SpanTypes.MESSAGE_PRODUCER
"$Tags.COMPONENT" "jms"
"span.origin.type" HornetQMessageConsumer.name
}
@ -247,7 +244,6 @@ class JMS2Test extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "jms"
"$MoreTags.SPAN_TYPE" SpanTypes.MESSAGE_PRODUCER
"$Tags.COMPONENT" "jms"
"span.origin.type" HornetQMessageProducer.name
}
@ -269,7 +265,6 @@ class JMS2Test extends AgentTestRunner {
tags {
"$MoreTags.SERVICE_NAME" "jms"
"$MoreTags.SPAN_TYPE" SpanTypes.MESSAGE_CONSUMER
"$Tags.COMPONENT" "jms"
"span.origin.type" origin.name
}

19
instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSDecorator.java
View File

@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.jms;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.ClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Tracer;
import java.lang.reflect.Method;
import javax.jms.Destination;
@ -27,22 +26,8 @@ import javax.jms.TemporaryQueue;
import javax.jms.TemporaryTopic;
import javax.jms.Topic;
public abstract class JMSDecorator extends ClientDecorator {
public static final JMSDecorator PRODUCER_DECORATE =
new JMSDecorator() {
@Override
protected String getSpanType() {
return SpanTypes.MESSAGE_PRODUCER;
}
};
public static final JMSDecorator CONSUMER_DECORATE =
new JMSDecorator() {
@Override
protected String getSpanType() {
return SpanTypes.MESSAGE_CONSUMER;
}
};
public class JMSDecorator extends ClientDecorator {
public static final JMSDecorator DECORATE = new JMSDecorator();
public static final Tracer TRACER =
OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jms-1.1");

14
instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageConsumerInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.jms;
import static io.opentelemetry.auto.instrumentation.jms.JMSDecorator.CONSUMER_DECORATE;
import static io.opentelemetry.auto.instrumentation.jms.JMSDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.jms.JMSDecorator.TRACER;
import static io.opentelemetry.auto.instrumentation.jms.MessageExtractAdapter.GETTER;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
@ -63,8 +63,6 @@ public final class JMSMessageConsumerInstrumentation extends Instrumenter.Defaul
public String[] helperClassNames() {
return new String[] {
packageName + ".JMSDecorator",
packageName + ".JMSDecorator$1",
packageName + ".JMSDecorator$2",
packageName + ".MessageExtractAdapter",
packageName + ".MessageInjectAdapter"
};
@ -98,9 +96,9 @@ public final class JMSMessageConsumerInstrumentation extends Instrumenter.Defaul
@Advice.Thrown final Throwable throwable) {
final String spanName;
if (message == null) {
spanName = CONSUMER_DECORATE.spanNameForReceive(method);
spanName = DECORATE.spanNameForReceive(method);
} else {
spanName = CONSUMER_DECORATE.spanNameForReceive(message);
spanName = DECORATE.spanNameForReceive(message);
}
final Span.Builder spanBuilder =
TRACER
@ -122,9 +120,9 @@ public final class JMSMessageConsumerInstrumentation extends Instrumenter.Defaul
span.setAttribute("span.origin.type", consumer.getClass().getName());
try (final Scope scope = TRACER.withSpan(span)) {
CONSUMER_DECORATE.afterStart(span);
CONSUMER_DECORATE.onError(span, throwable);
CONSUMER_DECORATE.beforeFinish(span);
DECORATE.afterStart(span);
DECORATE.onError(span, throwable);
DECORATE.beforeFinish(span);
span.end();
}
}

12
instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageListenerInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.jms;
import static io.opentelemetry.auto.instrumentation.jms.JMSDecorator.CONSUMER_DECORATE;
import static io.opentelemetry.auto.instrumentation.jms.JMSDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.jms.JMSDecorator.TRACER;
import static io.opentelemetry.auto.instrumentation.jms.MessageExtractAdapter.GETTER;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
@ -61,8 +61,6 @@ public final class JMSMessageListenerInstrumentation extends Instrumenter.Defaul
public String[] helperClassNames() {
return new String[] {
packageName + ".JMSDecorator",
packageName + ".JMSDecorator$1",
packageName + ".JMSDecorator$2",
packageName + ".MessageExtractAdapter",
packageName + ".MessageInjectAdapter"
};
@ -82,7 +80,7 @@ public final class JMSMessageListenerInstrumentation extends Instrumenter.Defaul
@Advice.Argument(0) final Message message, @Advice.This final MessageListener listener) {
final Span.Builder spanBuilder =
TRACER.spanBuilder(CONSUMER_DECORATE.spanNameForConsumer(message)).setSpanKind(CONSUMER);
TRACER.spanBuilder(DECORATE.spanNameForConsumer(message)).setSpanKind(CONSUMER);
try {
final SpanContext extractedContext = TRACER.getHttpTextFormat().extract(message, GETTER);
spanBuilder.setParent(extractedContext);
@ -93,7 +91,7 @@ public final class JMSMessageListenerInstrumentation extends Instrumenter.Defaul
final Span span = spanBuilder.startSpan();
span.setAttribute("span.origin.type", listener.getClass().getName());
CONSUMER_DECORATE.afterStart(span);
DECORATE.afterStart(span);
return new SpanWithScope(span, TRACER.withSpan(span));
}
@ -105,8 +103,8 @@ public final class JMSMessageListenerInstrumentation extends Instrumenter.Defaul
return;
}
final Span span = spanWithScope.getSpan();
CONSUMER_DECORATE.onError(span, throwable);
CONSUMER_DECORATE.beforeFinish(span);
DECORATE.onError(span, throwable);
DECORATE.beforeFinish(span);
span.end();
spanWithScope.closeScope();
}

20
instrumentation/jms-1.1/src/main/java/io/opentelemetry/auto/instrumentation/jms/JMSMessageProducerInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.jms;
import static io.opentelemetry.auto.instrumentation.jms.JMSDecorator.PRODUCER_DECORATE;
import static io.opentelemetry.auto.instrumentation.jms.JMSDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.jms.JMSDecorator.TRACER;
import static io.opentelemetry.auto.instrumentation.jms.MessageInjectAdapter.SETTER;
import static io.opentelemetry.auto.tooling.ClassLoaderMatcher.hasClassesNamed;
@ -63,8 +63,6 @@ public final class JMSMessageProducerInstrumentation extends Instrumenter.Defaul
public String[] helperClassNames() {
return new String[] {
packageName + ".JMSDecorator",
packageName + ".JMSDecorator$1",
packageName + ".JMSDecorator$2",
packageName + ".MessageExtractAdapter",
packageName + ".MessageInjectAdapter"
};
@ -104,11 +102,11 @@ public final class JMSMessageProducerInstrumentation extends Instrumenter.Defaul
final Span span =
TRACER
.spanBuilder(PRODUCER_DECORATE.spanNameForProducer(message, defaultDestination))
.spanBuilder(DECORATE.spanNameForProducer(message, defaultDestination))
.setSpanKind(PRODUCER)
.startSpan();
span.setAttribute("span.origin.type", producer.getClass().getName());
PRODUCER_DECORATE.afterStart(span);
DECORATE.afterStart(span);
TRACER.getHttpTextFormat().inject(span.getContext(), message, SETTER);
@ -124,8 +122,8 @@ public final class JMSMessageProducerInstrumentation extends Instrumenter.Defaul
CallDepthThreadLocalMap.reset(MessageProducer.class);
final Span span = spanWithScope.getSpan();
PRODUCER_DECORATE.onError(span, throwable);
PRODUCER_DECORATE.beforeFinish(span);
DECORATE.onError(span, throwable);
DECORATE.beforeFinish(span);
span.end();
spanWithScope.closeScope();
@ -146,11 +144,11 @@ public final class JMSMessageProducerInstrumentation extends Instrumenter.Defaul
final Span span =
TRACER
.spanBuilder(PRODUCER_DECORATE.spanNameForProducer(message, destination))
.spanBuilder(DECORATE.spanNameForProducer(message, destination))
.setSpanKind(PRODUCER)
.startSpan();
span.setAttribute("span.origin.type", producer.getClass().getName());
PRODUCER_DECORATE.afterStart(span);
DECORATE.afterStart(span);
TRACER.getHttpTextFormat().inject(span.getContext(), message, SETTER);
@ -166,8 +164,8 @@ public final class JMSMessageProducerInstrumentation extends Instrumenter.Defaul
CallDepthThreadLocalMap.reset(MessageProducer.class);
final Span span = spanWithScope.getSpan();
PRODUCER_DECORATE.onError(span, throwable);
PRODUCER_DECORATE.beforeFinish(span);
DECORATE.onError(span, throwable);
DECORATE.beforeFinish(span);
span.end();
spanWithScope.closeScope();
}

6
instrumentation/jms-1.1/src/test/groovy/JMS1Test.groovy
View File

@ -14,7 +14,6 @@
* limitations under the License.
*/
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.asserts.TraceAssert
@ -150,7 +149,6 @@ class JMS1Test extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "jms"
"$MoreTags.SPAN_TYPE" SpanTypes.MESSAGE_CONSUMER
"$Tags.COMPONENT" "jms"
"span.origin.type" ActiveMQMessageConsumer.name
}
@ -185,7 +183,6 @@ class JMS1Test extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "jms"
"$MoreTags.SPAN_TYPE" SpanTypes.MESSAGE_CONSUMER
"$Tags.COMPONENT" "jms"
"span.origin.type" ActiveMQMessageConsumer.name
}
@ -235,7 +232,6 @@ class JMS1Test extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "jms"
"$MoreTags.SPAN_TYPE" SpanTypes.MESSAGE_CONSUMER
"$Tags.COMPONENT" "jms"
"span.origin.type" ActiveMQMessageConsumer.name
}
@ -263,7 +259,6 @@ class JMS1Test extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "jms"
"$MoreTags.SPAN_TYPE" SpanTypes.MESSAGE_PRODUCER
"$Tags.COMPONENT" "jms"
"span.origin.type" ActiveMQMessageProducer.name
}
@ -284,7 +279,6 @@ class JMS1Test extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "jms"
"$MoreTags.SPAN_TYPE" SpanTypes.MESSAGE_CONSUMER
"$Tags.COMPONENT" "jms"
"span.origin.type" origin.name
}

5
instrumentation/jsp-2.3/src/main/java/io/opentelemetry/auto/instrumentation/jsp/JSPDecorator.java
View File

@ -34,11 +34,6 @@ public class JSPDecorator extends BaseDecorator {
public static final Tracer TRACER =
OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.jsp-2.3");
@Override
protected String getSpanType() {
return null;
}
@Override
protected String getComponentName() {
return "jsp-http-servlet";

9
instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy
View File

@ -16,7 +16,6 @@
import com.google.common.io.Files
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpServerDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.OkHttpUtils
@ -111,7 +110,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -179,7 +177,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -244,7 +241,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -306,7 +302,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
spanKind SERVER
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -387,7 +382,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -448,7 +442,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -557,7 +550,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
spanKind SERVER
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -617,7 +609,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
// resourceName "GET /$jspWebappContext/$staticFile"
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long

7
instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy
View File

@ -16,7 +16,6 @@
import com.google.common.io.Files
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpServerDecorator
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.OkHttpUtils
@ -110,7 +109,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -201,7 +199,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -262,7 +259,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -398,7 +394,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -509,7 +504,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
spanKind SERVER
errored true
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long
@ -585,7 +579,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
spanKind SERVER
errored false
tags {
"$MoreTags.SPAN_TYPE" SpanTypes.HTTP_SERVER
"$Tags.COMPONENT" "java-web-servlet"
"$MoreTags.NET_PEER_IP" "127.0.0.1"
"$MoreTags.NET_PEER_PORT" Long

10
instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkaclients/KafkaConsumerInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.kafkaclients;
import static io.opentelemetry.auto.instrumentation.kafkaclients.KafkaDecorator.CONSUMER_DECORATE;
import static io.opentelemetry.auto.instrumentation.kafkaclients.KafkaDecorator.DECORATE;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named;
@ -51,8 +51,6 @@ public final class KafkaConsumerInstrumentation extends Instrumenter.Default {
public String[] helperClassNames() {
return new String[] {
packageName + ".KafkaDecorator",
packageName + ".KafkaDecorator$1",
packageName + ".KafkaDecorator$2",
packageName + ".TextMapExtractAdapter",
packageName + ".TracingIterable",
packageName + ".TracingIterator",
@ -92,7 +90,7 @@ public final class KafkaConsumerInstrumentation extends Instrumenter.Default {
@Advice.OnMethodExit(suppress = Throwable.class)
public static void wrap(@Advice.Return(readOnly = false) Iterable<ConsumerRecord> iterable) {
if (iterable != null) {
iterable = new TracingIterable(iterable, CONSUMER_DECORATE);
iterable = new TracingIterable(iterable, DECORATE);
}
}
}
@ -102,7 +100,7 @@ public final class KafkaConsumerInstrumentation extends Instrumenter.Default {
@Advice.OnMethodExit(suppress = Throwable.class)
public static void wrap(@Advice.Return(readOnly = false) List<ConsumerRecord> iterable) {
if (iterable != null) {
iterable = new TracingList(iterable, CONSUMER_DECORATE);
iterable = new TracingList(iterable, DECORATE);
}
}
}
@ -112,7 +110,7 @@ public final class KafkaConsumerInstrumentation extends Instrumenter.Default {
@Advice.OnMethodExit(suppress = Throwable.class)
public static void wrap(@Advice.Return(readOnly = false) Iterator<ConsumerRecord> iterator) {
if (iterator != null) {
iterator = new TracingIterator(iterator, CONSUMER_DECORATE);
iterator = new TracingIterator(iterator, DECORATE);
}
}
}

19
instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkaclients/KafkaDecorator.java
View File

@ -17,28 +17,13 @@ package io.opentelemetry.auto.instrumentation.kafkaclients;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.ClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Tracer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.producer.ProducerRecord;
public abstract class KafkaDecorator extends ClientDecorator {
public static final KafkaDecorator PRODUCER_DECORATE =
new KafkaDecorator() {
@Override
protected String getSpanType() {
return SpanTypes.MESSAGE_PRODUCER;
}
};
public static final KafkaDecorator CONSUMER_DECORATE =
new KafkaDecorator() {
@Override
protected String getSpanType() {
return SpanTypes.MESSAGE_CONSUMER;
}
};
public class KafkaDecorator extends ClientDecorator {
public static final KafkaDecorator DECORATE = new KafkaDecorator();
public static final Tracer TRACER =
OpenTelemetry.getTracerFactory().get("io.opentelemetry.auto.kafka-clients-0.11");

21
instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkaclients/KafkaProducerInstrumentation.java
View File

@ -15,7 +15,7 @@
*/
package io.opentelemetry.auto.instrumentation.kafkaclients;
import static io.opentelemetry.auto.instrumentation.kafkaclients.KafkaDecorator.PRODUCER_DECORATE;
import static io.opentelemetry.auto.instrumentation.kafkaclients.KafkaDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.kafkaclients.KafkaDecorator.TRACER;
import static io.opentelemetry.auto.instrumentation.kafkaclients.TextMapInjectAdapter.SETTER;
import static io.opentelemetry.trace.Span.Kind.PRODUCER;
@ -57,8 +57,6 @@ public final class KafkaProducerInstrumentation extends Instrumenter.Default {
public String[] helperClassNames() {
return new String[] {
packageName + ".KafkaDecorator",
packageName + ".KafkaDecorator$1",
packageName + ".KafkaDecorator$2",
packageName + ".TextMapInjectAdapter",
KafkaProducerInstrumentation.class.getName() + "$ProducerCallback"
};
@ -83,12 +81,9 @@ public final class KafkaProducerInstrumentation extends Instrumenter.Default {
@Advice.Argument(value = 0, readOnly = false) ProducerRecord record,
@Advice.Argument(value = 1, readOnly = false) Callback callback) {
final Span span =
TRACER
.spanBuilder(PRODUCER_DECORATE.spanNameOnProduce(record))
.setSpanKind(PRODUCER)
.startSpan();
PRODUCER_DECORATE.afterStart(span);
PRODUCER_DECORATE.onProduce(span, record);
TRACER.spanBuilder(DECORATE.spanNameOnProduce(record)).setSpanKind(PRODUCER).startSpan();
DECORATE.afterStart(span);
DECORATE.onProduce(span, record);
callback = new ProducerCallback(callback, span);
@ -120,8 +115,8 @@ public final class KafkaProducerInstrumentation extends Instrumenter.Default {
public static void stopSpan(
@Advice.Enter final SpanWithScope spanWithScope, @Advice.Thrown final Throwable throwable) {
final Span span = spanWithScope.getSpan();
PRODUCER_DECORATE.onError(span, throwable);
PRODUCER_DECORATE.beforeFinish(span);
DECORATE.onError(span, throwable);
DECORATE.beforeFinish(span);
span.end();
spanWithScope.closeScope();
}
@ -139,13 +134,13 @@ public final class KafkaProducerInstrumentation extends Instrumenter.Default {
@Override
public void onCompletion(final RecordMetadata metadata, final Exception exception) {
try (final Scope scope = TRACER.withSpan(span)) {
PRODUCER_DECORATE.onError(span, exception);
DECORATE.onError(span, exception);
try {
if (callback != null) {
callback.onCompletion(metadata, exception);
}
} finally {
PRODUCER_DECORATE.beforeFinish(span);
DECORATE.beforeFinish(span);
span.end();
}
}

4
instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy
View File

@ -105,7 +105,6 @@ class KafkaClientTest extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "kafka"
"$MoreTags.SPAN_TYPE" "queue"
"$Tags.COMPONENT" "java-kafka"
}
}
@ -116,7 +115,6 @@ class KafkaClientTest extends AgentTestRunner {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "kafka"
"$MoreTags.SPAN_TYPE" "queue"
"$Tags.COMPONENT" "java-kafka"
"partition" { it >= 0 }
"offset" 0
@ -174,7 +172,6 @@ class KafkaClientTest extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "kafka"
"$MoreTags.SPAN_TYPE" "queue"
"$Tags.COMPONENT" "java-kafka"
"kafka.partition" { it >= 0 }
}
@ -186,7 +183,6 @@ class KafkaClientTest extends AgentTestRunner {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "kafka"
"$MoreTags.SPAN_TYPE" "queue"
"$Tags.COMPONENT" "java-kafka"
"partition" { it >= 0 }
"offset" 0

6
instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkastreams/KafkaStreamsDecorator.java
View File

@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.kafkastreams;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.ClientDecorator;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Tracer;
import org.apache.kafka.streams.processor.internals.StampedRecord;
@ -38,11 +37,6 @@ public class KafkaStreamsDecorator extends ClientDecorator {
return "java-kafka";
}
@Override
protected String getSpanType() {
return SpanTypes.MESSAGE_CONSUMER;
}
public String spanNameForConsume(final StampedRecord record) {
if (record == null) {
return null;

5
instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy
View File

@ -144,7 +144,6 @@ class KafkaStreamsTest extends AgentTestRunner {
parent()
tags {
"$MoreTags.SERVICE_NAME" "kafka"
"$MoreTags.SPAN_TYPE" "queue"
"$Tags.COMPONENT" "java-kafka"
}
}
@ -156,7 +155,6 @@ class KafkaStreamsTest extends AgentTestRunner {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "kafka"
"$MoreTags.SPAN_TYPE" "queue"
"$Tags.COMPONENT" "java-kafka"
"partition" { it >= 0 }
"offset" 0
@ -170,7 +168,6 @@ class KafkaStreamsTest extends AgentTestRunner {
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "kafka"
"$MoreTags.SPAN_TYPE" "queue"
"$Tags.COMPONENT" "java-kafka"
"partition" { it >= 0 }
"offset" 0
@ -185,7 +182,6 @@ class KafkaStreamsTest extends AgentTestRunner {
childOf span(2)
tags {
"$MoreTags.SERVICE_NAME" "kafka"
"$MoreTags.SPAN_TYPE" "queue"
"$Tags.COMPONENT" "java-kafka"
}
}
@ -197,7 +193,6 @@ class KafkaStreamsTest extends AgentTestRunner {
childOf span(3)
tags {
"$MoreTags.SERVICE_NAME" "kafka"
"$MoreTags.SPAN_TYPE" "queue"
"$Tags.COMPONENT" "java-kafka"
"partition" { it >= 0 }
"offset" 0

6
instrumentation/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/LettuceClientDecorator.java
View File

@ -19,7 +19,6 @@ import io.lettuce.core.RedisURI;
import io.opentelemetry.OpenTelemetry;
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.DatabaseClientDecorator;
import io.opentelemetry.auto.instrumentation.api.MoreTags;
import io.opentelemetry.auto.instrumentation.api.SpanTypes;
import io.opentelemetry.trace.Span;
import io.opentelemetry.trace.Tracer;
@ -39,11 +38,6 @@ public class LettuceClientDecorator extends DatabaseClientDecorator<RedisURI> {
return "redis-client";
}
@Override
protected String getSpanType() {
return SpanTypes.REDIS;
}
@Override
protected String dbType() {
return "redis";

13
instrumentation/lettuce-5.0/src/test/groovy/LettuceAsyncClientTest.groovy
View File

@ -24,7 +24,6 @@ import io.lettuce.core.api.sync.RedisCommands
import io.lettuce.core.codec.StringCodec
import io.lettuce.core.protocol.AsyncCommand
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -136,7 +135,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$MoreTags.NET_PEER_NAME" HOST
"$MoreTags.NET_PEER_PORT" port
@ -172,7 +170,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored true
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$MoreTags.NET_PEER_NAME" HOST
"$MoreTags.NET_PEER_PORT" incorrectPort
@ -200,7 +197,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -235,7 +231,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -284,7 +279,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -319,7 +313,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -372,7 +365,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -385,7 +377,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -428,7 +419,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored true
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
errorTags(IllegalStateException, "TestException")
@ -466,7 +456,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
"db.command.cancelled" true
@ -489,7 +478,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -512,7 +500,6 @@ class LettuceAsyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}

9
instrumentation/lettuce-5.0/src/test/groovy/LettuceReactiveClientTest.groovy
View File

@ -19,7 +19,6 @@ import io.lettuce.core.api.StatefulConnection
import io.lettuce.core.api.reactive.RedisReactiveCommands
import io.lettuce.core.api.sync.RedisCommands
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -109,7 +108,6 @@ class LettuceReactiveClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -135,7 +133,6 @@ class LettuceReactiveClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -169,7 +166,6 @@ class LettuceReactiveClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -201,7 +197,6 @@ class LettuceReactiveClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -223,7 +218,6 @@ class LettuceReactiveClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
"db.command.results.count" 157
@ -246,7 +240,6 @@ class LettuceReactiveClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
"db.command.cancelled" true
@ -282,7 +275,6 @@ class LettuceReactiveClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -304,7 +296,6 @@ class LettuceReactiveClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}

12
instrumentation/lettuce-5.0/src/test/groovy/LettuceSyncClientTest.groovy
View File

@ -19,7 +19,6 @@ import io.lettuce.core.RedisConnectionException
import io.lettuce.core.api.StatefulConnection
import io.lettuce.core.api.sync.RedisCommands
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags
import io.opentelemetry.auto.test.AgentTestRunner
import io.opentelemetry.auto.test.utils.PortUtils
@ -116,7 +115,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$MoreTags.NET_PEER_NAME" HOST
"$MoreTags.NET_PEER_PORT" port
@ -149,7 +147,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored true
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$MoreTags.NET_PEER_NAME" HOST
"$MoreTags.NET_PEER_PORT" incorrectPort
@ -176,7 +173,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -199,7 +195,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -222,7 +217,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -245,7 +239,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -268,7 +261,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -291,7 +283,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -314,7 +305,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -336,7 +326,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}
@ -358,7 +347,6 @@ class LettuceSyncClientTest extends AgentTestRunner {
errored false
tags {
"$MoreTags.SERVICE_NAME" "redis"
"$MoreTags.SPAN_TYPE" SpanTypes.REDIS
"$Tags.COMPONENT" "redis-client"
"$Tags.DB_TYPE" "redis"
}

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