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

Add RoleName to headers in ping requests to QuickPulse #2113

Merged
merged 5 commits into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ private void AddHeaders(HttpWebRequest request, bool includeIdentityHeaders, str
request.Headers.Add(QuickPulseConstants.XMsQpsInstanceNameHeaderName, this.instanceName);
request.Headers.Add(QuickPulseConstants.XMsQpsStreamIdHeaderName, this.streamId);
request.Headers.Add(QuickPulseConstants.XMsQpsMachineNameHeaderName, this.machineName);
request.Headers.Add(QuickPulseConstants.XMsQpsRoleNameHeaderName, this.roleName);
request.Headers.Add(QuickPulseConstants.XMsQpsInvariantVersionHeaderName,
MonitoringDataPoint.CurrentInvariantVersion.ToString(CultureInfo.InvariantCulture));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ private void AddHeaders(HttpRequestMessage request, bool includeIdentityHeaders,
request.Headers.TryAddWithoutValidation(QuickPulseConstants.XMsQpsInstanceNameHeaderName, this.instanceName);
request.Headers.TryAddWithoutValidation(QuickPulseConstants.XMsQpsStreamIdHeaderName, this.streamId);
request.Headers.TryAddWithoutValidation(QuickPulseConstants.XMsQpsMachineNameHeaderName, this.machineName);
request.Headers.TryAddWithoutValidation(QuickPulseConstants.XMsQpsRoleNameHeaderName, this.roleName);
request.Headers.TryAddWithoutValidation(QuickPulseConstants.XMsQpsInvariantVersionHeaderName,
MonitoringDataPoint.CurrentInvariantVersion.ToString(CultureInfo.InvariantCulture));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1309,10 +1309,11 @@ public void QuickPulseServiceClientSubmitsStreamIdToServiceWithPing()
{
// ARRANGE
var streamId = "this stream";
var roleName = "Role-Name-1";
var serviceClient = new QuickPulseServiceClient(
this.TestContext.Properties[ServiceEndpointPropertyName] as Uri,
string.Empty,
string.Empty,
roleName,
streamId,
string.Empty,
string.Empty,
Expand All @@ -1331,6 +1332,7 @@ public void QuickPulseServiceClientSubmitsStreamIdToServiceWithPing()
Assert.AreEqual(1, this.pings.Count);
Assert.AreEqual(streamId, this.pings[0].Item1.StreamId);
Assert.AreEqual(streamId, this.pings[0].Item3.StreamId);
Assert.AreEqual(roleName, this.pings[0].Item1.RoleName);
}

[TestMethod]
Expand Down Expand Up @@ -2115,6 +2117,7 @@ private void ProcessRequest(HttpListener listener, AutoResetEvent ev)
var invariantVersion =
context.Request.Headers[QuickPulseConstants.XMsQpsInvariantVersionHeaderName];
var streamId = context.Request.Headers[QuickPulseConstants.XMsQpsStreamIdHeaderName];
var roleName = context.Request.Headers[QuickPulseConstants.XMsQpsRoleNameHeaderName];
rambhatt-msft marked this conversation as resolved.
Show resolved Hide resolved
var collectionConfigurationETag =
context.Request.Headers[QuickPulseConstants.XMsQpsConfigurationETagHeaderName];

Expand All @@ -2125,6 +2128,7 @@ private void ProcessRequest(HttpListener listener, AutoResetEvent ev)
TransmissionTime = new DateTimeOffset(transmissionTime, TimeSpan.Zero),
InstanceName = instanceName,
MachineName = machineName,
RoleName = roleName,
InvariantVersion = int.Parse(invariantVersion, CultureInfo.InvariantCulture),
StreamId = streamId
},
Expand Down Expand Up @@ -2204,6 +2208,8 @@ private class PingHeaders
public int InvariantVersion { get; set; }

public string StreamId { get; set; }

public string RoleName { get; set; }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ internal static class QuickPulseConstants
/// </summary>
internal const string XMsQpsMachineNameHeaderName = "x-ms-qps-machine-name";

/// <summary>
/// Role name header.
/// </summary>
internal const string XMsQpsRoleNameHeaderName = "x-ms-qps-role-name";

/// <summary>
/// Invariant version header.
/// </summary>
Expand Down