Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the semantic conventions to v1.17.0 #5134

Merged
merged 2 commits into from
Jan 19, 2023
Merged

Update the semantic conventions to v1.17.0 #5134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff87aeb
Update the semantic conventions to v1.17.0
jkwatson Jan 18, 2023
7cdedc4
add a few more deprecated items
jkwatson Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildscripts/semantic-convention/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
ROOT_DIR="${SCRIPT_DIR}/../../"

# freeze the spec & generator tools versions to make SemanticAttributes generation reproducible
SEMCONV_VERSION=1.16.0
SEMCONV_VERSION=1.17.0
SPEC_VERSION=v$SEMCONV_VERSION
SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
GENERATOR_VERSION=0.14.0
Expand Down
89 changes: 89 additions & 0 deletions buildscripts/semantic-convention/templates/SemanticAttributes.java.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,95 @@ public final class {{class}} {
@Deprecated
public static final AttributeKey<Long> HTTP_RETRY_COUNT = longKey("http.retry_count");


/**
* A string identifying the messaging system.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_DESTINATION_NAME} instead.
*/
@Deprecated
public static final AttributeKey<String> MESSAGING_DESTINATION =
stringKey("messaging.destination");

/**
* A boolean that is true if the message destination is temporary.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_DESTINATION_TEMPORARY} instead.
*/
@Deprecated
public static final AttributeKey<Boolean> MESSAGING_TEMP_DESTINATION =
booleanKey("messaging.temp_destination");

/**
* The name of the transport protocol.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. There is no replacement.
*/
@Deprecated
public static final AttributeKey<String> MESSAGING_PROTOCOL = stringKey("messaging.protocol");

/**
* The version of the transport protocol.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. There is no replacement.
*/
@Deprecated
public static final AttributeKey<String> MESSAGING_PROTOCOL_VERSION =
stringKey("messaging.protocol_version");

/**
* Connection string.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. There is no replacement.
*/
@Deprecated
public static final AttributeKey<String> MESSAGING_URL = stringKey("messaging.url");

/**
* The <a href="#conversations">conversation ID</a> identifying the conversation to which the
* message belongs, represented as a string. Sometimes called &quot;Correlation ID&quot;.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_MESSAGE_CONVERSATION_ID} instead.
*/
@Deprecated
public static final AttributeKey<String> MESSAGING_CONVERSATION_ID =
stringKey("messaging.conversation_id");

/**
* RabbitMQ message routing key.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY} instead.
*/
@Deprecated
public static final AttributeKey<String> MESSAGING_RABBITMQ_ROUTING_KEY =
stringKey("messaging.rabbitmq.routing_key");

/**
* Partition the message is received from.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_KAFKA_SOURCE_PARTITION} instead.
*/
@Deprecated
public static final AttributeKey<Long> MESSAGING_KAFKA_PARTITION =
longKey("messaging.kafka.partition");

/**
* A boolean that is true if the message is a tombstone.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_KAFKA_MESSAGE_TOMBSTONE} instead.
*/
@Deprecated
public static final AttributeKey<Boolean> MESSAGING_KAFKA_TOMBSTONE =
booleanKey("messaging.kafka.tombstone");

/**
* The timestamp in milliseconds that the delay message is expected to be delivered to consumer.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_ROCKETMQ_MESSAGE_DELIVERY_TIMESTAMP} instead.
*/
@Deprecated
public static final AttributeKey<Long> MESSAGING_ROCKETMQ_DELIVERY_TIMESTAMP =
longKey("messaging.rocketmq.delivery_timestamp");


/**
* The delay time level for delay message, which determines the message delay time.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#MESSAGING_ROCKETMQ_MESSAGE_DELAY_TIME_LEVEL} instead.
*/
@Deprecated
public static final AttributeKey<Long> MESSAGING_ROCKETMQ_DELAY_TIME_LEVEL =
longKey("messaging.rocketmq.delay_time_level");

{% endif %}

private {{class}}() {}
Expand Down
2 changes: 1 addition & 1 deletion semconv/src/main/java/io/opentelemetry/semconv/resource/attributes/ResourceAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@SuppressWarnings("unused")
public final class ResourceAttributes {
/** The URL of the OpenTelemetry schema for these keys and values. */
public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.16.0";
public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.17.0";

/**
* Array of brand name and version separated by a space
Expand Down
Loading