Merge branch 'main' into sampler-config

open-telemetry · Mar 19, 2024 · bb35bce · bb35bce
2 parents db9093d + 8f9eb90
commit bb35bce
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 4 deletions.
diff --git a/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md b/src/OpenTelemetry.Api.ProviderBuilderExtensions/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 * Added `IOpenTelemetryBuilder` interface to support authoring extensions which
   can configure multiple OpenTelemetry signals (tracing, metrics, and/or logs).
   ([#5265](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5265))

diff --git a/src/OpenTelemetry.Api/CHANGELOG.md b/src/OpenTelemetry.Api/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 ## 1.7.0
 
 Released 2023-Dec-08

diff --git a/src/OpenTelemetry.Exporter.Console/CHANGELOG.md b/src/OpenTelemetry.Exporter.Console/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 ## 1.7.0
 
 Released 2023-Dec-08

diff --git a/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md b/src/OpenTelemetry.Exporter.InMemory/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 ## 1.7.0
 
 Released 2023-Dec-08

diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 * **Experimental (pre-release builds only):** Added
   `LoggerProviderBuilder.AddOtlpExporter` registration extensions.
   [#5103](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5103)

diff --git a/...elemetry.Exporter.OpenTelemetryProtocol/PersistentStorage/PersistentStorageEventSource.cs b/...elemetry.Exporter.OpenTelemetryProtocol/PersistentStorage/PersistentStorageEventSource.cs
@@ -145,7 +145,7 @@ public void CouldNotRemoveExpiredLease(string srcFilePath, string destFilePath,
         this.WriteEvent(8, srcFilePath, destFilePath, ex);
     }
 
-    [Event(9, Message = "{0}: Error Message: {1}. Exception: {3}", Level = EventLevel.Error)]
+    [Event(9, Message = "{0}: Error Message: {1}. Exception: {2}", Level = EventLevel.Error)]
     public void PersistentStorageException(string className, string message, string ex)
     {
         this.WriteEvent(9, className, message, ex);

diff --git a/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md b/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 * Added option to disable _total suffix addition to counter metrics
   ([#5305](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5305))
 

diff --git a/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/README.md b/src/OpenTelemetry.Exporter.Prometheus.AspNetCore/README.md
@@ -8,9 +8,7 @@ for configuring an ASP.NET Core application with an endpoint for Prometheus
 to scrape.
 
 > [!NOTE]
-> This exporter does not support [OpenMetrics
-format](https://github.com/OpenObservability/OpenMetrics), and consequently,
-does not support Exemplars. For using Exemplars, use the [OTLP
+> This exporter does not support Exemplars. For using Exemplars, use the [OTLP
 Exporter](../OpenTelemetry.Exporter.OpenTelemetryProtocol/README.md) and use a
 component like OTel Collector to expose metrics (with exemplars) to Prometheus.
 This [tutorial](../../docs/metrics/exemplars/README.md) shows one way how to do that.

diff --git a/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md b/src/OpenTelemetry.Exporter.Prometheus.HttpListener/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 * Added option to disable _total suffix addition to counter metrics
   ([#5305](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5305))
 

diff --git a/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md b/src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 ## 1.7.0
 
 Released 2023-Dec-08

diff --git a/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md b/src/OpenTelemetry.Extensions.Hosting/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 * `OpenTelemetryBuilder` has been marked obsolete. Component authors using
   `OpenTelemetryBuilder` for cross-cutting signal configuration extensions
   should switch to targeting `IOpenTelemetryBuilder` instead.

diff --git a/src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md b/src/OpenTelemetry.Extensions.Propagators/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 ## 1.7.0
 
 Released 2023-Dec-08

diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 1.8.0-beta.1
+
+Released 2024-Mar-14
+
 * Throw NotSupportedException when using `SetErrorStatusOnException` method for
   Tracing in Mono Runtime and Native AOT environment because the dependent
   `Marshal.GetExceptionPointers()` API is not supported on these platforms.

diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/EventSourceTest.cs b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/EventSourceTest.cs
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;
+using OpenTelemetry.PersistentStorage.Abstractions;
+using OpenTelemetry.PersistentStorage.FileSystem;
 using OpenTelemetry.Tests;
 using Xunit;
 
@@ -14,4 +16,16 @@ public void EventSourceTest_OpenTelemetryProtocolExporterEventSource()
     {
         EventSourceTestHelper.MethodsAreImplementedConsistentlyWithTheirAttributes(OpenTelemetryProtocolExporterEventSource.Log);
     }
+
+    [Fact]
+    public void EventSourceTest_PersistentStorageAbstractionsEventSource()
+    {
+        EventSourceTestHelper.MethodsAreImplementedConsistentlyWithTheirAttributes(PersistentStorageAbstractionsEventSource.Log);
+    }
+
+    [Fact]
+    public void EventSourceTest_PersistentStorageEventSource()
+    {
+        EventSourceTestHelper.MethodsAreImplementedConsistentlyWithTheirAttributes(PersistentStorageEventSource.Log);
+    }
 }