Skip to content

Commit ea2ee89

Browse files
malkiamalkia
authored
Merge pull request #398 from open-telemetry/main
merged from upstream
2 parents 0aa01be + 4ad3b8b commit ea2ee89

24 files changed

+2707
-548
lines changed

‎CMakeLists.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,10 @@ if(WITH_EXAMPLES_HTTP AND NOT WITH_EXAMPLES)
275275
message(FATAL_ERROR "WITH_EXAMPLES_HTTP=ON requires WITH_EXAMPLES=ON")
276276
endif()
277277

278+
if(WITH_GSL)
279+
include("${opentelemetry-cpp_SOURCE_DIR}/cmake/ms-gsl.cmake")
280+
endif()
281+
278282
find_package(Threads)
279283

280284
function(set_target_version target_name)
@@ -635,7 +639,9 @@ message(STATUS "CMake: ${CMAKE_VERSION}")
635639
message(STATUS "GTest: ${GTest_VERSION} (${GTest_PROVIDER})")
636640
message(STATUS "benchmark: ${benchmark_VERSION} (${benchmark_PROVIDER})")
637641
if(WITH_GSL)
638-
message(STATUS "GSL: ${GSL_VERSION}")
642+
message(
643+
STATUS "Microsoft.GSL: ${Microsoft.GSL_VERSION} (${Microsoft.GSL_PROVIDER})"
644+
)
639645
endif()
640646
if(absl_FOUND)
641647
message(STATUS "Abseil: ${absl_VERSION}")

‎api/CMakeLists.txt‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,7 @@ target_include_directories(
99

1010
set_target_properties(opentelemetry_api PROPERTIES EXPORT_NAME api)
1111

12-
otel_add_component(
13-
COMPONENT
14-
api
15-
TARGETS
16-
opentelemetry_api
17-
FILES_DIRECTORY
18-
"include/opentelemetry"
19-
FILES_DESTINATION
20-
"include"
21-
FILES_MATCHING
22-
PATTERN
23-
"*.h")
24-
25-
if(OPENTELEMETRY_INSTALL)
26-
unset(TARGET_DEPS)
27-
endif()
12+
unset(TARGET_DEPS)
2813

2914
if(BUILD_TESTING)
3015
add_subdirectory(test)
@@ -74,18 +59,8 @@ endif()
7459

7560
if(WITH_GSL)
7661
target_compile_definitions(opentelemetry_api INTERFACE HAVE_GSL)
77-
78-
# Guidelines Support Library path. Used if we are not on not get C++20.
79-
#
80-
find_package(Microsoft.GSL QUIET)
81-
if(TARGET Microsoft.GSL::GSL)
82-
target_link_libraries(opentelemetry_api INTERFACE Microsoft.GSL::GSL)
83-
list(APPEND TARGET_DEPS "gsl")
84-
else()
85-
set(GSL_DIR third_party/ms-gsl)
86-
target_include_directories(
87-
opentelemetry_api INTERFACE "$<BUILD_INTERFACE:${GSL_DIR}/include>")
88-
endif()
62+
target_link_libraries(opentelemetry_api INTERFACE Microsoft.GSL::GSL)
63+
list(APPEND TARGET_DEPS "gsl")
8964
endif()
9065

9166
if(WITH_NO_GETENV)
@@ -140,6 +115,19 @@ if(APPLE)
140115
target_link_libraries(opentelemetry_api INTERFACE "-framework CoreFoundation")
141116
endif()
142117

118+
otel_add_component(
119+
COMPONENT
120+
api
121+
TARGETS
122+
opentelemetry_api
123+
FILES_DIRECTORY
124+
"include/opentelemetry"
125+
FILES_DESTINATION
126+
"include"
127+
FILES_MATCHING
128+
PATTERN
129+
"*.h")
130+
143131
include(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake)
144132

145133
if(OPENTELEMETRY_INSTALL)

‎api/include/opentelemetry/semconv/db_attributes.h‎

Lines changed: 0 additions & 185 deletions
Original file line numberDiff line numberDiff line change
@@ -137,151 +137,11 @@ static constexpr const char *kDbSystemName = "db.system.name";
137137

138138
namespace DbSystemNameValues
139139
{
140-
/**
141-
Some other SQL database. Fallback only.
142-
*/
143-
static constexpr const char *kOtherSql = "other_sql";
144-
145-
/**
146-
<a href="https://documentation.softwareag.com/?pf=adabas">Adabas (Adaptable Database System)</a>
147-
*/
148-
static constexpr const char *kSoftwareagAdabas = "softwareag.adabas";
149-
150-
/**
151-
<a href="https://www.actian.com/databases/ingres/">Actian Ingres</a>
152-
*/
153-
static constexpr const char *kActianIngres = "actian.ingres";
154-
155-
/**
156-
<a href="https://aws.amazon.com/pm/dynamodb/">Amazon DynamoDB</a>
157-
*/
158-
static constexpr const char *kAwsDynamodb = "aws.dynamodb";
159-
160-
/**
161-
<a href="https://aws.amazon.com/redshift/">Amazon Redshift</a>
162-
*/
163-
static constexpr const char *kAwsRedshift = "aws.redshift";
164-
165-
/**
166-
<a href="https://learn.microsoft.com/azure/cosmos-db">Azure Cosmos DB</a>
167-
*/
168-
static constexpr const char *kAzureCosmosdb = "azure.cosmosdb";
169-
170-
/**
171-
<a href="https://www.intersystems.com/products/cache/">InterSystems Caché</a>
172-
*/
173-
static constexpr const char *kIntersystemsCache = "intersystems.cache";
174-
175-
/**
176-
<a href="https://cassandra.apache.org/">Apache Cassandra</a>
177-
*/
178-
static constexpr const char *kCassandra = "cassandra";
179-
180-
/**
181-
<a href="https://clickhouse.com/">ClickHouse</a>
182-
*/
183-
static constexpr const char *kClickhouse = "clickhouse";
184-
185-
/**
186-
<a href="https://www.cockroachlabs.com/">CockroachDB</a>
187-
*/
188-
static constexpr const char *kCockroachdb = "cockroachdb";
189-
190-
/**
191-
<a href="https://www.couchbase.com/">Couchbase</a>
192-
*/
193-
static constexpr const char *kCouchbase = "couchbase";
194-
195-
/**
196-
<a href="https://couchdb.apache.org/">Apache CouchDB</a>
197-
*/
198-
static constexpr const char *kCouchdb = "couchdb";
199-
200-
/**
201-
<a href="https://db.apache.org/derby/">Apache Derby</a>
202-
*/
203-
static constexpr const char *kDerby = "derby";
204-
205-
/**
206-
<a href="https://www.elastic.co/elasticsearch">Elasticsearch</a>
207-
*/
208-
static constexpr const char *kElasticsearch = "elasticsearch";
209-
210-
/**
211-
<a href="https://www.firebirdsql.org/">Firebird</a>
212-
*/
213-
static constexpr const char *kFirebirdsql = "firebirdsql";
214-
215-
/**
216-
<a href="https://cloud.google.com/spanner">Google Cloud Spanner</a>
217-
*/
218-
static constexpr const char *kGcpSpanner = "gcp.spanner";
219-
220-
/**
221-
<a href="https://geode.apache.org/">Apache Geode</a>
222-
*/
223-
static constexpr const char *kGeode = "geode";
224-
225-
/**
226-
<a href="https://h2database.com/">H2 Database</a>
227-
*/
228-
static constexpr const char *kH2database = "h2database";
229-
230-
/**
231-
<a href="https://hbase.apache.org/">Apache HBase</a>
232-
*/
233-
static constexpr const char *kHbase = "hbase";
234-
235-
/**
236-
<a href="https://hive.apache.org/">Apache Hive</a>
237-
*/
238-
static constexpr const char *kHive = "hive";
239-
240-
/**
241-
<a href="https://hsqldb.org/">HyperSQL Database</a>
242-
*/
243-
static constexpr const char *kHsqldb = "hsqldb";
244-
245-
/**
246-
<a href="https://www.ibm.com/db2">IBM Db2</a>
247-
*/
248-
static constexpr const char *kIbmDb2 = "ibm.db2";
249-
250-
/**
251-
<a href="https://www.ibm.com/products/informix">IBM Informix</a>
252-
*/
253-
static constexpr const char *kIbmInformix = "ibm.informix";
254-
255-
/**
256-
<a href="https://www.ibm.com/products/netezza">IBM Netezza</a>
257-
*/
258-
static constexpr const char *kIbmNetezza = "ibm.netezza";
259-
260-
/**
261-
<a href="https://www.influxdata.com/">InfluxDB</a>
262-
*/
263-
static constexpr const char *kInfluxdb = "influxdb";
264-
265-
/**
266-
<a href="https://www.instantdb.com/">Instant</a>
267-
*/
268-
static constexpr const char *kInstantdb = "instantdb";
269-
270140
/**
271141
<a href="https://mariadb.org/">MariaDB</a>
272142
*/
273143
static constexpr const char *kMariadb = "mariadb";
274144

275-
/**
276-
<a href="https://memcached.org/">Memcached</a>
277-
*/
278-
static constexpr const char *kMemcached = "memcached";
279-
280-
/**
281-
<a href="https://www.mongodb.com/">MongoDB</a>
282-
*/
283-
static constexpr const char *kMongodb = "mongodb";
284-
285145
/**
286146
<a href="https://www.microsoft.com/sql-server">Microsoft SQL Server</a>
287147
*/
@@ -292,56 +152,11 @@ static constexpr const char *kMicrosoftSqlServer = "microsoft.sql_server";
292152
*/
293153
static constexpr const char *kMysql = "mysql";
294154

295-
/**
296-
<a href="https://neo4j.com/">Neo4j</a>
297-
*/
298-
static constexpr const char *kNeo4j = "neo4j";
299-
300-
/**
301-
<a href="https://opensearch.org/">OpenSearch</a>
302-
*/
303-
static constexpr const char *kOpensearch = "opensearch";
304-
305-
/**
306-
<a href="https://www.oracle.com/database/">Oracle Database</a>
307-
*/
308-
static constexpr const char *kOracleDb = "oracle.db";
309-
310155
/**
311156
<a href="https://www.postgresql.org/">PostgreSQL</a>
312157
*/
313158
static constexpr const char *kPostgresql = "postgresql";
314159

315-
/**
316-
<a href="https://redis.io/">Redis</a>
317-
*/
318-
static constexpr const char *kRedis = "redis";
319-
320-
/**
321-
<a href="https://www.sap.com/products/technology-platform/hana/what-is-sap-hana.html">SAP HANA</a>
322-
*/
323-
static constexpr const char *kSapHana = "sap.hana";
324-
325-
/**
326-
<a href="https://maxdb.sap.com/">SAP MaxDB</a>
327-
*/
328-
static constexpr const char *kSapMaxdb = "sap.maxdb";
329-
330-
/**
331-
<a href="https://www.sqlite.org/">SQLite</a>
332-
*/
333-
static constexpr const char *kSqlite = "sqlite";
334-
335-
/**
336-
<a href="https://www.teradata.com/">Teradata</a>
337-
*/
338-
static constexpr const char *kTeradata = "teradata";
339-
340-
/**
341-
<a href="https://trino.io/">Trino</a>
342-
*/
343-
static constexpr const char *kTrino = "trino";
344-
345160
} // namespace DbSystemNameValues
346161

347162
} // namespace db

‎api/include/opentelemetry/semconv/incubating/az_attributes.h‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,22 @@ namespace az
2020
{
2121

2222
/**
23-
<a
24-
href="https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers">Azure
25-
Resource Provider Namespace</a> as recognized by the client.
23+
Deprecated, use @code azure.resource_provider.namespace @endcode instead.
24+
25+
@deprecated
26+
{"note": "Replaced by @code azure.resource_provider.namespace @endcode.", "reason": "renamed",
27+
"renamed_to": "azure.resource_provider.namespace"}
2628
*/
27-
static constexpr const char *kAzNamespace = "az.namespace";
29+
OPENTELEMETRY_DEPRECATED static constexpr const char *kAzNamespace = "az.namespace";
2830

2931
/**
30-
The unique identifier of the service request. It's generated by the Azure service and returned
31-
with the response.
32+
Deprecated, use @code azure.service.request.id @endcode instead.
33+
34+
@deprecated
35+
{"note": "Replaced by @code azure.service.request.id @endcode.", "reason": "renamed",
36+
"renamed_to": "azure.service.request.id"}
3237
*/
33-
static constexpr const char *kAzServiceRequestId = "az.service_request_id";
38+
OPENTELEMETRY_DEPRECATED static constexpr const char *kAzServiceRequestId = "az.service_request_id";
3439

3540
} // namespace az
3641
} // namespace semconv

‎api/include/opentelemetry/semconv/incubating/azure_attributes.h‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,19 @@ static constexpr const char *kAzureCosmosdbRequestBodySize = "azure.cosmosdb.req
6262
static constexpr const char *kAzureCosmosdbResponseSubStatusCode =
6363
"azure.cosmosdb.response.sub_status_code";
6464

65+
/**
66+
<a
67+
href="https://learn.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers">Azure
68+
Resource Provider Namespace</a> as recognized by the client.
69+
*/
70+
static constexpr const char *kAzureResourceProviderNamespace = "azure.resource_provider.namespace";
71+
72+
/**
73+
The unique identifier of the service request. It's generated by the Azure service and returned
74+
with the response.
75+
*/
76+
static constexpr const char *kAzureServiceRequestId = "azure.service.request.id";
77+
6578
namespace AzureCosmosdbConnectionModeValues
6679
{
6780
/**

‎api/include/opentelemetry/semconv/incubating/cloud_attributes.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static constexpr const char *kCloudRegion = "cloud.region";
7474
<li><strong>GCP:</strong> The <a
7575
href="https://cloud.google.com/iam/docs/full-resource-names">URI of the resource</a></li>
7676
<li><strong>Azure:</strong> The <a
77-
href="https://docs.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource
77+
href="https://learn.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource
7878
ID</a> of the invoked function, <em>not</em> the function app, having the form
7979
@code
8080
/subscriptions/<SUBSCRIPTION_GUID>/resourceGroups/<RG>/providers/Microsoft.Web/sites/<FUNCAPP>/functions/<FUNC>
@@ -139,37 +139,37 @@ static constexpr const char *kAwsOpenshift = "aws_openshift";
139139
/**
140140
Azure Virtual Machines
141141
*/
142-
static constexpr const char *kAzureVm = "azure_vm";
142+
static constexpr const char *kAzureVm = "azure.vm";
143143

144144
/**
145145
Azure Container Apps
146146
*/
147-
static constexpr const char *kAzureContainerApps = "azure_container_apps";
147+
static constexpr const char *kAzureContainerApps = "azure.container_apps";
148148

149149
/**
150150
Azure Container Instances
151151
*/
152-
static constexpr const char *kAzureContainerInstances = "azure_container_instances";
152+
static constexpr const char *kAzureContainerInstances = "azure.container_instances";
153153

154154
/**
155155
Azure Kubernetes Service
156156
*/
157-
static constexpr const char *kAzureAks = "azure_aks";
157+
static constexpr const char *kAzureAks = "azure.aks";
158158

159159
/**
160160
Azure Functions
161161
*/
162-
static constexpr const char *kAzureFunctions = "azure_functions";
162+
static constexpr const char *kAzureFunctions = "azure.functions";
163163

164164
/**
165165
Azure App Service
166166
*/
167-
static constexpr const char *kAzureAppService = "azure_app_service";
167+
static constexpr const char *kAzureAppService = "azure.app_service";
168168

169169
/**
170170
Azure Red Hat OpenShift
171171
*/
172-
static constexpr const char *kAzureOpenshift = "azure_openshift";
172+
static constexpr const char *kAzureOpenshift = "azure.openshift";
173173

174174
/**
175175
Google Bare Metal Solution (BMS)

0 commit comments

Comments
 (0)