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

Update to semconv 1.20.0 #5497

Merged
merged 1 commit into from
Jun 2, 2023
Merged

Update to semconv 1.20.0 #5497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.19.0
SEMCONV_VERSION=1.20.0
SPEC_VERSION=v$SEMCONV_VERSION
SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
GENERATOR_VERSION=0.18.0
Expand Down
109 changes: 105 additions & 4 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 @@ -206,14 +206,14 @@ public final class {{class}} {

/**
* The name of the transport protocol.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#NET_APP_PROTOCOL_NAME} instead.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#NET_PROTOCOL_NAME} instead.
*/
@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. Use {@link SemanticAttributes#NET_APP_PROTOCOL_VERSION} instead.
* @deprecated This item has been removed as of 1.17.0 of the semantic conventions. Use {@link SemanticAttributes#NET_PROTOCOL_VERSION} instead.
*/
@Deprecated
public static final AttributeKey<String> MESSAGING_PROTOCOL_VERSION =
Expand Down Expand Up @@ -288,7 +288,7 @@ public final class {{class}} {
* @deprecated This item has been moved, use {@link io.opentelemetry.semconv.resource.attributes.ResourceAttributes#OTEL_SCOPE_VERSION} instead.
*/
@Deprecated
public static final AttributeKey<String> OTEL_SCOPE_VERSION = stringKey("otel.scope.version");;
public static final AttributeKey<String> OTEL_SCOPE_VERSION = stringKey("otel.scope.version");

/**
* The execution ID of the current function execution.
Expand Down Expand Up @@ -321,7 +321,108 @@ public final class {{class}} {
* @deprecated Deprecated, use the {@link io.opentelemetry.semconv.resource.attributes.ResourceAttributes#OTEL_SCOPE_VERSION} attribute.
*/
@Deprecated
public static final AttributeKey<String> OTEL_LIBRARY_VERSION = stringKey("otel.library.version");
public static final AttributeKey<String> OTEL_LIBRARY_VERSION = stringKey("otel.library.version");

/**
* Kind of HTTP protocol used.
* @deprecated This item has been removed as of 1.20.0 of the semantic conventions.
*/
@Deprecated
public static final AttributeKey<String> HTTP_FLAVOR = stringKey("http.flavor");

/**
* Enum definitions for {@link #HTTP_FLAVOR}.
* @deprecated This item has been removed as of 1.20.0 of the semantic conventions.
*/
@Deprecated
public static final class HttpFlavorValues {
/** HTTP/1.0. */
public static final String HTTP_1_0 = "1.0";

/** HTTP/1.1. */
public static final String HTTP_1_1 = "1.1";

/** HTTP/2. */
public static final String HTTP_2_0 = "2.0";

/** HTTP/3. */
public static final String HTTP_3_0 = "3.0";

/** SPDY protocol. */
public static final String SPDY = "SPDY";

/** QUIC protocol. */
public static final String QUIC = "QUIC";

private HttpFlavorValues() {}
}

/**
* Application layer protocol used. The value SHOULD be normalized to lowercase.
* @deprecated This item has been removed as of 1.20.0 of the semantic conventions. Use {@link SemanticAttributes#NET_PROTOCOL_NAME} instead.
*/
@Deprecated
public static final AttributeKey<String> NET_APP_PROTOCOL_NAME = stringKey("net.app.protocol.name");

/**
* Version of the application layer protocol used. See note below.
*
* <p>Notes:
*
* <ul>
* <li>{@code net.app.protocol.version} refers to the version of the protocol used and might be
* different from the protocol client's version. If the HTTP client used has a version of
* {@code 0.27.2}, but sends HTTP version {@code 1.1}, this attribute should be set to
* {@code 1.1}.
* </ul>
* @deprecated This item has been removed as of 1.20.0 of the semantic conventions. Use {@link SemanticAttributes#NET_PROTOCOL_VERSION} instead.
*/
@Deprecated
public static final AttributeKey<String> NET_APP_PROTOCOL_VERSION = stringKey("net.app.protocol.version");

/**
* The kind of message destination.
* @deprecated This item has been removed as of 1.20.0 of the semantic conventions.
*/
@Deprecated
public static final AttributeKey<String> MESSAGING_DESTINATION_KIND = stringKey("messaging.destination.kind");

/**
* Enum values for {@link #MESSAGING_DESTINATION_KIND}.
* @deprecated This item has been removed as of 1.20.0 of the semantic conventions.
*/
@Deprecated
public static final class MessagingDestinationKindValues {
/** A message sent to a queue. */
public static final String QUEUE = "queue";

/** A message sent to a topic. */
public static final String TOPIC = "topic";

private MessagingDestinationKindValues() {}
}

/**
* The kind of message source.
* @deprecated This item has been removed as of 1.20.0 of the semantic conventions.
*/
@Deprecated
public static final AttributeKey<String> MESSAGING_SOURCE_KIND = stringKey("messaging.source.kind");

/**
* Enum values for {@link #MESSAGING_SOURCE_KIND}.
* @deprecated This item has been removed as of 1.20.0 of the semantic conventions.
*/
@Deprecated
public static final class MessagingSourceKindValues {
/** A message received from a queue. */
public static final String QUEUE = "queue";

/** A message received from a topic. */
public static final String TOPIC = "topic";

private MessagingSourceKindValues() {}
}

{% endif %}

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.19.0";
public static final String SCHEMA_URL = "https://opentelemetry.io/schemas/1.20.0";

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