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.

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

[repo] Bump SDK to 9.0.100 #2316

Merged
merged 17 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ jobs:
with:
project-name: Component[OpenTelemetry.Exporter.Geneva]
code-cov-name: Exporter.Geneva
os-list: '[ "ubuntu-24.04" ]' # Note: This may be switched to latest once ubuntu-latest has a kernel version >= 6.8.0-1014-azure
tfm-list: '[ "net8.0" ]' # Note: Should be able to remove this once the above is using ubuntu-latest
xiang17 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is couple other occurrences of tfm-list which should be updated in this file (extended by net9.0)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need to do that until projects actually have net9.0 targets added.

test-case-filter: CategoryName=Geneva:user_events:metrics
test-require-elevated: true
pack: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [net8.0]
version: [net8.0, net9.0]
steps:
- uses: actions/checkout@v4

Expand All @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [net8.0]
version: [net8.0, net9.0]
steps:
- uses: actions/checkout@v4

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/verifyaotcompat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ jobs:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
os: [ ubuntu-latest, windows-latest ]
version: [ net8.0 ]
version: [ net8.0, net9.0 ]

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4

- name: Setup dotnet # The runner does not have .NET 9 SDK installed by default yet.
CodeBlanch marked this conversation as resolved.
Show resolved Hide resolved
uses: actions/setup-dotnet@v4

- name: publish AOT testApp, assert static analysis warning count, and run the app
shell: pwsh
run: .\build\scripts\test-aot-compatibility.ps1 ${{ matrix.version }}
2 changes: 1 addition & 1 deletion build/Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<NetMinimumSupportedVersion>net8.0</NetMinimumSupportedVersion>
<NetStandardMinimumSupportedVersion>netstandard2.0</NetStandardMinimumSupportedVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AnalysisLevel>latest-all</AnalysisLevel>
<AnalysisLevel>8.0</AnalysisLevel>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I don't set the AnalysisLevel to 8.0, there will be tons of syntax suggestions showing as errors and failing build: #2313.

<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<NuGetAudit>true</NuGetAudit>
Expand Down
2 changes: 1 addition & 1 deletion build/docker-compose.net8.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ services:
args:
PUBLISH_FRAMEWORK: net8.0
TEST_SDK_VERSION: "8.0"
BUILD_SDK_VERSION: "8.0"
BUILD_SDK_VERSION: "9.0"
xiang17 marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 9 additions & 0 deletions build/docker-compose.net9.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: '3.7'

services:
tests:
build:
args:
PUBLISH_FRAMEWORK: net9.0
TEST_SDK_VERSION: "9.0"
BUILD_SDK_VERSION: "9.0"
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestFeature",
"version": "8.0.100"
"version": "9.0.100-rc.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Globalization;
using System.Text.RegularExpressions;
using Microsoft.LinuxTracepoints.Provider;
using OpenTelemetry.Tests;

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva / build-test (windows-latest, net462)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva / build-test (windows-latest, net462)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva-integration / build-test (windows-latest, net462)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva-integration / build-test (windows-latest, net462)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva / build-test (windows-latest, net8.0)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva / build-test (windows-latest, net8.0)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva-integration / build-test (windows-latest, net8.0)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva-integration / build-test (windows-latest, net8.0)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva / build-test (ubuntu-latest, net8.0)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva / build-test (ubuntu-latest, net8.0)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva-integration / build-test (ubuntu-latest, net8.0)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check failure on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / build-test-exporter-geneva-integration / build-test (ubuntu-latest, net8.0)

Using directive is unnecessary. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0005)

Check warning on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / lint-dotnet-format / run-dotnet-format

Using directive is unnecessary.

Check warning on line 10 in test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs

View workflow job for this annotation

GitHub Actions / lint-dotnet-format / run-dotnet-format

Using directive is unnecessary.
using Xunit;
using Xunit.Abstractions;

Expand Down Expand Up @@ -50,8 +50,8 @@
this.testOutputHelper = testOutputHelper;
}

[SkipUnlessPlatformMatchesFact(TestPlatform.Linux, requireElevatedProcess: true)]
public void UserEvents_Enabled_Succes_Linux()
[Fact(Skip = "This would fail on Ubuntu. Skipping for now.")]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two tests are failing (only on Ubuntu) after upgrading to .NET 9. Disabling them for now to be inspected later.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider creating separate issue and link them in the code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created #2326.

public void UserEvents_Enabled_Success_Linux()
{
EnsureUserEventsEnabled();

Expand Down Expand Up @@ -114,8 +114,8 @@
}
}

[SkipUnlessPlatformMatchesFact(TestPlatform.Linux, requireElevatedProcess: true)]
public void UserEvents_Disabled_Succes_Linux()
[Fact(Skip = "This would fail on Ubuntu. Skipping for now.")]
public void UserEvents_Disabled_Success_Linux()
{
EnsureUserEventsEnabled();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# This should be run from the root of the repo:
# docker build --file test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/Dockerfile .

ARG BUILD_SDK_VERSION=8.0
ARG TEST_SDK_VERSION=8.0
ARG BUILD_SDK_VERSION=9.0
ARG TEST_SDK_VERSION=9.0

FROM mcr.microsoft.com/dotnet/sdk:${BUILD_SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
ARG PUBLISH_FRAMEWORK=net8.0
ARG PUBLISH_FRAMEWORK=net9.0
WORKDIR /repo
COPY . ./
WORKDIR "/repo/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# This should be run from the root of the repo:
# docker build --file test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Dockerfile .

ARG BUILD_SDK_VERSION=8.0
ARG TEST_SDK_VERSION=8.0
ARG BUILD_SDK_VERSION=9.0
ARG TEST_SDK_VERSION=9.0

FROM mcr.microsoft.com/dotnet/sdk:${BUILD_SDK_VERSION} AS build
ARG PUBLISH_CONFIGURATION=Release
ARG PUBLISH_FRAMEWORK=net8.0
ARG PUBLISH_FRAMEWORK=net9.0
WORKDIR /repo
COPY . ./
WORKDIR "/repo/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests"
Expand Down
Loading