Skip to content

Commit 8420c89

Browse files
authored
Merge branch 'main' into poc_config_yaml
2 parents 3b58494 + 902ee88 commit 8420c89

File tree

20 files changed

+404
-331
lines changed

20 files changed

+404
-331
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ jobs:
4949
submodules: 'recursive'
5050
- name: setup
5151
env:
52-
CC: /usr/bin/gcc-10
53-
CXX: /usr/bin/g++-10
52+
CC: /usr/bin/gcc-12
53+
CXX: /usr/bin/g++-12
5454
run: |
5555
sudo -E ./ci/setup_googletest.sh
5656
sudo -E ./ci/setup_ci_environment.sh
5757
- name: run cmake tests (without otlp-exporter)
5858
env:
59-
CC: /usr/bin/gcc-10
60-
CXX: /usr/bin/g++-10
59+
CC: /usr/bin/gcc-12
60+
CXX: /usr/bin/g++-12
6161
run: |
6262
./ci/do_ci.sh cmake.test
6363
@@ -297,15 +297,15 @@ jobs:
297297
submodules: 'recursive'
298298
- name: setup
299299
env:
300-
CC: /usr/bin/gcc-10
301-
CXX: /usr/bin/g++-10
300+
CC: /usr/bin/gcc-12
301+
CXX: /usr/bin/g++-12
302302
run: |
303303
sudo -E ./ci/setup_googletest.sh
304304
sudo -E ./ci/setup_ci_environment.sh
305305
- name: run cmake tests (without otlp-exporter)
306306
env:
307-
CC: /usr/bin/gcc-10
308-
CXX: /usr/bin/g++-10
307+
CC: /usr/bin/gcc-12
308+
CXX: /usr/bin/g++-12
309309
run: |
310310
./ci/do_ci.sh cmake.with_async_export.test
311311
@@ -393,7 +393,7 @@ jobs:
393393

394394
cmake_test_cxx20_clang:
395395
name: CMake C++20 test(Clang with libc++)
396-
runs-on: ubuntu-latest
396+
runs-on: ubuntu-22.04
397397
steps:
398398
- uses: actions/checkout@v4
399399
with:
@@ -443,7 +443,7 @@ jobs:
443443

444444
cmake_test_cxx23_clang:
445445
name: CMake C++23 test(Clang with libc++)
446-
runs-on: ubuntu-latest
446+
runs-on: ubuntu-22.04
447447
steps:
448448
- uses: actions/checkout@v4
449449
with:
@@ -572,15 +572,15 @@ jobs:
572572
submodules: 'recursive'
573573
- name: setup
574574
env:
575-
CC: /usr/bin/gcc-10
576-
CXX: /usr/bin/g++-10
575+
CC: /usr/bin/gcc-12
576+
CXX: /usr/bin/g++-12
577577
run: |
578578
sudo -E ./ci/setup_googletest.sh
579579
sudo -E ./ci/setup_ci_environment.sh
580580
- name: run tests
581581
env:
582-
CC: /usr/bin/gcc-10
583-
CXX: /usr/bin/g++-10
582+
CC: /usr/bin/gcc-12
583+
CXX: /usr/bin/g++-12
584584
run: ./ci/do_ci.sh cmake.test_example_plugin
585585

586586
bazel_test:
@@ -892,7 +892,7 @@ jobs:
892892

893893
code_coverage:
894894
name: Code coverage
895-
runs-on: ubuntu-latest
895+
runs-on: ubuntu-22.04
896896
steps:
897897
- uses: actions/checkout@v4
898898
with:
@@ -970,8 +970,8 @@ jobs:
970970
submodules: 'recursive'
971971
- name: setup
972972
env:
973-
CC: /usr/bin/gcc-10
974-
CXX: /usr/bin/g++-10
973+
CC: /usr/bin/gcc-12
974+
CXX: /usr/bin/g++-12
975975
run: |
976976
sudo -E ./ci/setup_googletest.sh
977977
sudo -E ./ci/setup_ci_environment.sh

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
rm -rf third_party
2121
- name: Setup
2222
env:
23-
CC: /usr/bin/gcc-10
24-
CXX: /usr/bin/g++-10
23+
CC: /usr/bin/gcc-12
24+
CXX: /usr/bin/g++-12
2525
GOOGLETEST_VERSION: 1.12.1
2626
run: |
2727
sudo -E ./ci/setup_googletest.sh

.github/workflows/iwyu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
readonly WARNING_COUNT=`grep -c "include-what-you-use reported diagnostics:" iwyu.log`
7070
echo "include-what-you-use reported ${WARNING_COUNT} warning(s)"
7171
# Acceptable limit, to decrease over time down to 0
72-
readonly WARNING_LIMIT=10
72+
readonly WARNING_LIMIT=180
7373
# FAIL the build if WARNING_COUNT > WARNING_LIMIT
7474
if [ $WARNING_COUNT -gt $WARNING_LIMIT ] ; then
7575
exit 1

api/include/opentelemetry/semconv/error_attributes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ namespace error
3636
* <p>
3737
* If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
3838
* @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
39-
* status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
40-
* @code error.type @endcode to capture all errors, regardless of whether they are defined within
41-
* the domain-specific set or not.</li>
39+
* status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
40+
* error.type @endcode to capture all errors, regardless of whether they are defined within the
41+
* domain-specific set or not.</li>
4242
* </ul>
4343
*/
4444
static constexpr const char *kErrorType = "error.type";

api/include/opentelemetry/semconv/incubating/aws_attributes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
247247
* The @code copy_source @endcode attribute applies to S3 copy operations and corresponds to the
248248
* @code --copy-source @endcode parameter of the <a
249249
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object
250-
* operation within the S3 API</a>. This applies in particular to the following operations: <p> <ul>
250+
* operation within the S3 API</a>. This applies in particular to the following operations: <ul>
251251
* <li><a
252252
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
253253
* <li><a
@@ -273,7 +273,7 @@ static constexpr const char *kAwsS3Delete = "aws.s3.delete";
273273
* <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a>
274274
* operations. <p> The @code key @endcode attribute is applicable to all object-related S3
275275
* operations, i.e. that require the object key as a mandatory parameter. This applies in particular
276-
* to the following operations: <p> <ul> <li><a
276+
* to the following operations: <ul> <li><a
277277
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
278278
* <li><a
279279
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
@@ -323,7 +323,7 @@ static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
323323
* The @code upload_id @endcode attribute applies to S3 multipart-upload operations and corresponds
324324
* to the @code --upload-id @endcode parameter of the <a
325325
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
326-
* operations. This applies in particular to the following operations: <p> <ul> <li><a
326+
* operations. This applies in particular to the following operations: <ul> <li><a
327327
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
328328
* <li><a
329329
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static constexpr const char *kCloudRegion = "cloud.region";
6565
* startup, so it may be necessary to set @code cloud.resource_id @endcode as a span attribute
6666
* instead. <p> The exact value to use for @code cloud.resource_id @endcode depends on the cloud
6767
* provider. The following well-known definitions MUST be used if you set this attribute and they
68-
* apply: <p> <ul> <li><strong>AWS Lambda:</strong> The function <a
68+
* apply: <ul> <li><strong>AWS Lambda:</strong> The function <a
6969
* href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take
7070
* care not to use the "invoked ARN" directly but replace any <a
7171
* href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a>

api/include/opentelemetry/semconv/incubating/deployment_attributes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static constexpr const char *kDeploymentEnvironment = "deployment.environment";
3434
* @code deployment.environment.name @endcode does not affect the uniqueness constraints defined
3535
* through the @code service.namespace @endcode, @code service.name @endcode and @code
3636
* service.instance.id @endcode resource attributes. This implies that resources carrying the
37-
* following attribute combinations MUST be considered to be identifying the same service: <p> <ul>
37+
* following attribute combinations MUST be considered to be identifying the same service: <ul>
3838
* <li>@code service.name=frontend @endcode, @code deployment.environment.name=production
3939
* @endcode</li> <li>@code service.name=frontend @endcode, @code deployment.environment.name=staging
4040
* @endcode.</li>

api/include/opentelemetry/semconv/incubating/error_attributes.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ namespace error
3636
* <p>
3737
* If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
3838
* @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
39-
* status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
40-
* @code error.type @endcode to capture all errors, regardless of whether they are defined within
41-
* the domain-specific set or not.</li>
39+
* status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
40+
* error.type @endcode to capture all errors, regardless of whether they are defined within the
41+
* domain-specific set or not.</li>
4242
* </ul>
4343
*/
4444
static constexpr const char *kErrorType = "error.type";

api/include/opentelemetry/semconv/incubating/faas_attributes.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ static constexpr const char *kFaasDocumentTime = "faas.document.time";
5858

5959
/**
6060
* The execution environment ID as a string, that will be potentially reused for other invocations
61-
* to the same function/function version. <p> <ul> <li><strong>AWS Lambda:</strong> Use the (full)
62-
* log stream name.</li>
61+
* to the same function/function version. <ul> <li><strong>AWS Lambda:</strong> Use the (full) log
62+
* stream name.</li>
6363
* </ul>
6464
*/
6565
static constexpr const char *kFaasInstance = "faas.instance";
@@ -109,7 +109,7 @@ static constexpr const char *kFaasMaxMemory = "faas.max_memory";
109109
* <a href="/docs/general/attributes.md#source-code-attributes">@code code.namespace @endcode/@code
110110
* code.function @endcode</a> span attributes). <p> For some cloud providers, the above definition
111111
* is ambiguous. The following definition of function name MUST be used for this attribute (and
112-
* consequently the span name) for the listed cloud providers/products: <p> <ul>
112+
* consequently the span name) for the listed cloud providers/products: <ul>
113113
* <li><strong>Azure:</strong> The full name @code <FUNCAPP>/<FUNC> @endcode, i.e., function app
114114
* name followed by a forward slash followed by the function name (this form can also be seen in the
115115
* resource JSON for the function). This means that a span attribute MUST be used, as an Azure
@@ -135,7 +135,6 @@ static constexpr const char *kFaasTrigger = "faas.trigger";
135135
* The immutable version of the function being executed.
136136
* <p>
137137
* Depending on the cloud provider and platform, use:
138-
* <p>
139138
* <ul>
140139
* <li><strong>AWS Lambda:</strong> The <a
141140
* href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function

api/include/opentelemetry/semconv/incubating/hw_metrics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDouble
132132
* states <p>
133133
* @code hw.status @endcode is currently specified as an <em>UpDownCounter</em> but would ideally be
134134
* represented using a <a
135-
* href="https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#stateset"><em>StateSet</em>
135+
* href="https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#stateset"><em>StateSet</em>
136136
* as defined in OpenMetrics</a>. This semantic convention will be updated once <em>StateSet</em> is
137137
* specified in OpenTelemetry. This planned change is not expected to have any consequence on the
138138
* way users query their timeseries backend to retrieve the values of @code hw.status @endcode over

0 commit comments

Comments
 (0)