[release/11.0] Update OpenTelemetry to 1.18.0 - #1803
Conversation
Add the Microsoft.Extensions.Configuration.EnvironmentVariables 10.0.0 reference package required by OpenTelemetry 1.18.0 and refresh the external component metadata and patches. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2058f6bb-3bc5-4873-af70-0538db686ef1 (cherry picked from commit b4d17ed)
|
/azp run source-build-assets-unified-build Note Comment posted with AI assistance (GitHub Copilot), per the README step to trigger a full VMR source build. |
|
No pipelines are associated with this pull request. |
|
This is just going to fail in the dependency flow to the VMR because the SDK's OTel reference will still be 1.16.0. So it'll just cause prebuilts there. When making dependency version updates, they should be combined into one PR. So apply these changes to dotnet/dotnet#9582. |
|
I didn't recognize there was a opentelemetry-dotnet-contribsubmodule. I think the fact that we updated OpenTelemetry to 1.18.0 but not OpenTelemetryDotNetContribPersistentStorageFileSystemReleaseVersion from 1.0.0 to 1.1.1 will cause a Source-Build SDK Baseline Diff baseline failure becauseOpenTelemetry.PersistentStorage.*.dll wont be in the source built SDK but the microsoft built SDK will have 1.1.1. |
Restore the executable bit (100755) on the two OpenTelemetry build scripts to match upstream open-telemetry/opentelemetry-dotnet@9db92a4e. The manual port of dotnet/source-build-assets#1803 in 11ac511 added them as 100644, which conflicted with the incoming flow. File contents were already identical. Also record source-build-assets 6e78c94 (BAR 333775) in source-manifest.json. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2947a385-a49b-4daa-ac9d-0a45bffb5833
Restore the executable bit (100755) on the two OpenTelemetry build scripts to match upstream open-telemetry/opentelemetry-dotnet@9db92a4e. The manual port of dotnet/source-build-assets#1803 in 98ad248 added them as 100644, which conflicted with the incoming flow. File contents were already identical. Also record source-build-assets 6e78c94 (BAR 333775) in source-manifest.json. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2947a385-a49b-4daa-ac9d-0a45bffb5833
Backport of #1802 to
release/11.0. This fixes the source-only prebuilt failure in dotnet/dotnet#9582.Why this branch
dotnet/sdk#56274 moved the SDK's
release/11.0.1xxto OpenTelemetry 1.18.0. Source-only builds of dotnet/dotnet#9582 now fail with six prebuilts:OpenTelemetry,OpenTelemetry.Api,OpenTelemetry.Api.ProviderBuilderExtensions,OpenTelemetry.Exporter.InMemory,OpenTelemetry.Exporter.OpenTelemetryProtocol1.18.0Microsoft.Extensions.Configuration.EnvironmentVariables10.0.0The VMR's
release/11.0.1xxandrelease/11.0.1xx-rc2branches both pinsrc/source-build-assetsto therelease/11.0HEAD (71716795). SBA has norelease/11.0.1xx-rc2branch. A change only onmainwould not reach #9582.Changes
This is a clean cherry-pick of b4d17ed from #1802. It follows the README section Updating an External Component to a Newer Version:
opentelemetry-dotnetsubmodule moves tocore-1.18.0(9db92a4e).SourceRevisionId,FileVersionRevision(2160) andOpenTelemetryDotNetReleaseVersionare updated to match.0001is refreshed. Patch0002(tolerate missingoriginremote) is dropped because upstream now includesIgnoreStandardErrorWarningFormat./p:IsAotCompatible=falseis added so the build does not restoreMicrosoft.NET.ILLink.Tasks, which is not available at this bootstrap layer.Microsoft.Extensions.Configuration.EnvironmentVariables10.0.0 reference package is added. OpenTelemetry 1.18.0 depends on[10.0.0,).The contrib packages are unchanged: Instrumentation.Http 1.16.0, Runtime 1.15.1 and PersistentStorage 1.1.0. SDK
release/11.0.1xxbumpsOpenTelemetryPersistentStoragePackageVersionto 1.1.1, but in source-only buildsOpenTelemetry.PersistentStorage.FileSystemis only aPackageVersionentry with noPackageReference. It came in transitively throughAzure.Monitor.OpenTelemetry.Exporter, which is excluded whenDotNetBuildSourceOnly=true. It also did not appear in the prebuilt report.Validation (Linux, Ubuntu 26.04)
./build.sh -sbsucceeds.Microsoft.Extensions.Configuration.EnvironmentVariables.10.0.0.nupkg.ExternalPackageTests: 5/5 pass, includingReleaseVersionMatchesPackageOutput.Expected
source-build-assets-unified-buildresultazure-pipelines/builds/vmr-build-pr.ymlinserts this PR into VMRmain, which still pins OpenTelemetry 1.16.0. That produces the same version skew seen on #1802: SDK layout DLLs are 1.16.0, while the collected PDBs are 1.18.0, soSymbolsTests.VerifySdkSymbolsfails. #1742 went through the same sequence: it merged while this check was red, and dotnet/sdk#55216 then aligned the SDK pins. Here the SDK side is already on 1.18.0 in dotnet/dotnet#9582. This change and dotnet/dotnet#9582 need to meet in VMRrelease/11.0.1xx.Note
This PR description was drafted with AI assistance (GitHub Copilot).