Merge 54efc22 into ff228ee

aws · May 18, 2021 · 115c731 · 115c731
2 parents ff228ee + 54efc22
commit 115c731
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/packages/core/lib/segments/attributes/remote_request_data.js b/packages/core/lib/segments/attributes/remote_request_data.js
@@ -15,7 +15,7 @@ function RemoteRequestData(req, res, downstreamXRayEnabled) {
 
 RemoteRequestData.prototype.init = function init(req, res, downstreamXRayEnabled) {
   this.request = {
-    url: (req.agent && req.agent.protocol) ? (req.agent.protocol + '//' + req.getHeader('host') +  stripQueryStringFromPath(req.path)) : '',
+    url: (req.agent && req.agent.protocol) ? (req.agent.protocol + '//' + (req.host || req.getHeader('host')) +  stripQueryStringFromPath(req.path)) : '',
     method: req.method || '',
   };
 

diff --git a/packages/core/test/unit/segments/attributes/remote_request_data.test.js b/packages/core/test/unit/segments/attributes/remote_request_data.test.js
@@ -50,5 +50,14 @@ describe('RemoteRequestData', function() {
         ''
       );
     });
+    it('should use the host from the request object over headers', () => {
+      const requestWithHost = Object.assign(request, { host: 'different-site.com' });
+
+      assert.propertyVal(
+        new RemoteRequestData(requestWithHost, response, true).request,
+        'url',
+        'https://different-site.com/path/to/resource'
+      );
+    });
   });
 });