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

Update the OpenTelemetry SDK version to 1.23.0 (#7800) 

Update the OpenTelemetry SDK version to `1.23.0`.

---------

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
OpenTelemetry Bot 2023-02-13 12:22:09 -08:00 committed by GitHub
parent c61996f5a4
commit f074b93110
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
51 changed files with 422 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencyManagement/build.gradle.kts
View File

@ -12,7 +12,7 @@ val dependencyVersions = hashMapOf<String, String>()
rootProject.extra["versions"] = dependencyVersions
// this line is managed by .github/scripts/update-sdk-version.sh
val otelSdkVersion = "1.22.0"
val otelSdkVersion = "1.23.0"
// Need both BOM and groovy jars
val groovyVersion = "4.0.9"

136
docs/semantic-conventions.md
View File

@ -1,97 +1,99 @@
# Semantic conventions
This document describes which [OpenTelemetry Semantic Conventions](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions)
This document describes
which [OpenTelemetry Semantic Conventions](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/trace/semantic_conventions)
are implemented by Java autoinstrumentation and which ones are not.
## Http Server
| Attribute | Required | Implemented? |
|---|:---:|:---:|
| `http.method` | Y | + |
| `http.url` | N | - [1] |
| `http.target` | N | + [1] |
| `http.host` | N | + [1] |
| `http.scheme` | N | + [1] |
| `http.status_code` | Y | + |
| `http.flavor` | N | + [2] |
| `http.user_agent` | N | + |
| `http.request_content_length` | N | - |
| `http.request_content_length_uncompressed` | N | - |
| `http.response_content_length` | N | - |
| `http.response_content_length_uncompressed` | N | - |
| `http.server_name` | N | - |
| `http.route` | N | - |
| `http.client_ip` | N | + |
| Attribute | Required | Implemented? |
|---------------------------------------------|:--------:|:------------:|
| `http.method` | Y | + |
| `http.url` | N | - [1] |
| `http.target` | N | + [1] |
| `http.host` | N | + [1] |
| `http.scheme` | N | + [1] |
| `http.status_code` | Y | + |
| `http.flavor` | N | + [2] |
| `http.user_agent` | N | + |
| `http.request_content_length` | N | - |
| `http.request_content_length_uncompressed` | N | - |
| `http.response_content_length` | N | - |
| `http.response_content_length_uncompressed` | N | - |
| `http.server_name` | N | - |
| `http.route` | N | - |
| `http.client_ip` | N | + |
**[1]:** Server instrumentations capture `http.scheme`, `http.host`, and `http.target` and do not
capture `http.url`.
**[2]:** In case of Armeria, return values are [SessionProtocol](https://github.com/line/armeria/blob/master/core/src/main/java/com/linecorp/armeria/common/SessionProtocol.java),
**[2]:** In case of Armeria, return values
are [SessionProtocol](https://github.com/line/armeria/blob/master/core/src/main/java/com/linecorp/armeria/common/SessionProtocol.java),
not values defined by spec.
## Http Client
| Attribute | Required | Implemented? |
|---|:---:|:---:|
| `http.method` | Y | + |
| `http.url` | N | + |
| `http.target` | N | - [1] |
| `http.host` | N | - [1] |
| `http.scheme` | N | - [1] |
| `http.status_code` | Y | + |
| `http.flavor` | N | + [2] |
| `http.user_agent` | N | + |
| `http.request_content_length` | N | - |
| `http.request_content_length_uncompressed` | N | - |
| `http.response_content_length` | N | - |
| `http.response_content_length_uncompressed` | N | - |
| Attribute | Required | Implemented? |
|---------------------------------------------|:--------:|:------------:|
| `http.method` | Y | + |
| `http.url` | N | + |
| `http.target` | N | - [1] |
| `http.host` | N | - [1] |
| `http.scheme` | N | - [1] |
| `http.status_code` | Y | + |
| `http.flavor` | N | + [2] |
| `http.user_agent` | N | + |
| `http.request_content_length` | N | - |
| `http.request_content_length_uncompressed` | N | - |
| `http.response_content_length` | N | - |
| `http.response_content_length_uncompressed` | N | - |
**[1]:** Client instrumentations capture `http.url` and do not capture `http.scheme`, `http.host`
and `http.target`.
**[2]:** In case of Armeria, return values are [SessionProtocol](https://github.com/line/armeria/blob/master/core/src/main/java/com/linecorp/armeria/common/SessionProtocol.java),
**[2]:** In case of Armeria, return values
are [SessionProtocol](https://github.com/line/armeria/blob/master/core/src/main/java/com/linecorp/armeria/common/SessionProtocol.java),
not values defined by spec.
## RPC
| Attribute | Required | Implemented? |
| -------------- | :---: | :---: |
| `rpc.system` | Y | + |
| `rpc.service` | N | + |
| `rpc.method` | N | + |
| Attribute | Required | Implemented? |
|---------------|:--------:|:------------:|
| `rpc.system` | Y | + |
| `rpc.service` | N | + |
| `rpc.method` | N | + |
## Database
| Attribute | Required | Implemented? |
| -------------- | :---: | :---: |
| `db.system` | Y | + |
| `db.connection_string` | N | only set for Redis, JDBC and MongoDB |
| `db.user` | N | only set for JDBC|
| `db.jdbc.driver_classname` | N | - |
| `db.mssql.instance_name` | N | - |
| `db.name` | N | only set of JDBC, Mongo, Geode and MongoDB |
| `db.statement` | N | +, except for ElasticSearch and Memcached, see `db.operation` |
| `db.operation` | N | only set for ElasticSearch, Memcached and JDBC |
| `db.cassandra.keyspace` | Y | + |
| `db.hbase` | Y | -, HBase is not supported |
| `db.redis.database_index` | N | only set for Lettuce driver, not for Jedis |
| `db.mongodb.collection` | Y | - |
| Attribute | Required | Implemented? |
|----------------------------|:--------:|:-------------------------------------------------------------:|
| `db.system` | Y | + |
| `db.connection_string` | N | only set for Redis, JDBC and MongoDB |
| `db.user` | N | only set for JDBC |
| `db.jdbc.driver_classname` | N | - |
| `db.mssql.instance_name` | N | - |
| `db.name` | N | only set of JDBC, Mongo, Geode and MongoDB |
| `db.statement` | N | +, except for ElasticSearch and Memcached, see `db.operation` |
| `db.operation` | N | only set for ElasticSearch, Memcached and JDBC |
| `db.cassandra.keyspace` | Y | + |
| `db.hbase` | Y | -, HBase is not supported |
| `db.redis.database_index` | N | only set for Lettuce driver, not for Jedis |
| `db.mongodb.collection` | Y | - |
## Messaging
Attribute name | Required? | Implemented? |
| -------------- | :-----: | :---: |
| `messaging.system` | Y | + |
| `messaging.destination` | Y | + |
| `messaging.destination_kind` | Y | + |
| `messaging.temp_destination` | N | - |
| `messaging.protocol` | N | - |
| `messaging.protocol_version` | N | - |
| `messaging.url` | N | - |
| `messaging.message_id` | N | only for JMS |
| `messaging.conversation_id` | N | only for JMS |
| `messaging.message_payload_size_bytes` | N | only for RabbitMQ and Kafka [1] |
| `messaging.message_payload_compressed_size_bytes` | N | - |
| `messaging.operation` | for consumers only | +
| Attribute name | Required? | Implemented? |
|---------------------------------------------------|:------------------:|:-------------------------------:|
| `messaging.system` | Y | + |
| `messaging.destination.name` | Y | + |
| `messaging.destination.kind` | Y | + |
| `messaging.destination.temporary` | N | - |
| `net.app.protocol.name` | N | - |
| `net.app.protocol.version` | N | - |
| `messaging.message.id` | N | only for JMS |
| `messaging.message.conversation_id` | N | only for JMS |
| `messaging.message.payload_size_bytes` | N | only for RabbitMQ and Kafka [1] |
| `messaging.message.payload_compressed_size_bytes` | N | - |
| `messaging.operation` | for consumers only | + |
**[1]:** Kafka consumer instrumentation sets this to the serialized size of the value

2
examples/distro/build.gradle
View File

@ -27,7 +27,7 @@ subprojects {
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.22.0",
opentelemetrySdk : "1.23.0",
// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "1.23.0-SNAPSHOT",

2
examples/extension/build.gradle
View File

@ -23,7 +23,7 @@ version '1.0'
ext {
versions = [
// this line is managed by .github/scripts/update-sdk-version.sh
opentelemetrySdk : "1.22.0",
opentelemetrySdk : "1.23.0",
// these lines are managed by .github/scripts/update-version.sh
opentelemetryJavaagent : "1.23.0-SNAPSHOT",

12
instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractor.java
View File

@ -74,16 +74,18 @@ public final class MessagingAttributesExtractor<REQUEST, RESPONSE>
getter.getDestinationKind(request));
boolean isTemporaryDestination = getter.isTemporaryDestination(request);
if (isTemporaryDestination) {
internalSet(attributes, SemanticAttributes.MESSAGING_TEMP_DESTINATION, true);
internalSet(attributes, SemanticAttributes.MESSAGING_DESTINATION, TEMP_DESTINATION_NAME);
internalSet(attributes, SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, true);
internalSet(attributes, SemanticAttributes.MESSAGING_DESTINATION_NAME, TEMP_DESTINATION_NAME);
} else {
internalSet(
attributes, SemanticAttributes.MESSAGING_DESTINATION, getter.getDestination(request));
attributes,
SemanticAttributes.MESSAGING_DESTINATION_NAME,
getter.getDestination(request));
}
internalSet(attributes, SemanticAttributes.MESSAGING_PROTOCOL, getter.getProtocol(request));
internalSet(attributes, SemanticAttributes.NET_APP_PROTOCOL_NAME, getter.getProtocol(request));
internalSet(
attributes,
SemanticAttributes.MESSAGING_PROTOCOL_VERSION,
SemanticAttributes.NET_APP_PROTOCOL_VERSION,
getter.getProtocolVersion(request));
internalSet(attributes, SemanticAttributes.MESSAGING_URL, getter.getUrl(request));
internalSet(

8
instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java
View File

@ -67,12 +67,12 @@ class MessagingAttributesExtractorTest {
List<MapEntry<AttributeKey<?>, Object>> expectedEntries = new ArrayList<>();
expectedEntries.add(entry(SemanticAttributes.MESSAGING_SYSTEM, "myQueue"));
expectedEntries.add(entry(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"));
expectedEntries.add(entry(SemanticAttributes.MESSAGING_DESTINATION, expectedDestination));
expectedEntries.add(entry(SemanticAttributes.MESSAGING_DESTINATION_NAME, expectedDestination));
if (temporary) {
expectedEntries.add(entry(SemanticAttributes.MESSAGING_TEMP_DESTINATION, true));
expectedEntries.add(entry(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, true));
}
expectedEntries.add(entry(SemanticAttributes.MESSAGING_PROTOCOL, "AMQP"));
expectedEntries.add(entry(SemanticAttributes.MESSAGING_PROTOCOL_VERSION, "1.0.0"));
expectedEntries.add(entry(SemanticAttributes.NET_APP_PROTOCOL_NAME, "AMQP"));
expectedEntries.add(entry(SemanticAttributes.NET_APP_PROTOCOL_VERSION, "1.0.0"));
expectedEntries.add(entry(SemanticAttributes.MESSAGING_URL, "http://broker/topic"));
expectedEntries.add(entry(SemanticAttributes.MESSAGING_CONVERSATION_ID, "42"));
expectedEntries.add(entry(SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES, 100L));

6
instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/KafkaSpanDecorator.java
View File

@ -65,7 +65,11 @@ class KafkaSpanDecorator extends MessagingSpanDecorator {
Integer partition = exchange.getIn().getHeader(PARTITION, Integer.class);
if (partition != null) {
attributes.put(SemanticAttributes.MESSAGING_KAFKA_PARTITION, partition);
if (camelDirection == CamelDirection.OUTBOUND) {
attributes.put(SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, partition);
} else {
attributes.put(SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION, partition);
}
}
if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {

3
instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/MessagingSpanDecorator.java
View File

@ -58,7 +58,8 @@ class MessagingSpanDecorator extends BaseSpanDecorator {
CamelDirection camelDirection) {
super.pre(attributes, exchange, endpoint, camelDirection);
attributes.put(SemanticAttributes.MESSAGING_DESTINATION, getDestination(exchange, endpoint));
attributes.put(
SemanticAttributes.MESSAGING_DESTINATION_NAME, getDestination(exchange, endpoint));
String messageId = getMessageId(exchange);
if (messageId != null) {

9
instrumentation/apache-camel-2.20/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/CamelSpan.groovy
View File

@ -6,6 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.apachecamel.aws
import io.opentelemetry.instrumentation.test.asserts.TraceAssert
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import static io.opentelemetry.api.trace.SpanKind.INTERNAL
@ -33,7 +34,7 @@ class CamelSpan {
}
attributes {
"apache-camel.uri" "aws-sqs://${queueName}?amazonSQSClient=%23sqsClient&delay=1000"
"messaging.destination" queueName
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" queueName
}
}
}
@ -49,8 +50,8 @@ class CamelSpan {
}
attributes {
"apache-camel.uri" "aws-sqs://${queueName}?amazonSQSClient=%23sqsClient&delay=1000"
"messaging.destination" queueName
"messaging.message_id" String
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" queueName
"$SemanticAttributes.MESSAGING_MESSAGE_ID" String
}
}
}
@ -62,7 +63,7 @@ class CamelSpan {
childOf parentSpan
attributes {
"apache-camel.uri" "aws-sns://${topicName}?amazonSNSClient=%23snsClient"
"messaging.destination" topicName
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" topicName
}
}
}

2
instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/internal/SqsMessageAttributesExtractor.java
View File

@ -18,7 +18,7 @@ class SqsMessageAttributesExtractor implements AttributesExtractor<SQSMessage, V
attributes.put(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS");
attributes.put(SemanticAttributes.MESSAGING_OPERATION, "process");
attributes.put(SemanticAttributes.MESSAGING_MESSAGE_ID, message.getMessageId());
attributes.put(SemanticAttributes.MESSAGING_DESTINATION, message.getEventSource());
attributes.put(SemanticAttributes.MESSAGING_DESTINATION_NAME, message.getEventSource());
}
@Override

8
instrumentation/aws-lambda/aws-lambda-events-2.2/library/src/test/java/io/opentelemetry/instrumentation/awslambdaevents/v2_2/AwsLambdaSqsMessageHandlerTest.java
View File

@ -117,7 +117,9 @@ public class AwsLambdaSqsMessageHandlerTest {
entry(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"),
entry(SemanticAttributes.MESSAGING_OPERATION, "process"),
entry(SemanticAttributes.MESSAGING_MESSAGE_ID, "message1"),
entry(SemanticAttributes.MESSAGING_DESTINATION, "queue1")))
entry(
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"queue1")))
.hasLinks(
LinkData.create(
SpanContext.createFromRemoteParent(
@ -136,7 +138,9 @@ public class AwsLambdaSqsMessageHandlerTest {
entry(SemanticAttributes.MESSAGING_SYSTEM, "AmazonSQS"),
entry(SemanticAttributes.MESSAGING_OPERATION, "process"),
entry(SemanticAttributes.MESSAGING_MESSAGE_ID, "message2"),
entry(SemanticAttributes.MESSAGING_DESTINATION, "queue1")))
entry(
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"queue1")))
.hasLinks(
LinkData.create(
SpanContext.createFromRemoteParent(

8
instrumentation/jms/jms-1.1/javaagent/src/jms2Test/groovy/Jms2Test.groovy
View File

@ -274,10 +274,10 @@ class Jms2Test extends AgentInstrumentationSpecification {
}
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "jms"
"$SemanticAttributes.MESSAGING_DESTINATION" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" destinationType
if (destinationName == "(temporary)") {
"$SemanticAttributes.MESSAGING_TEMP_DESTINATION" true
"$SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY" true
}
"$SemanticAttributes.MESSAGING_MESSAGE_ID" String
}
@ -303,7 +303,7 @@ class Jms2Test extends AgentInstrumentationSpecification {
}
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "jms"
"$SemanticAttributes.MESSAGING_DESTINATION" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" destinationType
"$SemanticAttributes.MESSAGING_OPERATION" operation
if (messageId != null) {
@ -311,7 +311,7 @@ class Jms2Test extends AgentInstrumentationSpecification {
"$SemanticAttributes.MESSAGING_MESSAGE_ID" { it == messageId || messageId == "" }
}
if (destinationName == "(temporary)") {
"$SemanticAttributes.MESSAGING_TEMP_DESTINATION" true
"$SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY" true
}
}
}

8
instrumentation/jms/jms-1.1/javaagent/src/test/groovy/Jms1Test.groovy
View File

@ -332,10 +332,10 @@ class Jms1Test extends AgentInstrumentationSpecification {
}
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "jms"
"$SemanticAttributes.MESSAGING_DESTINATION" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" destinationType
if (destinationName == "(temporary)") {
"$SemanticAttributes.MESSAGING_TEMP_DESTINATION" true
"$SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY" true
}
"$SemanticAttributes.MESSAGING_MESSAGE_ID" String
if (testHeaders) {
@ -365,7 +365,7 @@ class Jms1Test extends AgentInstrumentationSpecification {
}
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "jms"
"$SemanticAttributes.MESSAGING_DESTINATION" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" destinationType
"$SemanticAttributes.MESSAGING_OPERATION" operation
if (messageId != null) {
@ -373,7 +373,7 @@ class Jms1Test extends AgentInstrumentationSpecification {
"$SemanticAttributes.MESSAGING_MESSAGE_ID" { it == messageId || messageId == "" }
}
if (destinationName == "(temporary)") {
"$SemanticAttributes.MESSAGING_TEMP_DESTINATION" true
"$SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY" true
}
if (testHeaders) {
"messaging.header.test_message_header" { it == ["test"] }

22
instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java
View File

@ -141,7 +141,8 @@ class Jms3InstrumentationTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, producerDestinationName),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
producerDestinationName),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, destinationKind),
equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId),
messagingTempDestination(isTemporary)));
@ -159,7 +160,8 @@ class Jms3InstrumentationTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, actualDestinationName),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
actualDestinationName),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, destinationKind),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"),
equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId))));
@ -209,7 +211,8 @@ class Jms3InstrumentationTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, producerDestinationName),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
producerDestinationName),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, destinationKind),
equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId),
messagingTempDestination(isTemporary)),
@ -220,7 +223,8 @@ class Jms3InstrumentationTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, actualDestinationName),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
actualDestinationName),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, destinationKind),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId)),
@ -293,7 +297,8 @@ class Jms3InstrumentationTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, producerDestinationName),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
producerDestinationName),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, destinationKind),
equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId),
messagingTempDestination(isTemporary),
@ -310,7 +315,8 @@ class Jms3InstrumentationTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, actualDestinationName),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
actualDestinationName),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, destinationKind),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
equalTo(SemanticAttributes.MESSAGING_MESSAGE_ID, messageId),
@ -325,8 +331,8 @@ class Jms3InstrumentationTest {
private static AttributeAssertion messagingTempDestination(boolean isTemporary) {
return isTemporary
? equalTo(SemanticAttributes.MESSAGING_TEMP_DESTINATION, true)
: satisfies(SemanticAttributes.MESSAGING_TEMP_DESTINATION, AbstractAssert::isNull);
? equalTo(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, true)
: satisfies(SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY, AbstractAssert::isNull);
}
static final class EmptyReceiveArgumentsProvider implements ArgumentsProvider {

35
instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/java/io/opentelemetry/instrumentation/kafkaclients/KafkaClientDefaultTest.java
View File

@ -98,10 +98,10 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -128,7 +128,7 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
.hasNoParent()
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"));
if (testHeaders) {
@ -145,14 +145,14 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
equalTo(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
greeting.getBytes(StandardCharsets.UTF_8).length),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -198,11 +198,11 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
.hasNoParent()
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_KAFKA_TOMBSTONE, true),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -218,7 +218,7 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
.hasNoParent()
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"));
},
@ -229,13 +229,13 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
equalTo(SemanticAttributes.MESSAGING_KAFKA_TOMBSTONE, true),
equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true),
equalTo(SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES, -1L),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -282,9 +282,10 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
.hasNoParent()
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_KAFKA_PARTITION, partition),
equalTo(
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, partition),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
AbstractLongAssert::isNotNegative));
@ -299,7 +300,7 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
.hasNoParent()
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"));
},
@ -310,13 +311,13 @@ class KafkaClientDefaultTest extends KafkaClientPropagationBaseTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
equalTo(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
greeting.getBytes(StandardCharsets.UTF_8).length),
equalTo(SemanticAttributes.MESSAGING_KAFKA_PARTITION, partition),
equalTo(SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION, partition),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
AbstractLongAssert::isNotNegative),

12
instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/java/io/opentelemetry/instrumentation/kafkaclients/KafkaClientPropagationDisabledTest.java
View File

@ -45,10 +45,10 @@ class KafkaClientPropagationDisabledTest extends KafkaClientPropagationBaseTest
.hasNoParent()
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -76,10 +76,10 @@ class KafkaClientPropagationDisabledTest extends KafkaClientPropagationBaseTest
.hasNoParent()
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -94,13 +94,13 @@ class KafkaClientPropagationDisabledTest extends KafkaClientPropagationBaseTest
.hasLinks(Collections.emptyList())
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
equalTo(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
message.getBytes(StandardCharsets.UTF_8).length),
equalTo(SemanticAttributes.MESSAGING_KAFKA_PARTITION, partition),
equalTo(SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION, partition),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
AbstractLongAssert::isNotNegative),

29
instrumentation/kafka/kafka-clients/kafka-clients-0.11/javaagent/src/test/java/io/opentelemetry/instrumentation/kafkaclients/KafkaClientSuppressReceiveSpansTest.java
View File

@ -76,10 +76,10 @@ class KafkaClientSuppressReceiveSpansTest extends KafkaClientPropagationBaseTest
.hasParent(trace.getSpan(0))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -91,14 +91,14 @@ class KafkaClientSuppressReceiveSpansTest extends KafkaClientPropagationBaseTest
.hasParent(trace.getSpan(1))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
equalTo(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
greeting.getBytes(StandardCharsets.UTF_8).length),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -143,11 +143,11 @@ class KafkaClientSuppressReceiveSpansTest extends KafkaClientPropagationBaseTest
.hasNoParent()
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_KAFKA_TOMBSTONE, true),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -159,13 +159,13 @@ class KafkaClientSuppressReceiveSpansTest extends KafkaClientPropagationBaseTest
.hasParent(trace.getSpan(0))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
equalTo(SemanticAttributes.MESSAGING_KAFKA_TOMBSTONE, true),
equalTo(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true),
equalTo(SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES, -1L),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -210,9 +210,10 @@ class KafkaClientSuppressReceiveSpansTest extends KafkaClientPropagationBaseTest
.hasNoParent()
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_KAFKA_PARTITION, partition),
equalTo(
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, partition),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
AbstractLongAssert::isNotNegative));
@ -223,13 +224,13 @@ class KafkaClientSuppressReceiveSpansTest extends KafkaClientPropagationBaseTest
.hasParent(trace.getSpan(0))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
equalTo(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
greeting.getBytes(StandardCharsets.UTF_8).length),
equalTo(SemanticAttributes.MESSAGING_KAFKA_PARTITION, partition),
equalTo(SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION, partition),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
AbstractLongAssert::isNotNegative),

6
instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafka/internal/InterceptorsTest.java
View File

@ -86,7 +86,7 @@ class InterceptorsTest extends KafkaClientBaseTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"));
},
span -> {
@ -95,14 +95,14 @@ class InterceptorsTest extends KafkaClientBaseTest {
.hasParent(trace.getSpan(1))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"),
equalTo(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
greeting.getBytes(StandardCharsets.UTF_8).length),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),

8
instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/src/test/java/io/opentelemetry/instrumentation/kafka/internal/WrapperTest.java
View File

@ -89,10 +89,10 @@ class WrapperTest extends KafkaClientBaseTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative));
if (testHeaders) {
span.hasAttributesSatisfying(
@ -107,14 +107,14 @@ class WrapperTest extends KafkaClientBaseTest {
.hasParent(trace.getSpan(1))
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, SHARED_TOPIC),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"),
equalTo(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
greeting.getBytes(StandardCharsets.UTF_8).length),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),

5
instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaConsumerAdditionalAttributesExtractor.java
View File

@ -29,10 +29,11 @@ public final class KafkaConsumerAdditionalAttributesExtractor
@Override
public void onStart(
AttributesBuilder attributes, Context parentContext, ConsumerRecord<?, ?> consumerRecord) {
attributes.put(SemanticAttributes.MESSAGING_KAFKA_PARTITION, (long) consumerRecord.partition());
attributes.put(
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION, (long) consumerRecord.partition());
attributes.put(MESSAGING_KAFKA_MESSAGE_OFFSET, consumerRecord.offset());
if (consumerRecord.value() == null) {
attributes.put(SemanticAttributes.MESSAGING_KAFKA_TOMBSTONE, true);
attributes.put(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true);
}
}

5
instrumentation/kafka/kafka-clients/kafka-clients-common/library/src/main/java/io/opentelemetry/instrumentation/kafka/internal/KafkaProducerAdditionalAttributesExtractor.java
View File

@ -31,7 +31,7 @@ final class KafkaProducerAdditionalAttributesExtractor
public void onStart(
AttributesBuilder attributes, Context parentContext, ProducerRecord<?, ?> producerRecord) {
if (producerRecord.value() == null) {
attributes.put(SemanticAttributes.MESSAGING_KAFKA_TOMBSTONE, true);
attributes.put(SemanticAttributes.MESSAGING_KAFKA_MESSAGE_TOMBSTONE, true);
}
}
@ -44,7 +44,8 @@ final class KafkaProducerAdditionalAttributesExtractor
@Nullable Throwable error) {
if (recordMetadata != null) {
attributes.put(SemanticAttributes.MESSAGING_KAFKA_PARTITION, recordMetadata.partition());
attributes.put(
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION, recordMetadata.partition());
attributes.put(MESSAGING_KAFKA_MESSAGE_OFFSET, recordMetadata.offset());
}
}

20
instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy
View File

@ -98,9 +98,9 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest {
hasNoParent()
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_KAFKA_PARTITION" { it >= 0 }
"$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 }
"messaging.kafka.message.offset" 0
}
}
@ -115,7 +115,7 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest {
hasNoParent()
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "receive"
}
@ -128,11 +128,11 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest {
hasLink(producerPending)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
"$SemanticAttributes.MESSAGING_KAFKA_PARTITION" { it >= 0 }
"$SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION" { it >= 0 }
"messaging.kafka.message.offset" 0
"kafka.record.queue_time_ms" { it >= 0 }
"asdf" "testing"
@ -145,9 +145,9 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest {
childOf span(1)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_KAFKA_PARTITION" { it >= 0 }
"$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 }
"messaging.kafka.message.offset" 0
}
}
@ -162,7 +162,7 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest {
hasNoParent()
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "receive"
}
@ -175,11 +175,11 @@ class KafkaStreamsDefaultTest extends KafkaStreamsBaseTest {
hasLink producerProcessed
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
"$SemanticAttributes.MESSAGING_KAFKA_PARTITION" { it >= 0 }
"$SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION" { it >= 0 }
"messaging.kafka.message.offset" 0
"kafka.record.queue_time_ms" { it >= 0 }
"testing" 123

16
instrumentation/kafka/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy
View File

@ -93,9 +93,9 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest {
hasNoParent()
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_KAFKA_PARTITION" { it >= 0 }
"$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 }
"messaging.kafka.message.offset" 0
}
}
@ -106,11 +106,11 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest {
childOf span(0)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PENDING
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
"$SemanticAttributes.MESSAGING_KAFKA_PARTITION" { it >= 0 }
"$SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION" { it >= 0 }
"messaging.kafka.message.offset" 0
"kafka.record.queue_time_ms" { it >= 0 }
"asdf" "testing"
@ -126,9 +126,9 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest {
childOf span(1)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_KAFKA_PARTITION" { it >= 0 }
"$SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION" { it >= 0 }
"messaging.kafka.message.offset" 0
}
}
@ -139,11 +139,11 @@ class KafkaStreamsSuppressReceiveSpansTest extends KafkaStreamsBaseTest {
childOf span(2)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "kafka"
"$SemanticAttributes.MESSAGING_DESTINATION" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" STREAM_PROCESSED
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
"$SemanticAttributes.MESSAGING_KAFKA_PARTITION" { it >= 0 }
"$SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION" { it >= 0 }
"messaging.kafka.message.offset" 0
"kafka.record.queue_time_ms" { it >= 0 }
"testing" 123

0
instrumentation/opentelemetry-api/opentelemetry-api-logs-1.19/javaagent/build.gradle.kts → instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/build.gradle.kts
View File

0
instrumentation/opentelemetry-api/opentelemetry-api-logs-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/OpenTelemetryApiLogsInstrumentationModule.java → instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/OpenTelemetryApiLogsInstrumentationModule.java
View File

0
instrumentation/opentelemetry-api/opentelemetry-api-logs-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/OpenTelemetryLogsInstrumentation.java → instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/OpenTelemetryLogsInstrumentation.java
View File

3
instrumentation/opentelemetry-api/opentelemetry-api-logs-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/ApplicationLogRecordBuilder.java → instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/ApplicationLogRecordBuilder.java
View File

@ -6,7 +6,6 @@
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.logs.bridge;
import application.io.opentelemetry.api.common.AttributeKey;
import application.io.opentelemetry.api.logs.EventBuilder;
import application.io.opentelemetry.api.logs.LogRecordBuilder;
import application.io.opentelemetry.api.logs.Severity;
import application.io.opentelemetry.context.Context;
@ -16,7 +15,7 @@ import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.trace.Bridgin
import java.time.Instant;
import java.util.concurrent.TimeUnit;
class ApplicationLogRecordBuilder implements EventBuilder {
class ApplicationLogRecordBuilder implements LogRecordBuilder {
private final io.opentelemetry.api.logs.LogRecordBuilder agentLogRecordBuilder;

6
instrumentation/opentelemetry-api/opentelemetry-api-logs-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/ApplicationLogger.java → instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/ApplicationLogger.java
View File

@ -5,7 +5,6 @@
package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.logs.bridge;
import application.io.opentelemetry.api.logs.EventBuilder;
import application.io.opentelemetry.api.logs.LogRecordBuilder;
import application.io.opentelemetry.api.logs.Logger;
@ -17,11 +16,6 @@ class ApplicationLogger implements Logger {
this.agentLogger = agentLogger;
}
@Override
public EventBuilder eventBuilder(String eventName) {
return new ApplicationLogRecordBuilder(agentLogger.eventBuilder(eventName));
}
@Override
public LogRecordBuilder logRecordBuilder() {
return new ApplicationLogRecordBuilder(agentLogger.logRecordBuilder());

7
instrumentation/opentelemetry-api/opentelemetry-api-logs-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/ApplicationLoggerBuilder.java → instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/ApplicationLoggerBuilder.java
View File

@ -17,13 +17,6 @@ final class ApplicationLoggerBuilder implements LoggerBuilder {
this.agentBuilder = agentBuilder;
}
@Override
@CanIgnoreReturnValue
public LoggerBuilder setEventDomain(String eventDomain) {
agentBuilder.setEventDomain(eventDomain);
return this;
}
@Override
@CanIgnoreReturnValue
public LoggerBuilder setSchemaUrl(String schemaUrl) {

0
instrumentation/opentelemetry-api/opentelemetry-api-logs-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/ApplicationLoggerProvider.java → instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/ApplicationLoggerProvider.java
View File

0
instrumentation/opentelemetry-api/opentelemetry-api-logs-1.19/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/LogBridging.java → instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/bridge/LogBridging.java
View File

0
instrumentation/opentelemetry-api/opentelemetry-api-logs-1.19/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/LoggerTest.java → instrumentation/opentelemetry-api/opentelemetry-api-logs-1.23/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/logs/LoggerTest.java
View File

2
instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitDeliveryExtraAttributesExtractor.java
View File

@ -20,7 +20,7 @@ class RabbitDeliveryExtraAttributesExtractor implements AttributesExtractor<Deli
Envelope envelope = request.getEnvelope();
String routingKey = envelope.getRoutingKey();
if (routingKey != null && !routingKey.isEmpty()) {
attributes.put(SemanticAttributes.MESSAGING_RABBITMQ_ROUTING_KEY, routingKey);
attributes.put(SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY, routingKey);
}
}

4
instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitInstrumenterHelper.java
View File

@ -33,10 +33,10 @@ public class RabbitInstrumenterHelper {
public void onPublish(Span span, String exchange, String routingKey) {
String exchangeName = normalizeExchangeName(exchange);
span.setAttribute(SemanticAttributes.MESSAGING_DESTINATION, exchangeName);
span.setAttribute(SemanticAttributes.MESSAGING_DESTINATION_NAME, exchangeName);
span.updateName(exchangeName + " send");
if (routingKey != null && !routingKey.isEmpty()) {
span.setAttribute(SemanticAttributes.MESSAGING_RABBITMQ_ROUTING_KEY, routingKey);
span.setAttribute(SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY, routingKey);
}
if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {
span.setAttribute(RABBITMQ_COMMAND, "basic.publish");

6
instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/RabbitMqTest.groovy
View File

@ -421,10 +421,10 @@ class RabbitMqTest extends AgentInstrumentationSpecification implements WithRabb
}
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION" exchange
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" exchange
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
"$SemanticAttributes.MESSAGING_RABBITMQ_ROUTING_KEY" { it == null || it == routingKey || it.startsWith("amq.gen-") }
"$SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" { it == null || it == routingKey || it.startsWith("amq.gen-") }
if (operation != null && operation != "send") {
"$SemanticAttributes.MESSAGING_OPERATION" operation
}
@ -438,7 +438,7 @@ class RabbitMqTest extends AgentInstrumentationSpecification implements WithRabb
switch (rabbitCommand) {
case "basic.publish":
"rabbitmq.command" "basic.publish"
"$SemanticAttributes.MESSAGING_RABBITMQ_ROUTING_KEY" {
"$SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" {
it == null || it == "some-routing-key" || it == "some-routing-queue" || it.startsWith("amq.gen-")
}
"rabbitmq.delivery_mode" { it == null || it == 2 }

23
instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetry/instrumentation/rocketmqclient/v4_8/AbstractRocketMqClientTest.groovy
View File

@ -8,8 +8,6 @@ package io.opentelemetry.instrumentation.rocketmqclient.v4_8
import io.opentelemetry.instrumentation.rocketmqclient.v4_8.base.BaseConf
import io.opentelemetry.instrumentation.test.InstrumentationSpecification
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
import java.util.concurrent.CompletableFuture
import java.util.concurrent.TimeUnit
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer
import org.apache.rocketmq.client.producer.DefaultMQProducer
import org.apache.rocketmq.client.producer.SendCallback
@ -20,6 +18,9 @@ import org.apache.rocketmq.remoting.common.RemotingHelper
import spock.lang.Shared
import spock.lang.Unroll
import java.util.concurrent.CompletableFuture
import java.util.concurrent.TimeUnit
import static io.opentelemetry.api.trace.SpanKind.CONSUMER
import static io.opentelemetry.api.trace.SpanKind.INTERNAL
import static io.opentelemetry.api.trace.SpanKind.PRODUCER
@ -104,7 +105,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
kind PRODUCER
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rocketmq"
"$SemanticAttributes.MESSAGING_DESTINATION" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_MESSAGE_ID" String
"$SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG" "TagA"
@ -118,7 +119,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
childOf span(0)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rocketmq"
"$SemanticAttributes.MESSAGING_DESTINATION" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
@ -160,7 +161,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
childOf span(0)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rocketmq"
"$SemanticAttributes.MESSAGING_DESTINATION" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_MESSAGE_ID" String
"$SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG" "TagA"
@ -174,7 +175,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
childOf span(1)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rocketmq"
"$SemanticAttributes.MESSAGING_DESTINATION" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
@ -238,7 +239,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
childOf span(0)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rocketmq"
"$SemanticAttributes.MESSAGING_DESTINATION" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_MESSAGE_ID" String
"messaging.rocketmq.broker_address" String
@ -261,7 +262,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
kind CONSUMER
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rocketmq"
"$SemanticAttributes.MESSAGING_DESTINATION" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
@ -279,7 +280,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
kind CONSUMER
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rocketmq"
"$SemanticAttributes.MESSAGING_DESTINATION" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
@ -325,7 +326,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
childOf span(0)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rocketmq"
"$SemanticAttributes.MESSAGING_DESTINATION" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_MESSAGE_ID" String
"$SemanticAttributes.MESSAGING_ROCKETMQ_MESSAGE_TAG" "TagA"
@ -340,7 +341,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
childOf span(1)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rocketmq"
"$SemanticAttributes.MESSAGING_DESTINATION" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" sharedTopic
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "topic"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long

6
instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientSuppressReceiveSpanTest.java
View File

@ -6,8 +6,8 @@
package io.opentelemetry.instrumentation.rocketmqclient.v5_0;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_KIND;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_NAME;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_MESSAGE_ID;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_OPERATION;
@ -122,7 +122,7 @@ public abstract class AbstractRocketMqClientSuppressReceiveSpanTest {
equalTo(
MESSAGING_DESTINATION_KIND,
SemanticAttributes.MessagingDestinationKindValues.TOPIC),
equalTo(MESSAGING_DESTINATION, topic)),
equalTo(MESSAGING_DESTINATION_NAME, topic)),
span ->
span.hasKind(SpanKind.CONSUMER)
.hasName(topic + " process")
@ -142,7 +142,7 @@ public abstract class AbstractRocketMqClientSuppressReceiveSpanTest {
equalTo(
MESSAGING_DESTINATION_KIND,
SemanticAttributes.MessagingDestinationKindValues.TOPIC),
equalTo(MESSAGING_DESTINATION, topic),
equalTo(MESSAGING_DESTINATION_NAME, topic),
equalTo(MESSAGING_OPERATION, "process")),
span ->
span.hasName("child")

8
instrumentation/rocketmq/rocketmq-client/rocketmq-client-5.0/testing/src/main/java/io/opentelemetry/instrumentation/rocketmqclient/v5_0/AbstractRocketMqClientTest.java
View File

@ -7,8 +7,8 @@ package io.opentelemetry.instrumentation.rocketmqclient.v5_0;
import static io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.orderByRootSpanKind;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_KIND;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_DESTINATION_NAME;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_MESSAGE_ID;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES;
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_OPERATION;
@ -299,7 +299,7 @@ public abstract class AbstractRocketMqClientTest {
equalTo(
MESSAGING_DESTINATION_KIND,
SemanticAttributes.MessagingDestinationKindValues.TOPIC),
equalTo(MESSAGING_DESTINATION, topic)));
equalTo(MESSAGING_DESTINATION_NAME, topic)));
attributeAssertions.addAll(Arrays.asList(extraAttributes));
return span.hasKind(SpanKind.PRODUCER)
@ -319,7 +319,7 @@ public abstract class AbstractRocketMqClientTest {
equalTo(
MESSAGING_DESTINATION_KIND,
SemanticAttributes.MessagingDestinationKindValues.TOPIC),
equalTo(MESSAGING_DESTINATION, topic),
equalTo(MESSAGING_DESTINATION_NAME, topic),
equalTo(MESSAGING_OPERATION, "receive"));
}
@ -345,7 +345,7 @@ public abstract class AbstractRocketMqClientTest {
equalTo(
MESSAGING_DESTINATION_KIND,
SemanticAttributes.MessagingDestinationKindValues.TOPIC),
equalTo(MESSAGING_DESTINATION, topic),
equalTo(MESSAGING_DESTINATION_NAME, topic),
equalTo(MESSAGING_OPERATION, "process")));
attributeAssertions.addAll(Arrays.asList(extraAttributes));

8
instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/kafka/KafkaIntegrationTest.java
View File

@ -106,10 +106,10 @@ class KafkaIntegrationTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
longKey("messaging.kafka.message.offset"),
@ -120,14 +120,14 @@ class KafkaIntegrationTest {
.hasParent(trace.getSpan(1))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
longKey("messaging.kafka.message.offset"),

10
instrumentation/spring/spring-integration-4.1/javaagent/src/test/groovy/SpringIntegrationAndRabbitTest.groovy
View File

@ -63,10 +63,10 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.NET_SOCK_FAMILY" { it == SemanticAttributes.NetSockFamilyValues.INET6 || it == null }
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION" "testTopic"
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testTopic"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
"$SemanticAttributes.MESSAGING_RABBITMQ_ROUTING_KEY" String
"$SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String
}
}
// spring-cloud-stream-binder-rabbit listener puts all messages into a BlockingQueue immediately after receiving
@ -78,11 +78,11 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i
kind CONSUMER
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION" "testTopic"
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testTopic"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
"$SemanticAttributes.MESSAGING_RABBITMQ_ROUTING_KEY" String
"$SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String
}
}
// spring-integration will detect that spring-rabbit has already created a consumer span and back off
@ -93,7 +93,7 @@ class SpringIntegrationAndRabbitTest extends AgentInstrumentationSpecification i
kind CONSUMER
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION" "testTopic"
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testTopic"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_ID" String

8
instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/groovy/SpringListenerTest.groovy
View File

@ -53,10 +53,10 @@ class SpringListenerTest extends AgentInstrumentationSpecification {
hasNoParent()
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "jms"
"$SemanticAttributes.MESSAGING_DESTINATION" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" destinationType
if (destinationName == "(temporary)") {
"$SemanticAttributes.MESSAGING_TEMP_DESTINATION" true
"$SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY" true
}
"$SemanticAttributes.MESSAGING_MESSAGE_ID" String
if (testHeaders) {
@ -81,7 +81,7 @@ class SpringListenerTest extends AgentInstrumentationSpecification {
}
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "jms"
"$SemanticAttributes.MESSAGING_DESTINATION" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" destinationName
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" destinationType
"$SemanticAttributes.MESSAGING_OPERATION" operation
if (messageId != null) {
@ -89,7 +89,7 @@ class SpringListenerTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.MESSAGING_MESSAGE_ID" { it == messageId || messageId == "" }
}
if (destinationName == "(temporary)") {
"$SemanticAttributes.MESSAGING_TEMP_DESTINATION" true
"$SemanticAttributes.MESSAGING_DESTINATION_TEMPORARY" true
}
if (testHeaders) {
"messaging.header.test_message_header" { it == ["test"] }

18
instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java
View File

@ -108,7 +108,8 @@ class SpringJmsListenerTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "spring-jms-listener"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"spring-jms-listener"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "queue"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_ID,
@ -120,7 +121,8 @@ class SpringJmsListenerTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "spring-jms-listener"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"spring-jms-listener"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "queue"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
@ -136,7 +138,8 @@ class SpringJmsListenerTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "spring-jms-listener"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"spring-jms-listener"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "queue"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"),
satisfies(
@ -188,7 +191,8 @@ class SpringJmsListenerTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "spring-jms-listener"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"spring-jms-listener"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "queue"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_ID,
@ -206,7 +210,8 @@ class SpringJmsListenerTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "spring-jms-listener"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"spring-jms-listener"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "queue"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
@ -228,7 +233,8 @@ class SpringJmsListenerTest {
.hasAttributesSatisfying(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "jms"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "spring-jms-listener"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"spring-jms-listener"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "queue"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive"),
satisfies(

48
instrumentation/spring/spring-kafka-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/kafka/v2_7/SpringKafkaTest.java
View File

@ -67,10 +67,10 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
longKey("messaging.kafka.message.offset"),
@ -86,7 +86,8 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")),
span ->
@ -96,14 +97,15 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasLinks(LinkData.create(producer.get().getSpanContext()))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
longKey("messaging.kafka.message.offset"),
@ -139,10 +141,10 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
longKey("messaging.kafka.message.offset"),
@ -158,7 +160,8 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")),
span ->
@ -170,14 +173,15 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasException(new IllegalArgumentException("boom"))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
longKey("messaging.kafka.message.offset"),
@ -209,10 +213,10 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
longKey("messaging.kafka.message.offset"),
@ -223,10 +227,10 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
longKey("messaging.kafka.message.offset"),
@ -243,7 +247,8 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")),
span ->
@ -255,7 +260,8 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
LinkData.create(producer2.get().getSpanContext()))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")),
span -> span.hasName("consumer").hasParent(trace.getSpan(1))));
@ -286,10 +292,10 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
longKey("messaging.kafka.message.offset"),
@ -305,7 +311,8 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")),
span ->
@ -317,7 +324,8 @@ class SpringKafkaTest extends AbstractSpringKafkaTest {
.hasException(new IllegalArgumentException("boom"))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")),
span -> span.hasName("consumer").hasParent(trace.getSpan(1))));

43
instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java
View File

@ -47,10 +47,11 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -62,14 +63,15 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -102,10 +104,11 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -119,14 +122,15 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -156,10 +160,11 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -170,10 +175,11 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -194,7 +200,9 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract
producer2.get().getSpanContext()))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")),
span -> span.hasName("consumer").hasParent(trace.getSpan(0))));
@ -227,10 +235,11 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -249,7 +258,9 @@ public abstract class AbstractSpringKafkaNoReceiveTelemetryTest extends Abstract
.hasException(new IllegalArgumentException("boom"))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME,
"testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")),
span -> span.hasName("consumer").hasParent(trace.getSpan(0))));

12
instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy
View File

@ -21,9 +21,9 @@ import org.springframework.context.annotation.Bean
import org.testcontainers.containers.GenericContainer
import org.testcontainers.containers.wait.strategy.Wait
import spock.lang.Shared
import spock.lang.Unroll
import java.time.Duration
import spock.lang.Unroll
import static io.opentelemetry.api.trace.SpanKind.CLIENT
import static io.opentelemetry.api.trace.SpanKind.CONSUMER
@ -103,10 +103,10 @@ class ContextPropagationTest extends AgentInstrumentationSpecification {
"$SemanticAttributes.NET_SOCK_PEER_ADDR" { it == "127.0.0.1" || it == null }
"$SemanticAttributes.NET_SOCK_PEER_PORT" Long
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION" "<default>"
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" "<default>"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
"$SemanticAttributes.MESSAGING_RABBITMQ_ROUTING_KEY" String
"$SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String
if (testHeaders) {
"messaging.header.test_message_header" { it == ["test"] }
}
@ -121,11 +121,11 @@ class ContextPropagationTest extends AgentInstrumentationSpecification {
childOf span(1)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION" "<default>"
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" "<default>"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long
"$SemanticAttributes.MESSAGING_RABBITMQ_ROUTING_KEY" String
"$SemanticAttributes.MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY" String
if (testHeaders) {
"messaging.header.test_message_header" { it == ["test"] }
}
@ -138,7 +138,7 @@ class ContextPropagationTest extends AgentInstrumentationSpecification {
childOf span(1)
attributes {
"$SemanticAttributes.MESSAGING_SYSTEM" "rabbitmq"
"$SemanticAttributes.MESSAGING_DESTINATION" "testQueue"
"$SemanticAttributes.MESSAGING_DESTINATION_NAME" "testQueue"
"$SemanticAttributes.MESSAGING_DESTINATION_KIND" "queue"
"$SemanticAttributes.MESSAGING_OPERATION" "process"
"$SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES" Long

39
instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/BatchRecordsVertxKafkaTest.java
View File

@ -69,10 +69,10 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -83,10 +83,10 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -103,7 +103,8 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")),
@ -117,7 +118,8 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
LinkData.create(producer2.get().getSpanContext()))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")),
span -> span.hasName("batch consumer").hasParent(trace.getSpan(1)),
@ -130,14 +132,15 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
.hasLinks(LinkData.create(producer1.get().getSpanContext()))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -155,14 +158,15 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
.hasLinks(LinkData.create(producer2.get().getSpanContext()))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -196,10 +200,10 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -215,7 +219,8 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")),
@ -229,7 +234,8 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
.hasException(new IllegalArgumentException("boom"))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")),
span -> span.hasName("batch consumer").hasParent(trace.getSpan(1)),
@ -241,14 +247,15 @@ class BatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),

24
instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/SingleRecordVertxKafkaTest.java
View File

@ -69,10 +69,10 @@ class SingleRecordVertxKafkaTest extends AbstractVertxKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -88,7 +88,8 @@ class SingleRecordVertxKafkaTest extends AbstractVertxKafkaTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")),
span ->
@ -98,14 +99,15 @@ class SingleRecordVertxKafkaTest extends AbstractVertxKafkaTest {
.hasLinks(LinkData.create(producer.get().getSpanContext()))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -142,10 +144,10 @@ class SingleRecordVertxKafkaTest extends AbstractVertxKafkaTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -161,7 +163,8 @@ class SingleRecordVertxKafkaTest extends AbstractVertxKafkaTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "receive")),
span ->
@ -173,14 +176,15 @@ class SingleRecordVertxKafkaTest extends AbstractVertxKafkaTest {
.hasException(new IllegalArgumentException("boom"))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),

30
instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/testNoReceiveTelemetry/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/NoReceiveTelemetryBatchRecordsVertxKafkaTest.java
View File

@ -70,10 +70,10 @@ class NoReceiveTelemetryBatchRecordsVertxKafkaTest extends AbstractVertxKafkaTes
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -84,14 +84,14 @@ class NoReceiveTelemetryBatchRecordsVertxKafkaTest extends AbstractVertxKafkaTes
.hasParent(trace.getSpan(1))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -105,10 +105,10 @@ class NoReceiveTelemetryBatchRecordsVertxKafkaTest extends AbstractVertxKafkaTes
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -119,14 +119,14 @@ class NoReceiveTelemetryBatchRecordsVertxKafkaTest extends AbstractVertxKafkaTes
.hasParent(trace.getSpan(4))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -148,7 +148,8 @@ class NoReceiveTelemetryBatchRecordsVertxKafkaTest extends AbstractVertxKafkaTes
LinkData.create(producer2.get().getSpanContext()))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")),
span -> span.hasName("batch consumer").hasParent(trace.getSpan(0))));
@ -177,10 +178,10 @@ class NoReceiveTelemetryBatchRecordsVertxKafkaTest extends AbstractVertxKafkaTes
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -191,14 +192,14 @@ class NoReceiveTelemetryBatchRecordsVertxKafkaTest extends AbstractVertxKafkaTes
.hasParent(trace.getSpan(1))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -218,7 +219,8 @@ class NoReceiveTelemetryBatchRecordsVertxKafkaTest extends AbstractVertxKafkaTes
.hasException(new IllegalArgumentException("boom"))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testBatchTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testBatchTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process")),
span -> span.hasName("batch consumer").hasParent(trace.getSpan(0))));

20
instrumentation/vertx/vertx-kafka-client-3.6/javaagent/src/testNoReceiveTelemetry/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/v3_6/NoReceiveTelemetrySingleRecordVertxKafkaTest.java
View File

@ -61,10 +61,11 @@ class NoReceiveTelemetrySingleRecordVertxKafkaTest extends AbstractVertxKafkaTes
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -75,14 +76,15 @@ class NoReceiveTelemetrySingleRecordVertxKafkaTest extends AbstractVertxKafkaTes
.hasParent(trace.getSpan(1))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -113,10 +115,11 @@ class NoReceiveTelemetrySingleRecordVertxKafkaTest extends AbstractVertxKafkaTes
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_DESTINATION_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),
@ -129,14 +132,15 @@ class NoReceiveTelemetrySingleRecordVertxKafkaTest extends AbstractVertxKafkaTes
.hasException(new IllegalArgumentException("boom"))
.hasAttributesSatisfyingExactly(
equalTo(SemanticAttributes.MESSAGING_SYSTEM, "kafka"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION, "testSingleTopic"),
equalTo(
SemanticAttributes.MESSAGING_DESTINATION_NAME, "testSingleTopic"),
equalTo(SemanticAttributes.MESSAGING_DESTINATION_KIND, "topic"),
equalTo(SemanticAttributes.MESSAGING_OPERATION, "process"),
satisfies(
SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES,
AbstractLongAssert::isNotNegative),
satisfies(
SemanticAttributes.MESSAGING_KAFKA_PARTITION,
SemanticAttributes.MESSAGING_KAFKA_SOURCE_PARTITION,
AbstractLongAssert::isNotNegative),
satisfies(
AttributeKey.longKey("messaging.kafka.message.offset"),

96
licenses/licenses.md generated
View File

@ -1,7 +1,7 @@
#javaagent
##Dependency License Report
_2023-02-10 15:41:11 PST_
_2023-02-10 17:34:19 PST_
## Apache License, Version 2.0
**1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18`
@ -37,204 +37,208 @@ _2023-02-10 15:41:11 PST_
> - **POM Project URL**: [https://github.com/square/okio/](https://github.com/square/okio/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**7** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.22.0`
**7** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**8** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-logs` **Version:** `1.22.0-alpha`
**8** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-events` **Version:** `1.23.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**9** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-logs` **Version:** `1.23.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**9** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.22.0`
**10** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**10** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.22.0`
**11** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-common` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**11** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-jaeger` **Version:** `1.22.0`
**12** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-jaeger` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**12** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging` **Version:** `1.22.0`
**13** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**13** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging-otlp` **Version:** `1.22.0`
**14** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-logging-otlp` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**14** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.22.0`
**15** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**15** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.22.0`
**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-common` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**16** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-logs` **Version:** `1.22.0-alpha`
**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-otlp-logs` **Version:** `1.23.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**17** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-prometheus` **Version:** `1.22.0-alpha`
**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-prometheus` **Version:** `1.23.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**18** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-zipkin` **Version:** `1.22.0`
**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-exporter-zipkin` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**19** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-kotlin` **Version:** `1.22.0`
**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-kotlin` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**20** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-trace-propagators` **Version:** `1.22.0`
**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-extension-trace-propagators` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**21** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.22.0`
**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**22** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.22.0`
**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**23** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.22.0-alpha`
**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.23.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**24** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.22.0`
**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**25** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-incubator` **Version:** `1.22.0-alpha`
**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-incubator` **Version:** `1.23.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**26** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-jaeger-remote-sampler` **Version:** `1.22.0`
**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-jaeger-remote-sampler` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**27** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.22.0-alpha`
**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.23.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**28** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.22.0`
**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**29** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.22.0`
**30** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.23.0`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**30** **Group:** `io.opentelemetry` **Name:** `opentelemetry-semconv` **Version:** `1.22.0-alpha`
**31** **Group:** `io.opentelemetry` **Name:** `opentelemetry-semconv` **Version:** `1.23.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
**31** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-aws-xray-propagator` **Version:** `1.22.0-alpha`
**32** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-aws-xray-propagator` **Version:** `1.22.0-alpha`
> - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**32** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-reporter` **Version:** `2.16.3`
**33** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-reporter` **Version:** `2.16.3`
> - **Manifest Project URL**: [https://zipkin.io/](https://zipkin.io/)
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
> - **Embedded license files**: [zipkin-reporter-2.16.3.jar/META-INF/LICENSE](zipkin-reporter-2.16.3.jar/META-INF/LICENSE)
**33** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-sender-okhttp3` **Version:** `2.16.3`
**34** **Group:** `io.zipkin.reporter2` **Name:** `zipkin-sender-okhttp3` **Version:** `2.16.3`
> - **Manifest Project URL**: [https://zipkin.io/](https://zipkin.io/)
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
> - **Embedded license files**: [zipkin-sender-okhttp3-2.16.3.jar/META-INF/LICENSE](zipkin-sender-okhttp3-2.16.3.jar/META-INF/LICENSE)
**34** **Group:** `io.zipkin.zipkin2` **Name:** `zipkin` **Version:** `2.23.2`
**35** **Group:** `io.zipkin.zipkin2` **Name:** `zipkin` **Version:** `2.23.2`
> - **Manifest Project URL**: [http://zipkin.io/](http://zipkin.io/)
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
> - **Embedded license files**: [zipkin-2.23.2.jar/META-INF/LICENSE](zipkin-2.23.2.jar/META-INF/LICENSE)
**35** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.13.0`
**36** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.13.0`
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
> - **Embedded license files**: [byte-buddy-dep-1.13.0.jar/META-INF/LICENSE](byte-buddy-dep-1.13.0.jar/META-INF/LICENSE)
- [byte-buddy-dep-1.13.0.jar/META-INF/NOTICE](byte-buddy-dep-1.13.0.jar/META-INF/NOTICE)
**36** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0`
**37** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0`
> - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**37** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `1.6.20`
**38** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `1.6.20`
> - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**38** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-common` **Version:** `1.6.20`
**39** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-common` **Version:** `1.6.20`
> - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**39** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `1.6.10`
**40** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk7` **Version:** `1.6.10`
> - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**40** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `1.6.10`
**41** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-jdk8` **Version:** `1.6.10`
> - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
**41** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.4`
**42** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.4`
> - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org)
> - **Manifest License**: The 3-Clause BSD License (Not Packaged)
> - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
> - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
**42** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.4`
**43** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.4`
> - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org)
> - **Manifest License**: The 3-Clause BSD License (Not Packaged)
> - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
> - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
**43** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.4`
**44** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.4`
> - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org)
> - **Manifest License**: The 3-Clause BSD License (Not Packaged)
> - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
> - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
**44** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `1.33`
**45** **Group:** `org.snakeyaml` **Name:** `snakeyaml-engine` **Version:** `2.6`
> - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
> - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml)
> - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml-engine](https://bitbucket.org/snakeyaml/snakeyaml-engine)
> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
## MIT License
**45** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.6`
**46** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.6`
> - **Manifest Project URL**: [http://www.qos.ch](http://www.qos.ch)
> - **POM Project URL**: [http://www.slf4j.org](http://www.slf4j.org)
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
**46** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.6`
**47** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.6`
> - **Manifest Project URL**: [http://www.qos.ch](http://www.qos.ch)
> - **POM Project URL**: [http://www.slf4j.org](http://www.slf4j.org)
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
## The 3-Clause BSD License
**47** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.4`
**48** **Group:** `org.ow2.asm` **Name:** `asm` **Version:** `9.4`
> - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org)
> - **Manifest License**: The 3-Clause BSD License (Not Packaged)
> - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
> - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
**48** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.4`
**49** **Group:** `org.ow2.asm` **Name:** `asm-commons` **Version:** `9.4`
> - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org)
> - **Manifest License**: The 3-Clause BSD License (Not Packaged)
> - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/)
> - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
> - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
**49** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.4`
**50** **Group:** `org.ow2.asm` **Name:** `asm-tree` **Version:** `9.4`
> - **Manifest Project URL**: [http://asm.ow2.org](http://asm.ow2.org)
> - **Manifest License**: The 3-Clause BSD License (Not Packaged)
> - **POM Project URL**: [http://asm.ow2.io/](http://asm.ow2.io/)
@ -243,4 +247,4 @@ _2023-02-10 15:41:11 PST_
## Unknown
**50** **Group:** `com.squareup.okio` **Name:** `okio` **Version:** `3.0.0`
**51** **Group:** `com.squareup.okio` **Name:** `okio` **Version:** `3.0.0`

2
settings.gradle.kts
View File

@ -364,7 +364,7 @@ hideFromDependabot(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:jav
hideFromDependabot(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent")
hideFromDependabot(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent")
hideFromDependabot(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent")
hideFromDependabot(":instrumentation:opentelemetry-api:opentelemetry-api-logs-1.19:javaagent")
hideFromDependabot(":instrumentation:opentelemetry-api:opentelemetry-api-logs-1.23:javaagent")
hideFromDependabot(":instrumentation:opentelemetry-extension-annotations-1.0:javaagent")
hideFromDependabot(":instrumentation:opentelemetry-extension-kotlin-1.0:javaagent")
hideFromDependabot(":instrumentation:opentelemetry-instrumentation-annotations-1.16:javaagent")