From f69d9c53e5891f74437e3a1688bda79bfba1ea0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:26:03 -0800 Subject: [PATCH 1/5] Bump dotnet-sdk from 9.0.100 to 9.0.101 (#6026) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 6a79b98070..df28660f8e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { "rollForward": "latestFeature", - "version": "9.0.100" + "version": "9.0.101" } } From fc9de8b9bcd4d57935d2bd3b5aa7aac13d96e50b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:40:08 -0800 Subject: [PATCH 2/5] Bump codecov/codecov-action from 4 to 5 (#6025) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/Component.BuildTest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Component.BuildTest.yml b/.github/workflows/Component.BuildTest.yml index de7ebb3fc4..3c9b79e23b 100644 --- a/.github/workflows/Component.BuildTest.yml +++ b/.github/workflows/Component.BuildTest.yml @@ -72,7 +72,7 @@ jobs: run: dotnet-coverage merge -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/**/*.coverage - name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }} - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 continue-on-error: true # Note: Don't fail for upload failures env: OS: ${{ matrix.os }} From ad4e80e282bfc96f32adc785c34dc136945f8051 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:08:55 -0800 Subject: [PATCH 3/5] Bump DavidAnson/markdownlint-cli2-action from 16.0.0 to 18.0.0 (#6027) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mikel Blanchard --- .github/workflows/markdownlint.yml | 2 +- docs/trace/customizing-the-sdk/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml index 2764b8cc93..d2bd52cd10 100644 --- a/.github/workflows/markdownlint.yml +++ b/.github/workflows/markdownlint.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: run markdownlint - uses: DavidAnson/markdownlint-cli2-action@v16.0.0 + uses: DavidAnson/markdownlint-cli2-action@v18.0.0 with: globs: | **/*.md diff --git a/docs/trace/customizing-the-sdk/README.md b/docs/trace/customizing-the-sdk/README.md index d78ed1cd56..b9cec40e94 100644 --- a/docs/trace/customizing-the-sdk/README.md +++ b/docs/trace/customizing-the-sdk/README.md @@ -477,8 +477,8 @@ When using the `AddOpenTelemetry` & `WithTracing` extension methods the into an existing collection (typically the collection used is the one managed by the application host). The `TracerProviderBuilder` will be able to access all services registered into that collection. For lifecycle management, the -`AddOpenTelemetry` registers an [IHostedService -](https://learn.microsoft.com/dotnet/api/microsoft.extensions.hosting.ihostedservice) +`AddOpenTelemetry` registers an +[IHostedService](https://learn.microsoft.com/dotnet/api/microsoft.extensions.hosting.ihostedservice) which is used to automatically start the `TracerProvider` when the host starts and the host will automatically shutdown and dispose the `TracerProvider` when it is shutdown. From 8e6d814f0f614b085681000f55117d93dbab760a Mon Sep 17 00:00:00 2001 From: Mikel Blanchard Date: Fri, 13 Dec 2024 12:20:04 -0800 Subject: [PATCH 4/5] [repo] Add dependabot.yml to solution (#6028) --- OpenTelemetry.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln index c109bf1075..f87a118b11 100644 --- a/OpenTelemetry.sln +++ b/OpenTelemetry.sln @@ -74,6 +74,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{F1D0 ProjectSection(SolutionItems) = preProject .github\codecov.yml = .github\codecov.yml .github\CODEOWNERS = .github\CODEOWNERS + .github\dependabot.yml = .github\dependabot.yml .github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md EndProjectSection EndProject From c94c422e31b2a5181a97b2dcf4bdc984f37ac1ff Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Fri, 13 Dec 2024 16:11:49 -0500 Subject: [PATCH 5/5] [prometheus] Update links to openmetrics to reference the v1.0.0 release (#6029) --- .../CHANGELOG.md | 2 +- .../CHANGELOG.md | 2 +- .../Internal/PrometheusMetric.cs | 8 ++++---- .../Proto/opentelemetry/proto/metrics/v1/metrics.proto | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md b/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md index 3aa9f67cb1..911753a52f 100644 --- a/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md @@ -150,7 +150,7 @@ Released 2022-Sep-29 ([#3651](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3651)) * Added `"# EOF\n"` ending following the [OpenMetrics - specification](https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md) + specification](https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md) ([#3654](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3654)) ## 1.4.0-alpha.2 diff --git a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md index bba2a1e0c6..cdf1708ca8 100644 --- a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md @@ -147,7 +147,7 @@ Released 2022-Sep-29 ([#3651](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3651)) * Added `"# EOF\n"` ending following the [OpenMetrics - specification](https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md) + specification](https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md) ([#3654](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3654)) ## 1.4.0-alpha.2 diff --git a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusMetric.cs b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusMetric.cs index 800963454a..cc9176ea0c 100644 --- a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusMetric.cs +++ b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/Internal/PrometheusMetric.cs @@ -37,7 +37,7 @@ public PrometheusMetric(string name, string unit, PrometheusType type, bool disa sanitizedUnit = GetUnit(unit); // The resulting unit SHOULD be added to the metric as - // [OpenMetrics UNIT metadata](https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#metricfamily) + // [OpenMetrics UNIT metadata](https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#metricfamily) // and as a suffix to the metric name. The unit suffix comes before any type-specific suffixes. // https://github.com/open-telemetry/opentelemetry-specification/blob/3dfb383fe583e3b74a2365c5a1d90256b273ee76/specification/compatibility/prometheus_and_openmetrics.md#metric-metadata-1 if (!sanitizedName.EndsWith(sanitizedUnit)) @@ -57,14 +57,14 @@ public PrometheusMetric(string name, string unit, PrometheusType type, bool disa } // For counters requested using OpenMetrics format, the MetricFamily name MUST be suffixed with '_total', regardless of the setting to disable the 'total' suffix. - // https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#counter-1 + // https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#counter-1 if (type == PrometheusType.Counter && !openMetricsName.EndsWith("_total")) { openMetricsName += "_total"; } // In OpenMetrics format, the UNIT, TYPE and HELP metadata must be suffixed with the unit (handled above), and not the '_total' suffix, as in the case for counters. - // https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#unit + // https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#unit var openMetricsMetadataName = type == PrometheusType.Counter ? SanitizeOpenMetricsName(openMetricsName) : sanitizedName; @@ -241,7 +241,7 @@ private static PrometheusType GetPrometheusType(Metric metric) // OTLP metrics use the c/s notation as specified at https://ucum.org/ucum.html // (See also https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/metrics.md#instrument-units) // Prometheus best practices for units: https://prometheus.io/docs/practices/naming/#base-units - // OpenMetrics specification for units: https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#units-and-base-units + // OpenMetrics specification for units: https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#units-and-base-units private static string MapUnit(ReadOnlySpan unit) { return unit switch diff --git a/src/Shared/Proto/opentelemetry/proto/metrics/v1/metrics.proto b/src/Shared/Proto/opentelemetry/proto/metrics/v1/metrics.proto index 19bb7ff8d5..9247d9f24b 100644 --- a/src/Shared/Proto/opentelemetry/proto/metrics/v1/metrics.proto +++ b/src/Shared/Proto/opentelemetry/proto/metrics/v1/metrics.proto @@ -430,7 +430,7 @@ message HistogramDataPoint { // events, and is assumed to be monotonic over the values of these events. // Negative events *can* be recorded, but sum should not be filled out when // doing so. This is specifically to enforce compatibility w/ OpenMetrics, - // see: https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#histogram + // see: https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#histogram optional double sum = 5; // bucket_counts is an optional field contains the count values of histogram @@ -509,7 +509,7 @@ message ExponentialHistogramDataPoint { // events, and is assumed to be monotonic over the values of these events. // Negative events *can* be recorded, but sum should not be filled out when // doing so. This is specifically to enforce compatibility w/ OpenMetrics, - // see: https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#histogram + // see: https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#histogram optional double sum = 5; // scale describes the resolution of the histogram. Boundaries are @@ -622,7 +622,7 @@ message SummaryDataPoint { // events, and is assumed to be monotonic over the values of these events. // Negative events *can* be recorded, but sum should not be filled out when // doing so. This is specifically to enforce compatibility w/ OpenMetrics, - // see: https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#summary + // see: https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#summary double sum = 5; // Represents the value at a given quantile of a distribution.