Skip to content

Commit

Permalink
Update VssApiVersion to 0.5.172-private (#3608)
Browse files Browse the repository at this point in the history
* Update vss-api-nuget package to add Verbose logging of filenames during artifact downloads

* work-around breaking change in BlobStoreClientTelemetry

Co-authored-by: Alexander Smolyakov <v-alsmo@microsoft.com>
  • Loading branch information
NoDataAvailable and Alexander Smolyakov authored Nov 12, 2021
1 parent b746996 commit 0e0fb2b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<OSPlatform>OS_UNKNOWN</OSPlatform>
<OSArchitecture>ARCH_UNKNOWN</OSArchitecture>
<DebugConstant></DebugConstant>
<VssApiVersion>0.5.171-private</VssApiVersion>
<VssApiVersion>0.5.172-private</VssApiVersion>
<CodeAnalysis>$(CodeAnalysis)</CodeAnalysis>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,44 @@ namespace Microsoft.VisualStudio.Services.Agent.Blob
{
public class BlobStoreClientTelemetryTfs : BlobStoreClientTelemetry
{
private CustomerIntelligenceTelemetrySender sender;

public BlobStoreClientTelemetryTfs(IAppTraceSource tracer, Uri baseAddress, VssConnection connection)
: base(tracer, baseAddress, new CustomerIntelligenceTelemetrySender(connection))
: this(tracer, baseAddress, new CustomerIntelligenceTelemetrySender(connection))
{
}

// for testing
public BlobStoreClientTelemetryTfs(IAppTraceSource tracer, Uri baseAddress, VssConnection connection, ITelemetrySender sender)
: base(tracer, baseAddress, sender)
{
this.sender = sender as CustomerIntelligenceTelemetrySender;
}

private BlobStoreClientTelemetryTfs(IAppTraceSource tracer, Uri baseAddress, CustomerIntelligenceTelemetrySender sender)
: base(tracer, baseAddress, sender)
{
this.sender = sender;
}

public async Task CommitTelemetryUpload(Guid planId, Guid jobId)
{
var ciSender = this.senders.OfType<CustomerIntelligenceTelemetrySender>().FirstOrDefault();
await (ciSender?.CommitTelemetryUpload(planId, jobId) ?? Task.CompletedTask);
await (this.sender?.CommitTelemetryUpload(planId, jobId) ?? Task.CompletedTask);
}

public Dictionary<string, object> GetArtifactDownloadTelemetry(Guid planId, Guid jobId)
{
var ciSender = this.senders.OfType<CustomerIntelligenceTelemetrySender>().FirstOrDefault();
return ciSender?.GetArtifactDownloadTelemetry(planId, jobId);
return this.sender?.GetArtifactDownloadTelemetry(planId, jobId);
}

protected override void Dispose(bool disposing)
{
if (disposing)
{
this.sender = null;
}

base.Dispose(disposing);
}
}
}

0 comments on commit 0e0fb2b

Please sign in to comment.