Skip to content

Commit 8d652f1

Browse files
authored
Merge branch 'main' into analysis-OpenTelemetry.Exporter.InMemory
2 parents 812d129 + 796f49b commit 8d652f1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/OpenTelemetry.Api/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Notes](../../RELEASENOTES.md).
1111
Released 2025-Mar-04
1212

1313
* Revert optimize performance of `TraceContextPropagator.Extract` introduced
14-
in #5749 to resolve #6158.
14+
in #5749 to resolve [GHSA-8785-wc3w-h8q6](https://github.com/open-telemetry/opentelemetry-dotnet/security/advisories/GHSA-8785-wc3w-h8q6).
1515
([#6161](https://github.com/open-telemetry/opentelemetry-dotnet/pull/6161))
1616

1717
## 1.11.1

src/OpenTelemetry/BatchExportProcessorOptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class BatchExportProcessorOptions<T>
2626
public int ExporterTimeoutMilliseconds { get; set; } = BatchExportProcessor<T>.DefaultExporterTimeoutMilliseconds;
2727

2828
/// <summary>
29-
/// Gets or sets the maximum batch size of every export. It must be smaller or equal to MaxQueueLength. The default value is 512.
29+
/// Gets or sets the maximum batch size of every export. It must be smaller or equal to <see cref="MaxQueueSize"/>. The default value is 512.
3030
/// </summary>
3131
public int MaxExportBatchSize { get; set; } = BatchExportProcessor<T>.DefaultMaxExportBatchSize;
3232
}

0 commit comments

Comments
 (0)