Skip to content

Commit ce5b220

Browse files
authored
Merge branch 'main' into api-iopentelemetrybuilder
2 parents 18e6662 + 10f8a0d commit ce5b220

File tree

46 files changed

+1063
-201
lines changed

Some content is hidden

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

46 files changed

+1063
-201
lines changed

.github/workflows/Component.BuildTest.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,15 @@ jobs:
6868
run: dotnet-coverage merge -r -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/*.coverage
6969

7070
- name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
71-
uses: codecov/codecov-action@v3.1.5
71+
uses: codecov/codecov-action@v4
7272
continue-on-error: true # Note: Don't fail for upload failures
7373
env:
7474
OS: ${{ matrix.os }}
7575
TFM: ${{ matrix.version }}
76+
token: ${{ secrets.CODECOV_TOKEN }}
7677
with:
7778
file: TestResults/Cobertura.xml
7879
env_vars: OS,TFM
7980
flags: ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
8081
name: Code Coverage for ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }} on [${{ matrix.os }}.${{ matrix.version }}]
82+
codecov_yml_path: .github/codecov.yml

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: configure Pagefile
28-
uses: al-cheb/configure-pagefile-action@v1.3
28+
uses: al-cheb/configure-pagefile-action@v1.4
2929
with:
3030
minimum-size: 8GB
3131
maximum-size: 32GB

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v4
1515

1616
- name: run markdownlint
17-
uses: DavidAnson/markdownlint-cli2-action@v14.0.0
17+
uses: DavidAnson/markdownlint-cli2-action@v15.0.0
1818
with:
1919
globs: |
2020
**/*.md

OpenTelemetry.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "experimental-apis", "experi
329329
docs\diagnostics\experimental-apis\OTEL1000.md = docs\diagnostics\experimental-apis\OTEL1000.md
330330
docs\diagnostics\experimental-apis\OTEL1001.md = docs\diagnostics\experimental-apis\OTEL1001.md
331331
docs\diagnostics\experimental-apis\OTEL1002.md = docs\diagnostics\experimental-apis\OTEL1002.md
332+
docs\diagnostics\experimental-apis\OTEL1003.md = docs\diagnostics\experimental-apis\OTEL1003.md
332333
docs\diagnostics\experimental-apis\README.md = docs\diagnostics\experimental-apis\README.md
333334
EndProjectSection
334335
EndProject

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@ If you are new here, please read the getting started docs:
3333
* [Logs](./docs/logs/README.md): [ASP.NET
3434
Core](./docs/logs/getting-started-aspnetcore/README.md) |
3535
[Console](./docs/logs/getting-started-console/README.md)
36-
* Metrics: [ASP.NET Core](./docs/metrics/getting-started-aspnetcore/README.md) |
36+
* [Metrics](./docs/metrics/README.md): [ASP.NET
37+
Core](./docs/metrics/getting-started-aspnetcore/README.md) |
3738
[Console](./docs/metrics/getting-started-console/README.md)
38-
* Traces: [ASP.NET Core](./docs/trace/getting-started-aspnetcore/README.md) |
39+
* [Traces](./docs/trace/README.md): [ASP.NET
40+
Core](./docs/trace/getting-started-aspnetcore/README.md) |
3941
[Console](./docs/trace/getting-started-console/README.md)
4042

4143
This repository includes multiple installable components, available on

build/Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Nullable>enable</Nullable>
1111
<ImplicitUsings>enable</ImplicitUsings>
1212
<!-- Suppress warnings for repo code using experimental features -->
13-
<NoWarn>$(NoWarn);OTEL1000;OTEL1001;OTEL1002</NoWarn>
13+
<NoWarn>$(NoWarn);OTEL1000;OTEL1001;OTEL1002;OTEL1003</NoWarn>
1414
<!--temporarily disable. See 3958-->
1515
<!--<AnalysisLevel>latest-All</AnalysisLevel>-->
1616
</PropertyGroup>
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# OpenTelemetry .NET Diagnostic: OTEL1003
2+
3+
## Overview
4+
5+
This is an Experimental API diagnostic covering the following API:
6+
7+
* `MetricStreamConfiguration.CardinalityLimit.get`
8+
* `MetricStreamConfiguration.CardinalityLimit.set`
9+
10+
Experimental APIs may be changed or removed in the future.
11+
12+
## Details
13+
14+
The OpenTelemetry Specification defines the
15+
[cardinality limit](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#cardinality-limits)
16+
of a metric can be set by the matching view.
17+
18+
From the specification:
19+
20+
> The cardinality limit for an aggregation is defined in one of three ways:
21+
> A view with criteria matching the instrument an aggregation is created for has
22+
> an aggregation_cardinality_limit value defined for the stream, that value
23+
> SHOULD be used. If there is no matching view, but the MetricReader defines a
24+
> default cardinality limit value based on the instrument an aggregation is
25+
> created for, that value SHOULD be used. If none of the previous values are
26+
> defined, the default value of 2000 SHOULD be used.
27+
28+
We are exposing these APIs experimentally until the specification declares them
29+
stable.

docs/diagnostics/experimental-apis/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ Description: Metrics Exemplar Support
3333

3434
Details: [OTEL1002](./OTEL1002.md)
3535

36+
### OTEL1003
37+
38+
Description: MetricStreamConfiguration CardinalityLimit Support
39+
40+
Details: [OTEL1003](./OTEL1003.md)
41+
3642
## Inactive
3743

3844
Experimental APIs which have been released stable or removed:

docs/logs/README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# OpenTelemetry .NET Logs
22

3+
<!-- markdownlint-disable MD033 -->
4+
<details>
5+
<summary>Table of Contents</summary>
6+
7+
* [Best Practices](#best-practices)
8+
* [Package Version](#package-version)
9+
* [Logging API](#logging-api)
10+
* [Logger Management](#logger-management)
11+
* [Log Correlation](#log-correlation)
12+
* [Log Enrichment](#log-enrichment)
13+
* [Log Filtering](#log-filtering)
14+
* [Log Redaction](#log-redaction)
15+
16+
</details>
17+
<!-- markdownlint-enable MD033 -->
18+
319
## Best Practices
420

521
The following tutorials have demonstrated the best practices for logging with

0 commit comments

Comments
 (0)