Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[extensions.aws & sampler.aws] Mitigate STJ vulnerabilities #2197

Merged
merged 2 commits into from
Oct 9, 2024
Merged

[extensions.aws & sampler.aws] Mitigate STJ vulnerabilities #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f0e6f
Mitigate STJ vulnerabilities in more projects targeting 6.0.0.
CodeBlanch Oct 9, 2024
73a1703
Patch CHANGELOGs.
CodeBlanch Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/OpenTelemetry.Exporter.OneCollector/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
* Drop support for .NET 6 as this target is no longer supported.
([#2123](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2123))

* Bumped `System.Text.Json` reference to `6.0.10` for runtimes older than
`net8.0` and bumped to `8.0.5` on `net8.0` in response to
* Bumped the `System.Text.Json` reference to `6.0.10` for runtimes older than
`net8.0` and added a direct reference for `System.Text.Json` at `8.0.5` on
`net8.0` in response to
[CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485).
([#2196](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2196))

Expand Down
6 changes: 6 additions & 0 deletions src/OpenTelemetry.Extensions.AWS/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Unreleased

* Bumped the `System.Text.Json` reference to `6.0.10` for runtimes older than
`net8.0` and added a direct reference for `System.Text.Json` at `8.0.5` on
`net8.0` in response to
[CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485).
([#2197](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2197))

## 1.3.0-beta.2

Released 2024-Sep-24
Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Extensions.AWS/OpenTelemetry.Extensions.AWS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
<Description>OpenTelemetry extensions for AWS.</Description>
<MinVerTagPrefix>Extensions.AWS-</MinVerTagPrefix>
<SystemTextJsonMinimumRequiredPkgVer>$(SystemTextJsonLatestNet6OutOfBandPkgVer)</SystemTextJsonMinimumRequiredPkgVer>
</PropertyGroup>

<!-- Do not run Package Baseline Validation as this package has never released a stable version.
Expand All @@ -16,7 +17,6 @@

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="System.Text.Json" Version="6.0.0" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/OpenTelemetry.Resources.AWS/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
and add .NET Standard 2.0 target.
([#2164](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2164))

* Bumped `System.Text.Json` reference to `6.0.10` for runtimes older than
`net8.0` and bumped to `8.0.5` on `net8.0` in response to
* Bumped the `System.Text.Json` reference to `6.0.10` for runtimes older than
`net8.0` and added a direct reference for `System.Text.Json` at `8.0.5` on
`net8.0` in response to
[CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485).
([#2196](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2196))

Expand Down
9 changes: 9 additions & 0 deletions src/OpenTelemetry.Sampler.AWS/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
* Drop support for .NET 6 as this target is no longer supported and add .NET 8 target.
([#2172](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2172))

* Bumped the `System.Text.Json` reference to `6.0.10` for runtimes older than
`net8.0` and added a direct reference for `System.Text.Json` at `8.0.5` on
`net8.0` in response to
[CVE-2024-43485](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-43485).
([#2197](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2197))

* Removed the `System.Net.Http` package reference from all targets.
([#2197](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2197))

## 0.1.0-alpha.2

Released 2024-Sep-09
Expand Down
7 changes: 5 additions & 2 deletions src/OpenTelemetry.Sampler.AWS/OpenTelemetry.Sampler.AWS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
<Description>OpenTelemetry remote sampler for AWS X-Ray.</Description>
<MinVerTagPrefix>Sampler.AWS-</MinVerTagPrefix>
<SystemTextJsonMinimumRequiredPkgVer>$(SystemTextJsonLatestNet6OutOfBandPkgVer)</SystemTextJsonMinimumRequiredPkgVer>
</PropertyGroup>

<!-- Do not run Package Baseline Validation as this package has never released a stable version.
Expand All @@ -16,8 +17,10 @@

<ItemGroup>
<PackageReference Include="OpenTelemetry" Version="$(OpenTelemetryCoreLatestVersion)" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.Json" Version="6.0.0" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(NetFrameworkMinimumSupportedVersion)'">
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryExporterInMemoryPkgVer)" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonLatestNet8OutOfBandPkgVer)" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading