@squiz/db-lib 1.69.0 → 1.71.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/db-lib",
-  "version": "1.69.0",
+  "version": "1.71.0",
   "description": "",
   "main": "lib/index.js",
   "private": false,
@@ -35,6 +35,7 @@
     "@aws-sdk/client-dynamodb": "^3.632.0",
     "@aws-sdk/client-secrets-manager": "3.614.0",
     "@aws-sdk/lib-dynamodb": "^3.632.0",
+    "@opentelemetry/api": "^1.6.0",
     "@squiz/dx-common-lib": "^1.66.4",
     "@squiz/dx-logger-lib": "^1.64.0",
     "dotenv": "16.0.3",

package/src/dynamodb/AbstractDynamoDbRepository.spec.ts

@@ -774,7 +774,6 @@ describe('AbstractRepository', () => {
         TransactItems: [
           {
             Delete: {
-              ConditionExpression: 'attribute_exists(pk)',
               Key: {
                 pk: 'test_item#foo',
                 sk: '#meta',

package/src/dynamodb/AbstractDynamoDbRepository.ts

@@ -307,6 +307,8 @@ export abstract class AbstractDynamoDbRepository<SHAPE extends object, DATA_CLAS
     };
 
     if (transaction.id?.length) {
+      // For transaction block, don't worry if the item being deleted does not exist
+      delete deleteCommandInput.ConditionExpression;
       // this command will be executed together with
       // other db write commands in the "transaction block"
       this.dbManager.addWriteTransactionItem(transaction.id, {

package/src/dynamodb/DynamoDbManager.ts

@@ -1,6 +1,9 @@
 import { DynamoDBDocument, TransactWriteCommandInput } from '@aws-sdk/lib-dynamodb';
 import { randomUUID } from 'crypto';
 import { TransactionError } from '../error/TransactionError';
+import { trace } from '@opentelemetry/api';
+
+const tracer = trace.getTracer('db-lib:DynamoDbManager');
 
 export type Transaction = {
   id?: string;
@@ -46,11 +49,28 @@ export class DynamoDbManager<TRepositories> {
     if (this.transactionItems[transactionId] === undefined) {
       throw new TransactionError(`No items in transaction '${transactionId}' to execute`);
     }
+    if (!this.transactionItems[transactionId].length) {
+      return;
+    }
 
-    return await this.client.transactWrite({
-      ClientRequestToken: transactionId,
-      TransactItems: this.transactionItems[transactionId],
-    });
+    return tracer.startActiveSpan(
+      'executeTransaction',
+      {
+        attributes: {
+          'transactionItems.length': this.transactionItems[transactionId].length,
+        },
+      },
+      async (span) => {
+        try {
+          return await this.client.transactWrite({
+            ClientRequestToken: transactionId,
+            TransactItems: this.transactionItems[transactionId],
+          });
+        } finally {
+          span.end();
+        }
+      },
+    );
   }
 
   private startTransaction(transactionId: string) {