modify per code review feedback 1

Azure · Dec 10, 2024 · 3861419 · 3861419
1 parent 74afb5f
commit 3861419
Show file tree

Hide file tree

Showing 13 changed files with 146 additions and 123 deletions.
diff --git a/src/blob/generated/middleware/end.middleware.ts b/src/blob/generated/middleware/end.middleware.ts
@@ -28,7 +28,7 @@ export default function endMiddleware(
     )}`,
     context.contextId
   );
-  AzuriteTelemetryClient.TraceBlobRequest(context);
+  AzuriteTelemetryClient.TraceRequest(context);
 
   res.getBodyStream().end();
 }
diff --git a/src/blob/generated/middleware/error.middleware.ts b/src/blob/generated/middleware/error.middleware.ts
@@ -1,3 +1,4 @@
+import { AzuriteTelemetryClient } from '../../../common/Telemetry';
 import Context from '../Context';
 import MiddlewareError from '../errors/MiddlewareError';
 import IRequest from '../IRequest';
@@ -129,6 +130,7 @@ export default function errorMiddleware(
       context.contextId
     );
   }
+  AzuriteTelemetryClient.TraceRequest(context);
 
   next();
 }
diff --git a/src/common/Telemetry.ts b/src/common/Telemetry.ts
diff --git a/src/queue/generated/middleware/end.middleware.ts b/src/queue/generated/middleware/end.middleware.ts
@@ -28,7 +28,7 @@ export default function endMiddleware(
     )}`,
     context.contextID
   );
-  AzuriteTelemetryClient.TraceQueueRequest(context);
+  AzuriteTelemetryClient.TraceRequest(context);
 
   res.getBodyStream().end();
 }
diff --git a/src/queue/generated/middleware/error.middleware.ts b/src/queue/generated/middleware/error.middleware.ts
@@ -1,3 +1,4 @@
+import { AzuriteTelemetryClient } from "../../../common/Telemetry";
 import Context from "../Context";
 import MiddlewareError from "../errors/MiddlewareError";
 import IRequest from "../IRequest";
@@ -129,6 +130,7 @@ export default function errorMiddleware(
       context.contextID
     );
   }
+  AzuriteTelemetryClient.TraceRequest(context) ;
 
   next();
 }
diff --git a/src/table/generated/middleware/end.middleware.ts b/src/table/generated/middleware/end.middleware.ts
@@ -28,7 +28,7 @@ export default function endMiddleware(
     )}`,
     context.contextID
   );
-  AzuriteTelemetryClient.TraceTableRequest(context) ;
+  AzuriteTelemetryClient.TraceRequest(context) ;
 
   res.getBodyStream().end();
 }
diff --git a/src/table/generated/middleware/error.middleware.ts b/src/table/generated/middleware/error.middleware.ts
@@ -1,3 +1,4 @@
+import { AzuriteTelemetryClient } from "../../../common/Telemetry";
 import Context from "../Context";
 import MiddlewareError from "../errors/MiddlewareError";
 import IRequest from "../IRequest";
@@ -126,6 +127,7 @@ export default function errorMiddleware(
       context.contextID
     );
   }
+  AzuriteTelemetryClient.TraceRequest(context) ;
 
   next();
 }
diff --git a/tests/BlobTestServerFactory.ts b/tests/BlobTestServerFactory.ts
@@ -79,7 +79,6 @@ export default class BlobTestServerFactory {
         undefined,
         inMemoryPersistence
       );
-      AzuriteTelemetryClient.init("", true, undefined);
       return new BlobServer(config);
     }
   }

diff --git a/tests/blob/blobCorsRequest.test.ts b/tests/blob/blobCorsRequest.test.ts
@@ -42,6 +42,7 @@ describe("Blob Cors requests test", () => {
 
   before(async () => {
     await server.start();
+    AzuriteTelemetryClient.init("", true, undefined);
     await AzuriteTelemetryClient.TraceStartEvent("Blob Test");
   });
 

diff --git a/tests/queue/oauth.test.ts b/tests/queue/oauth.test.ts
@@ -42,6 +42,7 @@ describe("Queue OAuth Basic", () => {
       oauth: "basic"
     })
     await server.start();
+    AzuriteTelemetryClient.init("", true, undefined);
     await AzuriteTelemetryClient.TraceStartEvent("Queue Test");
   });
 

diff --git a/tests/queue/utils/QueueTestServerFactory.ts b/tests/queue/utils/QueueTestServerFactory.ts
@@ -46,7 +46,6 @@ export default class QueueTestServerFactory {
       undefined,
       inMemoryPersistence
     );
-    AzuriteTelemetryClient.init("", true, undefined);
     return new QueueServer(config);
   }
 }
diff --git a/tests/table/apis/table.entity.azure.data-tables.test.ts b/tests/table/apis/table.entity.azure.data-tables.test.ts
@@ -39,6 +39,7 @@ describe("table Entity APIs test - using Azure/data-tables", () => {
   before(async () => {
     server = createTableServerForTestHttps();
     await server.start();
+    AzuriteTelemetryClient.init("", true, undefined);
     await AzuriteTelemetryClient.TraceStartEvent("Table Test");
   });
 

diff --git a/tests/table/utils/TableTestServerFactory.ts b/tests/table/utils/TableTestServerFactory.ts
@@ -45,7 +45,6 @@ export default class TableTestServerFactory {
       undefined,
       inMemoryPersistence
     );
-    AzuriteTelemetryClient.init("", true, undefined);
     return new TableServer(config);
   }
 }