Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
185 changes: 0 additions & 185 deletions api/include/opentelemetry/semconv/db_attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,151 +137,11 @@ static constexpr const char *kDbSystemName = "db.system.name";

namespace DbSystemNameValues
{
/**
Some other SQL database. Fallback only.
*/
static constexpr const char *kOtherSql = "other_sql";

/**
<a href="https://documentation.softwareag.com/?pf=adabas">Adabas (Adaptable Database System)</a>
*/
static constexpr const char *kSoftwareagAdabas = "softwareag.adabas";

/**
<a href="https://www.actian.com/databases/ingres/">Actian Ingres</a>
*/
static constexpr const char *kActianIngres = "actian.ingres";

/**
<a href="https://aws.amazon.com/pm/dynamodb/">Amazon DynamoDB</a>
*/
static constexpr const char *kAwsDynamodb = "aws.dynamodb";

/**
<a href="https://aws.amazon.com/redshift/">Amazon Redshift</a>
*/
static constexpr const char *kAwsRedshift = "aws.redshift";

/**
<a href="https://learn.microsoft.com/azure/cosmos-db">Azure Cosmos DB</a>
*/
static constexpr const char *kAzureCosmosdb = "azure.cosmosdb";

/**
<a href="https://www.intersystems.com/products/cache/">InterSystems Caché</a>
*/
static constexpr const char *kIntersystemsCache = "intersystems.cache";

/**
<a href="https://cassandra.apache.org/">Apache Cassandra</a>
*/
static constexpr const char *kCassandra = "cassandra";

/**
<a href="https://clickhouse.com/">ClickHouse</a>
*/
static constexpr const char *kClickhouse = "clickhouse";

/**
<a href="https://www.cockroachlabs.com/">CockroachDB</a>
*/
static constexpr const char *kCockroachdb = "cockroachdb";

/**
<a href="https://www.couchbase.com/">Couchbase</a>
*/
static constexpr const char *kCouchbase = "couchbase";

/**
<a href="https://couchdb.apache.org/">Apache CouchDB</a>
*/
static constexpr const char *kCouchdb = "couchdb";

/**
<a href="https://db.apache.org/derby/">Apache Derby</a>
*/
static constexpr const char *kDerby = "derby";

/**
<a href="https://www.elastic.co/elasticsearch">Elasticsearch</a>
*/
static constexpr const char *kElasticsearch = "elasticsearch";

/**
<a href="https://www.firebirdsql.org/">Firebird</a>
*/
static constexpr const char *kFirebirdsql = "firebirdsql";

/**
<a href="https://cloud.google.com/spanner">Google Cloud Spanner</a>
*/
static constexpr const char *kGcpSpanner = "gcp.spanner";

/**
<a href="https://geode.apache.org/">Apache Geode</a>
*/
static constexpr const char *kGeode = "geode";

/**
<a href="https://h2database.com/">H2 Database</a>
*/
static constexpr const char *kH2database = "h2database";

/**
<a href="https://hbase.apache.org/">Apache HBase</a>
*/
static constexpr const char *kHbase = "hbase";

/**
<a href="https://hive.apache.org/">Apache Hive</a>
*/
static constexpr const char *kHive = "hive";

/**
<a href="https://hsqldb.org/">HyperSQL Database</a>
*/
static constexpr const char *kHsqldb = "hsqldb";

/**
<a href="https://www.ibm.com/db2">IBM Db2</a>
*/
static constexpr const char *kIbmDb2 = "ibm.db2";

/**
<a href="https://www.ibm.com/products/informix">IBM Informix</a>
*/
static constexpr const char *kIbmInformix = "ibm.informix";

/**
<a href="https://www.ibm.com/products/netezza">IBM Netezza</a>
*/
static constexpr const char *kIbmNetezza = "ibm.netezza";

/**
<a href="https://www.influxdata.com/">InfluxDB</a>
*/
static constexpr const char *kInfluxdb = "influxdb";

/**
<a href="https://www.instantdb.com/">Instant</a>
*/
static constexpr const char *kInstantdb = "instantdb";

/**
<a href="https://mariadb.org/">MariaDB</a>
*/
static constexpr const char *kMariadb = "mariadb";

/**
<a href="https://memcached.org/">Memcached</a>
*/
static constexpr const char *kMemcached = "memcached";

/**
<a href="https://www.mongodb.com/">MongoDB</a>
*/
static constexpr const char *kMongodb = "mongodb";

/**
<a href="https://www.microsoft.com/sql-server">Microsoft SQL Server</a>
*/
Expand All @@ -292,56 +152,11 @@ static constexpr const char *kMicrosoftSqlServer = "microsoft.sql_server";
*/
static constexpr const char *kMysql = "mysql";

/**
<a href="https://neo4j.com/">Neo4j</a>
*/
static constexpr const char *kNeo4j = "neo4j";

/**
<a href="https://opensearch.org/">OpenSearch</a>
*/
static constexpr const char *kOpensearch = "opensearch";

/**
<a href="https://www.oracle.com/database/">Oracle Database</a>
*/
static constexpr const char *kOracleDb = "oracle.db";

/**
<a href="https://www.postgresql.org/">PostgreSQL</a>
*/
static constexpr const char *kPostgresql = "postgresql";

/**
<a href="https://redis.io/">Redis</a>
*/
static constexpr const char *kRedis = "redis";

/**
<a href="https://www.sap.com/products/technology-platform/hana/what-is-sap-hana.html">SAP HANA</a>
*/
static constexpr const char *kSapHana = "sap.hana";

/**
<a href="https://maxdb.sap.com/">SAP MaxDB</a>
*/
static constexpr const char *kSapMaxdb = "sap.maxdb";

/**
<a href="https://www.sqlite.org/">SQLite</a>
*/
static constexpr const char *kSqlite = "sqlite";

/**
<a href="https://www.teradata.com/">Teradata</a>
*/
static constexpr const char *kTeradata = "teradata";

/**
<a href="https://trino.io/">Trino</a>
*/
static constexpr const char *kTrino = "trino";

} // namespace DbSystemNameValues

} // namespace db
Expand Down
19 changes: 12 additions & 7 deletions api/include/opentelemetry/semconv/incubating/az_attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,22 @@ namespace az
{

/**
<a
href="https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers">Azure
Resource Provider Namespace</a> as recognized by the client.
Deprecated, use @code azure.resource_provider.namespace @endcode instead.

@deprecated
{"note": "Replaced by @code azure.resource_provider.namespace @endcode.", "reason": "renamed",
"renamed_to": "azure.resource_provider.namespace"}
*/
static constexpr const char *kAzNamespace = "az.namespace";
OPENTELEMETRY_DEPRECATED static constexpr const char *kAzNamespace = "az.namespace";

/**
The unique identifier of the service request. It's generated by the Azure service and returned
with the response.
Deprecated, use @code azure.service.request.id @endcode instead.

@deprecated
{"note": "Replaced by @code azure.service.request.id @endcode.", "reason": "renamed",
"renamed_to": "azure.service.request.id"}
*/
static constexpr const char *kAzServiceRequestId = "az.service_request_id";
OPENTELEMETRY_DEPRECATED static constexpr const char *kAzServiceRequestId = "az.service_request_id";

} // namespace az
} // namespace semconv
Expand Down
13 changes: 13 additions & 0 deletions api/include/opentelemetry/semconv/incubating/azure_attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,19 @@ static constexpr const char *kAzureCosmosdbRequestBodySize = "azure.cosmosdb.req
static constexpr const char *kAzureCosmosdbResponseSubStatusCode =
"azure.cosmosdb.response.sub_status_code";

/**
<a
href="https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers">Azure
Resource Provider Namespace</a> as recognized by the client.
*/
static constexpr const char *kAzureResourceProviderNamespace = "azure.resource_provider.namespace";

/**
The unique identifier of the service request. It's generated by the Azure service and returned
with the response.
*/
static constexpr const char *kAzureServiceRequestId = "azure.service.request.id";

namespace AzureCosmosdbConnectionModeValues
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static constexpr const char *kCloudRegion = "cloud.region";
<li><strong>GCP:</strong> The <a
href="https://cloud.google.com/iam/docs/full-resource-names">URI of the resource</a></li>
<li><strong>Azure:</strong> The <a
href="https://docs.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource
href="https://learn.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource
ID</a> of the invoked function, <em>not</em> the function app, having the form
@code
/subscriptions/<SUBSCRIPTION_GUID>/resourceGroups/<RG>/providers/Microsoft.Web/sites/<FUNCAPP>/functions/<FUNC>
Expand Down Expand Up @@ -139,37 +139,37 @@ static constexpr const char *kAwsOpenshift = "aws_openshift";
/**
Azure Virtual Machines
*/
static constexpr const char *kAzureVm = "azure_vm";
static constexpr const char *kAzureVm = "azure.vm";

/**
Azure Container Apps
*/
static constexpr const char *kAzureContainerApps = "azure_container_apps";
static constexpr const char *kAzureContainerApps = "azure.container_apps";

/**
Azure Container Instances
*/
static constexpr const char *kAzureContainerInstances = "azure_container_instances";
static constexpr const char *kAzureContainerInstances = "azure.container_instances";

/**
Azure Kubernetes Service
*/
static constexpr const char *kAzureAks = "azure_aks";
static constexpr const char *kAzureAks = "azure.aks";

/**
Azure Functions
*/
static constexpr const char *kAzureFunctions = "azure_functions";
static constexpr const char *kAzureFunctions = "azure.functions";

/**
Azure App Service
*/
static constexpr const char *kAzureAppService = "azure_app_service";
static constexpr const char *kAzureAppService = "azure.app_service";

/**
Azure Red Hat OpenShift
*/
static constexpr const char *kAzureOpenshift = "azure_openshift";
static constexpr const char *kAzureOpenshift = "azure.openshift";

/**
Google Bare Metal Solution (BMS)
Expand Down
Loading
Loading