Skip to content

SCAN4NET-500 Add more telemetry in the targets #2520

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

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

SCAN4NET-500 Add more telemetry in the targets #2520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca4fc70
Add more telemetry in the targets
martin-strecker-sonarsource May 28, 2025
fccd4cc
Fixc Typo
martin-strecker-sonarsource May 28, 2025
f02bafc
Fix E2E
martin-strecker-sonarsource May 28, 2025
9b9fdd1
Merge branch 'master' into Martin/SolutionTelemetry
martin-strecker-sonarsource May 28, 2025
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: 1 addition & 1 deletion Tests/SonarScanner.MSBuild.Tasks.IntegrationTest/E2ETests/E2EAnalysisTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ public void E2E_TelemetryFiles_AllWritten()
File.Exists(solutionTargetTelemetryFile).Should().BeTrue();
File.ReadAllLines(solutionTargetTelemetryFile).Should().SatisfyRespectively(
x => x.Should().StartWith("""{"dotnetenterprise.s4net.build.visual_studio_version":"""),
x => x.Should().StartWith("""{"dotnetenterprise.s4net.build.msbuild_tools_version":"""));
x => x.Should().StartWith("""{"dotnetenterprise.s4net.build.msbuild_version":"""));

var projectTelemetryFile = Path.Combine(rootOutputFolder, "0", "Telemetry.json");
File.Exists(projectTelemetryFile).Should().BeTrue();
Expand Down
14 changes: 10 additions & 4 deletions src/SonarScanner.MSBuild.Tasks/Targets/SonarQube.Integration.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@

<Target Name="WriteSonarTelemetry" Condition ="$(SonarTelemetryFilePath) != ''" BeforeTargets="Build">
<ItemGroup>
<SonarTelemetry Condition="$(VisualStudioVersion) != ''" Include="dotnetenterprise.s4net.build.visual_studio_version" Value="$(VisualStudioVersion)" />
<SonarTelemetry Include="dotnetenterprise.s4net.build.msbuild_tools_version" Value="$(MSBuildToolsVersion)" />
<SonarTelemetry Condition="$(VisualStudioVersion) != ''" Include="dotnetenterprise.s4net.build.visual_studio_version" Value="$(VisualStudioVersion)" /> <!-- https://learn.microsoft.com/en-us/visualstudio/msbuild/common-msbuild-project-properties?view=vs-2022-->
<SonarTelemetry Condition="$(MSBuildVersion) != ''" Include="dotnetenterprise.s4net.build.msbuild_version" Value="$(MSBuildVersion)" /> <!-- Version of MSBuild. Preferred over MSBuildToolsVersion which defaults to just "Current" https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-reserved-and-well-known-properties?view=vs-2022-->
</ItemGroup>

<WriteSonarTelemetry Filename="$(SonarTelemetryFilePath)" CreateNew="true" Telemetry="@(SonarTelemetry)"/>
Expand Down Expand Up @@ -364,8 +364,6 @@
<SonarReportFilePath Condition= "$(SonarErrorLogExists) == 'true'" Include="$(SonarErrorLog)" />
</ItemGroup>

<WriteSonarTelemetry Filename="$(SonarProjectTelemetryFilePath)" Key="dotnetenterprise.s4net.build.target_framework_moniker" Value="$(TargetFrameworkMoniker)" />

<ItemGroup>
<SonarQubeSetting Include="sonar.$(SQLanguage).roslyn.reportFilePaths" Condition=" @(SonarReportFilePath) != '' ">
<!-- Join the paths with | -->
Expand Down Expand Up @@ -403,6 +401,14 @@
Configuration="$(Configuration)"
Platform="$(Platform)"
TargetFramework="$(TargetFramework)" />

<ItemGroup>
<SonarProjectTelemetry Condition="$(TargetFrameworkMoniker) != ''" Include="dotnetenterprise.s4net.build.target_framework_moniker" Value="$(TargetFrameworkMoniker)" />
<SonarProjectTelemetry Condition="$(UsingMicrosoftNETSdk) != ''" Include="dotnetenterprise.s4net.build.using_microsoft_net_sdk" Value="$(UsingMicrosoftNETSdk)" /> <!-- new SDK style projects https://stackoverflow.com/a/53530363-->
<SonarProjectTelemetry Condition="$(Deterministic) != ''" Include="dotnetenterprise.s4net.build.deterministic" Value="$(Deterministic)" />
<SonarProjectTelemetry Condition="$(NuGetProjectStyle) != ''" Include="dotnetenterprise.s4net.build.nuget_project_style" Value="$(NuGetProjectStyle)" />
</ItemGroup>
<WriteSonarTelemetry Condition="$(SonarProjectTelemetryFilePath)!=''" Filename="$(SonarProjectTelemetryFilePath)" Telemetry="@(SonarProjectTelemetry)" />

<Message Importance="high" Text="Sonar: ($(MSBuildProjectFile)) Project processed successfully" />
</Target>
Expand Down
Loading