Skip to content

Commit 82dd3ab

Browse files
esigoesigo
authored
Merge branch 'main' into 3118-devcontainer
2 parents a842a0b + 57114c5 commit 82dd3ab

File tree

204 files changed

+1366
-428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+1366
-428
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,15 @@ jobs:
452452
run: |
453453
sudo ./ci/setup_grpc.sh
454454
./ci/do_ci.sh cmake.exporter.otprotocol.test
455+
- name: generate test cert
456+
env:
457+
CFSSL_VERSION: 1.6.3
458+
run: |
459+
sudo -E ./tools/setup-cfssl.sh
460+
(cd ./functional/cert; ./generate_cert.sh)
461+
- name: run func test
462+
run: |
463+
(cd ./functional/otlp; ./run_test.sh)
455464
456465
cmake_modern_protobuf_grpc_with_abseil_test:
457466
name: CMake test (with modern protobuf,grpc and abseil)

‎.iwyu.imp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
{ "include": ["<gtest/gtest-param-test.h>", "private", "<gtest/gtest.h>", "public"] },
2020
{ "include": ["<gtest/gtest_pred_impl.h>", "private", "<gtest/gtest.h>", "public"] },
2121
{ "include": ["<gtest/gtest-typed-test.h>", "private", "<gtest/gtest.h>", "public"] },
22+
{ "include": ["<gtest/gtest-assertion-result.h>", "private", "<gtest/gtest.h>", "public"] },
2223

2324
# We prefer to include <gmock/gmock.h> for simplicity
2425
{ "include": ["<gmock/gmock-function-mocker.h>", "private", "<gmock/gmock.h>", "public"] },

‎CHANGELOG.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ Increment the:
2121
* [SDK] Fix instrumentation scope attributes evaluated in equal method
2222
[#3214](https://github.com/open-telemetry/opentelemetry-cpp/pull/3214)
2323

24+
* [EXPORTER] Fix scope attributes missing from otlp traces metrics
25+
[#3185](https://github.com/open-telemetry/opentelemetry-cpp/pull/3185)
26+
2427
## [1.18 2024-11-25]
2528

2629
* [EXPORTER] Fix crash in ElasticsearchLogRecordExporter
@@ -155,9 +158,6 @@ Increment the:
155158
* [bazel] Update opentelemetry-proto in MODULE.bazel
156159
[#3163](https://github.com/open-telemetry/opentelemetry-cpp/pull/3163)
157160

158-
* [EXPORTER] Fix scope attributes missing from otlp traces metrics
159-
[#3185](https://github.com/open-telemetry/opentelemetry-cpp/pull/3185)
160-
161161
Important changes:
162162

163163
* [API] Jaeger Propagator should not be deprecated

‎MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")
1313
bazel_dep(name = "curl", version = "8.8.0")
1414
bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc")
1515
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json")
16-
bazel_dep(name = "opentelemetry-proto", version = "1.4.0", repo_name = "com_github_opentelemetry_proto")
16+
bazel_dep(name = "opentelemetry-proto", version = "1.5.0", repo_name = "com_github_opentelemetry_proto")
1717
bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
1818
bazel_dep(name = "platforms", version = "0.0.8")
1919
bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")

‎api/include/opentelemetry/logs/severity.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#pragma once
55

6+
#include <cstdint>
7+
68
#include "opentelemetry/nostd/string_view.h"
79
#include "opentelemetry/version.h"
810

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ namespace http
2525
* <p>
2626
* histogram
2727
*/
28-
static constexpr const char *kMetricHttpClientRequestDuration =
29-
"metric.http.client.request.duration";
28+
static constexpr const char *kMetricHttpClientRequestDuration = "http.client.request.duration";
3029
static constexpr const char *descrMetricHttpClientRequestDuration =
3130
"Duration of HTTP client requests.";
3231
static constexpr const char *unitMetricHttpClientRequestDuration = "s";
@@ -52,8 +51,7 @@ CreateSyncDoubleMetricHttpClientRequestDuration(metrics::Meter *meter)
5251
* <p>
5352
* histogram
5453
*/
55-
static constexpr const char *kMetricHttpServerRequestDuration =
56-
"metric.http.server.request.duration";
54+
static constexpr const char *kMetricHttpServerRequestDuration = "http.server.request.duration";
5755
static constexpr const char *descrMetricHttpServerRequestDuration =
5856
"Duration of HTTP server requests.";
5957
static constexpr const char *unitMetricHttpServerRequestDuration = "s";

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace container
2727
* <p>
2828
* counter
2929
*/
30-
static constexpr const char *kMetricContainerCpuTime = "metric.container.cpu.time";
30+
static constexpr const char *kMetricContainerCpuTime = "container.cpu.time";
3131
static constexpr const char *descrMetricContainerCpuTime = "Total CPU time consumed";
3232
static constexpr const char *unitMetricContainerCpuTime = "s";
3333

@@ -66,7 +66,7 @@ CreateAsyncDoubleMetricContainerCpuTime(metrics::Meter *meter)
6666
* <p>
6767
* gauge
6868
*/
69-
static constexpr const char *kMetricContainerCpuUsage = "metric.container.cpu.usage";
69+
static constexpr const char *kMetricContainerCpuUsage = "container.cpu.usage";
7070
static constexpr const char *descrMetricContainerCpuUsage =
7171
"Container's CPU usage, measured in cpus. Range from 0 to the number of allocatable CPUs";
7272
static constexpr const char *unitMetricContainerCpuUsage = "{cpu}";
@@ -109,7 +109,7 @@ CreateAsyncDoubleMetricContainerCpuUsage(metrics::Meter *meter)
109109
* <p>
110110
* counter
111111
*/
112-
static constexpr const char *kMetricContainerDiskIo = "metric.container.disk.io";
112+
static constexpr const char *kMetricContainerDiskIo = "container.disk.io";
113113
static constexpr const char *descrMetricContainerDiskIo = "Disk bytes for the container.";
114114
static constexpr const char *unitMetricContainerDiskIo = "By";
115115

@@ -148,7 +148,7 @@ CreateAsyncDoubleMetricContainerDiskIo(metrics::Meter *meter)
148148
* <p>
149149
* counter
150150
*/
151-
static constexpr const char *kMetricContainerMemoryUsage = "metric.container.memory.usage";
151+
static constexpr const char *kMetricContainerMemoryUsage = "container.memory.usage";
152152
static constexpr const char *descrMetricContainerMemoryUsage = "Memory usage of the container.";
153153
static constexpr const char *unitMetricContainerMemoryUsage = "By";
154154

@@ -187,7 +187,7 @@ CreateAsyncDoubleMetricContainerMemoryUsage(metrics::Meter *meter)
187187
* <p>
188188
* counter
189189
*/
190-
static constexpr const char *kMetricContainerNetworkIo = "metric.container.network.io";
190+
static constexpr const char *kMetricContainerNetworkIo = "container.network.io";
191191
static constexpr const char *descrMetricContainerNetworkIo = "Network bytes for the container.";
192192
static constexpr const char *unitMetricContainerNetworkIo = "By";
193193

@@ -226,7 +226,7 @@ CreateAsyncDoubleMetricContainerNetworkIo(metrics::Meter *meter)
226226
* as a floating point number with the highest precision available. The actual accuracy would depend
227227
* on the instrumentation and operating system. <p> gauge
228228
*/
229-
static constexpr const char *kMetricContainerUptime = "metric.container.uptime";
229+
static constexpr const char *kMetricContainerUptime = "container.uptime";
230230
static constexpr const char *descrMetricContainerUptime = "The time the container has been running";
231231
static constexpr const char *unitMetricContainerUptime = "s";
232232

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

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace db
2424
* The number of connections that are currently in state described by the @code state @endcode
2525
* attribute <p> updowncounter
2626
*/
27-
static constexpr const char *kMetricDbClientConnectionCount = "metric.db.client.connection.count";
27+
static constexpr const char *kMetricDbClientConnectionCount = "db.client.connection.count";
2828
static constexpr const char *descrMetricDbClientConnectionCount =
2929
"The number of connections that are currently in state described by the `state` attribute";
3030
static constexpr const char *unitMetricDbClientConnectionCount = "{connection}";
@@ -67,7 +67,7 @@ CreateAsyncDoubleMetricDbClientConnectionCount(metrics::Meter *meter)
6767
* histogram
6868
*/
6969
static constexpr const char *kMetricDbClientConnectionCreateTime =
70-
"metric.db.client.connection.create_time";
70+
"db.client.connection.create_time";
7171
static constexpr const char *descrMetricDbClientConnectionCreateTime =
7272
"The time it took to create a new connection";
7373
static constexpr const char *unitMetricDbClientConnectionCreateTime = "s";
@@ -93,8 +93,7 @@ CreateSyncDoubleMetricDbClientConnectionCreateTime(metrics::Meter *meter)
9393
* <p>
9494
* updowncounter
9595
*/
96-
static constexpr const char *kMetricDbClientConnectionIdleMax =
97-
"metric.db.client.connection.idle.max";
96+
static constexpr const char *kMetricDbClientConnectionIdleMax = "db.client.connection.idle.max";
9897
static constexpr const char *descrMetricDbClientConnectionIdleMax =
9998
"The maximum number of idle open connections allowed";
10099
static constexpr const char *unitMetricDbClientConnectionIdleMax = "{connection}";
@@ -136,8 +135,7 @@ CreateAsyncDoubleMetricDbClientConnectionIdleMax(metrics::Meter *meter)
136135
* <p>
137136
* updowncounter
138137
*/
139-
static constexpr const char *kMetricDbClientConnectionIdleMin =
140-
"metric.db.client.connection.idle.min";
138+
static constexpr const char *kMetricDbClientConnectionIdleMin = "db.client.connection.idle.min";
141139
static constexpr const char *descrMetricDbClientConnectionIdleMin =
142140
"The minimum number of idle open connections allowed";
143141
static constexpr const char *unitMetricDbClientConnectionIdleMin = "{connection}";
@@ -179,7 +177,7 @@ CreateAsyncDoubleMetricDbClientConnectionIdleMin(metrics::Meter *meter)
179177
* <p>
180178
* updowncounter
181179
*/
182-
static constexpr const char *kMetricDbClientConnectionMax = "metric.db.client.connection.max";
180+
static constexpr const char *kMetricDbClientConnectionMax = "db.client.connection.max";
183181
static constexpr const char *descrMetricDbClientConnectionMax =
184182
"The maximum number of open connections allowed";
185183
static constexpr const char *unitMetricDbClientConnectionMax = "{connection}";
@@ -222,7 +220,7 @@ CreateAsyncDoubleMetricDbClientConnectionMax(metrics::Meter *meter)
222220
* updowncounter
223221
*/
224222
static constexpr const char *kMetricDbClientConnectionPendingRequests =
225-
"metric.db.client.connection.pending_requests";
223+
"db.client.connection.pending_requests";
226224
static constexpr const char *descrMetricDbClientConnectionPendingRequests =
227225
"The number of current pending requests for an open connection";
228226
static constexpr const char *unitMetricDbClientConnectionPendingRequests = "{request}";
@@ -264,8 +262,7 @@ CreateAsyncDoubleMetricDbClientConnectionPendingRequests(metrics::Meter *meter)
264262
* <p>
265263
* counter
266264
*/
267-
static constexpr const char *kMetricDbClientConnectionTimeouts =
268-
"metric.db.client.connection.timeouts";
265+
static constexpr const char *kMetricDbClientConnectionTimeouts = "db.client.connection.timeouts";
269266
static constexpr const char *descrMetricDbClientConnectionTimeouts =
270267
"The number of connection timeouts that have occurred trying to obtain a connection from the "
271268
"pool";
@@ -308,8 +305,7 @@ CreateAsyncDoubleMetricDbClientConnectionTimeouts(metrics::Meter *meter)
308305
* <p>
309306
* histogram
310307
*/
311-
static constexpr const char *kMetricDbClientConnectionUseTime =
312-
"metric.db.client.connection.use_time";
308+
static constexpr const char *kMetricDbClientConnectionUseTime = "db.client.connection.use_time";
313309
static constexpr const char *descrMetricDbClientConnectionUseTime =
314310
"The time between borrowing a connection and returning it to the pool";
315311
static constexpr const char *unitMetricDbClientConnectionUseTime = "s";
@@ -335,8 +331,7 @@ CreateSyncDoubleMetricDbClientConnectionUseTime(metrics::Meter *meter)
335331
* <p>
336332
* histogram
337333
*/
338-
static constexpr const char *kMetricDbClientConnectionWaitTime =
339-
"metric.db.client.connection.wait_time";
334+
static constexpr const char *kMetricDbClientConnectionWaitTime = "db.client.connection.wait_time";
340335
static constexpr const char *descrMetricDbClientConnectionWaitTime =
341336
"The time it took to obtain an open connection from the pool";
342337
static constexpr const char *unitMetricDbClientConnectionWaitTime = "s";
@@ -366,7 +361,7 @@ CreateSyncDoubleMetricDbClientConnectionWaitTime(metrics::Meter *meter)
366361
*/
367362
OPENTELEMETRY_DEPRECATED
368363
static constexpr const char *kMetricDbClientConnectionsCreateTime =
369-
"metric.db.client.connections.create_time";
364+
"db.client.connections.create_time";
370365
OPENTELEMETRY_DEPRECATED
371366
static constexpr const char *descrMetricDbClientConnectionsCreateTime =
372367
"Deprecated, use `db.client.connection.create_time` instead. Note: the unit also changed from "
@@ -401,8 +396,7 @@ CreateSyncDoubleMetricDbClientConnectionsCreateTime(metrics::Meter *meter)
401396
* updowncounter
402397
*/
403398
OPENTELEMETRY_DEPRECATED
404-
static constexpr const char *kMetricDbClientConnectionsIdleMax =
405-
"metric.db.client.connections.idle.max";
399+
static constexpr const char *kMetricDbClientConnectionsIdleMax = "db.client.connections.idle.max";
406400
OPENTELEMETRY_DEPRECATED
407401
static constexpr const char *descrMetricDbClientConnectionsIdleMax =
408402
"Deprecated, use `db.client.connection.idle.max` instead.";
@@ -454,8 +448,7 @@ CreateAsyncDoubleMetricDbClientConnectionsIdleMax(metrics::Meter *meter)
454448
* updowncounter
455449
*/
456450
OPENTELEMETRY_DEPRECATED
457-
static constexpr const char *kMetricDbClientConnectionsIdleMin =
458-
"metric.db.client.connections.idle.min";
451+
static constexpr const char *kMetricDbClientConnectionsIdleMin = "db.client.connections.idle.min";
459452
OPENTELEMETRY_DEPRECATED
460453
static constexpr const char *descrMetricDbClientConnectionsIdleMin =
461454
"Deprecated, use `db.client.connection.idle.min` instead.";
@@ -507,7 +500,7 @@ CreateAsyncDoubleMetricDbClientConnectionsIdleMin(metrics::Meter *meter)
507500
* updowncounter
508501
*/
509502
OPENTELEMETRY_DEPRECATED
510-
static constexpr const char *kMetricDbClientConnectionsMax = "metric.db.client.connections.max";
503+
static constexpr const char *kMetricDbClientConnectionsMax = "db.client.connections.max";
511504
OPENTELEMETRY_DEPRECATED
512505
static constexpr const char *descrMetricDbClientConnectionsMax =
513506
"Deprecated, use `db.client.connection.max` instead.";
@@ -560,7 +553,7 @@ CreateAsyncDoubleMetricDbClientConnectionsMax(metrics::Meter *meter)
560553
*/
561554
OPENTELEMETRY_DEPRECATED
562555
static constexpr const char *kMetricDbClientConnectionsPendingRequests =
563-
"metric.db.client.connections.pending_requests";
556+
"db.client.connections.pending_requests";
564557
OPENTELEMETRY_DEPRECATED
565558
static constexpr const char *descrMetricDbClientConnectionsPendingRequests =
566559
"Deprecated, use `db.client.connection.pending_requests` instead.";
@@ -612,8 +605,7 @@ CreateAsyncDoubleMetricDbClientConnectionsPendingRequests(metrics::Meter *meter)
612605
* counter
613606
*/
614607
OPENTELEMETRY_DEPRECATED
615-
static constexpr const char *kMetricDbClientConnectionsTimeouts =
616-
"metric.db.client.connections.timeouts";
608+
static constexpr const char *kMetricDbClientConnectionsTimeouts = "db.client.connections.timeouts";
617609
OPENTELEMETRY_DEPRECATED
618610
static constexpr const char *descrMetricDbClientConnectionsTimeouts =
619611
"Deprecated, use `db.client.connection.timeouts` instead.";
@@ -665,7 +657,7 @@ CreateAsyncDoubleMetricDbClientConnectionsTimeouts(metrics::Meter *meter)
665657
* updowncounter
666658
*/
667659
OPENTELEMETRY_DEPRECATED
668-
static constexpr const char *kMetricDbClientConnectionsUsage = "metric.db.client.connections.usage";
660+
static constexpr const char *kMetricDbClientConnectionsUsage = "db.client.connections.usage";
669661
OPENTELEMETRY_DEPRECATED
670662
static constexpr const char *descrMetricDbClientConnectionsUsage =
671663
"Deprecated, use `db.client.connection.count` instead.";
@@ -716,8 +708,7 @@ CreateAsyncDoubleMetricDbClientConnectionsUsage(metrics::Meter *meter)
716708
* ms @endcode to @code s @endcode. <p> histogram
717709
*/
718710
OPENTELEMETRY_DEPRECATED
719-
static constexpr const char *kMetricDbClientConnectionsUseTime =
720-
"metric.db.client.connections.use_time";
711+
static constexpr const char *kMetricDbClientConnectionsUseTime = "db.client.connections.use_time";
721712
OPENTELEMETRY_DEPRECATED
722713
static constexpr const char *descrMetricDbClientConnectionsUseTime =
723714
"Deprecated, use `db.client.connection.use_time` instead. Note: the unit also changed from "
@@ -751,8 +742,7 @@ CreateSyncDoubleMetricDbClientConnectionsUseTime(metrics::Meter *meter)
751742
* ms @endcode to @code s @endcode. <p> histogram
752743
*/
753744
OPENTELEMETRY_DEPRECATED
754-
static constexpr const char *kMetricDbClientConnectionsWaitTime =
755-
"metric.db.client.connections.wait_time";
745+
static constexpr const char *kMetricDbClientConnectionsWaitTime = "db.client.connections.wait_time";
756746
OPENTELEMETRY_DEPRECATED
757747
static constexpr const char *descrMetricDbClientConnectionsWaitTime =
758748
"Deprecated, use `db.client.connection.wait_time` instead. Note: the unit also changed from "
@@ -784,7 +774,7 @@ CreateSyncDoubleMetricDbClientConnectionsWaitTime(metrics::Meter *meter)
784774
* updowncounter
785775
*/
786776
static constexpr const char *kMetricDbClientCosmosdbActiveInstanceCount =
787-
"metric.db.client.cosmosdb.active_instance.count";
777+
"db.client.cosmosdb.active_instance.count";
788778
static constexpr const char *descrMetricDbClientCosmosdbActiveInstanceCount =
789779
"Number of active client instances";
790780
static constexpr const char *unitMetricDbClientCosmosdbActiveInstanceCount = "{instance}";
@@ -826,7 +816,7 @@ CreateAsyncDoubleMetricDbClientCosmosdbActiveInstanceCount(metrics::Meter *meter
826816
* by the operation <p> histogram
827817
*/
828818
static constexpr const char *kMetricDbClientCosmosdbOperationRequestCharge =
829-
"metric.db.client.cosmosdb.operation.request_charge";
819+
"db.client.cosmosdb.operation.request_charge";
830820
static constexpr const char *descrMetricDbClientCosmosdbOperationRequestCharge =
831821
"[Request charge](https://learn.microsoft.com/azure/cosmos-db/request-units) consumed by the "
832822
"operation";
@@ -855,8 +845,7 @@ CreateSyncDoubleMetricDbClientCosmosdbOperationRequestCharge(metrics::Meter *met
855845
* <p>
856846
* histogram
857847
*/
858-
static constexpr const char *kMetricDbClientOperationDuration =
859-
"metric.db.client.operation.duration";
848+
static constexpr const char *kMetricDbClientOperationDuration = "db.client.operation.duration";
860849
static constexpr const char *descrMetricDbClientOperationDuration =
861850
"Duration of database client operations.";
862851
static constexpr const char *unitMetricDbClientOperationDuration = "s";
@@ -883,7 +872,7 @@ CreateSyncDoubleMetricDbClientOperationDuration(metrics::Meter *meter)
883872
* histogram
884873
*/
885874
static constexpr const char *kMetricDbClientResponseReturnedRows =
886-
"metric.db.client.response.returned_rows";
875+
"db.client.response.returned_rows";
887876
static constexpr const char *descrMetricDbClientResponseReturnedRows =
888877
"The actual number of records returned by the database operation.";
889878
static constexpr const char *unitMetricDbClientResponseReturnedRows = "{row}";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace dns
2525
* <p>
2626
* histogram
2727
*/
28-
static constexpr const char *kMetricDnsLookupDuration = "metric.dns.lookup.duration";
28+
static constexpr const char *kMetricDnsLookupDuration = "dns.lookup.duration";
2929
static constexpr const char *descrMetricDnsLookupDuration =
3030
"Measures the time taken to perform a DNS lookup.";
3131
static constexpr const char *unitMetricDnsLookupDuration = "s";

0 commit comments

Comments
 (0)