Skip to content

Commit 1d1d3a4

Browse files
committed
Merge remote-tracking branch 'upstream/main' into zhaez/lineage-trace-propagation
2 parents a107530 + c2eb2e5 commit 1d1d3a4

File tree

56 files changed

+3641
-55
lines changed

Some content is hidden

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

56 files changed

+3641
-55
lines changed

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
uses: actions/checkout@v4
1313

1414
- name: run markdownlint
15-
uses: DavidAnson/markdownlint-cli2-action@v19.0.0
15+
uses: DavidAnson/markdownlint-cli2-action@v19.1.0
1616
with:
1717
globs: |
1818
**/*.md

build/Common.nonprod.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
3333
<SupportedNetTargets>net9.0;net8.0</SupportedNetTargets>
3434
<XUnitRunnerVisualStudioPkgVer>[2.8.2,3.0)</XUnitRunnerVisualStudioPkgVer>
35-
<XUnitPkgVer>[2.9.2,3.0)</XUnitPkgVer>
36-
<WiremockNetPkgVer>[1.6.8,2.0)</WiremockNetPkgVer>
35+
<XUnitPkgVer>[2.9.3,3.0)</XUnitPkgVer>
36+
<WiremockNetPkgVer>[1.7.0,2.0)</WiremockNetPkgVer>
3737
</PropertyGroup>
3838

3939
<ItemGroup Condition="'$(IsTestProject)' == 'true'">

build/Common.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<MicrosoftOwinPkgVer>[4.2.2,5.0)</MicrosoftOwinPkgVer>
4242
<MicrosoftPublicApiAnalyzersPkgVer>[3.11.0-beta1.23525.2]</MicrosoftPublicApiAnalyzersPkgVer>
4343
<MicrosoftSourceLinkGitHubPkgVer>[8.0.0,9.0)</MicrosoftSourceLinkGitHubPkgVer>
44-
<OpenTelemetryCoreUnstableLatestVersion>[1.10.0-beta.1]</OpenTelemetryCoreUnstableLatestVersion>
45-
<OpenTelemetryCoreLatestVersion>[1.10.0,2.0)</OpenTelemetryCoreLatestVersion>
44+
<OpenTelemetryCoreUnstableLatestVersion>[1.11.0-beta.1]</OpenTelemetryCoreUnstableLatestVersion>
45+
<OpenTelemetryCoreLatestVersion>[1.11.1,2.0)</OpenTelemetryCoreLatestVersion>
4646
<OpenTelemetryCoreLatestPrereleaseVersion>[1.11.0-rc.1]</OpenTelemetryCoreLatestPrereleaseVersion>
4747
<StackExchangeRedisPkgVer>[2.6.122,3.0)</StackExchangeRedisPkgVer>
4848
<ConfluentKafkaPkgVer>[2.4.0,3.0)</ConfluentKafkaPkgVer>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
33
"rollForward": "latestFeature",
4-
"version": "9.0.101"
4+
"version": "9.0.102"
55
}
66
}

src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
the LogExporter.
99
([#2422](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2422))
1010

11+
* Updated OpenTelemetry core component version(s) to `1.11.1`.
12+
([#2477](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2477))
13+
1114
## 1.10.0
1215

1316
Released 2024-Nov-18
@@ -298,7 +301,9 @@ Released 2023-Mar-13
298301
([#935](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/935))
299302

300303
* Update OpenTelemetry SDK version to `1.5.0-alpha.1`.
304+
301305
* Update GenevaMetricExporter to use TLV format serialization.
306+
302307
* Add support for exporting exemplars.
303308
([#1069](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1069))
304309

@@ -350,11 +355,14 @@ Released 2022-Dec-19
350355

351356
* Update OpenTelemetry to 1.4.0-rc.1
352357
([#820](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/820))
358+
353359
* Add support in logs for prefix-based table name mapping configuration.
354360
[#796](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/796)
361+
355362
* Updated the trace exporter to use the new performance APIs introduced in
356363
`System.Diagnostics.DiagnosticSource` v7.0.
357364
[#838](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/838)
365+
358366
* Avoid allocation when serializing scopes.
359367
([#818](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/818))
360368

@@ -365,10 +373,13 @@ Released 2022-Dec-09
365373
* Added support for
366374
[DateTimeOffset](https://learn.microsoft.com/dotnet/api/system.datetimeoffset).
367375
([#797](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/797))
376+
368377
* Fix the overflow bucket value serialization for Histogram.
369378
([#805](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/805))
379+
370380
* Fix EventSource logging.
371381
([#813](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/813))
382+
372383
* Update `MessagePackSerializer` to use
373384
[BinaryPrimitives](https://learn.microsoft.com/dotnet/api/system.buffers.binary.binaryprimitives)
374385
to serialize scalar types more efficiently by avoiding repeated bound checks.

0 commit comments

Comments
 (0)