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.

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

[SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 #1761

Merged
merged 8 commits into from
Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ Increment the:
* [METRICS SDK] - Remove old metrics from Github CI
[#1733](https://github.com/open-telemetry/opentelemetry-cpp/pull/1733)
* [BUILD] Add CMake OTELCPP_PROTO_PATH [#1730](https://github.com/open-telemetry/opentelemetry-cpp/pull/1730)
* [SEMANTIC CONVENTIONS] Upgrade to version 1.15.0
[#1761](https://github.com/open-telemetry/opentelemetry-cpp/pull/1761)

Deprecation notes:

Expand Down
49 changes: 46 additions & 3 deletions api/include/opentelemetry/trace/semantic_conventions.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace SemanticConventions
/**
* The URL of the OpenTelemetry schema for these keys and values.
*/
static constexpr const char *SCHEMA_URL = "https://opentelemetry.io/schemas/1.14.0";
static constexpr const char *SCHEMA_URL = "https://opentelemetry.io/schemas/1.15.0";

/**
* The type of the exception (its fully-qualified class name, if applicable). The dynamic type of
Expand Down Expand Up @@ -257,6 +257,17 @@ static constexpr const char *DB_MONGODB_COLLECTION = "db.mongodb.collection";
*/
static constexpr const char *DB_SQL_TABLE = "db.sql.table";

/**
* Name of the code, either "OK" or "ERROR". MUST NOT be set if the status code
* is UNSET.
*/
static constexpr const char *OTEL_STATUS_CODE = "otel.status_code";

/**
* Description of the Status if it has a value, otherwise not set.
*/
static constexpr const char *OTEL_STATUS_DESCRIPTION = "otel.status_description";

/**
* Type of the trigger which caused this function execution.
*
Expand Down Expand Up @@ -571,9 +582,14 @@ static constexpr const char *HTTP_RESPONSE_CONTENT_LENGTH = "http.response_conte
static constexpr const char *HTTP_URL = "http.url";

/**
* The ordinal number of request re-sending attempt.
* The ordinal number of request resending attempt (for any reason, including redirects).
*
* <p>Notes:
<ul> <li>The resend count SHOULD be updated each time an HTTP request gets resent by the client,
regardless of what was the cause of the resending (e.g. redirection, authorization failure, 503
Server Unavailable, network issues, or any other).</li> </ul>
*/
static constexpr const char *HTTP_RETRY_COUNT = "http.retry_count";
static constexpr const char *HTTP_RESEND_COUNT = "http.resend_count";

/**
* The URI scheme identifying the used protocol.
Expand Down Expand Up @@ -879,6 +895,24 @@ static constexpr const char *MESSAGING_ROCKETMQ_CLIENT_GROUP = "messaging.rocket
*/
static constexpr const char *MESSAGING_ROCKETMQ_CLIENT_ID = "messaging.rocketmq.client_id";

/**
* The timestamp in milliseconds that the delay message is expected to be delivered to consumer.
*/
static constexpr const char *MESSAGING_ROCKETMQ_DELIVERY_TIMESTAMP =
"messaging.rocketmq.delivery_timestamp";

/**
* The delay time level for delay message, which determines the message delay time.
*/
static constexpr const char *MESSAGING_ROCKETMQ_DELAY_TIME_LEVEL =
"messaging.rocketmq.delay_time_level";

/**
* It is essential for FIFO message. Messages that belong to the same message group are always
* processed one by one within the same consumer group.
*/
static constexpr const char *MESSAGING_ROCKETMQ_MESSAGE_GROUP = "messaging.rocketmq.message_group";

/**
* Type of message.
*/
Expand Down Expand Up @@ -1103,6 +1137,15 @@ static constexpr const char *SERIAL = "serial";
static constexpr const char *LOCAL_SERIAL = "local_serial";
} // namespace DbCassandraConsistencyLevelValues

namespace OtelStatusCodeValues
{
/** The operation has been validated by an Application developer or Operator to have completed
* successfully. */
static constexpr const char *OK = "OK";
/** The operation contains an error. */
static constexpr const char *ERROR = "ERROR";
} // namespace OtelStatusCodeValues

namespace FaasTriggerValues
{
/** A response to some data source operation such as a database or filesystem read/write. */
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/semantic-convention/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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.14.0
SEMCONV_VERSION=1.15.0
SPEC_VERSION=v$SEMCONV_VERSION
SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
GENERATOR_VERSION=0.14.0
Expand Down
22 changes: 21 additions & 1 deletion sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace SemanticConventions
/**
* The URL of the OpenTelemetry schema for these keys and values.
*/
static constexpr const char *SCHEMA_URL = "https://opentelemetry.io/schemas/1.14.0";
static constexpr const char *SCHEMA_URL = "https://opentelemetry.io/schemas/1.15.0";

/**
* Array of brand name and version separated by a space
Expand Down Expand Up @@ -670,6 +670,26 @@ static constexpr const char *WEBENGINE_VERSION = "webengine.version";
*/
static constexpr const char *WEBENGINE_DESCRIPTION = "webengine.description";

/**
* The name of the instrumentation scope - ({@code InstrumentationScope.Name} in OTLP).
*/
static constexpr const char *OTEL_SCOPE_NAME = "otel.scope.name";

/**
* The version of the instrumentation scope - ({@code InstrumentationScope.Version} in OTLP).
*/
static constexpr const char *OTEL_SCOPE_VERSION = "otel.scope.version";

/**
* Deprecated, use the {@code otel.scope.name} attribute.
*/
static constexpr const char *OTEL_LIBRARY_NAME = "otel.library.name";

/**
* Deprecated, use the {@code otel.scope.version} attribute.
*/
static constexpr const char *OTEL_LIBRARY_VERSION = "otel.library.version";

// Enum definitions
namespace CloudProviderValues
{
Expand Down