@opentelemetry/instrumentation-xml-http-request
Advanced tools
Comparing version 0.34.0 to 0.35.0
@@ -1,2 +0,2 @@ | ||
export declare const VERSION = "0.34.0"; | ||
export declare const VERSION = "0.35.0"; | ||
//# sourceMappingURL=version.d.ts.map |
@@ -17,3 +17,3 @@ /* | ||
// this is autogenerated file, see scripts/version-update.js | ||
export var VERSION = '0.34.0'; | ||
export var VERSION = '0.35.0'; | ||
//# sourceMappingURL=version.js.map |
@@ -126,4 +126,3 @@ /* | ||
var _this = this; | ||
var applyCustomAttributesOnSpan = this._getConfig() | ||
.applyCustomAttributesOnSpan; | ||
var applyCustomAttributesOnSpan = this._getConfig().applyCustomAttributesOnSpan; | ||
if (typeof applyCustomAttributesOnSpan === 'function') { | ||
@@ -246,3 +245,3 @@ safeExecuteInTheMiddle(function () { return applyCustomAttributesOnSpan(span, xhr); }, function (error) { | ||
_a[SemanticAttributes.HTTP_METHOD] = method, | ||
_a[SemanticAttributes.HTTP_URL] = url, | ||
_a[SemanticAttributes.HTTP_URL] = parseUrl(url).toString(), | ||
_a), | ||
@@ -294,3 +293,3 @@ }); | ||
var plugin = this; | ||
function endSpanTimeout(eventName, xhrMem, endTime) { | ||
function endSpanTimeout(eventName, xhrMem, performanceEndTime, endTime) { | ||
var callbackToRemoveEvents = xhrMem.callbackToRemoveEvents; | ||
@@ -302,3 +301,3 @@ if (typeof callbackToRemoveEvents === 'function') { | ||
if (span) { | ||
plugin._findResourceAndAddNetworkEvents(xhrMem, span, spanUrl, sendStartTime, endTime); | ||
plugin._findResourceAndAddNetworkEvents(xhrMem, span, spanUrl, sendStartTime, performanceEndTime); | ||
span.addEvent(eventName, endTime); | ||
@@ -322,3 +321,4 @@ plugin._addFinalSpanAttributes(span, xhrMem, spanUrl); | ||
} | ||
var endTime = hrTime(); | ||
var performanceEndTime = hrTime(); | ||
var endTime = Date.now(); | ||
// the timeout is needed as observer doesn't have yet information | ||
@@ -328,3 +328,3 @@ // when event "load" is called. Also the time may differ depends on | ||
setTimeout(function () { | ||
endSpanTimeout(eventName, xhrMem, endTime); | ||
endSpanTimeout(eventName, xhrMem, performanceEndTime, endTime); | ||
}, OBSERVER_WAIT_TIME_MS); | ||
@@ -331,0 +331,0 @@ } |
@@ -1,2 +0,2 @@ | ||
export declare const VERSION = "0.34.0"; | ||
export declare const VERSION = "0.35.0"; | ||
//# sourceMappingURL=version.d.ts.map |
@@ -17,3 +17,3 @@ /* | ||
// this is autogenerated file, see scripts/version-update.js | ||
export const VERSION = '0.34.0'; | ||
export const VERSION = '0.35.0'; | ||
//# sourceMappingURL=version.js.map |
@@ -107,4 +107,3 @@ /* | ||
_applyAttributesAfterXHR(span, xhr) { | ||
const applyCustomAttributesOnSpan = this._getConfig() | ||
.applyCustomAttributesOnSpan; | ||
const applyCustomAttributesOnSpan = this._getConfig().applyCustomAttributesOnSpan; | ||
if (typeof applyCustomAttributesOnSpan === 'function') { | ||
@@ -226,3 +225,3 @@ safeExecuteInTheMiddle(() => applyCustomAttributesOnSpan(span, xhr), error => { | ||
[SemanticAttributes.HTTP_METHOD]: method, | ||
[SemanticAttributes.HTTP_URL]: url, | ||
[SemanticAttributes.HTTP_URL]: parseUrl(url).toString(), | ||
}, | ||
@@ -269,3 +268,3 @@ }); | ||
const plugin = this; | ||
function endSpanTimeout(eventName, xhrMem, endTime) { | ||
function endSpanTimeout(eventName, xhrMem, performanceEndTime, endTime) { | ||
const callbackToRemoveEvents = xhrMem.callbackToRemoveEvents; | ||
@@ -277,3 +276,3 @@ if (typeof callbackToRemoveEvents === 'function') { | ||
if (span) { | ||
plugin._findResourceAndAddNetworkEvents(xhrMem, span, spanUrl, sendStartTime, endTime); | ||
plugin._findResourceAndAddNetworkEvents(xhrMem, span, spanUrl, sendStartTime, performanceEndTime); | ||
span.addEvent(eventName, endTime); | ||
@@ -297,3 +296,4 @@ plugin._addFinalSpanAttributes(span, xhrMem, spanUrl); | ||
} | ||
const endTime = hrTime(); | ||
const performanceEndTime = hrTime(); | ||
const endTime = Date.now(); | ||
// the timeout is needed as observer doesn't have yet information | ||
@@ -303,3 +303,3 @@ // when event "load" is called. Also the time may differ depends on | ||
setTimeout(() => { | ||
endSpanTimeout(eventName, xhrMem, endTime); | ||
endSpanTimeout(eventName, xhrMem, performanceEndTime, endTime); | ||
}, OBSERVER_WAIT_TIME_MS); | ||
@@ -306,0 +306,0 @@ } |
@@ -1,2 +0,2 @@ | ||
export declare const VERSION = "0.34.0"; | ||
export declare const VERSION = "0.35.0"; | ||
//# sourceMappingURL=version.d.ts.map |
@@ -20,3 +20,3 @@ "use strict"; | ||
// this is autogenerated file, see scripts/version-update.js | ||
exports.VERSION = '0.34.0'; | ||
exports.VERSION = '0.35.0'; | ||
//# sourceMappingURL=version.js.map |
@@ -110,4 +110,3 @@ "use strict"; | ||
_applyAttributesAfterXHR(span, xhr) { | ||
const applyCustomAttributesOnSpan = this._getConfig() | ||
.applyCustomAttributesOnSpan; | ||
const applyCustomAttributesOnSpan = this._getConfig().applyCustomAttributesOnSpan; | ||
if (typeof applyCustomAttributesOnSpan === 'function') { | ||
@@ -229,3 +228,3 @@ (0, instrumentation_1.safeExecuteInTheMiddle)(() => applyCustomAttributesOnSpan(span, xhr), error => { | ||
[semantic_conventions_1.SemanticAttributes.HTTP_METHOD]: method, | ||
[semantic_conventions_1.SemanticAttributes.HTTP_URL]: url, | ||
[semantic_conventions_1.SemanticAttributes.HTTP_URL]: (0, sdk_trace_web_1.parseUrl)(url).toString(), | ||
}, | ||
@@ -272,3 +271,3 @@ }); | ||
const plugin = this; | ||
function endSpanTimeout(eventName, xhrMem, endTime) { | ||
function endSpanTimeout(eventName, xhrMem, performanceEndTime, endTime) { | ||
const callbackToRemoveEvents = xhrMem.callbackToRemoveEvents; | ||
@@ -280,3 +279,3 @@ if (typeof callbackToRemoveEvents === 'function') { | ||
if (span) { | ||
plugin._findResourceAndAddNetworkEvents(xhrMem, span, spanUrl, sendStartTime, endTime); | ||
plugin._findResourceAndAddNetworkEvents(xhrMem, span, spanUrl, sendStartTime, performanceEndTime); | ||
span.addEvent(eventName, endTime); | ||
@@ -300,3 +299,4 @@ plugin._addFinalSpanAttributes(span, xhrMem, spanUrl); | ||
} | ||
const endTime = (0, core_1.hrTime)(); | ||
const performanceEndTime = (0, core_1.hrTime)(); | ||
const endTime = Date.now(); | ||
// the timeout is needed as observer doesn't have yet information | ||
@@ -306,3 +306,3 @@ // when event "load" is called. Also the time may differ depends on | ||
setTimeout(() => { | ||
endSpanTimeout(eventName, xhrMem, endTime); | ||
endSpanTimeout(eventName, xhrMem, performanceEndTime, endTime); | ||
}, OBSERVER_WAIT_TIME_MS); | ||
@@ -309,0 +309,0 @@ } |
{ | ||
"name": "@opentelemetry/instrumentation-xml-http-request", | ||
"version": "0.34.0", | ||
"version": "0.35.0", | ||
"description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", | ||
@@ -12,4 +12,4 @@ "main": "build/src/index.js", | ||
"prepublishOnly": "npm run compile", | ||
"compile": "tsc --build tsconfig.all.json", | ||
"clean": "tsc --build --clean tsconfig.all.json", | ||
"compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", | ||
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", | ||
"lint": "eslint . --ext .ts", | ||
@@ -21,3 +21,3 @@ "lint:fix": "eslint . --ext .ts --fix", | ||
"test:browser": "nyc karma start --single-run", | ||
"watch": "tsc --build --watch tsconfig.all.json", | ||
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", | ||
"precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", | ||
@@ -61,5 +61,5 @@ "prewatch": "node ../../../scripts/version-update.js", | ||
"@opentelemetry/api": "^1.0.0", | ||
"@opentelemetry/context-zone": "1.8.0", | ||
"@opentelemetry/propagator-b3": "1.8.0", | ||
"@opentelemetry/sdk-trace-base": "1.8.0", | ||
"@opentelemetry/context-zone": "1.9.0", | ||
"@opentelemetry/propagator-b3": "1.9.0", | ||
"@opentelemetry/sdk-trace-base": "1.9.0", | ||
"@types/mocha": "10.0.0", | ||
@@ -81,3 +81,3 @@ "@types/node": "18.6.5", | ||
"rimraf": "3.0.2", | ||
"sinon": "14.0.0", | ||
"sinon": "15.0.0", | ||
"ts-loader": "8.4.0", | ||
@@ -94,10 +94,10 @@ "ts-mocha": "10.0.0", | ||
"dependencies": { | ||
"@opentelemetry/core": "1.8.0", | ||
"@opentelemetry/instrumentation": "0.34.0", | ||
"@opentelemetry/sdk-trace-web": "1.8.0", | ||
"@opentelemetry/semantic-conventions": "1.8.0" | ||
"@opentelemetry/core": "1.9.0", | ||
"@opentelemetry/instrumentation": "0.35.0", | ||
"@opentelemetry/sdk-trace-web": "1.9.0", | ||
"@opentelemetry/semantic-conventions": "1.9.0" | ||
}, | ||
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation-xml-http-request", | ||
"sideEffects": false, | ||
"gitHead": "7972edf6659fb6e0d5928a5cf7a35f26683e168f" | ||
"gitHead": "08f597f3a3d71a4852b0afbba120af15ca038121" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
199131
+ Added@opentelemetry/api@1.4.1(transitive)
+ Added@opentelemetry/core@1.9.0(transitive)
+ Added@opentelemetry/instrumentation@0.35.0(transitive)
+ Added@opentelemetry/resources@1.9.0(transitive)
+ Added@opentelemetry/sdk-trace-base@1.9.0(transitive)
+ Added@opentelemetry/sdk-trace-web@1.9.0(transitive)
+ Added@opentelemetry/semantic-conventions@1.9.0(transitive)
- Removed@opentelemetry/api@1.3.0(transitive)
- Removed@opentelemetry/core@1.8.0(transitive)
- Removed@opentelemetry/instrumentation@0.34.0(transitive)
- Removed@opentelemetry/resources@1.8.0(transitive)
- Removed@opentelemetry/sdk-trace-base@1.8.0(transitive)
- Removed@opentelemetry/sdk-trace-web@1.8.0(transitive)
- Removed@opentelemetry/semantic-conventions@1.8.0(transitive)
Updated@opentelemetry/core@1.9.0