Skip to content

Commit

Permalink
Merge branch 'main' into poc_config_yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalff authored Dec 17, 2024
2 parents 3b58494 + 902ee88 commit 8420c89
Show file tree
Hide file tree
Showing 20 changed files with 404 additions and 331 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ jobs:
submodules: 'recursive'
- name: setup
env:
CC: /usr/bin/gcc-10
CXX: /usr/bin/g++-10
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
- name: run cmake tests (without otlp-exporter)
env:
CC: /usr/bin/gcc-10
CXX: /usr/bin/g++-10
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: |
./ci/do_ci.sh cmake.test
Expand Down Expand Up @@ -297,15 +297,15 @@ jobs:
submodules: 'recursive'
- name: setup
env:
CC: /usr/bin/gcc-10
CXX: /usr/bin/g++-10
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
- name: run cmake tests (without otlp-exporter)
env:
CC: /usr/bin/gcc-10
CXX: /usr/bin/g++-10
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: |
./ci/do_ci.sh cmake.with_async_export.test
Expand Down Expand Up @@ -393,7 +393,7 @@ jobs:

cmake_test_cxx20_clang:
name: CMake C++20 test(Clang with libc++)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -443,7 +443,7 @@ jobs:

cmake_test_cxx23_clang:
name: CMake C++23 test(Clang with libc++)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -572,15 +572,15 @@ jobs:
submodules: 'recursive'
- name: setup
env:
CC: /usr/bin/gcc-10
CXX: /usr/bin/g++-10
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
- name: run tests
env:
CC: /usr/bin/gcc-10
CXX: /usr/bin/g++-10
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: ./ci/do_ci.sh cmake.test_example_plugin

bazel_test:
Expand Down Expand Up @@ -892,7 +892,7 @@ jobs:

code_coverage:
name: Code coverage
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -970,8 +970,8 @@ jobs:
submodules: 'recursive'
- name: setup
env:
CC: /usr/bin/gcc-10
CXX: /usr/bin/g++-10
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
run: |
sudo -E ./ci/setup_googletest.sh
sudo -E ./ci/setup_ci_environment.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
rm -rf third_party
- name: Setup
env:
CC: /usr/bin/gcc-10
CXX: /usr/bin/g++-10
CC: /usr/bin/gcc-12
CXX: /usr/bin/g++-12
GOOGLETEST_VERSION: 1.12.1
run: |
sudo -E ./ci/setup_googletest.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/iwyu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
readonly WARNING_COUNT=`grep -c "include-what-you-use reported diagnostics:" iwyu.log`
echo "include-what-you-use reported ${WARNING_COUNT} warning(s)"
# Acceptable limit, to decrease over time down to 0
readonly WARNING_LIMIT=10
readonly WARNING_LIMIT=180
# FAIL the build if WARNING_COUNT > WARNING_LIMIT
if [ $WARNING_COUNT -gt $WARNING_LIMIT ] ; then
exit 1
Expand Down
6 changes: 3 additions & 3 deletions api/include/opentelemetry/semconv/error_attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ namespace error
* <p>
* If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
* @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
* status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
* @code error.type @endcode to capture all errors, regardless of whether they are defined within
* the domain-specific set or not.</li>
* status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
* error.type @endcode to capture all errors, regardless of whether they are defined within the
* domain-specific set or not.</li>
* </ul>
*/
static constexpr const char *kErrorType = "error.type";
Expand Down
6 changes: 3 additions & 3 deletions api/include/opentelemetry/semconv/incubating/aws_attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static constexpr const char *kAwsS3Bucket = "aws.s3.bucket";
* The @code copy_source @endcode attribute applies to S3 copy operations and corresponds to the
* @code --copy-source @endcode parameter of the <a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object
* operation within the S3 API</a>. This applies in particular to the following operations: <p> <ul>
* operation within the S3 API</a>. This applies in particular to the following operations: <ul>
* <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
* <li><a
Expand All @@ -273,7 +273,7 @@ static constexpr const char *kAwsS3Delete = "aws.s3.delete";
* <a href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a>
* operations. <p> The @code key @endcode attribute is applicable to all object-related S3
* operations, i.e. that require the object key as a mandatory parameter. This applies in particular
* to the following operations: <p> <ul> <li><a
* to the following operations: <ul> <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/copy-object.html">copy-object</a></li>
* <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/delete-object.html">delete-object</a></li>
Expand Down Expand Up @@ -323,7 +323,7 @@ static constexpr const char *kAwsS3PartNumber = "aws.s3.part_number";
* The @code upload_id @endcode attribute applies to S3 multipart-upload operations and corresponds
* to the @code --upload-id @endcode parameter of the <a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/index.html">S3 API</a> multipart
* operations. This applies in particular to the following operations: <p> <ul> <li><a
* operations. This applies in particular to the following operations: <ul> <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/abort-multipart-upload.html">abort-multipart-upload</a></li>
* <li><a
* href="https://docs.aws.amazon.com/cli/latest/reference/s3api/complete-multipart-upload.html">complete-multipart-upload</a></li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static constexpr const char *kCloudRegion = "cloud.region";
* startup, so it may be necessary to set @code cloud.resource_id @endcode as a span attribute
* instead. <p> The exact value to use for @code cloud.resource_id @endcode depends on the cloud
* provider. The following well-known definitions MUST be used if you set this attribute and they
* apply: <p> <ul> <li><strong>AWS Lambda:</strong> The function <a
* apply: <ul> <li><strong>AWS Lambda:</strong> The function <a
* href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>. Take
* care not to use the "invoked ARN" directly but replace any <a
* href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static constexpr const char *kDeploymentEnvironment = "deployment.environment";
* @code deployment.environment.name @endcode does not affect the uniqueness constraints defined
* through the @code service.namespace @endcode, @code service.name @endcode and @code
* service.instance.id @endcode resource attributes. This implies that resources carrying the
* following attribute combinations MUST be considered to be identifying the same service: <p> <ul>
* following attribute combinations MUST be considered to be identifying the same service: <ul>
* <li>@code service.name=frontend @endcode, @code deployment.environment.name=production
* @endcode</li> <li>@code service.name=frontend @endcode, @code deployment.environment.name=staging
* @endcode.</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ namespace error
* <p>
* If the operation has completed successfully, instrumentations SHOULD NOT set @code error.type
* @endcode. <p> If a specific domain defines its own set of error identifiers (such as HTTP or gRPC
* status codes), it's RECOMMENDED to: <p> <ul> <li>Use a domain-specific attribute</li> <li>Set
* @code error.type @endcode to capture all errors, regardless of whether they are defined within
* the domain-specific set or not.</li>
* status codes), it's RECOMMENDED to: <ul> <li>Use a domain-specific attribute</li> <li>Set @code
* error.type @endcode to capture all errors, regardless of whether they are defined within the
* domain-specific set or not.</li>
* </ul>
*/
static constexpr const char *kErrorType = "error.type";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ static constexpr const char *kFaasDocumentTime = "faas.document.time";

/**
* The execution environment ID as a string, that will be potentially reused for other invocations
* to the same function/function version. <p> <ul> <li><strong>AWS Lambda:</strong> Use the (full)
* log stream name.</li>
* to the same function/function version. <ul> <li><strong>AWS Lambda:</strong> Use the (full) log
* stream name.</li>
* </ul>
*/
static constexpr const char *kFaasInstance = "faas.instance";
Expand Down Expand Up @@ -109,7 +109,7 @@ static constexpr const char *kFaasMaxMemory = "faas.max_memory";
* <a href="/docs/general/attributes.md#source-code-attributes">@code code.namespace @endcode/@code
* code.function @endcode</a> span attributes). <p> For some cloud providers, the above definition
* is ambiguous. The following definition of function name MUST be used for this attribute (and
* consequently the span name) for the listed cloud providers/products: <p> <ul>
* consequently the span name) for the listed cloud providers/products: <ul>
* <li><strong>Azure:</strong> The full name @code <FUNCAPP>/<FUNC> @endcode, i.e., function app
* name followed by a forward slash followed by the function name (this form can also be seen in the
* resource JSON for the function). This means that a span attribute MUST be used, as an Azure
Expand All @@ -135,7 +135,6 @@ static constexpr const char *kFaasTrigger = "faas.trigger";
* The immutable version of the function being executed.
* <p>
* Depending on the cloud provider and platform, use:
* <p>
* <ul>
* <li><strong>AWS Lambda:</strong> The <a
* href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-versions.html">function
Expand Down
2 changes: 1 addition & 1 deletion api/include/opentelemetry/semconv/incubating/hw_metrics.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDouble
* states <p>
* @code hw.status @endcode is currently specified as an <em>UpDownCounter</em> but would ideally be
* represented using a <a
* href="https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#stateset"><em>StateSet</em>
* href="https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#stateset"><em>StateSet</em>
* as defined in OpenMetrics</a>. This semantic convention will be updated once <em>StateSet</em> is
* specified in OpenTelemetry. This planned change is not expected to have any consequence on the
* way users query their timeseries backend to retrieve the values of @code hw.status @endcode over
Expand Down
6 changes: 2 additions & 4 deletions api/include/opentelemetry/semconv/incubating/system_metrics.h
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDouble
* Time disk spent activated
* <p>
* The real elapsed time ("wall clock") used in the I/O path (time from operations running in
* parallel are not counted). Measured as: <p> <ul> <li>Linux: Field 13 from <a
* parallel are not counted). Measured as: <ul> <li>Linux: Field 13 from <a
* href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
* <li>Windows: The complement of
* <a
Expand Down Expand Up @@ -380,7 +380,7 @@ CreateAsyncDoubleMetricSystemDiskMerged(metrics::Meter *meter)
* Sum of the time each operation took to complete
* <p>
* Because it is the sum of time each request took, parallel-issued requests each contribute to make
* the count grow. Measured as: <p> <ul> <li>Linux: Fields 7 & 11 from <a
* the count grow. Measured as: <ul> <li>Linux: Fields 7 & 11 from <a
* href="https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats">procfs-diskstats</a></li>
* <li>Windows: "Avg. Disk sec/Read" perf counter multiplied by "Disk Reads/sec" perf counter
* (similar for Writes)</li>
Expand Down Expand Up @@ -888,7 +888,6 @@ CreateAsyncDoubleMetricSystemNetworkConnections(metrics::Meter *meter)
* Count of packets that are dropped or discarded even though there was no error
* <p>
* Measured as:
* <p>
* <ul>
* <li>Linux: the @code drop @endcode column in @code /proc/dev/net @endcode (<a
* href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>)</li>
Expand Down Expand Up @@ -937,7 +936,6 @@ CreateAsyncDoubleMetricSystemNetworkDropped(metrics::Meter *meter)
* Count of network errors detected
* <p>
* Measured as:
* <p>
* <ul>
* <li>Linux: the @code errs @endcode column in @code /proc/dev/net @endcode (<a
* href="https://web.archive.org/web/20180321091318/http://www.onlamp.com/pub/a/linux/2000/11/16/LinuxAdmin.html">source</a>).</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ static constexpr const char *kUrlFragment = "url.fragment";
*
* Query string values for the following keys SHOULD be redacted by default and replaced by the
* value @code REDACTED @endcode:
* <p>
* <ul>
* <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
Expand Down Expand Up @@ -110,7 +109,7 @@ static constexpr const char *kUrlPort = "url.port";
* can identify it. <p>
*
* Query string values for the following keys SHOULD be redacted by default and replaced by the
* value @code REDACTED @endcode: <p> <ul> <li><a
* value @code REDACTED @endcode: <ul> <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
* AWSAccessKeyId @endcode</a></li> <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
Expand Down
3 changes: 1 addition & 2 deletions api/include/opentelemetry/semconv/url_attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ static constexpr const char *kUrlFragment = "url.fragment";
*
* Query string values for the following keys SHOULD be redacted by default and replaced by the
* value @code REDACTED @endcode:
* <p>
* <ul>
* <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
Expand Down Expand Up @@ -73,7 +72,7 @@ static constexpr const char *kUrlPath = "url.path";
* can identify it. <p>
*
* Query string values for the following keys SHOULD be redacted by default and replaced by the
* value @code REDACTED @endcode: <p> <ul> <li><a
* value @code REDACTED @endcode: <ul> <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
* AWSAccessKeyId @endcode</a></li> <li><a
* href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html#RESTAuthenticationQueryStringAuth">@code
Expand Down
Loading

0 comments on commit 8420c89

Please sign in to comment.