Skip to content

Commit 23b666e

Browse files
author
Timothy Mothra
authored
[AzureMonitor] upgrade OTel to v1.11 (Azure#48574)
* upgrade OTel to v1.10 and fix api conflicts * bugfix: should not create exception telemetry when message is empty * test bug: fixing bug with requestData.Success * adding support for net9.0 to csproj and global.json * upgrade OTel to v1.10 and fix api conflicts * bugfix: should not create exception telemetry when message is empty * test bug: fixing bug with requestData.Success * adding support for net9.0 to csproj and global.json * cleanup * bump version 1.11.* * fix for Http * changelogs * changelog * fix unit tests * comment * pr feedback, revert change
1 parent 93bb4b7 commit 23b666e

File tree

20 files changed

+337
-316
lines changed

20 files changed

+337
-316
lines changed

eng/Packages.Data.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@
180180

181181
<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Monitor.OpenTelemetry'))">
182182
<!-- OpenTelemetry dependency approved for Azure.Monitor.OpenTelemetry.Exporter package only -->
183-
<PackageReference Update="OpenTelemetry" Version="1.9.0" />
184-
<PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
185-
<PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
186-
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
187-
<PackageReference Update="OpenTelemetry.PersistentStorage.FileSystem" Version="1.0.0" />
183+
<PackageReference Update="OpenTelemetry" Version="1.11.2" />
184+
<PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
185+
<PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
186+
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
187+
<PackageReference Update="OpenTelemetry.PersistentStorage.FileSystem" Version="1.0.1" />
188188
<PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="[2.1.1,6.0)" />
189189
<PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="[2.1.1,6.0)" />
190190
</ItemGroup>
@@ -373,12 +373,12 @@
373373
<PackageReference Update="NSubstitute" Version="3.1.0" />
374374
<PackageReference Update="NUnit" Version="3.13.2" />
375375
<PackageReference Update="NUnit3TestAdapter" Version="4.4.2" />
376-
<PackageReference Update="OpenTelemetry" Version="1.9.0" />
377-
<PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.9.0" />
378-
<PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
379-
<PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
380-
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
381-
<PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.9.0-beta.1" />
376+
<PackageReference Update="OpenTelemetry" Version="1.11.2" />
377+
<PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.11.2" />
378+
<PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.11.2" />
379+
<PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
380+
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
381+
<PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.11.0-beta.2" />
382382
<PackageReference Update="Polly" Version="7.1.0" />
383383
<PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
384384
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />

sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010

1111
### Other Changes
1212

13+
* Update OpenTelemetry dependencies
14+
([#48574](https://github.com/Azure/azure-sdk-for-net/pull/48574))
15+
- OpenTelemetry 1.11.2
16+
- OpenTelemetry.Extensions.Hosting 1.11.2
17+
- OpenTelemetry.Instrumentation.AspNetCore 1.11.1
18+
- OpenTelemetry.Instrumentation.Http 1.11.1
19+
1320
## 1.3.0-beta.2 (2024-10-11)
1421

1522
### Bugs Fixed

sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/src/Vendoring/OpenTelemetry.Instrumentation.SqlClient/Implementation/SqlClientDiagnosticListener.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public override void OnEventWritten(string name, object? payload)
187187

188188
if (this.options.RecordException)
189189
{
190-
activity.RecordException(exception);
190+
activity.AddException(exception); // TODO: I made this change only to get the build to pass. This has already been fixed in Contrib repo and needs to be synced here
191191
}
192192
}
193193
else

sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/tests/Azure.Monitor.OpenTelemetry.AspNetCore.Integration.Tests/SessionRecords/DistroWebAppLiveTests/VerifyDistro.json

Lines changed: 52 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)