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

Removing the Feature flag for TestLogStore in CoveragePublisher #81

Merged
merged 1 commit into from
Nov 22, 2024
Merged

Removing the Feature flag for TestLogStore in CoveragePublisher #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions src/CoveragePublisher.Tests/CoverageProcessorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
private Mock<Parser> _mockParser;
private Mock<ITelemetryDataCollector> _mockTelemetryDataCollector = new Mock<ITelemetryDataCollector>();
private IFeatureFlagHelper _featureFlagHelper;
private ICoveragePublisher _publisher;

Check warning on line 26 in src/CoveragePublisher.Tests/CoverageProcessorTests.cs

View workflow job for this annotation

GitHub Actions / build 

Field 'CoverageProcessorTests._publisher' is never assigned to, and will always have its default value null

Check warning on line 26 in src/CoveragePublisher.Tests/CoverageProcessorTests.cs

View workflow job for this annotation

GitHub Actions / build 

Field 'CoverageProcessorTests._publisher' is never assigned to, and will always have its default value null
private Mock<IFeatureFlagHelper> _mockFFHelper = new Mock<IFeatureFlagHelper>();

[TestInitialize]
Expand Down Expand Up @@ -55,7 +55,6 @@

summary.AddCoverageStatistics("", 0, 0, CoverageSummary.Priority.Class);

_mockPublisher.Setup(x => x.IsFileCoverageJsonSupported()).Returns(false);
_mockParser.Setup(x => x.GetCoverageSummary()).Returns(summary);

processor.ParseAndPublishCoverage(_config, token, _mockParser.Object).Wait();
Expand All @@ -72,7 +71,6 @@
var processor = new CoverageProcessor(_mockPublisher.Object, _mockTelemetryDataCollector.Object);
var coverage = new List<FileCoverageInfo>();

_mockPublisher.Setup(x => x.IsFileCoverageJsonSupported()).Returns(true);
_mockParser.Setup(x => x.GetFileCoverageInfos()).Returns(coverage);

processor.ParseAndPublishCoverage(_config, token, _mockParser.Object).Wait();
Expand All @@ -92,7 +90,6 @@
var processor = new CoverageProcessor(_mockPublisher.Object, _mockTelemetryDataCollector.Object);
var coverage = new List<FileCoverageInfo>();

_mockPublisher.Setup(x => x.IsFileCoverageJsonSupported()).Returns(true);
_mockParser.Setup(x => x.GetFileCoverageInfos()).Throws(new ParsingException("message", new Exception("error")));

processor.ParseAndPublishCoverage(_config, token, _mockParser.Object).Wait();
Expand Down Expand Up @@ -125,7 +122,6 @@
new FileCoverageInfo()
};

_mockPublisher.Setup(x => x.IsFileCoverageJsonSupported()).Returns(true);
_mockPublisher.Setup(x => x.IsUploadNativeFilesToTCMSupported()).Returns(true);
_mockParser.Setup(x => x.GetFileCoverageInfos()).Returns(coverage);

Expand All @@ -150,10 +146,8 @@

summary.AddCoverageStatistics("", 3, 3, CoverageSummary.Priority.Class);

_mockPublisher.Setup(x => x.IsFileCoverageJsonSupported()).Returns(false);
_mockParser.Setup(x => x.GetCoverageSummary()).Returns(summary);

_mockPublisher.Setup(x => x.IsFileCoverageJsonSupported()).Returns(true);
_mockParser.Setup(x => x.GetFileCoverageInfos()).Returns(coverage);

processor.ParseAndPublishCoverage(_config, token, _mockParser.Object).Wait();
Expand All @@ -176,7 +170,6 @@

summary.AddCoverageStatistics("", 0, 0, CoverageSummary.Priority.Class);

_mockPublisher.Setup(x => x.IsFileCoverageJsonSupported()).Returns(false);
_mockParser.Setup(x => x.GetCoverageSummary()).Returns(summary);

processor.ParseAndPublishCoverage(_config, token, _mockParser.Object).Wait();
Expand Down
64 changes: 22 additions & 42 deletions src/CoveragePublisher/CoverageProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public async Task ParseAndPublishCoverage(PublisherConfiguration config, Cancell
"}";
});

var supportsFileCoverageJson = _publisher.IsFileCoverageJsonSupported();
var uploadNativeCoverageFilesToLogStore = _publisher.IsUploadNativeFilesToTCMSupported();
_telemetry.AddOrUpdate("uploadNativeCoverageFilesToLogStore", uploadNativeCoverageFilesToLogStore.ToString());

Expand All @@ -53,62 +52,43 @@ public async Task ParseAndPublishCoverage(PublisherConfiguration config, Cancell

await _publisher.PublishNativeCoverageFiles(config.CoverageFiles, token);
}
if (supportsFileCoverageJson)
{
var fileCoverage = parser.GetFileCoverageInfos();

var summary = parser.GetCoverageSummary();
var fileCoverage = parser.GetFileCoverageInfos();

bool IsCodeCoverageData = (summary.CodeCoverageData != null);
var summary = parser.GetCoverageSummary();

bool IsCoverageStats = (summary.CodeCoverageData.CoverageStats != null);
bool IsCodeCoverageData = (summary.CodeCoverageData != null);

_telemetry.AddOrUpdate("UniqueFilesCovered", fileCoverage.Count);
bool IsCoverageStats = (summary.CodeCoverageData.CoverageStats != null);

TraceLogger.Debug("Publishing code coverage summary supported");
_telemetry.AddOrUpdate("UniqueFilesCovered", fileCoverage.Count);

if (summary == null || (IsCodeCoverageData && IsCoverageStats && summary.CodeCoverageData.CoverageStats.Count == 0))
{
TraceLogger.Warning(Resources.NoSummaryStatisticsGenerated);
}
else
{
using (new SimpleTimer("CoverageProcesser", "PublishCoverageSummary", _telemetry))
{
await _publisher.PublishCoverageSummary(summary, token);
}
}
TraceLogger.Debug("Publishing code coverage summary supported");

if (fileCoverage.Count == 0)
{
TraceLogger.Warning(Resources.NoCoverageFilesGenerated);
}
else
{
using (new SimpleTimer("CoverageProcesser", "PublishFileCoverage", _telemetry))
{
await _publisher.PublishFileCoverage(fileCoverage, token);
}
}
if (summary == null || (IsCodeCoverageData && IsCoverageStats && summary.CodeCoverageData.CoverageStats.Count == 0))
{
TraceLogger.Warning(Resources.NoSummaryStatisticsGenerated);
}
else
{
TraceLogger.Debug("Publishing file json coverage is not supported.");
var summary = parser.GetCoverageSummary();

if (summary == null || summary.CodeCoverageData.CoverageStats.Count == 0)
using (new SimpleTimer("CoverageProcesser", "PublishCoverageSummary", _telemetry))
{
TraceLogger.Warning(Resources.NoSummaryStatisticsGenerated);
await _publisher.PublishCoverageSummary(summary, token);
}
else
}

if (fileCoverage.Count == 0)
{
TraceLogger.Warning(Resources.NoCoverageFilesGenerated);
}
else
{
using (new SimpleTimer("CoverageProcesser", "PublishFileCoverage", _telemetry))
{
using (new SimpleTimer("CoverageProcesser", "PublishCoverageSummary", _telemetry))
{
await _publisher.PublishCoverageSummary(summary, token);
}
await _publisher.PublishFileCoverage(fileCoverage, token);
}
}

//Feature Flag for PublishHTMLReport; To be cleaned up post PCCRV2 upgrade
if (config.GenerateHTMLReport)
{
Expand Down
5 changes: 0 additions & 5 deletions src/CoveragePublisher/Model/Publishers/ICoveragePublisher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ public interface ICoveragePublisher
/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
Task PublishHTMLReport(string reportDirectory, CancellationToken cancellationToken);

/// <summary>
/// Gets weather publisher supports publishing <see cref="FileCoverageInfo"/> format.
/// </summary>
bool IsFileCoverageJsonSupported();

/// <summary>
/// Gets weather we can upload native file to tcm logstore.
/// </summary>
Expand Down
5 changes: 0 additions & 5 deletions src/CoveragePublisher/Publishers/DefaultPublisher/AzurePipelinesPublisher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ public AzurePipelinesPublisher(bool enableTelemetry)
_logStoreHelper = new LogStoreHelper(_clientFactory);
}

public bool IsFileCoverageJsonSupported()
{
return _featureFlagHelper.GetFeatureFlagState(Constants.FeatureFlags.TestLogStoreOnTCMService, true);
}

public async Task PublishCoverageSummary(CoverageSummary coverageSummary, CancellationToken cancellationToken)
{
var coverageData = coverageSummary.CodeCoverageData;
Expand Down
1 change: 0 additions & 1 deletion src/CoveragePublisher/Publishers/DefaultPublisher/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ internal static class FeatureFlags
{
public const string EnablePublishToTcmServiceDirectlyFromTaskFF = "TestManagement.Server.EnablePublishToTcmServiceDirectlyFromTask";
public const string UploadNativeCoverageFilesToLogStore = "TestManagement.Server.UploadNativeCoverageFilesToLogStore";
public const string TestLogStoreOnTCMService = "TestManagement.Server.TestLogStoreOnTCMService";
}
internal static class CoverageConstants
{
Expand Down
Loading