diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a0f0bb00d..ef4694706b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -320,6 +320,8 @@ update the semantic convention in instrumentation library is needed.
* [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)
<<<<<<< HEAD
>>>>>>> 7634edf4 ([Logs SDK] LogProcessor, LogExporter changes (#1727))
@@ -349,7 +351,22 @@ Deprecation notes:
Note that function `opentelemetry::utils::hashCode`,
declared in the ETW exporter, is not affected by this deprecation.
+<<<<<<< HEAD
>>>>>>> 702a68c1 ([Deprecation] Deprecate experimental semantic conventions (#1742) (#1744))
+=======
+Breaking changes:
+
+* [SEMANTIC CONVENTIONS] Upgrade to version 1.15.0
+ [#1761](https://github.com/open-telemetry/opentelemetry-cpp/pull/1761)
+ * Naming of semantic conventions has changed from uppercase constants,
+ like `SemanticConventions::SERVICE_NAME`,
+ to camel case, like `SemanticConventions::kServiceName`.
+ This is necessary to avoid collisions with macros in general,
+ which breaks the build on some platforms.
+ * Semantic conventions are flagged as experimental,
+ which is why this change is done in this release.
+
+>>>>>>> d7a388b1 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
## [1.7.0] 2022-10-28
* [METRICS SDK] Validate Instrument meta data (name, unit, description) [#1713](https://github.com/open-telemetry/opentelemetry-cpp/pull/1713)
diff --git a/api/include/opentelemetry/trace/semantic_conventions.h b/api/include/opentelemetry/trace/semantic_conventions.h
index bf8eff3e2a..2a3af97cc2 100644
--- a/api/include/opentelemetry/trace/semantic_conventions.h
+++ b/api/include/opentelemetry/trace/semantic_conventions.h
@@ -12,6 +12,7 @@
#include "opentelemetry/version.h"
<<<<<<< HEAD
+<<<<<<< HEAD
=======
/*
* Special considerations for FaasDocumentOperationValues::DELETE.
@@ -26,6 +27,8 @@
# endif
#endif
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
OPENTELEMETRY_BEGIN_NAMESPACE
namespace trace
@@ -39,16 +42,21 @@ namespace SemanticConventions
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.15.0";
=======
static constexpr const char *SCHEMA_URL = "https://opentelemetry.io/schemas/1.14.0";
>>>>>>> 4dcb8da7 ([SEMANTIC CONVENTIONS] Upgrade to version 1.14.0 (#1697))
+=======
+static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.15.0";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The type of the exception (its fully-qualified class name, if applicable). The dynamic type of
* the exception should be preferred over the static type in languages that support it.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kExceptionType = "exception.type";
=======
static constexpr const char *EXCEPTION_TYPE = "exception.type";
@@ -408,21 +416,34 @@ static constexpr const char *DB_SQL_TABLE = "db.sql.table";
* the exception should be preferred over the static type in languages that support it.
*/
static constexpr const char *EXCEPTION_TYPE = "exception.type";
+=======
+static constexpr const char *kExceptionType = "exception.type";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The exception message.
*/
-static constexpr const char *EXCEPTION_MESSAGE = "exception.message";
+static constexpr const char *kExceptionMessage = "exception.message";
/**
* A stacktrace as a string in the natural representation for the language runtime. The
* representation is to be determined and documented by each language SIG.
*/
-static constexpr const char *EXCEPTION_STACKTRACE = "exception.stacktrace";
+static constexpr const char *kExceptionStacktrace = "exception.stacktrace";
/**
+<<<<<<< HEAD
* SHOULD be set to true if the exception event is recorded at a point where it is known that the
exception is escaping the scope of the span.
+=======
+ * The name identifies the event.
+ */
+static constexpr const char *kEventName = "event.name";
+
+/**
+ * The domain identifies the context in which an event happened. An event name is unique only within
+a domain.
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
*
* Notes:
- An exception is considered to have escaped (or left) the scope of a span,
@@ -437,8 +458,212 @@ above.
- It follows that an exception may still escape the scope of th
{@code exception.escaped} attribute was not set or set to false, since the event might have been
recorded at a time where it was not clear whether the exception will escape.
*/
+<<<<<<< HEAD
static constexpr const char *EXCEPTION_ESCAPED = "exception.escaped";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kEventDomain = "event.domain";
+
+/**
+ * The full invoked ARN as provided on the {@code Context} passed to the function ({@code
+ Lambda-Runtime-Invoked-Function-Arn} header on the {@code /runtime/invocation/next} applicable).
+ *
+ * Notes:
+
- This may be different from {@code faas.id} if an alias is involved.
+ */
+static constexpr const char *kAwsLambdaInvokedArn = "aws.lambda.invoked_arn";
+
+/**
+ * The event_id
+ * uniquely identifies the event.
+ */
+static constexpr const char *kCloudeventsEventId = "cloudevents.event_id";
+
+/**
+ * The source
+ * identifies the context in which an event happened.
+ */
+static constexpr const char *kCloudeventsEventSource = "cloudevents.event_source";
+
+/**
+ * The version of
+ * the CloudEvents specification which the event uses.
+ */
+static constexpr const char *kCloudeventsEventSpecVersion = "cloudevents.event_spec_version";
+
+/**
+ * The event_type
+ * contains a value describing the type of event related to the originating occurrence.
+ */
+static constexpr const char *kCloudeventsEventType = "cloudevents.event_type";
+
+/**
+ * The subject of
+ * the event in the context of the event producer (identified by source).
+ */
+static constexpr const char *kCloudeventsEventSubject = "cloudevents.event_subject";
+
+/**
+ * Parent-child Reference type
+ *
+ * Notes:
+
- The causal relationship between a child Span and a parent Span.
+ */
+static constexpr const char *kOpentracingRefType = "opentracing.ref_type";
+
+/**
+ * An identifier for the database management system (DBMS) product being used. See below for a list
+ * of well-known identifiers.
+ */
+static constexpr const char *kDbSystem = "db.system";
+
+/**
+ * The connection string used to connect to the database. It is recommended to remove embedded
+ * credentials.
+ */
+static constexpr const char *kDbConnectionString = "db.connection_string";
+
+/**
+ * Username for accessing the database.
+ */
+static constexpr const char *kDbUser = "db.user";
+
+/**
+ * The fully-qualified class name of the Java Database Connectivity
+ * (JDBC) driver used to connect.
+ */
+static constexpr const char *kDbJdbcDriverClassname = "db.jdbc.driver_classname";
+
+/**
+ * This attribute is used to report the name of the database being accessed. For commands that
+ switch the database, this should be set to the target database (even if the command fails).
+ *
+ * Notes:
+
- In some SQL databases, the database name to be used is called "schema name". In
+ case there are multiple layers that could be considered for database name (e.g. Oracle instance
+ name and schema name), the database name to be used is the more specific layer (e.g. Oracle schema
+ name).
+ */
+static constexpr const char *kDbName = "db.name";
+
+/**
+ * The database statement being executed.
+ *
+ * Notes:
+
- The value may be sanitized to exclude sensitive information.
+ */
+static constexpr const char *kDbStatement = "db.statement";
+
+/**
+ * The name of the operation being executed, e.g. the MongoDB command
+ name such as {@code findAndModify}, or the SQL keyword.
+ *
+ * Notes:
+
- When setting this to an SQL keyword, it is not recommended to attempt any client-side
+ parsing of {@code db.statement} just to get this property, but it should be set if the operation
+ name is provided by the library being instrumented. If the SQL statement has an ambiguous
+ operation, or performs more than one operation, this value may be omitted.
+ */
+static constexpr const char *kDbOperation = "db.operation";
+
+/**
+ * The Microsoft SQL Server instance
+ name connecting to. This name is used to determine the port of a named instance.
+ *
+ * Notes:
+
- If setting a {@code db.mssql.instance_name}, {@code net.peer.port} is no longer required
+ (but still recommended if non-standard).
+ */
+static constexpr const char *kDbMssqlInstanceName = "db.mssql.instance_name";
+
+/**
+ * The fetch size used for paging, i.e. how many rows will be returned at once.
+ */
+static constexpr const char *kDbCassandraPageSize = "db.cassandra.page_size";
+
+/**
+ * The consistency level of the query. Based on consistency values from CQL.
+ */
+static constexpr const char *kDbCassandraConsistencyLevel = "db.cassandra.consistency_level";
+
+/**
+ * The name of the primary table that the operation is acting upon, including the keyspace name (if
+ applicable).
+ *
+ * Notes:
+
- This mirrors the db.sql.table attribute but references cassandra rather than sql. It is
+ not recommended to attempt any client-side parsing of {@code db.statement} just to get this
+ property, but it should be set if it is provided by the library being instrumented. If the
+ operation is acting upon an anonymous table, or more than one table, this value MUST NOT be
+ set.
+ */
+static constexpr const char *kDbCassandraTable = "db.cassandra.table";
+
+/**
+ * Whether or not the query is idempotent.
+ */
+static constexpr const char *kDbCassandraIdempotence = "db.cassandra.idempotence";
+
+/**
+ * The number of times a query was speculatively executed. Not set or {@code 0} if the query was not
+ * executed speculatively.
+ */
+static constexpr const char *kDbCassandraSpeculativeExecutionCount =
+ "db.cassandra.speculative_execution_count";
+
+/**
+ * The ID of the coordinating node for a query.
+ */
+static constexpr const char *kDbCassandraCoordinatorId = "db.cassandra.coordinator.id";
+
+/**
+ * The data center of the coordinating node for a query.
+ */
+static constexpr const char *kDbCassandraCoordinatorDc = "db.cassandra.coordinator.dc";
+
+/**
+ * The index of the database being accessed as used in the {@code SELECT} command, provided as an integer. To be
+ * used instead of the generic {@code db.name} attribute.
+ */
+static constexpr const char *kDbRedisDatabaseIndex = "db.redis.database_index";
+
+/**
+ * The collection being accessed within the database stated in {@code db.name}.
+ */
+static constexpr const char *kDbMongodbCollection = "db.mongodb.collection";
+
+/**
+ * The name of the primary table that the operation is acting upon, including the database name (if
+ applicable).
+ *
+ * Notes:
+
- It is not recommended to attempt any client-side parsing of {@code db.statement} just to
+ get this property, but it should be set if it is provided by the library being instrumented. If the
+ operation is acting upon an anonymous table, or more than one table, this value MUST NOT be
+ set.
+ */
+static constexpr const char *kDbSqlTable = "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 *kOtelStatusCode = "otel.status_code";
+
+/**
+ * Description of the Status if it has a value, otherwise not set.
+ */
+static constexpr const char *kOtelStatusDescription = "otel.status_description";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
=======
@@ -454,38 +679,54 @@ If clients set it, it should be the same as the trigger that corresponding incom
lambda, which is often HTTP).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasTrigger = "faas.trigger";
=======
static constexpr const char *FAAS_TRIGGER = "faas.trigger";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasTrigger = "faas.trigger";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The execution ID of the current function execution.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasExecution = "faas.execution";
=======
static constexpr const char *FAAS_EXECUTION = "faas.execution";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasExecution = "faas.execution";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the source on which the triggering operation was performed. For example, in Cloud
* Storage or S3 corresponds to the bucket name, and in Cosmos DB to the database name.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasDocumentCollection = "faas.document.collection";
=======
static constexpr const char *FAAS_DOCUMENT_COLLECTION = "faas.document.collection";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasDocumentCollection = "faas.document.collection";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Describes the type of the operation that was performed on the data.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasDocumentOperation = "faas.document.operation";
=======
static constexpr const char *FAAS_DOCUMENT_OPERATION = "faas.document.operation";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasDocumentOperation = "faas.document.operation";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A string containing the time when the data was accessed in the UTC.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasDocumentTime = "faas.document.time";
=======
static constexpr const char *FAAS_DOCUMENT_TIME = "faas.document.time";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasDocumentTime = "faas.document.time";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The document name/table subjected to the operation. For example, in Cloud Storage or S3 is the
* name of the file, and in Cosmos DB the table name.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasDocumentName = "faas.document.name";
=======
static constexpr const char *FAAS_DOCUMENT_NAME = "faas.document.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasDocumentName = "faas.document.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A string containing the function invocation time in the UTC.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasTime = "faas.time";
=======
static constexpr const char *FAAS_TIME = "faas.time";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasTime = "faas.time";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A string containing the schedule period as .
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasCron = "faas.cron";
=======
static constexpr const char *FAAS_CRON = "faas.cron";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasCron = "faas.cron";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A boolean that is true if the serverless function is executed for the first time (aka
* cold-start).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasColdstart = "faas.coldstart";
=======
static constexpr const char *FAAS_COLDSTART = "faas.coldstart";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasColdstart = "faas.coldstart";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the invoked function.
@@ -548,10 +809,14 @@ static constexpr const char *FAAS_COLDSTART = "faas.coldstart";
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasInvokedName = "faas.invoked_name";
=======
static constexpr const char *FAAS_INVOKED_NAME = "faas.invoked_name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasInvokedName = "faas.invoked_name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The cloud provider of the invoked function.
@@ -561,10 +826,14 @@ static constexpr const char *FAAS_INVOKED_NAME = "faas.invoked_name";
function.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasInvokedProvider = "faas.invoked_provider";
=======
static constexpr const char *FAAS_INVOKED_PROVIDER = "faas.invoked_provider";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasInvokedProvider = "faas.invoked_provider";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The cloud region of the invoked function.
@@ -574,15 +843,20 @@ static constexpr const char *FAAS_INVOKED_PROVIDER = "faas.invoked_provider";
function.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasInvokedRegion = "faas.invoked_region";
=======
static constexpr const char *FAAS_INVOKED_REGION = "faas.invoked_region";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasInvokedRegion = "faas.invoked_region";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Transport protocol used. See note below.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kNetTransport = "net.transport";
/**
@@ -627,11 +901,14 @@ static constexpr const char *kNetSockFamily = "net.sock.family";
* Logical remote hostname, see note below.
=======
static constexpr const char *NET_TRANSPORT = "net.transport";
+=======
+static constexpr const char *kNetTransport = "net.transport";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Application layer protocol used. The value SHOULD be normalized to lowercase.
*/
-static constexpr const char *NET_APP_PROTOCOL_NAME = "net.app.protocol.name";
+static constexpr const char *kNetAppProtocolName = "net.app.protocol.name";
/**
* Version of the application layer protocol used. See note below.
@@ -642,7 +919,7 @@ static constexpr const char *NET_APP_PROTOCOL_NAME = "net.app.protocol.name";
0.27.2}, but sends HTTP version {@code 1.1}, this attribute should be set to {@code 1.1}.
*/
-static constexpr const char *NET_APP_PROTOCOL_VERSION = "net.app.protocol.version";
+static constexpr const char *kNetAppProtocolVersion = "net.app.protocol.version";
/**
<<<<<<< HEAD
@@ -651,24 +928,24 @@ static constexpr const char *NET_APP_PROTOCOL_VERSION = "net.app.protocol.versio
=======
* Remote socket peer name.
*/
-static constexpr const char *NET_SOCK_PEER_NAME = "net.sock.peer.name";
+static constexpr const char *kNetSockPeerName = "net.sock.peer.name";
/**
* Remote socket peer address: IPv4 or IPv6 for internet protocols, path for local communication, etc.
*/
-static constexpr const char *NET_SOCK_PEER_ADDR = "net.sock.peer.addr";
+static constexpr const char *kNetSockPeerAddr = "net.sock.peer.addr";
/**
* Remote socket peer port.
*/
-static constexpr const char *NET_SOCK_PEER_PORT = "net.sock.peer.port";
+static constexpr const char *kNetSockPeerPort = "net.sock.peer.port";
/**
* Protocol address
* family which is used for communication.
*/
-static constexpr const char *NET_SOCK_FAMILY = "net.sock.family";
+static constexpr const char *kNetSockFamily = "net.sock.family";
/**
* Logical remote hostname, see note below.
@@ -679,6 +956,7 @@ static constexpr const char *NET_SOCK_FAMILY = "net.sock.family";
lookup.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kNetPeerName = "net.peer.name";
/**
@@ -707,91 +985,126 @@ static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
static constexpr const char *kNetSockHostPort = "net.sock.host.port";
=======
static constexpr const char *NET_PEER_NAME = "net.peer.name";
+=======
+static constexpr const char *kNetPeerName = "net.peer.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Logical remote port number
*/
-static constexpr const char *NET_PEER_PORT = "net.peer.port";
+static constexpr const char *kNetPeerPort = "net.peer.port";
/**
* Logical local hostname or similar, see note below.
*/
-static constexpr const char *NET_HOST_NAME = "net.host.name";
+static constexpr const char *kNetHostName = "net.host.name";
/**
* Logical local port number, preferably the one that the peer used to connect
*/
-static constexpr const char *NET_HOST_PORT = "net.host.port";
+static constexpr const char *kNetHostPort = "net.host.port";
/**
* Local socket address. Useful in case of a multi-IP host.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *NET_HOST_NAME = "net.host.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
=======
static constexpr const char *NET_SOCK_HOST_ADDR = "net.sock.host.addr";
+=======
+static constexpr const char *kNetSockHostAddr = "net.sock.host.addr";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Local socket port number.
*/
+<<<<<<< HEAD
static constexpr const char *NET_SOCK_HOST_PORT = "net.sock.host.port";
>>>>>>> 5c1e16b8 ([Semantic Conventions] Align on the specification 1.13.0 (#1625))
+=======
+static constexpr const char *kNetSockHostPort = "net.sock.host.port";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The internet connection type currently being used by the host.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kNetHostConnectionType = "net.host.connection.type";
=======
static constexpr const char *NET_HOST_CONNECTION_TYPE = "net.host.connection.type";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kNetHostConnectionType = "net.host.connection.type";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* This describes more details regarding the connection.type. It may be the type of cell technology
* connection, but it could be used for describing details about a wifi connection.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kNetHostConnectionSubtype = "net.host.connection.subtype";
=======
static constexpr const char *NET_HOST_CONNECTION_SUBTYPE = "net.host.connection.subtype";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kNetHostConnectionSubtype = "net.host.connection.subtype";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the mobile carrier.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kNetHostCarrierName = "net.host.carrier.name";
=======
static constexpr const char *NET_HOST_CARRIER_NAME = "net.host.carrier.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kNetHostCarrierName = "net.host.carrier.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The mobile carrier country code.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kNetHostCarrierMcc = "net.host.carrier.mcc";
=======
static constexpr const char *NET_HOST_CARRIER_MCC = "net.host.carrier.mcc";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kNetHostCarrierMcc = "net.host.carrier.mcc";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The mobile carrier network code.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kNetHostCarrierMnc = "net.host.carrier.mnc";
=======
static constexpr const char *NET_HOST_CARRIER_MNC = "net.host.carrier.mnc";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kNetHostCarrierMnc = "net.host.carrier.mnc";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The ISO 3166-1 alpha-2 2-character country code associated with the mobile carrier network.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kNetHostCarrierIcc = "net.host.carrier.icc";
=======
static constexpr const char *NET_HOST_CARRIER_ICC = "net.host.carrier.icc";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kNetHostCarrierIcc = "net.host.carrier.icc";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The {@code service.name} of
@@ -799,10 +1112,14 @@ static constexpr const char *NET_HOST_CARRIER_ICC = "net.host.carrier.icc";
* remote service if any.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kPeerService = "peer.service";
=======
static constexpr const char *PEER_SERVICE = "peer.service";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kPeerService = "peer.service";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Username or client_id extracted from the access token or >>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kEnduserId = "enduser.id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Actual/assumed role the client is making the request under extracted from token or application
* security context.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kEnduserRole = "enduser.role";
=======
static constexpr const char *ENDUSER_ROLE = "enduser.role";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kEnduserRole = "enduser.role";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Scopes or granted authorities the client currently possesses extracted from token or application
@@ -834,37 +1159,53 @@ static constexpr const char *ENDUSER_ROLE = "enduser.role";
* Assertion.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kEnduserScope = "enduser.scope";
=======
static constexpr const char *ENDUSER_SCOPE = "enduser.scope";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kEnduserScope = "enduser.scope";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Current "managed" thread ID (as opposed to OS thread ID).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kThreadId = "thread.id";
=======
static constexpr const char *THREAD_ID = "thread.id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kThreadId = "thread.id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Current thread name.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kThreadName = "thread.name";
=======
static constexpr const char *THREAD_NAME = "thread.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kThreadName = "thread.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The method or function name, or equivalent (usually rightmost part of the code unit's name).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCodeFunction = "code.function";
=======
static constexpr const char *CODE_FUNCTION = "code.function";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kCodeFunction = "code.function";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The "namespace" within which {@code code.function} is defined. Usually the qualified
@@ -872,41 +1213,57 @@ static constexpr const char *CODE_FUNCTION = "code.function";
* form a unique identifier for the code unit.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCodeNamespace = "code.namespace";
=======
static constexpr const char *CODE_NAMESPACE = "code.namespace";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kCodeNamespace = "code.namespace";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The source code file name that identifies the code unit as uniquely as possible (preferably an
* absolute file path).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCodeFilepath = "code.filepath";
=======
static constexpr const char *CODE_FILEPATH = "code.filepath";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kCodeFilepath = "code.filepath";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The line number in {@code code.filepath} best representing the operation. It SHOULD point within
* the code unit named in {@code code.function}.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCodeLineno = "code.lineno";
=======
static constexpr const char *CODE_LINENO = "code.lineno";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kCodeLineno = "code.lineno";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* HTTP request method.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
static constexpr const char *kHttpMethod = "http.method";
/**
* HTTP response status code.
*/
static constexpr const char *kHttpStatusCode = "http.status_code";
+<<<<<<< HEAD
/**
* Kind of HTTP protocol used.
@@ -1015,6 +1372,8 @@ static constexpr const char *HTTP_SCHEME = "http.scheme";
* HTTP response status code.
*/
static constexpr const char *HTTP_STATUS_CODE = "http.status_code";
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Kind of HTTP protocol used.
@@ -1023,13 +1382,13 @@ static constexpr const char *HTTP_STATUS_CODE = "http.status_code";
- If {@code net.transport} is not specified, it can be assumed to be {@code IP.TCP} except
if {@code http.flavor} is {@code QUIC}, in which case {@code IP.UDP} is assumed.
*/
-static constexpr const char *HTTP_FLAVOR = "http.flavor";
+static constexpr const char *kHttpFlavor = "http.flavor";
/**
* Value of the HTTP
* User-Agent header sent by the client.
*/
-static constexpr const char *HTTP_USER_AGENT = "http.user_agent";
+static constexpr const char *kHttpUserAgent = "http.user_agent";
/**
* The size of the request payload body in bytes. This is the number of bytes transferred excluding
@@ -1037,7 +1396,7 @@ static constexpr const char *HTTP_USER_AGENT = "http.user_agent";
* href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length
* header. For requests using transport encoding, this should be the compressed size.
*/
-static constexpr const char *HTTP_REQUEST_CONTENT_LENGTH = "http.request_content_length";
+static constexpr const char *kHttpRequestContentLength = "http.request_content_length";
/**
* The size of the response payload body in bytes. This is the number of bytes transferred excluding
@@ -1045,7 +1404,7 @@ static constexpr const char *HTTP_REQUEST_CONTENT_LENGTH = "http.request_content
* href="https://www.rfc-editor.org/rfc/rfc9110.html#field.content-length">Content-Length
* header. For requests using transport encoding, this should be the compressed size.
*/
-static constexpr const char *HTTP_RESPONSE_CONTENT_LENGTH = "http.response_content_length";
+static constexpr const char *kHttpResponseContentLength = "http.response_content_length";
/**
* Full HTTP request URL in the form {@code scheme://host[:port]/path?query[#fragment]}. Usually the
@@ -1056,22 +1415,27 @@ static constexpr const char *HTTP_RESPONSE_CONTENT_LENGTH = "http.response_conte
https://username:password@www.example.com/}. In such case the attribute's value should be {@code
https://www.example.com/}.
*/
-static constexpr const char *HTTP_URL = "http.url";
+static constexpr const char *kHttpUrl = "http.url";
/**
- * The ordinal number of request re-sending attempt.
+ * The ordinal number of request resending attempt (for any reason, including redirects).
+ *
+ * Notes:
+
- 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).
*/
-static constexpr const char *HTTP_RETRY_COUNT = "http.retry_count";
+static constexpr const char *kHttpResendCount = "http.resend_count";
/**
* The URI scheme identifying the used protocol.
*/
-static constexpr const char *HTTP_SCHEME = "http.scheme";
+static constexpr const char *kHttpScheme = "http.scheme";
/**
* The full request target as passed in a HTTP request line or equivalent.
*/
-static constexpr const char *HTTP_TARGET = "http.target";
+static constexpr const char *kHttpTarget = "http.target";
/**
* The matched route (path template in the format used by the respective server framework). See note
@@ -1082,8 +1446,12 @@ static constexpr const char *HTTP_TARGET = "http.target";
framework as the route attribute should have low-cardinality and the URI path can NOT substitute
it.
*/
+<<<<<<< HEAD
static constexpr const char *HTTP_ROUTE = "http.route";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kHttpRoute = "http.route";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The IP address of the original client behind all proxies, if known (e.g. from
*/
static constexpr const char *kHttpClientIp = "http.client_ip";
+<<<<<<< HEAD
=======
- This is not necessarily the same as {@code net.peer.ip}, which would
=======
@@ -1119,201 +1488,287 @@ the closest proxy.
*/
static constexpr const char *HTTP_CLIENT_IP = "http.client_ip";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The keys in the {@code RequestItems} object field.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbTableNames = "aws.dynamodb.table_names";
=======
static constexpr const char *AWS_DYNAMODB_TABLE_NAMES = "aws.dynamodb.table_names";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbTableNames = "aws.dynamodb.table_names";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The JSON-serialized value of each item in the {@code ConsumedCapacity} response field.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbConsumedCapacity = "aws.dynamodb.consumed_capacity";
=======
static constexpr const char *AWS_DYNAMODB_CONSUMED_CAPACITY = "aws.dynamodb.consumed_capacity";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbConsumedCapacity = "aws.dynamodb.consumed_capacity";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The JSON-serialized value of the {@code ItemCollectionMetrics} response field.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbItemCollectionMetrics =
=======
static constexpr const char *AWS_DYNAMODB_ITEM_COLLECTION_METRICS =
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbItemCollectionMetrics =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"aws.dynamodb.item_collection_metrics";
/**
* The value of the {@code ProvisionedThroughput.ReadCapacityUnits} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbProvisionedReadCapacity =
=======
static constexpr const char *AWS_DYNAMODB_PROVISIONED_READ_CAPACITY =
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbProvisionedReadCapacity =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"aws.dynamodb.provisioned_read_capacity";
/**
* The value of the {@code ProvisionedThroughput.WriteCapacityUnits} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbProvisionedWriteCapacity =
=======
static constexpr const char *AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY =
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbProvisionedWriteCapacity =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"aws.dynamodb.provisioned_write_capacity";
/**
* The value of the {@code ConsistentRead} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbConsistentRead = "aws.dynamodb.consistent_read";
=======
static constexpr const char *AWS_DYNAMODB_CONSISTENT_READ = "aws.dynamodb.consistent_read";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbConsistentRead = "aws.dynamodb.consistent_read";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code ProjectionExpression} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbProjection = "aws.dynamodb.projection";
=======
static constexpr const char *AWS_DYNAMODB_PROJECTION = "aws.dynamodb.projection";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbProjection = "aws.dynamodb.projection";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code Limit} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbLimit = "aws.dynamodb.limit";
=======
static constexpr const char *AWS_DYNAMODB_LIMIT = "aws.dynamodb.limit";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbLimit = "aws.dynamodb.limit";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code AttributesToGet} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbAttributesToGet = "aws.dynamodb.attributes_to_get";
=======
static constexpr const char *AWS_DYNAMODB_ATTRIBUTES_TO_GET = "aws.dynamodb.attributes_to_get";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbAttributesToGet = "aws.dynamodb.attributes_to_get";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code IndexName} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbIndexName = "aws.dynamodb.index_name";
=======
static constexpr const char *AWS_DYNAMODB_INDEX_NAME = "aws.dynamodb.index_name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbIndexName = "aws.dynamodb.index_name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code Select} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbSelect = "aws.dynamodb.select";
=======
static constexpr const char *AWS_DYNAMODB_SELECT = "aws.dynamodb.select";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbSelect = "aws.dynamodb.select";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The JSON-serialized value of each item of the {@code GlobalSecondaryIndexes} request field
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbGlobalSecondaryIndexes =
=======
static constexpr const char *AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES =
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbGlobalSecondaryIndexes =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"aws.dynamodb.global_secondary_indexes";
/**
* The JSON-serialized value of each item of the {@code LocalSecondaryIndexes} request field.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbLocalSecondaryIndexes =
=======
static constexpr const char *AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES =
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbLocalSecondaryIndexes =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"aws.dynamodb.local_secondary_indexes";
/**
* The value of the {@code ExclusiveStartTableName} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbExclusiveStartTable = "aws.dynamodb.exclusive_start_table";
=======
static constexpr const char *AWS_DYNAMODB_EXCLUSIVE_START_TABLE =
"aws.dynamodb.exclusive_start_table";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbExclusiveStartTable = "aws.dynamodb.exclusive_start_table";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The the number of items in the {@code TableNames} response parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbTableCount = "aws.dynamodb.table_count";
=======
static constexpr const char *AWS_DYNAMODB_TABLE_COUNT = "aws.dynamodb.table_count";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbTableCount = "aws.dynamodb.table_count";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code ScanIndexForward} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbScanForward = "aws.dynamodb.scan_forward";
=======
static constexpr const char *AWS_DYNAMODB_SCAN_FORWARD = "aws.dynamodb.scan_forward";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbScanForward = "aws.dynamodb.scan_forward";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code Segment} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbSegment = "aws.dynamodb.segment";
=======
static constexpr const char *AWS_DYNAMODB_SEGMENT = "aws.dynamodb.segment";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbSegment = "aws.dynamodb.segment";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code TotalSegments} request parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbTotalSegments = "aws.dynamodb.total_segments";
=======
static constexpr const char *AWS_DYNAMODB_TOTAL_SEGMENTS = "aws.dynamodb.total_segments";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbTotalSegments = "aws.dynamodb.total_segments";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code Count} response parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbCount = "aws.dynamodb.count";
=======
static constexpr const char *AWS_DYNAMODB_COUNT = "aws.dynamodb.count";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbCount = "aws.dynamodb.count";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The value of the {@code ScannedCount} response parameter.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbScannedCount = "aws.dynamodb.scanned_count";
=======
static constexpr const char *AWS_DYNAMODB_SCANNED_COUNT = "aws.dynamodb.scanned_count";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbScannedCount = "aws.dynamodb.scanned_count";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The JSON-serialized value of each item in the {@code AttributeDefinitions} request field.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbAttributeDefinitions =
=======
static constexpr const char *AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS =
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsDynamodbAttributeDefinitions =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"aws.dynamodb.attribute_definitions";
/**
@@ -1321,6 +1776,7 @@ static constexpr const char *AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS =
* field.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsDynamodbGlobalSecondaryIndexUpdates =
"aws.dynamodb.global_secondary_index_updates";
@@ -1348,17 +1804,20 @@ static constexpr const char *kGraphqlDocument = "graphql.document";
static constexpr const char *kMessagingSystem = "messaging.system";
=======
static constexpr const char *AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES =
+=======
+static constexpr const char *kAwsDynamodbGlobalSecondaryIndexUpdates =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"aws.dynamodb.global_secondary_index_updates";
/**
* The name of the operation being executed.
*/
-static constexpr const char *GRAPHQL_OPERATION_NAME = "graphql.operation.name";
+static constexpr const char *kGraphqlOperationName = "graphql.operation.name";
/**
* The type of the operation being executed.
*/
-static constexpr const char *GRAPHQL_OPERATION_TYPE = "graphql.operation.type";
+static constexpr const char *kGraphqlOperationType = "graphql.operation.type";
/**
* The GraphQL document being executed.
@@ -1366,106 +1825,150 @@ static constexpr const char *GRAPHQL_OPERATION_TYPE = "graphql.operation.type";
* Notes:
- The value may be sanitized to exclude sensitive information.
*/
-static constexpr const char *GRAPHQL_DOCUMENT = "graphql.document";
+static constexpr const char *kGraphqlDocument = "graphql.document";
/**
* A string identifying the messaging system.
*/
+<<<<<<< HEAD
static constexpr const char *MESSAGING_SYSTEM = "messaging.system";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingSystem = "messaging.system";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The message destination name. This might be equal to the span name but is required nevertheless.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingDestination = "messaging.destination";
=======
static constexpr const char *MESSAGING_DESTINATION = "messaging.destination";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingDestination = "messaging.destination";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The kind of message destination
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingDestinationKind = "messaging.destination_kind";
=======
static constexpr const char *MESSAGING_DESTINATION_KIND = "messaging.destination_kind";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingDestinationKind = "messaging.destination_kind";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A boolean that is true if the message destination is temporary.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingTempDestination = "messaging.temp_destination";
=======
static constexpr const char *MESSAGING_TEMP_DESTINATION = "messaging.temp_destination";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingTempDestination = "messaging.temp_destination";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the transport protocol.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingProtocol = "messaging.protocol";
=======
static constexpr const char *MESSAGING_PROTOCOL = "messaging.protocol";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingProtocol = "messaging.protocol";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The version of the transport protocol.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingProtocolVersion = "messaging.protocol_version";
=======
static constexpr const char *MESSAGING_PROTOCOL_VERSION = "messaging.protocol_version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingProtocolVersion = "messaging.protocol_version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Connection string.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingUrl = "messaging.url";
=======
static constexpr const char *MESSAGING_URL = "messaging.url";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingUrl = "messaging.url";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A value used by the messaging system as an identifier for the message, represented as a string.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingMessageId = "messaging.message_id";
=======
static constexpr const char *MESSAGING_MESSAGE_ID = "messaging.message_id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingMessageId = "messaging.message_id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The conversation ID identifying the conversation to which the
* message belongs, represented as a string. Sometimes called "Correlation ID".
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingConversationId = "messaging.conversation_id";
=======
static constexpr const char *MESSAGING_CONVERSATION_ID = "messaging.conversation_id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingConversationId = "messaging.conversation_id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The (uncompressed) size of the message payload in bytes. Also use this attribute if it is unknown
* whether the compressed or uncompressed payload size is reported.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingMessagePayloadSizeBytes =
=======
static constexpr const char *MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES =
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingMessagePayloadSizeBytes =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"messaging.message_payload_size_bytes";
/**
* The compressed size of the message payload in bytes.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingMessagePayloadCompressedSizeBytes =
=======
static constexpr const char *MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES =
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingMessagePayloadCompressedSizeBytes =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"messaging.message_payload_compressed_size_bytes";
/**
@@ -1475,10 +1978,14 @@ static constexpr const char *MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES =
* case.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingOperation = "messaging.operation";
=======
static constexpr const char *MESSAGING_OPERATION = "messaging.operation";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingOperation = "messaging.operation";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The identifier for the consumer receiving a message. For Kafka, set it to {@code
@@ -1487,19 +1994,27 @@ static constexpr const char *MESSAGING_OPERATION = "messaging.operation";
* {@code client_id} of the client consuming the message.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingConsumerId = "messaging.consumer_id";
=======
static constexpr const char *MESSAGING_CONSUMER_ID = "messaging.consumer_id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingConsumerId = "messaging.consumer_id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* RabbitMQ message routing key.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingRabbitmqRoutingKey = "messaging.rabbitmq.routing_key";
=======
static constexpr const char *MESSAGING_RABBITMQ_ROUTING_KEY = "messaging.rabbitmq.routing_key";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingRabbitmqRoutingKey = "messaging.rabbitmq.routing_key";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Message keys in Kafka are used for grouping alike messages to ensure they're processed on the
@@ -1512,71 +2027,102 @@ static constexpr const char *MESSAGING_RABBITMQ_ROUTING_KEY = "messaging.rabbitm
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingKafkaMessageKey = "messaging.kafka.message_key";
=======
static constexpr const char *MESSAGING_KAFKA_MESSAGE_KEY = "messaging.kafka.message_key";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingKafkaMessageKey = "messaging.kafka.message_key";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Name of the Kafka Consumer Group that is handling the message. Only applies to consumers, not
* producers.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingKafkaConsumerGroup = "messaging.kafka.consumer_group";
=======
static constexpr const char *MESSAGING_KAFKA_CONSUMER_GROUP = "messaging.kafka.consumer_group";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingKafkaConsumerGroup = "messaging.kafka.consumer_group";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Client Id for the Consumer or Producer that is handling the message.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingKafkaClientId = "messaging.kafka.client_id";
=======
static constexpr const char *MESSAGING_KAFKA_CLIENT_ID = "messaging.kafka.client_id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingKafkaClientId = "messaging.kafka.client_id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Partition the message is sent to.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingKafkaPartition = "messaging.kafka.partition";
=======
static constexpr const char *MESSAGING_KAFKA_PARTITION = "messaging.kafka.partition";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingKafkaPartition = "messaging.kafka.partition";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A boolean that is true if the message is a tombstone.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingKafkaTombstone = "messaging.kafka.tombstone";
=======
static constexpr const char *MESSAGING_KAFKA_TOMBSTONE = "messaging.kafka.tombstone";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingKafkaTombstone = "messaging.kafka.tombstone";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Namespace of RocketMQ resources, resources in different namespaces are individual.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingRocketmqNamespace = "messaging.rocketmq.namespace";
=======
static constexpr const char *MESSAGING_ROCKETMQ_NAMESPACE = "messaging.rocketmq.namespace";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingRocketmqNamespace = "messaging.rocketmq.namespace";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Name of the RocketMQ producer/consumer group that is handling the message. The client type is
* identified by the SpanKind.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingRocketmqClientGroup = "messaging.rocketmq.client_group";
=======
static constexpr const char *MESSAGING_ROCKETMQ_CLIENT_GROUP = "messaging.rocketmq.client_group";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingRocketmqClientGroup = "messaging.rocketmq.client_group";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The unique identifier for each client.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
static constexpr const char *kMessagingRocketmqClientId = "messaging.rocketmq.client_id";
/**
@@ -1596,55 +2142,78 @@ static constexpr const char *kMessagingRocketmqDelayTimeLevel =
* processed one by one within the same consumer group.
*/
static constexpr const char *kMessagingRocketmqMessageGroup = "messaging.rocketmq.message_group";
+<<<<<<< HEAD
=======
static constexpr const char *MESSAGING_ROCKETMQ_CLIENT_ID = "messaging.rocketmq.client_id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Type of message.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingRocketmqMessageType = "messaging.rocketmq.message_type";
=======
static constexpr const char *MESSAGING_ROCKETMQ_MESSAGE_TYPE = "messaging.rocketmq.message_type";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingRocketmqMessageType = "messaging.rocketmq.message_type";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The secondary classifier of message besides topic.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingRocketmqMessageTag = "messaging.rocketmq.message_tag";
=======
static constexpr const char *MESSAGING_ROCKETMQ_MESSAGE_TAG = "messaging.rocketmq.message_tag";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingRocketmqMessageTag = "messaging.rocketmq.message_tag";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Key(s) of message, another way to mark message besides message id.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingRocketmqMessageKeys = "messaging.rocketmq.message_keys";
=======
static constexpr const char *MESSAGING_ROCKETMQ_MESSAGE_KEYS = "messaging.rocketmq.message_keys";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingRocketmqMessageKeys = "messaging.rocketmq.message_keys";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Model of message consumption. This only applies to consumer spans.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kMessagingRocketmqConsumptionModel =
=======
static constexpr const char *MESSAGING_ROCKETMQ_CONSUMPTION_MODEL =
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kMessagingRocketmqConsumptionModel =
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
"messaging.rocketmq.consumption_model";
/**
* A string identifying the remoting system. See below for a list of well-known identifiers.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kRpcSystem = "rpc.system";
=======
static constexpr const char *RPC_SYSTEM = "rpc.system";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kRpcSystem = "rpc.system";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The full (logical) name of the service being called, including its package name, if applicable.
@@ -1657,10 +2226,14 @@ static constexpr const char *RPC_SYSTEM = "rpc.system";
side).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kRpcService = "rpc.service";
=======
static constexpr const char *RPC_SERVICE = "rpc.service";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kRpcService = "rpc.service";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the (logical) method being called, must be equal to the $method part in the span
@@ -1673,30 +2246,42 @@ static constexpr const char *RPC_SERVICE = "rpc.service";
client stub method on the client side).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kRpcMethod = "rpc.method";
=======
static constexpr const char *RPC_METHOD = "rpc.method";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kRpcMethod = "rpc.method";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The numeric status
* code of the gRPC request.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kRpcGrpcStatusCode = "rpc.grpc.status_code";
=======
static constexpr const char *RPC_GRPC_STATUS_CODE = "rpc.grpc.status_code";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kRpcGrpcStatusCode = "rpc.grpc.status_code";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Protocol version as in {@code jsonrpc} property of request/response. Since JSON-RPC 1.0 does not
* specify this, the value can be omitted.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kRpcJsonrpcVersion = "rpc.jsonrpc.version";
=======
static constexpr const char *RPC_JSONRPC_VERSION = "rpc.jsonrpc.version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kRpcJsonrpcVersion = "rpc.jsonrpc.version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* {@code id} property of request or response. Since protocol allows id to be int, string, {@code
@@ -1704,24 +2289,33 @@ static constexpr const char *RPC_JSONRPC_VERSION = "rpc.jsonrpc.version";
* empty string in case of {@code null} value. Omit entirely if this is a notification.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kRpcJsonrpcRequestId = "rpc.jsonrpc.request_id";
=======
static constexpr const char *RPC_JSONRPC_REQUEST_ID = "rpc.jsonrpc.request_id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kRpcJsonrpcRequestId = "rpc.jsonrpc.request_id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* {@code error.code} property of response if it is an error response.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code";
=======
static constexpr const char *RPC_JSONRPC_ERROR_CODE = "rpc.jsonrpc.error_code";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kRpcJsonrpcErrorCode = "rpc.jsonrpc.error_code";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* {@code error.message} property of response if it is an error response.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message";
// Enum definitions
@@ -1743,31 +2337,39 @@ static constexpr const char *kChildOf = "child_of";
static constexpr const char *kFollowsFrom = "follows_from";
=======
static constexpr const char *RPC_JSONRPC_ERROR_MESSAGE = "rpc.jsonrpc.error_message";
+=======
+static constexpr const char *kRpcJsonrpcErrorMessage = "rpc.jsonrpc.error_message";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
// Enum definitions
namespace EventDomainValues
{
/** Events from browser apps. */
-static constexpr const char *BROWSER = "browser";
+static constexpr const char *kBrowser = "browser";
/** Events from mobile apps. */
-static constexpr const char *DEVICE = "device";
+static constexpr const char *kDevice = "device";
/** Events from Kubernetes. */
-static constexpr const char *K8S = "k8s";
+static constexpr const char *kK8s = "k8s";
} // namespace EventDomainValues
namespace OpentracingRefTypeValues
{
/** The parent Span depends on the child Span in some capacity. */
-static constexpr const char *CHILD_OF = "child_of";
+static constexpr const char *kChildOf = "child_of";
/** The parent Span does not depend in any way on the result of the child Span. */
+<<<<<<< HEAD
static constexpr const char *FOLLOWS_FROM = "follows_from";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFollowsFrom = "follows_from";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace OpentracingRefTypeValues
namespace DbSystemValues
{
/** Some other SQL database. Fallback only. See notes. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kOtherSql = "other_sql";
/** Microsoft SQL Server. */
static constexpr const char *kMssql = "mssql";
@@ -1865,97 +2467,101 @@ static constexpr const char *kCockroachdb = "cockroachdb";
static constexpr const char *kOpensearch = "opensearch";
=======
static constexpr const char *OTHER_SQL = "other_sql";
+=======
+static constexpr const char *kOtherSql = "other_sql";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** Microsoft SQL Server. */
-static constexpr const char *MSSQL = "mssql";
+static constexpr const char *kMssql = "mssql";
/** MySQL. */
-static constexpr const char *MYSQL = "mysql";
+static constexpr const char *kMysql = "mysql";
/** Oracle Database. */
-static constexpr const char *ORACLE = "oracle";
+static constexpr const char *kOracle = "oracle";
/** IBM Db2. */
-static constexpr const char *DB2 = "db2";
+static constexpr const char *kDb2 = "db2";
/** PostgreSQL. */
-static constexpr const char *POSTGRESQL = "postgresql";
+static constexpr const char *kPostgresql = "postgresql";
/** Amazon Redshift. */
-static constexpr const char *REDSHIFT = "redshift";
+static constexpr const char *kRedshift = "redshift";
/** Apache Hive. */
-static constexpr const char *HIVE = "hive";
+static constexpr const char *kHive = "hive";
/** Cloudscape. */
-static constexpr const char *CLOUDSCAPE = "cloudscape";
+static constexpr const char *kCloudscape = "cloudscape";
/** HyperSQL DataBase. */
-static constexpr const char *HSQLDB = "hsqldb";
+static constexpr const char *kHsqldb = "hsqldb";
/** Progress Database. */
-static constexpr const char *PROGRESS = "progress";
+static constexpr const char *kProgress = "progress";
/** SAP MaxDB. */
-static constexpr const char *MAXDB = "maxdb";
+static constexpr const char *kMaxdb = "maxdb";
/** SAP HANA. */
-static constexpr const char *HANADB = "hanadb";
+static constexpr const char *kHanadb = "hanadb";
/** Ingres. */
-static constexpr const char *INGRES = "ingres";
+static constexpr const char *kIngres = "ingres";
/** FirstSQL. */
-static constexpr const char *FIRSTSQL = "firstsql";
+static constexpr const char *kFirstsql = "firstsql";
/** EnterpriseDB. */
-static constexpr const char *EDB = "edb";
+static constexpr const char *kEdb = "edb";
/** InterSystems Caché. */
-static constexpr const char *CACHE = "cache";
+static constexpr const char *kCache = "cache";
/** Adabas (Adaptable Database System). */
-static constexpr const char *ADABAS = "adabas";
+static constexpr const char *kAdabas = "adabas";
/** Firebird. */
-static constexpr const char *FIREBIRD = "firebird";
+static constexpr const char *kFirebird = "firebird";
/** Apache Derby. */
-static constexpr const char *DERBY = "derby";
+static constexpr const char *kDerby = "derby";
/** FileMaker. */
-static constexpr const char *FILEMAKER = "filemaker";
+static constexpr const char *kFilemaker = "filemaker";
/** Informix. */
-static constexpr const char *INFORMIX = "informix";
+static constexpr const char *kInformix = "informix";
/** InstantDB. */
-static constexpr const char *INSTANTDB = "instantdb";
+static constexpr const char *kInstantdb = "instantdb";
/** InterBase. */
-static constexpr const char *INTERBASE = "interbase";
+static constexpr const char *kInterbase = "interbase";
/** MariaDB. */
-static constexpr const char *MARIADB = "mariadb";
+static constexpr const char *kMariadb = "mariadb";
/** Netezza. */
-static constexpr const char *NETEZZA = "netezza";
+static constexpr const char *kNetezza = "netezza";
/** Pervasive PSQL. */
-static constexpr const char *PERVASIVE = "pervasive";
+static constexpr const char *kPervasive = "pervasive";
/** PointBase. */
-static constexpr const char *POINTBASE = "pointbase";
+static constexpr const char *kPointbase = "pointbase";
/** SQLite. */
-static constexpr const char *SQLITE = "sqlite";
+static constexpr const char *kSqlite = "sqlite";
/** Sybase. */
-static constexpr const char *SYBASE = "sybase";
+static constexpr const char *kSybase = "sybase";
/** Teradata. */
-static constexpr const char *TERADATA = "teradata";
+static constexpr const char *kTeradata = "teradata";
/** Vertica. */
-static constexpr const char *VERTICA = "vertica";
+static constexpr const char *kVertica = "vertica";
/** H2. */
-static constexpr const char *H2 = "h2";
+static constexpr const char *kH2 = "h2";
/** ColdFusion IMQ. */
-static constexpr const char *COLDFUSION = "coldfusion";
+static constexpr const char *kColdfusion = "coldfusion";
/** Apache Cassandra. */
-static constexpr const char *CASSANDRA = "cassandra";
+static constexpr const char *kCassandra = "cassandra";
/** Apache HBase. */
-static constexpr const char *HBASE = "hbase";
+static constexpr const char *kHbase = "hbase";
/** MongoDB. */
-static constexpr const char *MONGODB = "mongodb";
+static constexpr const char *kMongodb = "mongodb";
/** Redis. */
-static constexpr const char *REDIS = "redis";
+static constexpr const char *kRedis = "redis";
/** Couchbase. */
-static constexpr const char *COUCHBASE = "couchbase";
+static constexpr const char *kCouchbase = "couchbase";
/** CouchDB. */
-static constexpr const char *COUCHDB = "couchdb";
+static constexpr const char *kCouchdb = "couchdb";
/** Microsoft Azure Cosmos DB. */
-static constexpr const char *COSMOSDB = "cosmosdb";
+static constexpr const char *kCosmosdb = "cosmosdb";
/** Amazon DynamoDB. */
-static constexpr const char *DYNAMODB = "dynamodb";
+static constexpr const char *kDynamodb = "dynamodb";
/** Neo4j. */
-static constexpr const char *NEO4J = "neo4j";
+static constexpr const char *kNeo4j = "neo4j";
/** Apache Geode. */
-static constexpr const char *GEODE = "geode";
+static constexpr const char *kGeode = "geode";
/** Elasticsearch. */
-static constexpr const char *ELASTICSEARCH = "elasticsearch";
+static constexpr const char *kElasticsearch = "elasticsearch";
/** Memcached. */
-static constexpr const char *MEMCACHED = "memcached";
+static constexpr const char *kMemcached = "memcached";
/** CockroachDB. */
+<<<<<<< HEAD
static constexpr const char *COCKROACHDB = "cockroachdb";
<<<<<<< HEAD
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
@@ -1963,12 +2569,18 @@ static constexpr const char *COCKROACHDB = "cockroachdb";
/** OpenSearch. */
static constexpr const char *OPENSEARCH = "opensearch";
>>>>>>> 5c1e16b8 ([Semantic Conventions] Align on the specification 1.13.0 (#1625))
+=======
+static constexpr const char *kCockroachdb = "cockroachdb";
+/** OpenSearch. */
+static constexpr const char *kOpensearch = "opensearch";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace DbSystemValues
namespace DbCassandraConsistencyLevelValues
{
/** all. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAll = "all";
/** each_quorum. */
static constexpr const char *kEachQuorum = "each_quorum";
@@ -2015,47 +2627,64 @@ static constexpr const char *kTimer = "timer";
static constexpr const char *kOther = "other";
=======
static constexpr const char *ALL = "all";
+=======
+static constexpr const char *kAll = "all";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** each_quorum. */
-static constexpr const char *EACH_QUORUM = "each_quorum";
+static constexpr const char *kEachQuorum = "each_quorum";
/** quorum. */
-static constexpr const char *QUORUM = "quorum";
+static constexpr const char *kQuorum = "quorum";
/** local_quorum. */
-static constexpr const char *LOCAL_QUORUM = "local_quorum";
+static constexpr const char *kLocalQuorum = "local_quorum";
/** one. */
-static constexpr const char *ONE = "one";
+static constexpr const char *kOne = "one";
/** two. */
-static constexpr const char *TWO = "two";
+static constexpr const char *kTwo = "two";
/** three. */
-static constexpr const char *THREE = "three";
+static constexpr const char *kThree = "three";
/** local_one. */
-static constexpr const char *LOCAL_ONE = "local_one";
+static constexpr const char *kLocalOne = "local_one";
/** any. */
-static constexpr const char *ANY = "any";
+static constexpr const char *kAny = "any";
/** serial. */
-static constexpr const char *SERIAL = "serial";
+static constexpr const char *kSerial = "serial";
/** local_serial. */
-static constexpr const char *LOCAL_SERIAL = "local_serial";
+static constexpr const char *kLocalSerial = "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 *kOk = "OK";
+/** The operation contains an error. */
+static constexpr const char *kError = "ERROR";
+} // namespace OtelStatusCodeValues
+
namespace FaasTriggerValues
{
/** A response to some data source operation such as a database or filesystem read/write. */
-static constexpr const char *DATASOURCE = "datasource";
+static constexpr const char *kDatasource = "datasource";
/** To provide an answer to an inbound HTTP request. */
-static constexpr const char *HTTP = "http";
+static constexpr const char *kHttp = "http";
/** A function is set to be executed when messages are sent to a messaging system. */
-static constexpr const char *PUBSUB = "pubsub";
+static constexpr const char *kPubsub = "pubsub";
/** A function is scheduled to be executed regularly. */
-static constexpr const char *TIMER = "timer";
+static constexpr const char *kTimer = "timer";
/** If none of the others apply. */
+<<<<<<< HEAD
static constexpr const char *OTHER = "other";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kOther = "other";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace FaasTriggerValues
namespace FaasDocumentOperationValues
{
/** When a new object is created. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kInsert = "insert";
/** When an object is modified. */
static constexpr const char *kEdit = "edit";
@@ -2063,17 +2692,25 @@ static constexpr const char *kEdit = "edit";
static constexpr const char *kDelete = "delete";
=======
static constexpr const char *INSERT = "insert";
+=======
+static constexpr const char *kInsert = "insert";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** When an object is modified. */
-static constexpr const char *EDIT = "edit";
+static constexpr const char *kEdit = "edit";
/** When an object is deleted. */
+<<<<<<< HEAD
static constexpr const char *DELETE = "delete";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kDelete = "delete";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace FaasDocumentOperationValues
namespace FaasInvokedProviderValues
{
/** Alibaba Cloud. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAlibabaCloud = "alibaba_cloud";
/** Amazon Web Services. */
static constexpr const char *kAws = "aws";
@@ -2085,21 +2722,29 @@ static constexpr const char *kGcp = "gcp";
static constexpr const char *kTencentCloud = "tencent_cloud";
=======
static constexpr const char *ALIBABA_CLOUD = "alibaba_cloud";
+=======
+static constexpr const char *kAlibabaCloud = "alibaba_cloud";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** Amazon Web Services. */
-static constexpr const char *AWS = "aws";
+static constexpr const char *kAws = "aws";
/** Microsoft Azure. */
-static constexpr const char *AZURE = "azure";
+static constexpr const char *kAzure = "azure";
/** Google Cloud Platform. */
-static constexpr const char *GCP = "gcp";
+static constexpr const char *kGcp = "gcp";
/** Tencent Cloud. */
+<<<<<<< HEAD
static constexpr const char *TENCENT_CLOUD = "tencent_cloud";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kTencentCloud = "tencent_cloud";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace FaasInvokedProviderValues
namespace NetTransportValues
{
/** ip_tcp. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kIpTcp = "ip_tcp";
/** ip_udp. */
static constexpr const char *kIpUdp = "ip_udp";
@@ -2135,45 +2780,53 @@ static constexpr const char *kUnavailable = "unavailable";
static constexpr const char *kUnknown = "unknown";
=======
static constexpr const char *IP_TCP = "ip_tcp";
+=======
+static constexpr const char *kIpTcp = "ip_tcp";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** ip_udp. */
-static constexpr const char *IP_UDP = "ip_udp";
+static constexpr const char *kIpUdp = "ip_udp";
/** Named or anonymous pipe. See note below. */
-static constexpr const char *PIPE = "pipe";
+static constexpr const char *kPipe = "pipe";
/** In-process communication. */
-static constexpr const char *INPROC = "inproc";
+static constexpr const char *kInproc = "inproc";
/** Something else (non IP-based). */
-static constexpr const char *OTHER = "other";
+static constexpr const char *kOther = "other";
} // namespace NetTransportValues
namespace NetSockFamilyValues
{
/** IPv4 address. */
-static constexpr const char *INET = "inet";
+static constexpr const char *kInet = "inet";
/** IPv6 address. */
-static constexpr const char *INET6 = "inet6";
+static constexpr const char *kInet6 = "inet6";
/** Unix domain socket path. */
-static constexpr const char *UNIX = "unix";
+static constexpr const char *kUnix = "unix";
} // namespace NetSockFamilyValues
namespace NetHostConnectionTypeValues
{
/** wifi. */
-static constexpr const char *WIFI = "wifi";
+static constexpr const char *kWifi = "wifi";
/** wired. */
-static constexpr const char *WIRED = "wired";
+static constexpr const char *kWired = "wired";
/** cell. */
-static constexpr const char *CELL = "cell";
+static constexpr const char *kCell = "cell";
/** unavailable. */
-static constexpr const char *UNAVAILABLE = "unavailable";
+static constexpr const char *kUnavailable = "unavailable";
/** unknown. */
+<<<<<<< HEAD
static constexpr const char *UNKNOWN = "unknown";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kUnknown = "unknown";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace NetHostConnectionTypeValues
namespace NetHostConnectionSubtypeValues
{
/** GPRS. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kGprs = "gprs";
/** EDGE. */
static constexpr const char *kEdge = "edge";
@@ -2217,53 +2870,61 @@ static constexpr const char *kNrnsa = "nrnsa";
static constexpr const char *kLteCa = "lte_ca";
=======
static constexpr const char *GPRS = "gprs";
+=======
+static constexpr const char *kGprs = "gprs";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** EDGE. */
-static constexpr const char *EDGE = "edge";
+static constexpr const char *kEdge = "edge";
/** UMTS. */
-static constexpr const char *UMTS = "umts";
+static constexpr const char *kUmts = "umts";
/** CDMA. */
-static constexpr const char *CDMA = "cdma";
+static constexpr const char *kCdma = "cdma";
/** EVDO Rel. 0. */
-static constexpr const char *EVDO_0 = "evdo_0";
+static constexpr const char *kEvdo0 = "evdo_0";
/** EVDO Rev. A. */
-static constexpr const char *EVDO_A = "evdo_a";
+static constexpr const char *kEvdoA = "evdo_a";
/** CDMA2000 1XRTT. */
-static constexpr const char *CDMA2000_1XRTT = "cdma2000_1xrtt";
+static constexpr const char *kCdma20001xrtt = "cdma2000_1xrtt";
/** HSDPA. */
-static constexpr const char *HSDPA = "hsdpa";
+static constexpr const char *kHsdpa = "hsdpa";
/** HSUPA. */
-static constexpr const char *HSUPA = "hsupa";
+static constexpr const char *kHsupa = "hsupa";
/** HSPA. */
-static constexpr const char *HSPA = "hspa";
+static constexpr const char *kHspa = "hspa";
/** IDEN. */
-static constexpr const char *IDEN = "iden";
+static constexpr const char *kIden = "iden";
/** EVDO Rev. B. */
-static constexpr const char *EVDO_B = "evdo_b";
+static constexpr const char *kEvdoB = "evdo_b";
/** LTE. */
-static constexpr const char *LTE = "lte";
+static constexpr const char *kLte = "lte";
/** EHRPD. */
-static constexpr const char *EHRPD = "ehrpd";
+static constexpr const char *kEhrpd = "ehrpd";
/** HSPAP. */
-static constexpr const char *HSPAP = "hspap";
+static constexpr const char *kHspap = "hspap";
/** GSM. */
-static constexpr const char *GSM = "gsm";
+static constexpr const char *kGsm = "gsm";
/** TD-SCDMA. */
-static constexpr const char *TD_SCDMA = "td_scdma";
+static constexpr const char *kTdScdma = "td_scdma";
/** IWLAN. */
-static constexpr const char *IWLAN = "iwlan";
+static constexpr const char *kIwlan = "iwlan";
/** 5G NR (New Radio). */
-static constexpr const char *NR = "nr";
+static constexpr const char *kNr = "nr";
/** 5G NRNSA (New Radio Non-Standalone). */
-static constexpr const char *NRNSA = "nrnsa";
+static constexpr const char *kNrnsa = "nrnsa";
/** LTE CA. */
+<<<<<<< HEAD
static constexpr const char *LTE_CA = "lte_ca";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kLteCa = "lte_ca";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace NetHostConnectionSubtypeValues
namespace HttpFlavorValues
{
/** HTTP/1.0. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kHttp10 = "1.0";
/** HTTP/1.1. */
static constexpr const char *kHttp11 = "1.1";
@@ -2295,41 +2956,49 @@ static constexpr const char *kQueue = "queue";
static constexpr const char *kTopic = "topic";
=======
static constexpr const char *HTTP_1_0 = "1.0";
+=======
+static constexpr const char *kHttp10 = "1.0";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** HTTP/1.1. */
-static constexpr const char *HTTP_1_1 = "1.1";
+static constexpr const char *kHttp11 = "1.1";
/** HTTP/2. */
-static constexpr const char *HTTP_2_0 = "2.0";
+static constexpr const char *kHttp20 = "2.0";
/** HTTP/3. */
-static constexpr const char *HTTP_3_0 = "3.0";
+static constexpr const char *kHttp30 = "3.0";
/** SPDY protocol. */
-static constexpr const char *SPDY = "SPDY";
+static constexpr const char *kSpdy = "SPDY";
/** QUIC protocol. */
-static constexpr const char *QUIC = "QUIC";
+static constexpr const char *kQuic = "QUIC";
} // namespace HttpFlavorValues
namespace GraphqlOperationTypeValues
{
/** GraphQL query. */
-static constexpr const char *QUERY = "query";
+static constexpr const char *kQuery = "query";
/** GraphQL mutation. */
-static constexpr const char *MUTATION = "mutation";
+static constexpr const char *kMutation = "mutation";
/** GraphQL subscription. */
-static constexpr const char *SUBSCRIPTION = "subscription";
+static constexpr const char *kSubscription = "subscription";
} // namespace GraphqlOperationTypeValues
namespace MessagingDestinationKindValues
{
/** A message sent to a queue. */
-static constexpr const char *QUEUE = "queue";
+static constexpr const char *kQueue = "queue";
/** A message sent to a topic. */
+<<<<<<< HEAD
static constexpr const char *TOPIC = "topic";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kTopic = "topic";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace MessagingDestinationKindValues
namespace MessagingOperationValues
{
/** receive. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kReceive = "receive";
/** process. */
static constexpr const char *kProcess = "process";
@@ -2338,12 +3007,18 @@ static constexpr const char *RECEIVE = "receive";
/** process. */
static constexpr const char *PROCESS = "process";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kReceive = "receive";
+/** process. */
+static constexpr const char *kProcess = "process";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace MessagingOperationValues
namespace MessagingRocketmqMessageTypeValues
{
/** Normal message. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kNormal = "normal";
/** FIFO message. */
static constexpr const char *kFifo = "fifo";
@@ -2353,19 +3028,27 @@ static constexpr const char *kDelay = "delay";
static constexpr const char *kTransaction = "transaction";
=======
static constexpr const char *NORMAL = "normal";
+=======
+static constexpr const char *kNormal = "normal";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** FIFO message. */
-static constexpr const char *FIFO = "fifo";
+static constexpr const char *kFifo = "fifo";
/** Delay message. */
-static constexpr const char *DELAY = "delay";
+static constexpr const char *kDelay = "delay";
/** Transaction message. */
+<<<<<<< HEAD
static constexpr const char *TRANSACTION = "transaction";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kTransaction = "transaction";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace MessagingRocketmqMessageTypeValues
namespace MessagingRocketmqConsumptionModelValues
{
/** Clustering consumption model. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kClustering = "clustering";
/** Broadcasting consumption model. */
static constexpr const char *kBroadcasting = "broadcasting";
@@ -2374,12 +3057,18 @@ static constexpr const char *CLUSTERING = "clustering";
/** Broadcasting consumption model. */
static constexpr const char *BROADCASTING = "broadcasting";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kClustering = "clustering";
+/** Broadcasting consumption model. */
+static constexpr const char *kBroadcasting = "broadcasting";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace MessagingRocketmqConsumptionModelValues
namespace RpcSystemValues
{
/** gRPC. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kGrpc = "grpc";
/** Java RMI. */
static constexpr const char *kJavaRmi = "java_rmi";
@@ -2389,19 +3078,27 @@ static constexpr const char *kDotnetWcf = "dotnet_wcf";
static constexpr const char *kApacheDubbo = "apache_dubbo";
=======
static constexpr const char *GRPC = "grpc";
+=======
+static constexpr const char *kGrpc = "grpc";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** Java RMI. */
-static constexpr const char *JAVA_RMI = "java_rmi";
+static constexpr const char *kJavaRmi = "java_rmi";
/** .NET WCF. */
-static constexpr const char *DOTNET_WCF = "dotnet_wcf";
+static constexpr const char *kDotnetWcf = "dotnet_wcf";
/** Apache Dubbo. */
+<<<<<<< HEAD
static constexpr const char *APACHE_DUBBO = "apache_dubbo";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kApacheDubbo = "apache_dubbo";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace RpcSystemValues
namespace RpcGrpcStatusCodeValues
{
/** OK. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const int kOk = 0;
/** CANCELLED. */
static constexpr const int kCancelled = 1;
@@ -2439,38 +3136,41 @@ static constexpr const int kUnauthenticated = 16;
=======
static constexpr const int OK = 0;
+=======
+static constexpr const int kOk = 0;
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** CANCELLED. */
-static constexpr const int CANCELLED = 1;
+static constexpr const int kCancelled = 1;
/** UNKNOWN. */
-static constexpr const int UNKNOWN = 2;
+static constexpr const int kUnknown = 2;
/** INVALID_ARGUMENT. */
-static constexpr const int INVALID_ARGUMENT = 3;
+static constexpr const int kInvalidArgument = 3;
/** DEADLINE_EXCEEDED. */
-static constexpr const int DEADLINE_EXCEEDED = 4;
+static constexpr const int kDeadlineExceeded = 4;
/** NOT_FOUND. */
-static constexpr const int NOT_FOUND = 5;
+static constexpr const int kNotFound = 5;
/** ALREADY_EXISTS. */
-static constexpr const int ALREADY_EXISTS = 6;
+static constexpr const int kAlreadyExists = 6;
/** PERMISSION_DENIED. */
-static constexpr const int PERMISSION_DENIED = 7;
+static constexpr const int kPermissionDenied = 7;
/** RESOURCE_EXHAUSTED. */
-static constexpr const int RESOURCE_EXHAUSTED = 8;
+static constexpr const int kResourceExhausted = 8;
/** FAILED_PRECONDITION. */
-static constexpr const int FAILED_PRECONDITION = 9;
+static constexpr const int kFailedPrecondition = 9;
/** ABORTED. */
-static constexpr const int ABORTED = 10;
+static constexpr const int kAborted = 10;
/** OUT_OF_RANGE. */
-static constexpr const int OUT_OF_RANGE = 11;
+static constexpr const int kOutOfRange = 11;
/** UNIMPLEMENTED. */
-static constexpr const int UNIMPLEMENTED = 12;
+static constexpr const int kUnimplemented = 12;
/** INTERNAL. */
-static constexpr const int INTERNAL = 13;
+static constexpr const int kInternal = 13;
/** UNAVAILABLE. */
-static constexpr const int UNAVAILABLE = 14;
+static constexpr const int kUnavailable = 14;
/** DATA_LOSS. */
-static constexpr const int DATA_LOSS = 15;
+static constexpr const int kDataLoss = 15;
/** UNAUTHENTICATED. */
-static constexpr const int UNAUTHENTICATED = 16;
+static constexpr const int kUnauthenticated = 16;
} // namespace RpcGrpcStatusCodeValues
<<<<<<< HEAD
diff --git a/buildscripts/semantic-convention/generate.sh b/buildscripts/semantic-convention/generate.sh
index 8c8e3f61cd..a77100a5b0 100755
--- a/buildscripts/semantic-convention/generate.sh
+++ b/buildscripts/semantic-convention/generate.sh
@@ -13,6 +13,9 @@ ROOT_DIR="${SCRIPT_DIR}/../../"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
SEMCONV_VERSION=1.15.0
SPEC_VERSION=v$SEMCONV_VERSION
SCHEMA_URL=https://opentelemetry.io/schemas/$SEMCONV_VERSION
diff --git a/buildscripts/semantic-convention/templates/SemanticAttributes.h.j2 b/buildscripts/semantic-convention/templates/SemanticAttributes.h.j2
index 52f57a50e2..f51455cbc4 100644
--- a/buildscripts/semantic-convention/templates/SemanticAttributes.h.j2
+++ b/buildscripts/semantic-convention/templates/SemanticAttributes.h.j2
@@ -41,6 +41,7 @@
#include "opentelemetry/version.h"
+<<<<<<< HEAD
<<<<<<< HEAD
=======
{%- if semconv == "trace" %}
@@ -59,6 +60,8 @@
{% endif %}
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
OPENTELEMETRY_BEGIN_NAMESPACE
{{namespace_open}}
@@ -68,10 +71,14 @@ namespace {{class}}
* The URL of the OpenTelemetry schema for these keys and values.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kSchemaUrl = "{{schemaUrl}}";
=======
static constexpr const char *SCHEMA_URL = "{{schemaUrl}}";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kSchemaUrl = "{{schemaUrl}}";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{%- for attribute in attributes if attribute.is_local and not attribute.ref %}
/**
@@ -90,10 +97,14 @@ static constexpr const char *SCHEMA_URL = "{{schemaUrl}}";
@Deprecated
{%- endif %}
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *k{{attribute.fqn | to_camelcase(True)}} = "{{attribute.fqn}}";
=======
static constexpr const char *{{attribute.fqn | to_const_name}} = "{{attribute.fqn}}";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *k{{attribute.fqn | to_camelcase(True)}} = "{{attribute.fqn}}";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{%- endfor %}
// Enum definitions
@@ -105,11 +116,15 @@ namespace {{enum_name}}
{
{%- for member in attribute.attr_type.members %}
/** {% filter escape %}{{member.brief | to_doc_brief}}.{% endfilter %} */
+<<<<<<< HEAD
<<<<<<< HEAD
static constexpr const {{ type }} k{{ member.member_id | to_camelcase(True) }} = {{ print_value(type, member.value) }};
=======
static constexpr const {{ type }} {{ member.member_id | to_const_name }} = {{ print_value(type, member.value) }};
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ static constexpr const {{ type }} k{{ member.member_id | to_camelcase(True) }} = {{ print_value(type, member.value) }};
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{%- endfor %}
}
{% endif %}
diff --git a/examples/grpc/client.cc b/examples/grpc/client.cc
index ebe64acf9a..e7055f3e4b 100644
--- a/examples/grpc/client.cc
+++ b/examples/grpc/client.cc
@@ -48,11 +48,15 @@ class GreeterClient
auto span = get_tracer("grpc")->StartSpan(
span_name,
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{{SemanticConventions::kRpcSystem, "grpc"},
{SemanticConventions::kRpcService, "grpc-example.GreetService"},
{SemanticConventions::kRpcMethod, "Greet"},
{SemanticConventions::kNetSockPeerAddr, ip},
{SemanticConventions::kNetPeerPort, port}},
+<<<<<<< HEAD
=======
{{SemanticConventions::RPC_SYSTEM, "grpc"},
{SemanticConventions::RPC_SERVICE, "grpc-example.GreetService"},
@@ -60,6 +64,8 @@ class GreeterClient
{SemanticConventions::NET_SOCK_PEER_ADDR, ip},
{SemanticConventions::NET_PEER_PORT, port}},
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
options);
auto scope = get_tracer("grpc-client")->WithActiveSpan(span);
@@ -75,11 +81,15 @@ class GreeterClient
if (status.ok())
{
span->SetStatus(StatusCode::kOk);
+<<<<<<< HEAD
<<<<<<< HEAD
span->SetAttribute(SemanticConventions::kRpcGrpcStatusCode, status.error_code());
=======
span->SetAttribute(SemanticConventions::RPC_GRPC_STATUS_CODE, status.error_code());
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ span->SetAttribute(SemanticConventions::kRpcGrpcStatusCode, status.error_code());
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
// Make sure to end your spans!
span->End();
return response.response();
@@ -88,11 +98,15 @@ class GreeterClient
{
std::cout << status.error_code() << ": " << status.error_message() << std::endl;
span->SetStatus(StatusCode::kError);
+<<<<<<< HEAD
<<<<<<< HEAD
span->SetAttribute(SemanticConventions::kRpcGrpcStatusCode, status.error_code());
=======
span->SetAttribute(SemanticConventions::RPC_GRPC_STATUS_CODE, status.error_code());
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ span->SetAttribute(SemanticConventions::kRpcGrpcStatusCode, status.error_code());
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
// Make sure to end your spans!
span->End();
return "RPC failed";
diff --git a/examples/grpc/server.cc b/examples/grpc/server.cc
index 999ed7dad5..7ae77e64af 100644
--- a/examples/grpc/server.cc
+++ b/examples/grpc/server.cc
@@ -66,16 +66,22 @@ class GreeterServer final : public Greeter::Service
std::string span_name = "GreeterService/Greet";
auto span = get_tracer("grpc")->StartSpan(span_name,
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{{SemanticConventions::kRpcSystem, "grpc"},
{SemanticConventions::kRpcService, "GreeterService"},
{SemanticConventions::kRpcMethod, "Greet"},
{SemanticConventions::kRpcGrpcStatusCode, 0}},
+<<<<<<< HEAD
=======
{{SemanticConventions::RPC_SYSTEM, "grpc"},
{SemanticConventions::RPC_SERVICE, "GreeterService"},
{SemanticConventions::RPC_METHOD, "Greet"},
{SemanticConventions::RPC_GRPC_STATUS_CODE, 0}},
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
options);
auto scope = get_tracer("grpc")->WithActiveSpan(span);
diff --git a/examples/http/client.cc b/examples/http/client.cc
index 522c555eee..ba5b28d659 100644
--- a/examples/http/client.cc
+++ b/examples/http/client.cc
@@ -26,6 +26,7 @@ void sendRequest(const std::string &url)
std::string span_name = url_parser.path_;
auto span = get_tracer("http-client")
->StartSpan(span_name,
+<<<<<<< HEAD
<<<<<<< HEAD
{{SemanticConventions::kHttpUrl, url_parser.url_},
{SemanticConventions::kHttpScheme, url_parser.scheme_},
@@ -35,6 +36,11 @@ void sendRequest(const std::string &url)
{SemanticConventions::HTTP_SCHEME, url_parser.scheme_},
{SemanticConventions::HTTP_METHOD, "GET"}},
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ {{SemanticConventions::kHttpUrl, url_parser.url_},
+ {SemanticConventions::kHttpScheme, url_parser.scheme_},
+ {SemanticConventions::kHttpMethod, "GET"}},
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
options);
auto scope = get_tracer("http-client")->WithActiveSpan(span);
@@ -50,11 +56,15 @@ void sendRequest(const std::string &url)
{
// set span attributes
auto status_code = result.GetResponse().GetStatusCode();
+<<<<<<< HEAD
<<<<<<< HEAD
span->SetAttribute(SemanticConventions::kHttpStatusCode, status_code);
=======
span->SetAttribute(SemanticConventions::HTTP_STATUS_CODE, status_code);
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ span->SetAttribute(SemanticConventions::kHttpStatusCode, status_code);
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
result.GetResponse().ForEachHeader(
[&span](nostd::string_view header_name, nostd::string_view header_value) {
span->SetAttribute("http.header." + std::string(header_name.data()), header_value);
diff --git a/examples/http/server.cc b/examples/http/server.cc
index 761ed47819..006a67a441 100644
--- a/examples/http/server.cc
+++ b/examples/http/server.cc
@@ -42,11 +42,15 @@ class RequestHandler : public HTTP_SERVER_NS::HttpRequestCallback
->StartSpan(span_name,
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{{SemanticConventions::kNetHostName, server_name},
{SemanticConventions::kNetHostPort, server_port},
{SemanticConventions::kHttpMethod, request.method},
{SemanticConventions::kHttpScheme, "http"},
{SemanticConventions::kHttpRequestContentLength,
+<<<<<<< HEAD
static_cast(request.content.length())},
{SemanticConventions::kHttpClientIp, request.client}},
=======
@@ -61,6 +65,10 @@ class RequestHandler : public HTTP_SERVER_NS::HttpRequestCallback
static_cast(request.content.length())},
{SemanticConventions::HTTP_CLIENT_IP, request.client}},
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ static_cast(request.content.length())},
+ {SemanticConventions::kHttpClientIp, request.client}},
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
options);
auto scope = get_tracer("http_server")->WithActiveSpan(span);
diff --git a/exporters/otlp/test/otlp_log_recordable_test.cc b/exporters/otlp/test/otlp_log_recordable_test.cc
index 613055a1f3..35c441ec70 100644
--- a/exporters/otlp/test/otlp_log_recordable_test.cc
+++ b/exporters/otlp/test/otlp_log_recordable_test.cc
@@ -104,29 +104,41 @@ TEST(OtlpLogRecordable, DefaultResource)
for (int i = 0; i < proto_resource.attributes_size(); i++)
{
auto attr = proto_resource.attributes(static_cast(i));
+<<<<<<< HEAD
<<<<<<< HEAD
if (attr.key() == resource::SemanticConventions::kTelemetrySdkLanguage)
=======
if (attr.key() == resource::SemanticConventions::TELEMETRY_SDK_LANGUAGE)
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ if (attr.key() == resource::SemanticConventions::kTelemetrySdkLanguage)
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{
EXPECT_EQ(attr.value().string_value(), "cpp");
++found_resource_count;
}
+<<<<<<< HEAD
<<<<<<< HEAD
else if (attr.key() == resource::SemanticConventions::kTelemetrySdkName)
=======
else if (attr.key() == resource::SemanticConventions::TELEMETRY_SDK_NAME)
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ else if (attr.key() == resource::SemanticConventions::kTelemetrySdkName)
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{
EXPECT_EQ(attr.value().string_value(), "opentelemetry");
++found_resource_count;
}
+<<<<<<< HEAD
<<<<<<< HEAD
else if (attr.key() == resource::SemanticConventions::kTelemetrySdkVersion)
=======
else if (attr.key() == resource::SemanticConventions::TELEMETRY_SDK_VERSION)
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ else if (attr.key() == resource::SemanticConventions::kTelemetrySdkVersion)
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{
EXPECT_EQ(attr.value().string_value(), OPENTELEMETRY_SDK_VERSION);
++found_resource_count;
diff --git a/exporters/zipkin/src/recordable.cc b/exporters/zipkin/src/recordable.cc
index e3249c999a..4044f29b06 100644
--- a/exporters/zipkin/src/recordable.cc
+++ b/exporters/zipkin/src/recordable.cc
@@ -216,6 +216,7 @@ void Recordable::SetResource(const sdk::resource::Resource &resource) noexcept
{
// only service.name attribute is supported by specs as of now.
auto attributes = resource.GetAttributes();
+<<<<<<< HEAD
<<<<<<< HEAD
if (attributes.find(SemanticConventions::kServiceName) != attributes.end())
{
@@ -225,6 +226,11 @@ void Recordable::SetResource(const sdk::resource::Resource &resource) noexcept
{
service_name_ = nostd::get(attributes[SemanticConventions::SERVICE_NAME]);
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ if (attributes.find(SemanticConventions::kServiceName) != attributes.end())
+ {
+ service_name_ = nostd::get(attributes[SemanticConventions::kServiceName]);
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
}
}
diff --git a/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h b/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
index 4b8626fb27..d9ca308a77 100644
--- a/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
+++ b/sdk/include/opentelemetry/sdk/resource/semantic_conventions.h
@@ -26,6 +26,7 @@ namespace SemanticConventions
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.15.0";
=======
static constexpr const char *SCHEMA_URL = "https://opentelemetry.io/schemas/1.12.0";
@@ -36,6 +37,9 @@ static constexpr const char *SCHEMA_URL = "https://opentelemetry.io/schemas/1.13
=======
static constexpr const char *SCHEMA_URL = "https://opentelemetry.io/schemas/1.14.0";
>>>>>>> 4dcb8da7 ([SEMANTIC CONVENTIONS] Upgrade to version 1.14.0 (#1697))
+=======
+static constexpr const char *kSchemaUrl = "https://opentelemetry.io/schemas/1.15.0";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Array of brand name and version separated by a space
@@ -48,6 +52,7 @@ static constexpr const char *SCHEMA_URL = "https://opentelemetry.io/schemas/1.14
navigator.userAgentData.brands}).
*/
static constexpr const char *kBrowserBrands = "browser.brands";
+<<<<<<< HEAD
=======
href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API
(navigator.userAgentData.brands).
@@ -58,6 +63,8 @@ static constexpr const char *kBrowserBrands = "browser.brands";
*/
static constexpr const char *BROWSER_BRANDS = "browser.brands";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The platform on which the browser is running
@@ -87,6 +94,7 @@ values in the {@code browser.platform} attribute should capture the exact value
provides.
*/
static constexpr const char *kBrowserPlatform = "browser.platform";
+<<<<<<< HEAD
/**
* A boolean that is true if the browser is running on a mobile device
@@ -109,6 +117,8 @@ provides.
*/
static constexpr const char *BROWSER_PLATFORM = "browser.platform";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A boolean that is true if the browser is running on a mobile device
@@ -118,7 +128,7 @@ static constexpr const char *BROWSER_PLATFORM = "browser.platform";
href="https://wicg.github.io/ua-client-hints/#interface">UA client hints API ({@code
navigator.userAgentData.mobile}). If unavailable, this attribute SHOULD be left unset.
*/
-static constexpr const char *BROWSER_MOBILE = "browser.mobile";
+static constexpr const char *kBrowserMobile = "browser.mobile";
/**
* Full user-agent string provided by the browser
@@ -129,6 +139,7 @@ static constexpr const char *BROWSER_MOBILE = "browser.mobile";
value, the legacy {@code navigator.userAgent} API can be used.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kBrowserUserAgent = "browser.user_agent";
/**
@@ -142,6 +153,9 @@ static constexpr const char *kBrowserLanguage = "browser.language";
=======
static constexpr const char *BROWSER_USER_AGENT = "browser.user_agent";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kBrowserUserAgent = "browser.user_agent";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Preferred language of the user using the browser
@@ -150,25 +164,33 @@ static constexpr const char *BROWSER_USER_AGENT = "browser.user_agent";
- This value is intended to be taken from the Navigator API {@code
navigator.language}.
*/
-static constexpr const char *BROWSER_LANGUAGE = "browser.language";
+static constexpr const char *kBrowserLanguage = "browser.language";
/**
* Name of the cloud provider.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCloudProvider = "cloud.provider";
=======
static constexpr const char *CLOUD_PROVIDER = "cloud.provider";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kCloudProvider = "cloud.provider";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The cloud account ID the resource is assigned to.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCloudAccountId = "cloud.account.id";
=======
static constexpr const char *CLOUD_ACCOUNT_ID = "cloud.account.id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kCloudAccountId = "cloud.account.id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The geographical region the resource is running.
@@ -183,10 +205,14 @@ static constexpr const char *CLOUD_ACCOUNT_ID = "cloud.account.id";
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCloudRegion = "cloud.region";
=======
static constexpr const char *CLOUD_REGION = "cloud.region";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kCloudRegion = "cloud.region";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Cloud regions often have multiple, isolated locations known as zones to increase availability.
@@ -197,10 +223,14 @@ static constexpr const char *CLOUD_REGION = "cloud.region";
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCloudAvailabilityZone = "cloud.availability_zone";
=======
static constexpr const char *CLOUD_AVAILABILITY_ZONE = "cloud.availability_zone";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kCloudAvailabilityZone = "cloud.availability_zone";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The cloud platform in use.
@@ -210,10 +240,14 @@ static constexpr const char *CLOUD_AVAILABILITY_ZONE = "cloud.availability_zone"
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCloudPlatform = "cloud.platform";
=======
static constexpr const char *CLOUD_PLATFORM = "cloud.platform";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kCloudPlatform = "cloud.platform";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The Amazon Resource Name (ARN) of an .
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsEcsContainerArn = "aws.ecs.container.arn";
=======
static constexpr const char *AWS_ECS_CONTAINER_ARN = "aws.ecs.container.arn";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsEcsContainerArn = "aws.ecs.container.arn";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The ARN of an ECS cluster.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsEcsClusterArn = "aws.ecs.cluster.arn";
=======
static constexpr const char *AWS_ECS_CLUSTER_ARN = "aws.ecs.cluster.arn";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsEcsClusterArn = "aws.ecs.cluster.arn";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The for an ECS task.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsEcsLaunchtype = "aws.ecs.launchtype";
=======
static constexpr const char *AWS_ECS_LAUNCHTYPE = "aws.ecs.launchtype";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsEcsLaunchtype = "aws.ecs.launchtype";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The ARN of an .
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsEcsTaskArn = "aws.ecs.task.arn";
=======
static constexpr const char *AWS_ECS_TASK_ARN = "aws.ecs.task.arn";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsEcsTaskArn = "aws.ecs.task.arn";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The task definition family this task definition is a member of.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsEcsTaskFamily = "aws.ecs.task.family";
=======
static constexpr const char *AWS_ECS_TASK_FAMILY = "aws.ecs.task.family";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsEcsTaskFamily = "aws.ecs.task.family";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The revision for this task definition.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsEcsTaskRevision = "aws.ecs.task.revision";
=======
static constexpr const char *AWS_ECS_TASK_REVISION = "aws.ecs.task.revision";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsEcsTaskRevision = "aws.ecs.task.revision";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The ARN of an EKS cluster.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsEksClusterArn = "aws.eks.cluster.arn";
=======
static constexpr const char *AWS_EKS_CLUSTER_ARN = "aws.eks.cluster.arn";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsEksClusterArn = "aws.eks.cluster.arn";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name(s) of the AWS log group(s) an application is writing to.
@@ -293,10 +355,14 @@ static constexpr const char *AWS_EKS_CLUSTER_ARN = "aws.eks.cluster.arn";
a single application has sidecar containers, and each write to their own log group.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsLogGroupNames = "aws.log.group.names";
=======
static constexpr const char *AWS_LOG_GROUP_NAMES = "aws.log.group.names";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsLogGroupNames = "aws.log.group.names";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The Amazon Resource Name(s) (ARN) of the AWS log group(s).
@@ -307,19 +373,27 @@ static constexpr const char *AWS_LOG_GROUP_NAMES = "aws.log.group.names";
group ARN format documentation.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsLogGroupArns = "aws.log.group.arns";
=======
static constexpr const char *AWS_LOG_GROUP_ARNS = "aws.log.group.arns";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsLogGroupArns = "aws.log.group.arns";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name(s) of the AWS log stream(s) an application is writing to.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsLogStreamNames = "aws.log.stream.names";
=======
static constexpr const char *AWS_LOG_STREAM_NAMES = "aws.log.stream.names";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsLogStreamNames = "aws.log.stream.names";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The ARN(s) of the AWS log stream(s).
@@ -331,19 +405,27 @@ static constexpr const char *AWS_LOG_STREAM_NAMES = "aws.log.stream.names";
necessarily identify both a log group and a log stream.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAwsLogStreamArns = "aws.log.stream.arns";
=======
static constexpr const char *AWS_LOG_STREAM_ARNS = "aws.log.stream.arns";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kAwsLogStreamArns = "aws.log.stream.arns";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Container name used by container runtime.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kContainerName = "container.name";
=======
static constexpr const char *CONTAINER_NAME = "container.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kContainerName = "container.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Container ID. Usually a UUID, as for example used to . The UUID might be abbreviated.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kContainerId = "container.id";
=======
static constexpr const char *CONTAINER_ID = "container.id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kContainerId = "container.id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The container runtime managing this container.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kContainerRuntime = "container.runtime";
=======
static constexpr const char *CONTAINER_RUNTIME = "container.runtime";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kContainerRuntime = "container.runtime";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Name of the image the container was built on.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kContainerImageName = "container.image.name";
=======
static constexpr const char *CONTAINER_IMAGE_NAME = "container.image.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kContainerImageName = "container.image.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Container image tag.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kContainerImageTag = "container.image.tag";
=======
static constexpr const char *CONTAINER_IMAGE_TAG = "container.image.tag";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kContainerImageTag = "container.image.tag";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Name of the deployment
* environment (aka deployment tier).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kDeploymentEnvironment = "deployment.environment";
=======
static constexpr const char *DEPLOYMENT_ENVIRONMENT = "deployment.environment";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kDeploymentEnvironment = "deployment.environment";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A unique identifier representing the device
@@ -410,10 +512,14 @@ static constexpr const char *DEPLOYMENT_ENVIRONMENT = "deployment.environment";
diligence.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kDeviceId = "device.id";
=======
static constexpr const char *DEVICE_ID = "device.id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kDeviceId = "device.id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The model identifier for the device
@@ -423,10 +529,14 @@ static constexpr const char *DEVICE_ID = "device.id";
rather than the market or consumer-friendly name of the device.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kDeviceModelIdentifier = "device.model.identifier";
=======
static constexpr const char *DEVICE_MODEL_IDENTIFIER = "device.model.identifier";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kDeviceModelIdentifier = "device.model.identifier";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The marketing name for the device model
@@ -436,10 +546,14 @@ static constexpr const char *DEVICE_MODEL_IDENTIFIER = "device.model.identifier"
rather than a machine readable alternative.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kDeviceModelName = "device.model.name";
=======
static constexpr const char *DEVICE_MODEL_NAME = "device.model.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kDeviceModelName = "device.model.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the device manufacturer
@@ -450,10 +564,14 @@ static constexpr const char *DEVICE_MODEL_NAME = "device.model.name";
SHOULD hardcode the value {@code Apple}.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kDeviceManufacturer = "device.manufacturer";
=======
static constexpr const char *DEVICE_MANUFACTURER = "device.manufacturer";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kDeviceManufacturer = "device.manufacturer";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the single function that this runtime instance executes.
@@ -474,10 +592,14 @@ the {@code faas.id} attribute).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasName = "faas.name";
=======
static constexpr const char *FAAS_NAME = "faas.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasName = "faas.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The unique ID of the single function that this runtime instance executes.
@@ -502,10 +624,14 @@ that would usually share a TracerProvider.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasId = "faas.id";
=======
static constexpr const char *FAAS_ID = "faas.id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasId = "faas.id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The immutable version of the function being executed.
@@ -523,10 +649,14 @@ not set this attribute.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasVersion = "faas.version";
=======
static constexpr const char *FAAS_VERSION = "faas.version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasVersion = "faas.version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The execution environment ID as a string, that will be potentially reused for other invocations
@@ -537,10 +667,14 @@ static constexpr const char *FAAS_VERSION = "faas.version";
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasInstance = "faas.instance";
=======
static constexpr const char *FAAS_INSTANCE = "faas.instance";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasInstance = "faas.instance";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The amount of memory available to the serverless function in MiB.
@@ -551,300 +685,429 @@ static constexpr const char *FAAS_INSTANCE = "faas.instance";
AWS_LAMBDA_FUNCTION_MEMORY_SIZE} provides this information.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kFaasMaxMemory = "faas.max_memory";
=======
static constexpr const char *FAAS_MAX_MEMORY = "faas.max_memory";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kFaasMaxMemory = "faas.max_memory";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Unique host ID. For Cloud, this must be the instance_id assigned by the cloud provider.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kHostId = "host.id";
=======
static constexpr const char *HOST_ID = "host.id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kHostId = "host.id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Name of the host. On Unix systems, it may contain what the hostname command returns, or the fully
* qualified hostname, or another name specified by the user.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kHostName = "host.name";
=======
static constexpr const char *HOST_NAME = "host.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kHostName = "host.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Type of host. For Cloud, this must be the machine type.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kHostType = "host.type";
=======
static constexpr const char *HOST_TYPE = "host.type";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kHostType = "host.type";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The CPU architecture the host system is running on.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kHostArch = "host.arch";
=======
static constexpr const char *HOST_ARCH = "host.arch";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kHostArch = "host.arch";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Name of the VM image or OS install the host was instantiated from.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kHostImageName = "host.image.name";
=======
static constexpr const char *HOST_IMAGE_NAME = "host.image.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kHostImageName = "host.image.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* VM image ID. For Cloud, this value is from the provider.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kHostImageId = "host.image.id";
=======
static constexpr const char *HOST_IMAGE_ID = "host.image.id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kHostImageId = "host.image.id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The version string of the VM image as defined in Version
* Attributes.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kHostImageVersion = "host.image.version";
=======
static constexpr const char *HOST_IMAGE_VERSION = "host.image.version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kHostImageVersion = "host.image.version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the cluster.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sClusterName = "k8s.cluster.name";
=======
static constexpr const char *K8S_CLUSTER_NAME = "k8s.cluster.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sClusterName = "k8s.cluster.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the Node.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sNodeName = "k8s.node.name";
=======
static constexpr const char *K8S_NODE_NAME = "k8s.node.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sNodeName = "k8s.node.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The UID of the Node.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sNodeUid = "k8s.node.uid";
=======
static constexpr const char *K8S_NODE_UID = "k8s.node.uid";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sNodeUid = "k8s.node.uid";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the namespace that the pod is running in.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sNamespaceName = "k8s.namespace.name";
=======
static constexpr const char *K8S_NAMESPACE_NAME = "k8s.namespace.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sNamespaceName = "k8s.namespace.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The UID of the Pod.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sPodUid = "k8s.pod.uid";
=======
static constexpr const char *K8S_POD_UID = "k8s.pod.uid";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sPodUid = "k8s.pod.uid";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the Pod.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sPodName = "k8s.pod.name";
=======
static constexpr const char *K8S_POD_NAME = "k8s.pod.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sPodName = "k8s.pod.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the Container from Pod specification, must be unique within a Pod. Container runtime
* usually uses different globally unique name ({@code container.name}).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sContainerName = "k8s.container.name";
=======
static constexpr const char *K8S_CONTAINER_NAME = "k8s.container.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sContainerName = "k8s.container.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Number of times the container was restarted. This attribute can be used to identify a particular
* container (running or stopped) within a container spec.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sContainerRestartCount = "k8s.container.restart_count";
=======
static constexpr const char *K8S_CONTAINER_RESTART_COUNT = "k8s.container.restart_count";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sContainerRestartCount = "k8s.container.restart_count";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The UID of the ReplicaSet.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sReplicasetUid = "k8s.replicaset.uid";
=======
static constexpr const char *K8S_REPLICASET_UID = "k8s.replicaset.uid";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sReplicasetUid = "k8s.replicaset.uid";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the ReplicaSet.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sReplicasetName = "k8s.replicaset.name";
=======
static constexpr const char *K8S_REPLICASET_NAME = "k8s.replicaset.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sReplicasetName = "k8s.replicaset.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The UID of the Deployment.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sDeploymentUid = "k8s.deployment.uid";
=======
static constexpr const char *K8S_DEPLOYMENT_UID = "k8s.deployment.uid";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sDeploymentUid = "k8s.deployment.uid";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the Deployment.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sDeploymentName = "k8s.deployment.name";
=======
static constexpr const char *K8S_DEPLOYMENT_NAME = "k8s.deployment.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sDeploymentName = "k8s.deployment.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The UID of the StatefulSet.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sStatefulsetUid = "k8s.statefulset.uid";
=======
static constexpr const char *K8S_STATEFULSET_UID = "k8s.statefulset.uid";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sStatefulsetUid = "k8s.statefulset.uid";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the StatefulSet.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sStatefulsetName = "k8s.statefulset.name";
=======
static constexpr const char *K8S_STATEFULSET_NAME = "k8s.statefulset.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sStatefulsetName = "k8s.statefulset.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The UID of the DaemonSet.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sDaemonsetUid = "k8s.daemonset.uid";
=======
static constexpr const char *K8S_DAEMONSET_UID = "k8s.daemonset.uid";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sDaemonsetUid = "k8s.daemonset.uid";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the DaemonSet.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sDaemonsetName = "k8s.daemonset.name";
=======
static constexpr const char *K8S_DAEMONSET_NAME = "k8s.daemonset.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sDaemonsetName = "k8s.daemonset.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The UID of the Job.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sJobUid = "k8s.job.uid";
=======
static constexpr const char *K8S_JOB_UID = "k8s.job.uid";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sJobUid = "k8s.job.uid";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the Job.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sJobName = "k8s.job.name";
=======
static constexpr const char *K8S_JOB_NAME = "k8s.job.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sJobName = "k8s.job.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The UID of the CronJob.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sCronjobUid = "k8s.cronjob.uid";
=======
static constexpr const char *K8S_CRONJOB_UID = "k8s.cronjob.uid";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sCronjobUid = "k8s.cronjob.uid";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the CronJob.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kK8sCronjobName = "k8s.cronjob.name";
=======
static constexpr const char *K8S_CRONJOB_NAME = "k8s.cronjob.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kK8sCronjobName = "k8s.cronjob.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The operating system type.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kOsType = "os.type";
=======
static constexpr const char *OS_TYPE = "os.type";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kOsType = "os.type";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Human readable (not intended to be parsed) OS version information, like e.g. reported by {@code
* ver} or {@code lsb_release -a} commands.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kOsDescription = "os.description";
=======
static constexpr const char *OS_DESCRIPTION = "os.description";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kOsDescription = "os.description";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Human readable operating system name.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kOsName = "os.name";
=======
static constexpr const char *OS_NAME = "os.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kOsName = "os.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The version string of the operating system as defined in Version Attributes.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kOsVersion = "os.version";
=======
static constexpr const char *OS_VERSION = "os.version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kOsVersion = "os.version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Process identifier (PID).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessPid = "process.pid";
/**
@@ -854,11 +1117,14 @@ static constexpr const char *kProcessParentPid = "process.parent_pid";
=======
static constexpr const char *PROCESS_PID = "process.pid";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessPid = "process.pid";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Parent Process identifier (PID).
*/
-static constexpr const char *PROCESS_PARENT_PID = "process.parent_pid";
+static constexpr const char *kProcessParentPid = "process.parent_pid";
/**
* The name of the process executable. On Linux based systems, can be set to the {@code Name} in
@@ -866,20 +1132,28 @@ static constexpr const char *PROCESS_PARENT_PID = "process.parent_pid";
* GetProcessImageFileNameW}.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessExecutableName = "process.executable.name";
=======
static constexpr const char *PROCESS_EXECUTABLE_NAME = "process.executable.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessExecutableName = "process.executable.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The full path to the process executable. On Linux based systems, can be set to the target of
* {@code proc/[pid]/exe}. On Windows, can be set to the result of {@code GetProcessImageFileNameW}.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessExecutablePath = "process.executable.path";
=======
static constexpr const char *PROCESS_EXECUTABLE_PATH = "process.executable.path";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessExecutablePath = "process.executable.path";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The command used to launch the process (i.e. the command name). On Linux based systems, can be
@@ -887,10 +1161,14 @@ static constexpr const char *PROCESS_EXECUTABLE_PATH = "process.executable.path"
* parameter extracted from {@code GetCommandLineW}.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessCommand = "process.command";
=======
static constexpr const char *PROCESS_COMMAND = "process.command";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessCommand = "process.command";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The full command used to launch the process as a single string representing the full command. On
@@ -898,10 +1176,14 @@ static constexpr const char *PROCESS_COMMAND = "process.command";
* assemble it just for monitoring; use {@code process.command_args} instead.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessCommandLine = "process.command_line";
=======
static constexpr const char *PROCESS_COMMAND_LINE = "process.command_line";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessCommandLine = "process.command_line";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* All the command arguments (including the command/executable itself) as received by the process.
@@ -910,48 +1192,68 @@ static constexpr const char *PROCESS_COMMAND_LINE = "process.command_line";
* executables, this would be the full argv vector passed to {@code main}.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessCommandArgs = "process.command_args";
=======
static constexpr const char *PROCESS_COMMAND_ARGS = "process.command_args";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessCommandArgs = "process.command_args";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The username of the user that owns the process.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessOwner = "process.owner";
=======
static constexpr const char *PROCESS_OWNER = "process.owner";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessOwner = "process.owner";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the runtime of this process. For compiled native binaries, this SHOULD be the name of
* the compiler.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessRuntimeName = "process.runtime.name";
=======
static constexpr const char *PROCESS_RUNTIME_NAME = "process.runtime.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessRuntimeName = "process.runtime.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The version of the runtime of this process, as returned by the runtime without modification.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessRuntimeVersion = "process.runtime.version";
=======
static constexpr const char *PROCESS_RUNTIME_VERSION = "process.runtime.version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessRuntimeVersion = "process.runtime.version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* An additional description about the runtime of the process, for example a specific vendor
* customization of the runtime environment.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kProcessRuntimeDescription = "process.runtime.description";
=======
static constexpr const char *PROCESS_RUNTIME_DESCRIPTION = "process.runtime.description";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kProcessRuntimeDescription = "process.runtime.description";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Logical name of the service.
@@ -964,10 +1266,14 @@ static constexpr const char *PROCESS_RUNTIME_DESCRIPTION = "process.runtime.desc
unknown_service}.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kServiceName = "service.name";
=======
static constexpr const char *SERVICE_NAME = "service.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kServiceName = "service.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* A namespace for {@code service.name}.
@@ -981,10 +1287,14 @@ static constexpr const char *SERVICE_NAME = "service.name";
namespace string is assumed equal to unspecified namespace.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kServiceNamespace = "service.namespace";
=======
static constexpr const char *SERVICE_NAMESPACE = "service.namespace";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kServiceNamespace = "service.namespace";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The string ID of the service instance.
@@ -1001,78 +1311,113 @@ static constexpr const char *SERVICE_NAMESPACE = "service.namespace";
reproducible UUIDs may also use Version 5, see RFC 4122 for more recommendations).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kServiceInstanceId = "service.instance.id";
=======
static constexpr const char *SERVICE_INSTANCE_ID = "service.instance.id";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kServiceInstanceId = "service.instance.id";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The version string of the service API or implementation.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kServiceVersion = "service.version";
=======
static constexpr const char *SERVICE_VERSION = "service.version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kServiceVersion = "service.version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the telemetry SDK as defined above.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kTelemetrySdkName = "telemetry.sdk.name";
=======
static constexpr const char *TELEMETRY_SDK_NAME = "telemetry.sdk.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kTelemetrySdkName = "telemetry.sdk.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The language of the telemetry SDK.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kTelemetrySdkLanguage = "telemetry.sdk.language";
=======
static constexpr const char *TELEMETRY_SDK_LANGUAGE = "telemetry.sdk.language";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kTelemetrySdkLanguage = "telemetry.sdk.language";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The version string of the telemetry SDK.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kTelemetrySdkVersion = "telemetry.sdk.version";
=======
static constexpr const char *TELEMETRY_SDK_VERSION = "telemetry.sdk.version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kTelemetrySdkVersion = "telemetry.sdk.version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The version string of the auto instrumentation agent, if used.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kTelemetryAutoVersion = "telemetry.auto.version";
=======
static constexpr const char *TELEMETRY_AUTO_VERSION = "telemetry.auto.version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kTelemetryAutoVersion = "telemetry.auto.version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The name of the web engine.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kWebengineName = "webengine.name";
=======
static constexpr const char *WEBENGINE_NAME = "webengine.name";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kWebengineName = "webengine.name";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* The version of the web engine.
*/
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kWebengineVersion = "webengine.version";
=======
static constexpr const char *WEBENGINE_VERSION = "webengine.version";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kWebengineVersion = "webengine.version";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/**
* Additional description of the web engine (e.g. detailed version and edition information).
*/
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
static constexpr const char *kWebengineDescription = "webengine.description";
/**
@@ -1094,15 +1439,19 @@ static constexpr const char *kOtelLibraryName = "otel.library.name";
* Deprecated, use the {@code otel.scope.version} attribute.
*/
static constexpr const char *kOtelLibraryVersion = "otel.library.version";
+<<<<<<< HEAD
=======
static constexpr const char *WEBENGINE_DESCRIPTION = "webengine.description";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
// Enum definitions
namespace CloudProviderValues
{
/** Alibaba Cloud. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAlibabaCloud = "alibaba_cloud";
/** Amazon Web Services. */
static constexpr const char *kAws = "aws";
@@ -1114,21 +1463,29 @@ static constexpr const char *kGcp = "gcp";
static constexpr const char *kTencentCloud = "tencent_cloud";
=======
static constexpr const char *ALIBABA_CLOUD = "alibaba_cloud";
+=======
+static constexpr const char *kAlibabaCloud = "alibaba_cloud";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** Amazon Web Services. */
-static constexpr const char *AWS = "aws";
+static constexpr const char *kAws = "aws";
/** Microsoft Azure. */
-static constexpr const char *AZURE = "azure";
+static constexpr const char *kAzure = "azure";
/** Google Cloud Platform. */
-static constexpr const char *GCP = "gcp";
+static constexpr const char *kGcp = "gcp";
/** Tencent Cloud. */
+<<<<<<< HEAD
static constexpr const char *TENCENT_CLOUD = "tencent_cloud";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kTencentCloud = "tencent_cloud";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace CloudProviderValues
namespace CloudPlatformValues
{
/** Alibaba Cloud Elastic Compute Service. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAlibabaCloudEcs = "alibaba_cloud_ecs";
/** Alibaba Cloud Function Compute. */
static constexpr const char *kAlibabaCloudFc = "alibaba_cloud_fc";
@@ -1172,53 +1529,61 @@ static constexpr const char *kTencentCloudEks = "tencent_cloud_eks";
static constexpr const char *kTencentCloudScf = "tencent_cloud_scf";
=======
static constexpr const char *ALIBABA_CLOUD_ECS = "alibaba_cloud_ecs";
+=======
+static constexpr const char *kAlibabaCloudEcs = "alibaba_cloud_ecs";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** Alibaba Cloud Function Compute. */
-static constexpr const char *ALIBABA_CLOUD_FC = "alibaba_cloud_fc";
+static constexpr const char *kAlibabaCloudFc = "alibaba_cloud_fc";
/** AWS Elastic Compute Cloud. */
-static constexpr const char *AWS_EC2 = "aws_ec2";
+static constexpr const char *kAwsEc2 = "aws_ec2";
/** AWS Elastic Container Service. */
-static constexpr const char *AWS_ECS = "aws_ecs";
+static constexpr const char *kAwsEcs = "aws_ecs";
/** AWS Elastic Kubernetes Service. */
-static constexpr const char *AWS_EKS = "aws_eks";
+static constexpr const char *kAwsEks = "aws_eks";
/** AWS Lambda. */
-static constexpr const char *AWS_LAMBDA = "aws_lambda";
+static constexpr const char *kAwsLambda = "aws_lambda";
/** AWS Elastic Beanstalk. */
-static constexpr const char *AWS_ELASTIC_BEANSTALK = "aws_elastic_beanstalk";
+static constexpr const char *kAwsElasticBeanstalk = "aws_elastic_beanstalk";
/** AWS App Runner. */
-static constexpr const char *AWS_APP_RUNNER = "aws_app_runner";
+static constexpr const char *kAwsAppRunner = "aws_app_runner";
/** Azure Virtual Machines. */
-static constexpr const char *AZURE_VM = "azure_vm";
+static constexpr const char *kAzureVm = "azure_vm";
/** Azure Container Instances. */
-static constexpr const char *AZURE_CONTAINER_INSTANCES = "azure_container_instances";
+static constexpr const char *kAzureContainerInstances = "azure_container_instances";
/** Azure Kubernetes Service. */
-static constexpr const char *AZURE_AKS = "azure_aks";
+static constexpr const char *kAzureAks = "azure_aks";
/** Azure Functions. */
-static constexpr const char *AZURE_FUNCTIONS = "azure_functions";
+static constexpr const char *kAzureFunctions = "azure_functions";
/** Azure App Service. */
-static constexpr const char *AZURE_APP_SERVICE = "azure_app_service";
+static constexpr const char *kAzureAppService = "azure_app_service";
/** Google Cloud Compute Engine (GCE). */
-static constexpr const char *GCP_COMPUTE_ENGINE = "gcp_compute_engine";
+static constexpr const char *kGcpComputeEngine = "gcp_compute_engine";
/** Google Cloud Run. */
-static constexpr const char *GCP_CLOUD_RUN = "gcp_cloud_run";
+static constexpr const char *kGcpCloudRun = "gcp_cloud_run";
/** Google Cloud Kubernetes Engine (GKE). */
-static constexpr const char *GCP_KUBERNETES_ENGINE = "gcp_kubernetes_engine";
+static constexpr const char *kGcpKubernetesEngine = "gcp_kubernetes_engine";
/** Google Cloud Functions (GCF). */
-static constexpr const char *GCP_CLOUD_FUNCTIONS = "gcp_cloud_functions";
+static constexpr const char *kGcpCloudFunctions = "gcp_cloud_functions";
/** Google Cloud App Engine (GAE). */
-static constexpr const char *GCP_APP_ENGINE = "gcp_app_engine";
+static constexpr const char *kGcpAppEngine = "gcp_app_engine";
/** Tencent Cloud Cloud Virtual Machine (CVM). */
-static constexpr const char *TENCENT_CLOUD_CVM = "tencent_cloud_cvm";
+static constexpr const char *kTencentCloudCvm = "tencent_cloud_cvm";
/** Tencent Cloud Elastic Kubernetes Service (EKS). */
-static constexpr const char *TENCENT_CLOUD_EKS = "tencent_cloud_eks";
+static constexpr const char *kTencentCloudEks = "tencent_cloud_eks";
/** Tencent Cloud Serverless Cloud Function (SCF). */
+<<<<<<< HEAD
static constexpr const char *TENCENT_CLOUD_SCF = "tencent_cloud_scf";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kTencentCloudScf = "tencent_cloud_scf";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace CloudPlatformValues
namespace AwsEcsLaunchtypeValues
{
/** ec2. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kEc2 = "ec2";
/** fargate. */
static constexpr const char *kFargate = "fargate";
@@ -1227,12 +1592,18 @@ static constexpr const char *EC2 = "ec2";
/** fargate. */
static constexpr const char *FARGATE = "fargate";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kEc2 = "ec2";
+/** fargate. */
+static constexpr const char *kFargate = "fargate";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace AwsEcsLaunchtypeValues
namespace HostArchValues
{
/** AMD64. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kAmd64 = "amd64";
/** ARM32. */
static constexpr const char *kArm32 = "arm32";
@@ -1250,27 +1621,35 @@ static constexpr const char *kS390x = "s390x";
static constexpr const char *kX86 = "x86";
=======
static constexpr const char *AMD64 = "amd64";
+=======
+static constexpr const char *kAmd64 = "amd64";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** ARM32. */
-static constexpr const char *ARM32 = "arm32";
+static constexpr const char *kArm32 = "arm32";
/** ARM64. */
-static constexpr const char *ARM64 = "arm64";
+static constexpr const char *kArm64 = "arm64";
/** Itanium. */
-static constexpr const char *IA64 = "ia64";
+static constexpr const char *kIa64 = "ia64";
/** 32-bit PowerPC. */
-static constexpr const char *PPC32 = "ppc32";
+static constexpr const char *kPpc32 = "ppc32";
/** 64-bit PowerPC. */
-static constexpr const char *PPC64 = "ppc64";
+static constexpr const char *kPpc64 = "ppc64";
/** IBM z/Architecture. */
-static constexpr const char *S390X = "s390x";
+static constexpr const char *kS390x = "s390x";
/** 32-bit x86. */
+<<<<<<< HEAD
static constexpr const char *X86 = "x86";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kX86 = "x86";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace HostArchValues
namespace OsTypeValues
{
/** Microsoft Windows. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kWindows = "windows";
/** Linux. */
static constexpr const char *kLinux = "linux";
@@ -1294,33 +1673,41 @@ static constexpr const char *kSolaris = "solaris";
static constexpr const char *kZOs = "z_os";
=======
static constexpr const char *WINDOWS = "windows";
+=======
+static constexpr const char *kWindows = "windows";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** Linux. */
-static constexpr const char *LINUX = "linux";
+static constexpr const char *kLinux = "linux";
/** Apple Darwin. */
-static constexpr const char *DARWIN = "darwin";
+static constexpr const char *kDarwin = "darwin";
/** FreeBSD. */
-static constexpr const char *FREEBSD = "freebsd";
+static constexpr const char *kFreebsd = "freebsd";
/** NetBSD. */
-static constexpr const char *NETBSD = "netbsd";
+static constexpr const char *kNetbsd = "netbsd";
/** OpenBSD. */
-static constexpr const char *OPENBSD = "openbsd";
+static constexpr const char *kOpenbsd = "openbsd";
/** DragonFly BSD. */
-static constexpr const char *DRAGONFLYBSD = "dragonflybsd";
+static constexpr const char *kDragonflybsd = "dragonflybsd";
/** HP-UX (Hewlett Packard Unix). */
-static constexpr const char *HPUX = "hpux";
+static constexpr const char *kHpux = "hpux";
/** AIX (Advanced Interactive eXecutive). */
-static constexpr const char *AIX = "aix";
+static constexpr const char *kAix = "aix";
/** SunOS, Oracle Solaris. */
-static constexpr const char *SOLARIS = "solaris";
+static constexpr const char *kSolaris = "solaris";
/** IBM z/OS. */
+<<<<<<< HEAD
static constexpr const char *Z_OS = "z_os";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kZOs = "z_os";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace OsTypeValues
namespace TelemetrySdkLanguageValues
{
/** cpp. */
<<<<<<< HEAD
+<<<<<<< HEAD
static constexpr const char *kCpp = "cpp";
/** dotnet. */
static constexpr const char *kDotnet = "dotnet";
@@ -1344,27 +1731,34 @@ static constexpr const char *kWebjs = "webjs";
static constexpr const char *kSwift = "swift";
=======
static constexpr const char *CPP = "cpp";
+=======
+static constexpr const char *kCpp = "cpp";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
/** dotnet. */
-static constexpr const char *DOTNET = "dotnet";
+static constexpr const char *kDotnet = "dotnet";
/** erlang. */
-static constexpr const char *ERLANG = "erlang";
+static constexpr const char *kErlang = "erlang";
/** go. */
-static constexpr const char *GO = "go";
+static constexpr const char *kGo = "go";
/** java. */
-static constexpr const char *JAVA = "java";
+static constexpr const char *kJava = "java";
/** nodejs. */
-static constexpr const char *NODEJS = "nodejs";
+static constexpr const char *kNodejs = "nodejs";
/** php. */
-static constexpr const char *PHP = "php";
+static constexpr const char *kPhp = "php";
/** python. */
-static constexpr const char *PYTHON = "python";
+static constexpr const char *kPython = "python";
/** ruby. */
-static constexpr const char *RUBY = "ruby";
+static constexpr const char *kRuby = "ruby";
/** webjs. */
-static constexpr const char *WEBJS = "webjs";
+static constexpr const char *kWebjs = "webjs";
/** swift. */
+<<<<<<< HEAD
static constexpr const char *SWIFT = "swift";
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+static constexpr const char *kSwift = "swift";
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
} // namespace TelemetrySdkLanguageValues
} // namespace SemanticConventions
diff --git a/sdk/src/resource/resource.cc b/sdk/src/resource/resource.cc
index 145d35dc50..72c3d7ee31 100644
--- a/sdk/src/resource/resource.cc
+++ b/sdk/src/resource/resource.cc
@@ -30,6 +30,7 @@ Resource Resource::Create(const ResourceAttributes &attributes, const std::strin
auto resource =
Resource::GetDefault().Merge(otel_resource).Merge(Resource{attributes, schema_url});
+<<<<<<< HEAD
<<<<<<< HEAD
if (resource.attributes_.find(SemanticConventions::kServiceName) == resource.attributes_.end())
{
@@ -43,15 +44,26 @@ Resource Resource::Create(const ResourceAttributes &attributes, const std::strin
auto it_process_executable_name =
resource.attributes_.find(SemanticConventions::PROCESS_EXECUTABLE_NAME);
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ if (resource.attributes_.find(SemanticConventions::kServiceName) == resource.attributes_.end())
+ {
+ std::string default_service_name = "unknown_service";
+ auto it_process_executable_name =
+ resource.attributes_.find(SemanticConventions::kProcessExecutableName);
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
if (it_process_executable_name != resource.attributes_.end())
{
default_service_name += ":" + nostd::get(it_process_executable_name->second);
}
+<<<<<<< HEAD
<<<<<<< HEAD
resource.attributes_[SemanticConventions::kServiceName] = default_service_name;
=======
resource.attributes_[SemanticConventions::SERVICE_NAME] = default_service_name;
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ resource.attributes_[SemanticConventions::kServiceName] = default_service_name;
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
}
return resource;
}
@@ -65,6 +77,7 @@ Resource &Resource::GetEmpty()
Resource &Resource::GetDefault()
{
static Resource default_resource(
+<<<<<<< HEAD
<<<<<<< HEAD
{{SemanticConventions::kTelemetrySdkLanguage, "cpp"},
{SemanticConventions::kTelemetrySdkName, "opentelemetry"},
@@ -74,6 +87,11 @@ Resource &Resource::GetDefault()
{SemanticConventions::TELEMETRY_SDK_NAME, "opentelemetry"},
{SemanticConventions::TELEMETRY_SDK_VERSION, OPENTELEMETRY_SDK_VERSION}},
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+ {{SemanticConventions::kTelemetrySdkLanguage, "cpp"},
+ {SemanticConventions::kTelemetrySdkName, "opentelemetry"},
+ {SemanticConventions::kTelemetrySdkVersion, OPENTELEMETRY_SDK_VERSION}},
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
std::string{});
return default_resource;
}
diff --git a/sdk/test/resource/resource_test.cc b/sdk/test/resource/resource_test.cc
index 232d7be2cb..ab27d77408 100644
--- a/sdk/test/resource/resource_test.cc
+++ b/sdk/test/resource/resource_test.cc
@@ -36,16 +36,22 @@ TEST(ResourceTest, create_without_servicename)
{"version", (uint32_t)1},
{"cost", 234.23},
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{SemanticConventions::kTelemetrySdkLanguage, "cpp"},
{SemanticConventions::kTelemetrySdkName, "opentelemetry"},
{SemanticConventions::kTelemetrySdkVersion, OPENTELEMETRY_SDK_VERSION},
{SemanticConventions::kServiceName, "unknown_service"}};
+<<<<<<< HEAD
=======
{SemanticConventions::TELEMETRY_SDK_LANGUAGE, "cpp"},
{SemanticConventions::TELEMETRY_SDK_NAME, "opentelemetry"},
{SemanticConventions::TELEMETRY_SDK_VERSION, OPENTELEMETRY_SDK_VERSION},
{SemanticConventions::SERVICE_NAME, "unknown_service"}};
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
ResourceAttributes attributes = {
{"service", "backend"}, {"version", (uint32_t)1}, {"cost", 234.23}};
@@ -76,16 +82,22 @@ TEST(ResourceTest, create_with_servicename)
{"version", (uint32_t)1},
{"cost", 234.23},
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{SemanticConventions::kTelemetrySdkLanguage, "cpp"},
{SemanticConventions::kTelemetrySdkName, "opentelemetry"},
{SemanticConventions::kTelemetrySdkVersion, OPENTELEMETRY_SDK_VERSION},
{SemanticConventions::kServiceName, "backend"},
+<<<<<<< HEAD
=======
{SemanticConventions::TELEMETRY_SDK_LANGUAGE, "cpp"},
{SemanticConventions::TELEMETRY_SDK_NAME, "opentelemetry"},
{SemanticConventions::TELEMETRY_SDK_VERSION, OPENTELEMETRY_SDK_VERSION},
{SemanticConventions::SERVICE_NAME, "backend"},
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
};
ResourceAttributes attributes = {
{"service.name", "backend"}, {"version", (uint32_t)1}, {"cost", 234.23}};
@@ -114,16 +126,22 @@ TEST(ResourceTest, create_with_emptyatrributes)
{
ResourceAttributes expected_attributes = {
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
{SemanticConventions::kTelemetrySdkLanguage, "cpp"},
{SemanticConventions::kTelemetrySdkName, "opentelemetry"},
{SemanticConventions::kTelemetrySdkVersion, OPENTELEMETRY_SDK_VERSION},
{SemanticConventions::kServiceName, "unknown_service"},
+<<<<<<< HEAD
=======
{SemanticConventions::TELEMETRY_SDK_LANGUAGE, "cpp"},
{SemanticConventions::TELEMETRY_SDK_NAME, "opentelemetry"},
{SemanticConventions::TELEMETRY_SDK_VERSION, OPENTELEMETRY_SDK_VERSION},
{SemanticConventions::SERVICE_NAME, "unknown_service"},
>>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+>>>>>>> e9c71463 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
};
ResourceAttributes attributes = {};
auto resource = Resource::Create(attributes);