Skip to content

Commit ddfff0c

Browse files
rkodevrkodev
authored
Update retry attribute names (#1359)
* Update retry attribute names * rename attributes * update versions * fix format
1 parent 2cf02ba commit ddfff0c

File tree

12 files changed

+19
-15
lines changed

12 files changed

+19
-15
lines changed

‎packages/abstractions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-abstractions",
3-
"version": "1.0.0-preview.63",
3+
"version": "1.0.0-preview.64",
44
"description": "Core abstractions for kiota generated libraries in TypeScript and JavaScript",
55
"main": "dist/es/src/index.js",
66
"module": "dist/es/src/index.js",

‎packages/authentication/azure/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-authentication-azure",
3-
"version": "1.0.0-preview.58",
3+
"version": "1.0.0-preview.59",
44
"description": "Authentication provider for Kiota using Azure Identity",
55
"main": "dist/es/src/index.js",
66
"module": "dist/es/src/index.js",

‎packages/authentication/spfx/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-authentication-spfx",
3-
"version": "1.0.0-preview.52",
3+
"version": "1.0.0-preview.53",
44
"description": "Authentication provider for using Kiota in SPFx solutions",
55
"main": "dist/es/src/index.js",
66
"module": "dist/es/src/index.js",

‎packages/bundle/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-bundle",
3-
"version": "1.0.0-preview.6",
3+
"version": "1.0.0-preview.7",
44
"description": "Kiota Bundle package providing default implementations for client setup for kiota generated libraries in TypeScript and JavaScript",
55
"main": "dist/es/src/index.js",
66
"module": "dist/es/src/index.js",

‎packages/http/fetch/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-http-fetchlibrary",
3-
"version": "1.0.0-preview.62",
3+
"version": "1.0.0-preview.63",
44
"description": "Kiota request adapter implementation with fetch",
55
"keywords": [
66
"Kiota",

‎packages/http/fetch/src/fetchRequestAdapter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ export class FetchRequestAdapter implements RequestAdapter {
463463
if (responseContentType) {
464464
spanForAttributes.setAttribute("http.response_content_type", responseContentType);
465465
}
466-
spanForAttributes.setAttribute("http.status_code", response.status);
466+
spanForAttributes.setAttribute("http.response.status_code", response.status);
467467
// getting the http.flavor (protocol version) is impossible with fetch API
468468
}
469469
return response;
@@ -479,7 +479,7 @@ export class FetchRequestAdapter implements RequestAdapter {
479479
const responseClaims = this.getClaimsFromResponse(response, claims);
480480
if (responseClaims) {
481481
span.addEvent(FetchRequestAdapter.authenticateChallengedEventKey);
482-
spanForAttributes.setAttribute("http.retry_count", 1);
482+
spanForAttributes.setAttribute("http.request.resend_count", 1);
483483
await this.purgeResponseBody(response);
484484
return await this.getHttpResponseMessage(requestInfo, spanForAttributes, responseClaims);
485485
}

‎packages/http/fetch/src/middlewares/redirectHandler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export class RedirectHandler implements Middleware {
177177
return trace.getTracer(tracerName).startActiveSpan(`redirectHandler - redirect ${redirectCount}`, (span) => {
178178
try {
179179
span.setAttribute("com.microsoft.kiota.handler.redirect.count", redirectCount);
180-
span.setAttribute("http.status_code", response.status);
180+
span.setAttribute("http.response.status_code", response.status);
181181
return this.executeWithRedirect(url, fetchRequestInit, redirectCount, currentOptions, requestOptions);
182182
} finally {
183183
span.end();

‎packages/http/fetch/src/middlewares/retryHandler.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,19 @@ export class RetryHandler implements Middleware {
165165
if (retryAttempts < currentOptions.maxRetries && this.isRetry(response) && this.isBuffered(fetchRequestInit) && currentOptions.shouldRetry(currentOptions.delay, retryAttempts, url, fetchRequestInit as RequestInit, response)) {
166166
++retryAttempts;
167167
setRequestHeader(fetchRequestInit, RetryHandler.RETRY_ATTEMPT_HEADER, retryAttempts.toString());
168+
let delay = null;
168169
if (response) {
169-
const delay = this.getDelay(response, retryAttempts, currentOptions.delay);
170+
delay = this.getDelay(response, retryAttempts, currentOptions.delay);
170171
await this.sleep(delay);
171172
}
172173
if (tracerName) {
173174
return await trace.getTracer(tracerName).startActiveSpan(`retryHandler - attempt ${retryAttempts}`, (span) => {
174175
try {
175-
span.setAttribute("http.retry_count", retryAttempts);
176-
span.setAttribute("http.status_code", response.status);
176+
span.setAttribute("http.request.resend_count", retryAttempts);
177+
if (delay) {
178+
span.setAttribute("http.request.resend_delay", delay);
179+
}
180+
span.setAttribute("http.response.status_code", response.status);
177181
return this.executeWithRetry(url, fetchRequestInit, retryAttempts, currentOptions, requestOptions);
178182
} finally {
179183
span.end();

‎packages/serialization/form/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-serialization-form",
3-
"version": "1.0.0-preview.51",
3+
"version": "1.0.0-preview.52",
44
"description": "Implementation of Kiota Serialization interfaces for URI from encoded",
55
"main": "dist/es/src/index.js",
66
"browser": {

‎packages/serialization/json/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-serialization-json",
3-
"version": "1.0.0-preview.63",
3+
"version": "1.0.0-preview.64",
44
"description": "Implementation of Kiota Serialization interfaces for JSON",
55
"main": "dist/es/src/index.js",
66
"type": "module",

‎packages/serialization/multipart/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-serialization-multipart",
3-
"version": "1.0.0-preview.41",
3+
"version": "1.0.0-preview.42",
44
"description": "Implementation of Kiota Serialization interfaces for multipart form data",
55
"main": "dist/es/src/index.js",
66
"module": "dist/es/src/index.js",

‎packages/serialization/text/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-serialization-text",
3-
"version": "1.0.0-preview.60",
3+
"version": "1.0.0-preview.61",
44
"description": "Implementation of Kiota Serialization interfaces for text",
55
"main": "dist/es/src/index.js",
66
"browser": {

0 commit comments

Comments
 (0)