@opentelemetry/instrumentation-aws-sdk 0.34.3 → 0.35.0

package/build/src/index.js

@@ -1,15 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 /*
  * Copyright The OpenTelemetry Authors
  *
@@ -25,6 +16,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-__exportStar(require("./aws-sdk"), exports);
-__exportStar(require("./types"), exports);
+tslib_1.__exportStar(require("./aws-sdk"), exports);
+tslib_1.__exportStar(require("./types"), exports);
 //# sourceMappingURL=index.js.map

package/build/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,4CAA0B;AAC1B,0CAAwB","sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nexport * from './aws-sdk';\nexport * from './types';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,oDAA0B;AAC1B,kDAAwB","sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nexport * from './aws-sdk';\nexport * from './types';\n"]}

package/build/src/services/dynamodb.d.ts

@@ -2,6 +2,7 @@ import { Span, Tracer } from '@opentelemetry/api';
 import { RequestMetadata, ServiceExtension } from './ServiceExtension';
 import { AwsSdkInstrumentationConfig, NormalizedRequest, NormalizedResponse } from '../types';
 export declare class DynamodbServiceExtension implements ServiceExtension {
+    toArray<T>(values: T | T[]): T[];
     requestPreSpanHook(normalizedRequest: NormalizedRequest): RequestMetadata;
     responseHook(response: NormalizedResponse, span: Span, tracer: Tracer, config: AwsSdkInstrumentationConfig): void;
 }

package/build/src/services/dynamodb.js

@@ -19,8 +19,11 @@ exports.DynamodbServiceExtension = void 0;
 const api_1 = require("@opentelemetry/api");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 class DynamodbServiceExtension {
+    toArray(values) {
+        return Array.isArray(values) ? values : [values];
+    }
     requestPreSpanHook(normalizedRequest) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const spanKind = api_1.SpanKind.CLIENT;
         let spanName;
         const isIncoming = false;
@@ -31,9 +34,104 @@ class DynamodbServiceExtension {
             [semantic_conventions_1.SemanticAttributes.DB_OPERATION]: operation,
             [semantic_conventions_1.SemanticAttributes.DB_STATEMENT]: JSON.stringify(normalizedRequest.commandInput),
         };
-        if (operation === 'BatchGetItem') {
+        // normalizedRequest.commandInput.RequestItems) is undefined when no table names are returned
+        // keys in this object are the table names
+        if ((_b = normalizedRequest.commandInput) === null || _b === void 0 ? void 0 : _b.TableName) {
+            // Necessary for commands with only 1 table name (example: CreateTable). Attribute is TableName not keys of RequestItems
+            // single table name returned for operations like CreateTable
+            spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_TABLE_NAMES] = [
+                normalizedRequest.commandInput.TableName,
+            ];
+        }
+        else if ((_c = normalizedRequest.commandInput) === null || _c === void 0 ? void 0 : _c.RequestItems) {
             spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_TABLE_NAMES] = Object.keys(normalizedRequest.commandInput.RequestItems);
         }
+        if (operation === 'CreateTable' || operation === 'UpdateTable') {
+            // only check for ProvisionedThroughput since ReadCapacityUnits and WriteCapacity units are required attributes
+            if ((_d = normalizedRequest.commandInput) === null || _d === void 0 ? void 0 : _d.ProvisionedThroughput) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_PROVISIONED_READ_CAPACITY] =
+                    normalizedRequest.commandInput.ProvisionedThroughput.ReadCapacityUnits;
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY] =
+                    normalizedRequest.commandInput.ProvisionedThroughput.WriteCapacityUnits;
+            }
+        }
+        if (operation === 'GetItem' ||
+            operation === 'Scan' ||
+            operation === 'Query') {
+            if ((_e = normalizedRequest.commandInput) === null || _e === void 0 ? void 0 : _e.ConsistentRead) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_CONSISTENT_READ] =
+                    normalizedRequest.commandInput.ConsistentRead;
+            }
+        }
+        if (operation === 'Query' || operation === 'Scan') {
+            if ((_f = normalizedRequest.commandInput) === null || _f === void 0 ? void 0 : _f.ProjectionExpression) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_PROJECTION] =
+                    normalizedRequest.commandInput.ProjectionExpression;
+            }
+        }
+        if (operation === 'CreateTable') {
+            if ((_g = normalizedRequest.commandInput) === null || _g === void 0 ? void 0 : _g.GlobalSecondaryIndexes) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES] = this.toArray(normalizedRequest.commandInput.GlobalSecondaryIndexes).map((x) => JSON.stringify(x));
+            }
+            if ((_h = normalizedRequest.commandInput) === null || _h === void 0 ? void 0 : _h.LocalSecondaryIndexes) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES] = this.toArray(normalizedRequest.commandInput.LocalSecondaryIndexes).map((x) => JSON.stringify(x));
+            }
+        }
+        if (operation === 'ListTables' ||
+            operation === 'Query' ||
+            operation === 'Scan') {
+            if ((_j = normalizedRequest.commandInput) === null || _j === void 0 ? void 0 : _j.Limit) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_LIMIT] =
+                    normalizedRequest.commandInput.Limit;
+            }
+        }
+        if (operation === 'ListTables') {
+            if ((_k = normalizedRequest.commandInput) === null || _k === void 0 ? void 0 : _k.ExclusiveStartTableName) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_EXCLUSIVE_START_TABLE] =
+                    normalizedRequest.commandInput.ExclusiveStartTableName;
+            }
+        }
+        if (operation === 'Query') {
+            if ((_l = normalizedRequest.commandInput) === null || _l === void 0 ? void 0 : _l.ScanIndexForward) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_SCAN_FORWARD] =
+                    normalizedRequest.commandInput.ScanIndexForward;
+            }
+            if ((_m = normalizedRequest.commandInput) === null || _m === void 0 ? void 0 : _m.IndexName) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_INDEX_NAME] =
+                    normalizedRequest.commandInput.IndexName;
+            }
+            if ((_o = normalizedRequest.commandInput) === null || _o === void 0 ? void 0 : _o.Select) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_SELECT] =
+                    normalizedRequest.commandInput.Select;
+            }
+        }
+        if (operation === 'Scan') {
+            if ((_p = normalizedRequest.commandInput) === null || _p === void 0 ? void 0 : _p.Segment) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_SEGMENT] =
+                    (_q = normalizedRequest.commandInput) === null || _q === void 0 ? void 0 : _q.Segment;
+            }
+            if ((_r = normalizedRequest.commandInput) === null || _r === void 0 ? void 0 : _r.TotalSegments) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_TOTAL_SEGMENTS] =
+                    (_s = normalizedRequest.commandInput) === null || _s === void 0 ? void 0 : _s.TotalSegments;
+            }
+            if ((_t = normalizedRequest.commandInput) === null || _t === void 0 ? void 0 : _t.IndexName) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_INDEX_NAME] =
+                    normalizedRequest.commandInput.IndexName;
+            }
+            if ((_u = normalizedRequest.commandInput) === null || _u === void 0 ? void 0 : _u.Select) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_SELECT] =
+                    normalizedRequest.commandInput.Select;
+            }
+        }
+        if (operation === 'UpdateTable') {
+            if ((_v = normalizedRequest.commandInput) === null || _v === void 0 ? void 0 : _v.AttributeDefinitions) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS] =
+                    this.toArray(normalizedRequest.commandInput.AttributeDefinitions).map((x) => JSON.stringify(x));
+            }
+            if ((_w = normalizedRequest.commandInput) === null || _w === void 0 ? void 0 : _w.GlobalSecondaryIndexUpdates) {
+                spanAttributes[semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES] = this.toArray(normalizedRequest.commandInput.GlobalSecondaryIndexUpdates).map((x) => JSON.stringify(x));
+            }
+        }
         return {
             isIncoming,
             spanAttributes,
@@ -42,13 +140,25 @@ class DynamodbServiceExtension {
         };
     }
     responseHook(response, span, tracer, config) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const operation = response.request.commandName;
         if (operation === 'BatchGetItem') {
             if (Array.isArray((_a = response.data) === null || _a === void 0 ? void 0 : _a.ConsumedCapacity)) {
                 span.setAttribute(semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_CONSUMED_CAPACITY, response.data.ConsumedCapacity.map((x) => JSON.stringify(x)));
             }
         }
+        if ((_b = response.data) === null || _b === void 0 ? void 0 : _b.ItemCollectionMetrics) {
+            span.setAttribute(semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_ITEM_COLLECTION_METRICS, this.toArray(response.data.ItemCollectionMetrics).map((x) => JSON.stringify(x)));
+        }
+        if ((_c = response.data) === null || _c === void 0 ? void 0 : _c.TableNames) {
+            span.setAttribute(semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_TABLE_COUNT, (_d = response.data) === null || _d === void 0 ? void 0 : _d.TableNames.length);
+        }
+        if ((_e = response.data) === null || _e === void 0 ? void 0 : _e.Count) {
+            span.setAttribute(semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_COUNT, (_f = response.data) === null || _f === void 0 ? void 0 : _f.Count);
+        }
+        if ((_g = response.data) === null || _g === void 0 ? void 0 : _g.ScannedCount) {
+            span.setAttribute(semantic_conventions_1.SemanticAttributes.AWS_DYNAMODB_SCANNED_COUNT, (_h = response.data) === null || _h === void 0 ? void 0 : _h.ScannedCount);
+        }
     }
 }
 exports.DynamodbServiceExtension = DynamodbServiceExtension;

package/build/src/services/dynamodb.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamodb.js","sourceRoot":"","sources":["../../../src/services/dynamodb.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,4CAA4D;AAE5D,8EAG6C;AAO7C,MAAa,wBAAwB;IACnC,kBAAkB,CAAC,iBAAoC;;QACrD,MAAM,QAAQ,GAAa,cAAQ,CAAC,MAAM,CAAC;QAC3C,IAAI,QAA4B,CAAC;QACjC,MAAM,UAAU,GAAG,KAAK,CAAC;QACzB,MAAM,SAAS,GAAG,iBAAiB,CAAC,WAAW,CAAC;QAEhD,MAAM,cAAc,GAAG;YACrB,CAAC,yCAAkB,CAAC,SAAS,CAAC,EAAE,qCAAc,CAAC,QAAQ;YACvD,CAAC,yCAAkB,CAAC,OAAO,CAAC,EAAE,MAAA,iBAAiB,CAAC,YAAY,0CAAE,SAAS;YACvE,CAAC,yCAAkB,CAAC,YAAY,CAAC,EAAE,SAAS;YAC5C,CAAC,yCAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,SAAS,CAC/C,iBAAiB,CAAC,YAAY,CAC/B;SACF,CAAC;QAEF,IAAI,SAAS,KAAK,cAAc,EAAE;YAChC,cAAc,CAAC,yCAAkB,CAAC,wBAAwB,CAAC,GAAG,MAAM,CAAC,IAAI,CACvE,iBAAiB,CAAC,YAAY,CAAC,YAAY,CAC5C,CAAC;SACH;QAED,OAAO;YACL,UAAU;YACV,cAAc;YACd,QAAQ;YACR,QAAQ;SACT,CAAC;IACJ,CAAC;IAED,YAAY,CACV,QAA4B,EAC5B,IAAU,EACV,MAAc,EACd,MAAmC;;QAEnC,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC;QAE/C,IAAI,SAAS,KAAK,cAAc,EAAE;YAChC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAA,QAAQ,CAAC,IAAI,0CAAE,gBAAgB,CAAC,EAAE;gBAClD,IAAI,CAAC,YAAY,CACf,yCAAkB,CAAC,8BAA8B,EACjD,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAChC,CAAC,CAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3D,CACF,CAAC;aACH;SACF;IACH,CAAC;CACF;AAjDD,4DAiDC","sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { Span, SpanKind, Tracer } from '@opentelemetry/api';\nimport { RequestMetadata, ServiceExtension } from './ServiceExtension';\nimport {\n  DbSystemValues,\n  SemanticAttributes,\n} from '@opentelemetry/semantic-conventions';\nimport {\n  AwsSdkInstrumentationConfig,\n  NormalizedRequest,\n  NormalizedResponse,\n} from '../types';\n\nexport class DynamodbServiceExtension implements ServiceExtension {\n  requestPreSpanHook(normalizedRequest: NormalizedRequest): RequestMetadata {\n    const spanKind: SpanKind = SpanKind.CLIENT;\n    let spanName: string | undefined;\n    const isIncoming = false;\n    const operation = normalizedRequest.commandName;\n\n    const spanAttributes = {\n      [SemanticAttributes.DB_SYSTEM]: DbSystemValues.DYNAMODB,\n      [SemanticAttributes.DB_NAME]: normalizedRequest.commandInput?.TableName,\n      [SemanticAttributes.DB_OPERATION]: operation,\n      [SemanticAttributes.DB_STATEMENT]: JSON.stringify(\n        normalizedRequest.commandInput\n      ),\n    };\n\n    if (operation === 'BatchGetItem') {\n      spanAttributes[SemanticAttributes.AWS_DYNAMODB_TABLE_NAMES] = Object.keys(\n        normalizedRequest.commandInput.RequestItems\n      );\n    }\n\n    return {\n      isIncoming,\n      spanAttributes,\n      spanKind,\n      spanName,\n    };\n  }\n\n  responseHook(\n    response: NormalizedResponse,\n    span: Span,\n    tracer: Tracer,\n    config: AwsSdkInstrumentationConfig\n  ) {\n    const operation = response.request.commandName;\n\n    if (operation === 'BatchGetItem') {\n      if (Array.isArray(response.data?.ConsumedCapacity)) {\n        span.setAttribute(\n          SemanticAttributes.AWS_DYNAMODB_CONSUMED_CAPACITY,\n          response.data.ConsumedCapacity.map(\n            (x: { [DictionaryKey: string]: any }) => JSON.stringify(x)\n          )\n        );\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"dynamodb.js","sourceRoot":"","sources":["../../../src/services/dynamodb.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { Span, SpanKind, Tracer } from '@opentelemetry/api';\nimport { RequestMetadata, ServiceExtension } from './ServiceExtension';\nimport {\n  DbSystemValues,\n  SemanticAttributes,\n} from '@opentelemetry/semantic-conventions';\nimport {\n  AwsSdkInstrumentationConfig,\n  NormalizedRequest,\n  NormalizedResponse,\n} from '../types';\n\nexport class DynamodbServiceExtension implements ServiceExtension {\n  toArray<T>(values: T | T[]): T[] {\n    return Array.isArray(values) ? values : [values];\n  }\n\n  requestPreSpanHook(normalizedRequest: NormalizedRequest): RequestMetadata {\n    const spanKind: SpanKind = SpanKind.CLIENT;\n    let spanName: string | undefined;\n    const isIncoming = false;\n    const operation = normalizedRequest.commandName;\n\n    const spanAttributes = {\n      [SemanticAttributes.DB_SYSTEM]: DbSystemValues.DYNAMODB,\n      [SemanticAttributes.DB_NAME]: normalizedRequest.commandInput?.TableName,\n      [SemanticAttributes.DB_OPERATION]: operation,\n      [SemanticAttributes.DB_STATEMENT]: JSON.stringify(\n        normalizedRequest.commandInput\n      ),\n    };\n\n    // normalizedRequest.commandInput.RequestItems) is undefined when no table names are returned\n    // keys in this object are the table names\n    if (normalizedRequest.commandInput?.TableName) {\n      // Necessary for commands with only 1 table name (example: CreateTable). Attribute is TableName not keys of RequestItems\n      // single table name returned for operations like CreateTable\n      spanAttributes[SemanticAttributes.AWS_DYNAMODB_TABLE_NAMES] = [\n        normalizedRequest.commandInput.TableName,\n      ];\n    } else if (normalizedRequest.commandInput?.RequestItems) {\n      spanAttributes[SemanticAttributes.AWS_DYNAMODB_TABLE_NAMES] = Object.keys(\n        normalizedRequest.commandInput.RequestItems\n      );\n    }\n\n    if (operation === 'CreateTable' || operation === 'UpdateTable') {\n      // only check for ProvisionedThroughput since ReadCapacityUnits and WriteCapacity units are required attributes\n      if (normalizedRequest.commandInput?.ProvisionedThroughput) {\n        spanAttributes[\n          SemanticAttributes.AWS_DYNAMODB_PROVISIONED_READ_CAPACITY\n        ] =\n          normalizedRequest.commandInput.ProvisionedThroughput.ReadCapacityUnits;\n        spanAttributes[\n          SemanticAttributes.AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY\n        ] =\n          normalizedRequest.commandInput.ProvisionedThroughput.WriteCapacityUnits;\n      }\n    }\n\n    if (\n      operation === 'GetItem' ||\n      operation === 'Scan' ||\n      operation === 'Query'\n    ) {\n      if (normalizedRequest.commandInput?.ConsistentRead) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_CONSISTENT_READ] =\n          normalizedRequest.commandInput.ConsistentRead;\n      }\n    }\n\n    if (operation === 'Query' || operation === 'Scan') {\n      if (normalizedRequest.commandInput?.ProjectionExpression) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_PROJECTION] =\n          normalizedRequest.commandInput.ProjectionExpression;\n      }\n    }\n\n    if (operation === 'CreateTable') {\n      if (normalizedRequest.commandInput?.GlobalSecondaryIndexes) {\n        spanAttributes[\n          SemanticAttributes.AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES\n        ] = this.toArray(\n          normalizedRequest.commandInput.GlobalSecondaryIndexes\n        ).map((x: { [DictionaryKey: string]: any }) => JSON.stringify(x));\n      }\n\n      if (normalizedRequest.commandInput?.LocalSecondaryIndexes) {\n        spanAttributes[\n          SemanticAttributes.AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES\n        ] = this.toArray(\n          normalizedRequest.commandInput.LocalSecondaryIndexes\n        ).map((x: { [DictionaryKey: string]: any }) => JSON.stringify(x));\n      }\n    }\n\n    if (\n      operation === 'ListTables' ||\n      operation === 'Query' ||\n      operation === 'Scan'\n    ) {\n      if (normalizedRequest.commandInput?.Limit) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_LIMIT] =\n          normalizedRequest.commandInput.Limit;\n      }\n    }\n\n    if (operation === 'ListTables') {\n      if (normalizedRequest.commandInput?.ExclusiveStartTableName) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_EXCLUSIVE_START_TABLE] =\n          normalizedRequest.commandInput.ExclusiveStartTableName;\n      }\n    }\n\n    if (operation === 'Query') {\n      if (normalizedRequest.commandInput?.ScanIndexForward) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_SCAN_FORWARD] =\n          normalizedRequest.commandInput.ScanIndexForward;\n      }\n\n      if (normalizedRequest.commandInput?.IndexName) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_INDEX_NAME] =\n          normalizedRequest.commandInput.IndexName;\n      }\n\n      if (normalizedRequest.commandInput?.Select) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_SELECT] =\n          normalizedRequest.commandInput.Select;\n      }\n    }\n\n    if (operation === 'Scan') {\n      if (normalizedRequest.commandInput?.Segment) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_SEGMENT] =\n          normalizedRequest.commandInput?.Segment;\n      }\n\n      if (normalizedRequest.commandInput?.TotalSegments) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_TOTAL_SEGMENTS] =\n          normalizedRequest.commandInput?.TotalSegments;\n      }\n\n      if (normalizedRequest.commandInput?.IndexName) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_INDEX_NAME] =\n          normalizedRequest.commandInput.IndexName;\n      }\n\n      if (normalizedRequest.commandInput?.Select) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_SELECT] =\n          normalizedRequest.commandInput.Select;\n      }\n    }\n\n    if (operation === 'UpdateTable') {\n      if (normalizedRequest.commandInput?.AttributeDefinitions) {\n        spanAttributes[SemanticAttributes.AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS] =\n          this.toArray(normalizedRequest.commandInput.AttributeDefinitions).map(\n            (x: { [DictionaryKey: string]: any }) => JSON.stringify(x)\n          );\n      }\n\n      if (normalizedRequest.commandInput?.GlobalSecondaryIndexUpdates) {\n        spanAttributes[\n          SemanticAttributes.AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES\n        ] = this.toArray(\n          normalizedRequest.commandInput.GlobalSecondaryIndexUpdates\n        ).map((x: { [DictionaryKey: string]: any }) => JSON.stringify(x));\n      }\n    }\n\n    return {\n      isIncoming,\n      spanAttributes,\n      spanKind,\n      spanName,\n    };\n  }\n\n  responseHook(\n    response: NormalizedResponse,\n    span: Span,\n    tracer: Tracer,\n    config: AwsSdkInstrumentationConfig\n  ) {\n    const operation = response.request.commandName;\n\n    if (operation === 'BatchGetItem') {\n      if (Array.isArray(response.data?.ConsumedCapacity)) {\n        span.setAttribute(\n          SemanticAttributes.AWS_DYNAMODB_CONSUMED_CAPACITY,\n          response.data.ConsumedCapacity.map(\n            (x: { [DictionaryKey: string]: any }) => JSON.stringify(x)\n          )\n        );\n      }\n    }\n\n    if (response.data?.ItemCollectionMetrics) {\n      span.setAttribute(\n        SemanticAttributes.AWS_DYNAMODB_ITEM_COLLECTION_METRICS,\n        this.toArray(response.data.ItemCollectionMetrics).map(\n          (x: { [DictionaryKey: string]: any }) => JSON.stringify(x)\n        )\n      );\n    }\n\n    if (response.data?.TableNames) {\n      span.setAttribute(\n        SemanticAttributes.AWS_DYNAMODB_TABLE_COUNT,\n        response.data?.TableNames.length\n      );\n    }\n\n    if (response.data?.Count) {\n      span.setAttribute(\n        SemanticAttributes.AWS_DYNAMODB_COUNT,\n        response.data?.Count\n      );\n    }\n\n    if (response.data?.ScannedCount) {\n      span.setAttribute(\n        SemanticAttributes.AWS_DYNAMODB_SCANNED_COUNT,\n        response.data?.ScannedCount\n      );\n    }\n  }\n}\n"]}

package/build/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.34.3";
+export declare const VERSION = "0.35.0";
 //# sourceMappingURL=version.d.ts.map

package/build/src/version.js

@@ -17,5 +17,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // this is autogenerated file, see scripts/version-update.js
-exports.VERSION = '0.34.3';
+exports.VERSION = '0.35.0';
 //# sourceMappingURL=version.js.map

package/build/src/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4DAA4D;AAC/C,QAAA,OAAO,GAAG,QAAQ,CAAC","sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\n// this is autogenerated file, see scripts/version-update.js\nexport const VERSION = '0.34.3';\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4DAA4D;AAC/C,QAAA,OAAO,GAAG,QAAQ,CAAC","sourcesContent":["/*\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\n// this is autogenerated file, see scripts/version-update.js\nexport const VERSION = '0.35.0';\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-aws-sdk",
-  "version": "0.34.3",
+  "version": "0.35.0",
   "description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package",
   "keywords": [
     "aws",
@@ -47,9 +47,10 @@
   },
   "dependencies": {
     "@opentelemetry/core": "^1.8.0",
-    "@opentelemetry/instrumentation": "^0.40.0",
-    "@opentelemetry/propagation-utils": "^0.29.5",
-    "@opentelemetry/semantic-conventions": "^1.0.0"
+    "@opentelemetry/instrumentation": "^0.41.0",
+    "@opentelemetry/propagation-utils": "^0.30.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "tslib": "^2.3.1"
   },
   "devDependencies": {
     "@aws-sdk/client-dynamodb": "3.85.0",
@@ -59,7 +60,7 @@
     "@aws-sdk/client-sqs": "3.85.0",
     "@aws-sdk/types": "3.78.0",
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/contrib-test-utils": "^0.33.4",
+    "@opentelemetry/contrib-test-utils": "^0.34.0",
     "@opentelemetry/sdk-trace-base": "^1.8.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.11.7",
@@ -79,5 +80,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "efdfc727a49090accee7fea8ff93011b6b84c1e4"
+  "gitHead": "f81f8a76a8f0af2101c62dbc73cde442f875d833"
 }