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

Rename and update redirect header for QuickPulse #997

Merged
merged 14 commits into from
Aug 5, 2022
11 changes: 9 additions & 2 deletions Library/QuickPulseSender.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import AutoCollectHttpDependencies = require("../AutoCollection/HttpDependencies
import Logging = require("./Logging");
import QuickPulseUtil = require("./QuickPulseUtil");
import Util = require("./Util");
import url = require("url");

// Types
import * as http from "http";
Expand All @@ -15,7 +16,7 @@ const QuickPulseConfig = {
method: "POST",
time: "x-ms-qps-transmission-time",
pollingIntervalHint: "x-ms-qps-service-polling-interval-hint",
endpointRedirect: "x-ms-qps-service-endpoint-redirect",
endpointRedirect: "x-ms-qps-service-endpoint-redirect-v2",
instanceName: "x-ms-qps-instance-name",
streamId: "x-ms-qps-stream-id",
machineName: "x-ms-qps-machine-name",
Expand Down Expand Up @@ -114,7 +115,13 @@ class QuickPulseSender {
const req = https.request(options, (res: http.IncomingMessage) => {
if (res.statusCode == 200) {
const shouldPOSTData = res.headers[QuickPulseConfig.subscribed] === "true";
const redirectHeader = res.headers[QuickPulseConfig.endpointRedirect] ? res.headers[QuickPulseConfig.endpointRedirect].toString() : null;
let redirectHeader = null;
try {
redirectHeader = res.headers[QuickPulseConfig.endpointRedirect] ? new url.URL(res.headers[QuickPulseConfig.endpointRedirect].toString()).host : null;
} catch (error) {
this._onError("Failed to parse redirect header from QuickPulse: " + Util.dumpObj(error));
}

const pollingIntervalHint = res.headers[QuickPulseConfig.pollingIntervalHint] ? parseInt(res.headers[QuickPulseConfig.pollingIntervalHint].toString()) : null;
this._consecutiveErrors = 0;
done(shouldPOSTData, res, redirectHeader, pollingIntervalHint);
Expand Down
2 changes: 0 additions & 2 deletions Tests/Library/QuickPulseStateManager.tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ describe("Library/QuickPulseStateManager", () => {
assert.equal((callArgs[0][4][4] as any)['value'], '1');

assert.equal(submitDataStub.callCount, 1);

qps.enable(false);
});

Expand All @@ -228,7 +227,6 @@ describe("Library/QuickPulseStateManager", () => {
assert.equal(callArgs[0][1], undefined);
assert.equal(callArgs[1][1], 'www.example.com');
assert.equal(callArgs[2][1], 'www.example.com');

});
});

Expand Down