@opentelemetry/instrumentation-aws-sdk 0.60.0 → 0.61.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +31 -3
- package/build/src/aws-sdk.d.ts +1 -0
- package/build/src/aws-sdk.js +15 -2
- package/build/src/aws-sdk.js.map +1 -1
- package/build/src/semconv-obsolete.d.ts +31 -0
- package/build/src/semconv-obsolete.js +57 -0
- package/build/src/semconv-obsolete.js.map +1 -0
- package/build/src/semconv.d.ts +307 -15
- package/build/src/semconv.js +309 -16
- package/build/src/semconv.js.map +1 -1
- package/build/src/services/dynamodb.js +29 -30
- package/build/src/services/dynamodb.js.map +1 -1
- package/build/src/services/lambda.js +6 -5
- package/build/src/services/lambda.js.map +1 -1
- package/build/src/services/sns.js +7 -8
- package/build/src/services/sns.js.map +1 -1
- package/build/src/services/sqs.js +1 -1
- package/build/src/services/sqs.js.map +1 -1
- package/build/src/utils.js +4 -4
- package/build/src/utils.js.map +1 -1
- package/build/src/version.d.ts +1 -1
- package/build/src/version.js +1 -1
- package/build/src/version.js.map +1 -1
- package/package.json +3 -4
|
@@ -17,7 +17,7 @@ exports.DynamodbServiceExtension = void 0;
|
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
19
|
const api_1 = require("@opentelemetry/api");
|
|
20
|
-
const
|
|
20
|
+
const semconv_1 = require("../semconv");
|
|
21
21
|
class DynamodbServiceExtension {
|
|
22
22
|
toArray(values) {
|
|
23
23
|
return Array.isArray(values) ? values : [values];
|
|
@@ -28,15 +28,15 @@ class DynamodbServiceExtension {
|
|
|
28
28
|
const isIncoming = false;
|
|
29
29
|
const operation = normalizedRequest.commandName;
|
|
30
30
|
const spanAttributes = {
|
|
31
|
-
[
|
|
32
|
-
[
|
|
33
|
-
[
|
|
31
|
+
[semconv_1.ATTR_DB_SYSTEM]: semconv_1.DB_SYSTEM_VALUE_DYNAMODB,
|
|
32
|
+
[semconv_1.ATTR_DB_NAME]: normalizedRequest.commandInput?.TableName,
|
|
33
|
+
[semconv_1.ATTR_DB_OPERATION]: operation,
|
|
34
34
|
};
|
|
35
35
|
if (config.dynamoDBStatementSerializer) {
|
|
36
36
|
try {
|
|
37
37
|
const sanitizedStatement = config.dynamoDBStatementSerializer(operation, normalizedRequest.commandInput);
|
|
38
38
|
if (typeof sanitizedStatement === 'string') {
|
|
39
|
-
spanAttributes[
|
|
39
|
+
spanAttributes[semconv_1.ATTR_DB_STATEMENT] = sanitizedStatement;
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
catch (err) {
|
|
@@ -48,19 +48,19 @@ class DynamodbServiceExtension {
|
|
|
48
48
|
if (normalizedRequest.commandInput?.TableName) {
|
|
49
49
|
// Necessary for commands with only 1 table name (example: CreateTable). Attribute is TableName not keys of RequestItems
|
|
50
50
|
// single table name returned for operations like CreateTable
|
|
51
|
-
spanAttributes[
|
|
51
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_TABLE_NAMES] = [
|
|
52
52
|
normalizedRequest.commandInput.TableName,
|
|
53
53
|
];
|
|
54
54
|
}
|
|
55
55
|
else if (normalizedRequest.commandInput?.RequestItems) {
|
|
56
|
-
spanAttributes[
|
|
56
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_TABLE_NAMES] = Object.keys(normalizedRequest.commandInput.RequestItems);
|
|
57
57
|
}
|
|
58
58
|
if (operation === 'CreateTable' || operation === 'UpdateTable') {
|
|
59
59
|
// only check for ProvisionedThroughput since ReadCapacityUnits and WriteCapacity units are required attributes
|
|
60
60
|
if (normalizedRequest.commandInput?.ProvisionedThroughput) {
|
|
61
|
-
spanAttributes[
|
|
61
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY] =
|
|
62
62
|
normalizedRequest.commandInput.ProvisionedThroughput.ReadCapacityUnits;
|
|
63
|
-
spanAttributes[
|
|
63
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY] =
|
|
64
64
|
normalizedRequest.commandInput.ProvisionedThroughput.WriteCapacityUnits;
|
|
65
65
|
}
|
|
66
66
|
}
|
|
@@ -68,23 +68,23 @@ class DynamodbServiceExtension {
|
|
|
68
68
|
operation === 'Scan' ||
|
|
69
69
|
operation === 'Query') {
|
|
70
70
|
if (normalizedRequest.commandInput?.ConsistentRead) {
|
|
71
|
-
spanAttributes[
|
|
71
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_CONSISTENT_READ] =
|
|
72
72
|
normalizedRequest.commandInput.ConsistentRead;
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
if (operation === 'Query' || operation === 'Scan') {
|
|
76
76
|
if (normalizedRequest.commandInput?.ProjectionExpression) {
|
|
77
|
-
spanAttributes[
|
|
77
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_PROJECTION] =
|
|
78
78
|
normalizedRequest.commandInput.ProjectionExpression;
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
if (operation === 'CreateTable') {
|
|
82
82
|
if (normalizedRequest.commandInput?.GlobalSecondaryIndexes) {
|
|
83
|
-
spanAttributes[
|
|
83
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES] =
|
|
84
84
|
this.toArray(normalizedRequest.commandInput.GlobalSecondaryIndexes).map((x) => JSON.stringify(x));
|
|
85
85
|
}
|
|
86
86
|
if (normalizedRequest.commandInput?.LocalSecondaryIndexes) {
|
|
87
|
-
spanAttributes[
|
|
87
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES] =
|
|
88
88
|
this.toArray(normalizedRequest.commandInput.LocalSecondaryIndexes).map((x) => JSON.stringify(x));
|
|
89
89
|
}
|
|
90
90
|
}
|
|
@@ -92,55 +92,54 @@ class DynamodbServiceExtension {
|
|
|
92
92
|
operation === 'Query' ||
|
|
93
93
|
operation === 'Scan') {
|
|
94
94
|
if (normalizedRequest.commandInput?.Limit) {
|
|
95
|
-
spanAttributes[
|
|
95
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_LIMIT] =
|
|
96
96
|
normalizedRequest.commandInput.Limit;
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
if (operation === 'ListTables') {
|
|
100
100
|
if (normalizedRequest.commandInput?.ExclusiveStartTableName) {
|
|
101
|
-
spanAttributes[
|
|
101
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_EXCLUSIVE_START_TABLE] =
|
|
102
102
|
normalizedRequest.commandInput.ExclusiveStartTableName;
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
if (operation === 'Query') {
|
|
106
106
|
if (normalizedRequest.commandInput?.ScanIndexForward) {
|
|
107
|
-
spanAttributes[
|
|
107
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_SCAN_FORWARD] =
|
|
108
108
|
normalizedRequest.commandInput.ScanIndexForward;
|
|
109
109
|
}
|
|
110
110
|
if (normalizedRequest.commandInput?.IndexName) {
|
|
111
|
-
spanAttributes[
|
|
111
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_INDEX_NAME] =
|
|
112
112
|
normalizedRequest.commandInput.IndexName;
|
|
113
113
|
}
|
|
114
114
|
if (normalizedRequest.commandInput?.Select) {
|
|
115
|
-
spanAttributes[
|
|
115
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_SELECT] =
|
|
116
116
|
normalizedRequest.commandInput.Select;
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
if (operation === 'Scan') {
|
|
120
120
|
if (normalizedRequest.commandInput?.Segment) {
|
|
121
|
-
spanAttributes[
|
|
121
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_SEGMENT] =
|
|
122
122
|
normalizedRequest.commandInput?.Segment;
|
|
123
123
|
}
|
|
124
124
|
if (normalizedRequest.commandInput?.TotalSegments) {
|
|
125
|
-
spanAttributes[
|
|
125
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_TOTAL_SEGMENTS] =
|
|
126
126
|
normalizedRequest.commandInput?.TotalSegments;
|
|
127
127
|
}
|
|
128
128
|
if (normalizedRequest.commandInput?.IndexName) {
|
|
129
|
-
spanAttributes[
|
|
129
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_INDEX_NAME] =
|
|
130
130
|
normalizedRequest.commandInput.IndexName;
|
|
131
131
|
}
|
|
132
132
|
if (normalizedRequest.commandInput?.Select) {
|
|
133
|
-
spanAttributes[
|
|
133
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_SELECT] =
|
|
134
134
|
normalizedRequest.commandInput.Select;
|
|
135
135
|
}
|
|
136
136
|
}
|
|
137
137
|
if (operation === 'UpdateTable') {
|
|
138
138
|
if (normalizedRequest.commandInput?.AttributeDefinitions) {
|
|
139
|
-
spanAttributes[
|
|
140
|
-
this.toArray(normalizedRequest.commandInput.AttributeDefinitions).map((x) => JSON.stringify(x));
|
|
139
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS] = this.toArray(normalizedRequest.commandInput.AttributeDefinitions).map((x) => JSON.stringify(x));
|
|
141
140
|
}
|
|
142
141
|
if (normalizedRequest.commandInput?.GlobalSecondaryIndexUpdates) {
|
|
143
|
-
spanAttributes[
|
|
142
|
+
spanAttributes[semconv_1.ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES] =
|
|
144
143
|
this.toArray(normalizedRequest.commandInput.GlobalSecondaryIndexUpdates).map((x) => JSON.stringify(x));
|
|
145
144
|
}
|
|
146
145
|
}
|
|
@@ -153,19 +152,19 @@ class DynamodbServiceExtension {
|
|
|
153
152
|
}
|
|
154
153
|
responseHook(response, span, _tracer, _config) {
|
|
155
154
|
if (response.data?.ConsumedCapacity) {
|
|
156
|
-
span.setAttribute(
|
|
155
|
+
span.setAttribute(semconv_1.ATTR_AWS_DYNAMODB_CONSUMED_CAPACITY, toArray(response.data.ConsumedCapacity).map((x) => JSON.stringify(x)));
|
|
157
156
|
}
|
|
158
157
|
if (response.data?.ItemCollectionMetrics) {
|
|
159
|
-
span.setAttribute(
|
|
158
|
+
span.setAttribute(semconv_1.ATTR_AWS_DYNAMODB_ITEM_COLLECTION_METRICS, this.toArray(response.data.ItemCollectionMetrics).map((x) => JSON.stringify(x)));
|
|
160
159
|
}
|
|
161
160
|
if (response.data?.TableNames) {
|
|
162
|
-
span.setAttribute(
|
|
161
|
+
span.setAttribute(semconv_1.ATTR_AWS_DYNAMODB_TABLE_COUNT, response.data?.TableNames.length);
|
|
163
162
|
}
|
|
164
163
|
if (response.data?.Count) {
|
|
165
|
-
span.setAttribute(
|
|
164
|
+
span.setAttribute(semconv_1.ATTR_AWS_DYNAMODB_COUNT, response.data?.Count);
|
|
166
165
|
}
|
|
167
166
|
if (response.data?.ScannedCount) {
|
|
168
|
-
span.setAttribute(
|
|
167
|
+
span.setAttribute(semconv_1.ATTR_AWS_DYNAMODB_SCANNED_COUNT, response.data?.ScannedCount);
|
|
169
168
|
}
|
|
170
169
|
}
|
|
171
170
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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 {\n Attributes,\n DiagLogger,\n Span,\n SpanKind,\n Tracer,\n} from '@opentelemetry/api';\nimport { RequestMetadata, ServiceExtension } from './ServiceExtension';\nimport {\n DBSYSTEMVALUES_DYNAMODB,\n SEMATTRS_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS,\n SEMATTRS_AWS_DYNAMODB_CONSISTENT_READ,\n SEMATTRS_AWS_DYNAMODB_CONSUMED_CAPACITY,\n SEMATTRS_AWS_DYNAMODB_COUNT,\n SEMATTRS_AWS_DYNAMODB_EXCLUSIVE_START_TABLE,\n SEMATTRS_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES,\n SEMATTRS_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES,\n SEMATTRS_AWS_DYNAMODB_INDEX_NAME,\n SEMATTRS_AWS_DYNAMODB_ITEM_COLLECTION_METRICS,\n SEMATTRS_AWS_DYNAMODB_LIMIT,\n SEMATTRS_AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES,\n SEMATTRS_AWS_DYNAMODB_PROJECTION,\n SEMATTRS_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY,\n SEMATTRS_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY,\n SEMATTRS_AWS_DYNAMODB_SCAN_FORWARD,\n SEMATTRS_AWS_DYNAMODB_SCANNED_COUNT,\n SEMATTRS_AWS_DYNAMODB_SEGMENT,\n SEMATTRS_AWS_DYNAMODB_SELECT,\n SEMATTRS_AWS_DYNAMODB_TABLE_COUNT,\n SEMATTRS_AWS_DYNAMODB_TABLE_NAMES,\n SEMATTRS_AWS_DYNAMODB_TOTAL_SEGMENTS,\n SEMATTRS_DB_NAME,\n SEMATTRS_DB_OPERATION,\n SEMATTRS_DB_STATEMENT,\n SEMATTRS_DB_SYSTEM,\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(\n normalizedRequest: NormalizedRequest,\n config: AwsSdkInstrumentationConfig,\n diag: DiagLogger\n ): 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: Attributes = {\n [SEMATTRS_DB_SYSTEM]: DBSYSTEMVALUES_DYNAMODB,\n [SEMATTRS_DB_NAME]: normalizedRequest.commandInput?.TableName,\n [SEMATTRS_DB_OPERATION]: operation,\n };\n\n if (config.dynamoDBStatementSerializer) {\n try {\n const sanitizedStatement = config.dynamoDBStatementSerializer(\n operation,\n normalizedRequest.commandInput\n );\n\n if (typeof sanitizedStatement === 'string') {\n spanAttributes[SEMATTRS_DB_STATEMENT] = sanitizedStatement;\n }\n } catch (err) {\n diag.error('failed to sanitize DynamoDB statement', err);\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[SEMATTRS_AWS_DYNAMODB_TABLE_NAMES] = [\n normalizedRequest.commandInput.TableName,\n ];\n } else if (normalizedRequest.commandInput?.RequestItems) {\n spanAttributes[SEMATTRS_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[SEMATTRS_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY] =\n normalizedRequest.commandInput.ProvisionedThroughput.ReadCapacityUnits;\n spanAttributes[SEMATTRS_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY] =\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[SEMATTRS_AWS_DYNAMODB_CONSISTENT_READ] =\n normalizedRequest.commandInput.ConsistentRead;\n }\n }\n\n if (operation === 'Query' || operation === 'Scan') {\n if (normalizedRequest.commandInput?.ProjectionExpression) {\n spanAttributes[SEMATTRS_AWS_DYNAMODB_PROJECTION] =\n normalizedRequest.commandInput.ProjectionExpression;\n }\n }\n\n if (operation === 'CreateTable') {\n if (normalizedRequest.commandInput?.GlobalSecondaryIndexes) {\n spanAttributes[SEMATTRS_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[SEMATTRS_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[SEMATTRS_AWS_DYNAMODB_LIMIT] =\n normalizedRequest.commandInput.Limit;\n }\n }\n\n if (operation === 'ListTables') {\n if (normalizedRequest.commandInput?.ExclusiveStartTableName) {\n spanAttributes[SEMATTRS_AWS_DYNAMODB_EXCLUSIVE_START_TABLE] =\n normalizedRequest.commandInput.ExclusiveStartTableName;\n }\n }\n\n if (operation === 'Query') {\n if (normalizedRequest.commandInput?.ScanIndexForward) {\n spanAttributes[SEMATTRS_AWS_DYNAMODB_SCAN_FORWARD] =\n normalizedRequest.commandInput.ScanIndexForward;\n }\n\n if (normalizedRequest.commandInput?.IndexName) {\n spanAttributes[SEMATTRS_AWS_DYNAMODB_INDEX_NAME] =\n normalizedRequest.commandInput.IndexName;\n }\n\n if (normalizedRequest.commandInput?.Select) {\n spanAttributes[SEMATTRS_AWS_DYNAMODB_SELECT] =\n normalizedRequest.commandInput.Select;\n }\n }\n\n if (operation === 'Scan') {\n if (normalizedRequest.commandInput?.Segment) {\n spanAttributes[SEMATTRS_AWS_DYNAMODB_SEGMENT] =\n normalizedRequest.commandInput?.Segment;\n }\n\n if (normalizedRequest.commandInput?.TotalSegments) {\n spanAttributes[SEMATTRS_AWS_DYNAMODB_TOTAL_SEGMENTS] =\n normalizedRequest.commandInput?.TotalSegments;\n }\n\n if (normalizedRequest.commandInput?.IndexName) {\n spanAttributes[SEMATTRS_AWS_DYNAMODB_INDEX_NAME] =\n normalizedRequest.commandInput.IndexName;\n }\n\n if (normalizedRequest.commandInput?.Select) {\n spanAttributes[SEMATTRS_AWS_DYNAMODB_SELECT] =\n normalizedRequest.commandInput.Select;\n }\n }\n\n if (operation === 'UpdateTable') {\n if (normalizedRequest.commandInput?.AttributeDefinitions) {\n spanAttributes[SEMATTRS_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[SEMATTRS_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 if (response.data?.ConsumedCapacity) {\n span.setAttribute(\n SEMATTRS_AWS_DYNAMODB_CONSUMED_CAPACITY,\n toArray(response.data.ConsumedCapacity).map(\n (x: { [DictionaryKey: string]: any }) => JSON.stringify(x)\n )\n );\n }\n\n if (response.data?.ItemCollectionMetrics) {\n span.setAttribute(\n SEMATTRS_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 SEMATTRS_AWS_DYNAMODB_TABLE_COUNT,\n response.data?.TableNames.length\n );\n }\n\n if (response.data?.Count) {\n span.setAttribute(SEMATTRS_AWS_DYNAMODB_COUNT, response.data?.Count);\n }\n\n if (response.data?.ScannedCount) {\n span.setAttribute(\n SEMATTRS_AWS_DYNAMODB_SCANNED_COUNT,\n response.data?.ScannedCount\n );\n }\n }\n}\n\nfunction toArray<T>(values: T | T[]): T[] {\n return Array.isArray(values) ? values : [values];\n}\n"]}
|
|
1
|
+
{"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 {\n Attributes,\n DiagLogger,\n Span,\n SpanKind,\n Tracer,\n} from '@opentelemetry/api';\nimport { RequestMetadata, ServiceExtension } from './ServiceExtension';\nimport {\n ATTR_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS,\n ATTR_AWS_DYNAMODB_CONSISTENT_READ,\n ATTR_AWS_DYNAMODB_CONSUMED_CAPACITY,\n ATTR_AWS_DYNAMODB_COUNT,\n ATTR_AWS_DYNAMODB_EXCLUSIVE_START_TABLE,\n ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEX_UPDATES,\n ATTR_AWS_DYNAMODB_GLOBAL_SECONDARY_INDEXES,\n ATTR_AWS_DYNAMODB_INDEX_NAME,\n ATTR_AWS_DYNAMODB_ITEM_COLLECTION_METRICS,\n ATTR_AWS_DYNAMODB_LIMIT,\n ATTR_AWS_DYNAMODB_LOCAL_SECONDARY_INDEXES,\n ATTR_AWS_DYNAMODB_PROJECTION,\n ATTR_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY,\n ATTR_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY,\n ATTR_AWS_DYNAMODB_SCAN_FORWARD,\n ATTR_AWS_DYNAMODB_SCANNED_COUNT,\n ATTR_AWS_DYNAMODB_SEGMENT,\n ATTR_AWS_DYNAMODB_SELECT,\n ATTR_AWS_DYNAMODB_TABLE_COUNT,\n ATTR_AWS_DYNAMODB_TABLE_NAMES,\n ATTR_AWS_DYNAMODB_TOTAL_SEGMENTS,\n ATTR_DB_NAME,\n ATTR_DB_OPERATION,\n ATTR_DB_STATEMENT,\n ATTR_DB_SYSTEM,\n DB_SYSTEM_VALUE_DYNAMODB,\n} from '../semconv';\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(\n normalizedRequest: NormalizedRequest,\n config: AwsSdkInstrumentationConfig,\n diag: DiagLogger\n ): 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: Attributes = {\n [ATTR_DB_SYSTEM]: DB_SYSTEM_VALUE_DYNAMODB,\n [ATTR_DB_NAME]: normalizedRequest.commandInput?.TableName,\n [ATTR_DB_OPERATION]: operation,\n };\n\n if (config.dynamoDBStatementSerializer) {\n try {\n const sanitizedStatement = config.dynamoDBStatementSerializer(\n operation,\n normalizedRequest.commandInput\n );\n\n if (typeof sanitizedStatement === 'string') {\n spanAttributes[ATTR_DB_STATEMENT] = sanitizedStatement;\n }\n } catch (err) {\n diag.error('failed to sanitize DynamoDB statement', err);\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[ATTR_AWS_DYNAMODB_TABLE_NAMES] = [\n normalizedRequest.commandInput.TableName,\n ];\n } else if (normalizedRequest.commandInput?.RequestItems) {\n spanAttributes[ATTR_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[ATTR_AWS_DYNAMODB_PROVISIONED_READ_CAPACITY] =\n normalizedRequest.commandInput.ProvisionedThroughput.ReadCapacityUnits;\n spanAttributes[ATTR_AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY] =\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[ATTR_AWS_DYNAMODB_CONSISTENT_READ] =\n normalizedRequest.commandInput.ConsistentRead;\n }\n }\n\n if (operation === 'Query' || operation === 'Scan') {\n if (normalizedRequest.commandInput?.ProjectionExpression) {\n spanAttributes[ATTR_AWS_DYNAMODB_PROJECTION] =\n normalizedRequest.commandInput.ProjectionExpression;\n }\n }\n\n if (operation === 'CreateTable') {\n if (normalizedRequest.commandInput?.GlobalSecondaryIndexes) {\n spanAttributes[ATTR_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[ATTR_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[ATTR_AWS_DYNAMODB_LIMIT] =\n normalizedRequest.commandInput.Limit;\n }\n }\n\n if (operation === 'ListTables') {\n if (normalizedRequest.commandInput?.ExclusiveStartTableName) {\n spanAttributes[ATTR_AWS_DYNAMODB_EXCLUSIVE_START_TABLE] =\n normalizedRequest.commandInput.ExclusiveStartTableName;\n }\n }\n\n if (operation === 'Query') {\n if (normalizedRequest.commandInput?.ScanIndexForward) {\n spanAttributes[ATTR_AWS_DYNAMODB_SCAN_FORWARD] =\n normalizedRequest.commandInput.ScanIndexForward;\n }\n\n if (normalizedRequest.commandInput?.IndexName) {\n spanAttributes[ATTR_AWS_DYNAMODB_INDEX_NAME] =\n normalizedRequest.commandInput.IndexName;\n }\n\n if (normalizedRequest.commandInput?.Select) {\n spanAttributes[ATTR_AWS_DYNAMODB_SELECT] =\n normalizedRequest.commandInput.Select;\n }\n }\n\n if (operation === 'Scan') {\n if (normalizedRequest.commandInput?.Segment) {\n spanAttributes[ATTR_AWS_DYNAMODB_SEGMENT] =\n normalizedRequest.commandInput?.Segment;\n }\n\n if (normalizedRequest.commandInput?.TotalSegments) {\n spanAttributes[ATTR_AWS_DYNAMODB_TOTAL_SEGMENTS] =\n normalizedRequest.commandInput?.TotalSegments;\n }\n\n if (normalizedRequest.commandInput?.IndexName) {\n spanAttributes[ATTR_AWS_DYNAMODB_INDEX_NAME] =\n normalizedRequest.commandInput.IndexName;\n }\n\n if (normalizedRequest.commandInput?.Select) {\n spanAttributes[ATTR_AWS_DYNAMODB_SELECT] =\n normalizedRequest.commandInput.Select;\n }\n }\n\n if (operation === 'UpdateTable') {\n if (normalizedRequest.commandInput?.AttributeDefinitions) {\n spanAttributes[ATTR_AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS] = this.toArray(\n normalizedRequest.commandInput.AttributeDefinitions\n ).map((x: { [DictionaryKey: string]: any }) => JSON.stringify(x));\n }\n\n if (normalizedRequest.commandInput?.GlobalSecondaryIndexUpdates) {\n spanAttributes[ATTR_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 if (response.data?.ConsumedCapacity) {\n span.setAttribute(\n ATTR_AWS_DYNAMODB_CONSUMED_CAPACITY,\n toArray(response.data.ConsumedCapacity).map(\n (x: { [DictionaryKey: string]: any }) => JSON.stringify(x)\n )\n );\n }\n\n if (response.data?.ItemCollectionMetrics) {\n span.setAttribute(\n ATTR_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 ATTR_AWS_DYNAMODB_TABLE_COUNT,\n response.data?.TableNames.length\n );\n }\n\n if (response.data?.Count) {\n span.setAttribute(ATTR_AWS_DYNAMODB_COUNT, response.data?.Count);\n }\n\n if (response.data?.ScannedCount) {\n span.setAttribute(\n ATTR_AWS_DYNAMODB_SCANNED_COUNT,\n response.data?.ScannedCount\n );\n }\n }\n}\n\nfunction toArray<T>(values: T | T[]): T[] {\n return Array.isArray(values) ? values : [values];\n}\n"]}
|
|
@@ -17,7 +17,8 @@ exports.LambdaServiceExtension = void 0;
|
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
19
|
const api_1 = require("@opentelemetry/api");
|
|
20
|
-
const
|
|
20
|
+
const semconv_1 = require("../semconv");
|
|
21
|
+
const semconv_obsolete_1 = require("../semconv-obsolete");
|
|
21
22
|
const api_2 = require("@opentelemetry/api");
|
|
22
23
|
class LambdaCommands {
|
|
23
24
|
static Invoke = 'Invoke';
|
|
@@ -30,11 +31,11 @@ class LambdaServiceExtension {
|
|
|
30
31
|
switch (request.commandName) {
|
|
31
32
|
case 'Invoke':
|
|
32
33
|
spanAttributes = {
|
|
33
|
-
[
|
|
34
|
-
[
|
|
34
|
+
[semconv_1.ATTR_FAAS_INVOKED_NAME]: functionName,
|
|
35
|
+
[semconv_1.ATTR_FAAS_INVOKED_PROVIDER]: 'aws',
|
|
35
36
|
};
|
|
36
37
|
if (request.region) {
|
|
37
|
-
spanAttributes[
|
|
38
|
+
spanAttributes[semconv_1.ATTR_FAAS_INVOKED_REGION] = request.region;
|
|
38
39
|
}
|
|
39
40
|
spanName = `${functionName} ${LambdaCommands.Invoke}`;
|
|
40
41
|
break;
|
|
@@ -61,7 +62,7 @@ class LambdaServiceExtension {
|
|
|
61
62
|
switch (response.request.commandName) {
|
|
62
63
|
case LambdaCommands.Invoke:
|
|
63
64
|
{
|
|
64
|
-
span.setAttribute(
|
|
65
|
+
span.setAttribute(semconv_obsolete_1.ATTR_FAAS_EXECUTION, response.requestId);
|
|
65
66
|
}
|
|
66
67
|
break;
|
|
67
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../src/services/lambda.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,4CAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../src/services/lambda.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, diag, Attributes } from '@opentelemetry/api';\nimport {\n ATTR_FAAS_INVOKED_NAME,\n ATTR_FAAS_INVOKED_PROVIDER,\n ATTR_FAAS_INVOKED_REGION,\n} from '../semconv';\nimport { ATTR_FAAS_EXECUTION } from '../semconv-obsolete';\nimport {\n AwsSdkInstrumentationConfig,\n NormalizedRequest,\n NormalizedResponse,\n} from '../types';\nimport { RequestMetadata, ServiceExtension } from './ServiceExtension';\nimport { context, propagation } from '@opentelemetry/api';\n\nclass LambdaCommands {\n public static readonly Invoke: string = 'Invoke';\n}\n\nexport class LambdaServiceExtension implements ServiceExtension {\n requestPreSpanHook(\n request: NormalizedRequest,\n _config: AwsSdkInstrumentationConfig\n ): RequestMetadata {\n const functionName = this.extractFunctionName(request.commandInput);\n\n let spanAttributes: Attributes = {};\n let spanName: string | undefined;\n\n switch (request.commandName) {\n case 'Invoke':\n spanAttributes = {\n [ATTR_FAAS_INVOKED_NAME]: functionName,\n [ATTR_FAAS_INVOKED_PROVIDER]: 'aws',\n };\n if (request.region) {\n spanAttributes[ATTR_FAAS_INVOKED_REGION] = request.region;\n }\n spanName = `${functionName} ${LambdaCommands.Invoke}`;\n break;\n }\n return {\n isIncoming: false,\n spanAttributes,\n spanKind: SpanKind.CLIENT,\n spanName,\n };\n }\n\n requestPostSpanHook = (request: NormalizedRequest) => {\n switch (request.commandName) {\n case LambdaCommands.Invoke:\n {\n if (request.commandInput) {\n request.commandInput.ClientContext = injectLambdaPropagationContext(\n request.commandInput.ClientContext\n );\n }\n }\n break;\n }\n };\n\n responseHook(\n response: NormalizedResponse,\n span: Span,\n tracer: Tracer,\n config: AwsSdkInstrumentationConfig\n ) {\n switch (response.request.commandName) {\n case LambdaCommands.Invoke:\n {\n span.setAttribute(ATTR_FAAS_EXECUTION, response.requestId);\n }\n break;\n }\n }\n\n extractFunctionName = (commandInput: Record<string, any>): string => {\n return commandInput?.FunctionName;\n };\n}\n\nconst injectLambdaPropagationContext = (\n clientContext: string | undefined\n): string | undefined => {\n try {\n const propagatedContext = {};\n propagation.inject(context.active(), propagatedContext);\n\n const parsedClientContext = clientContext\n ? JSON.parse(Buffer.from(clientContext, 'base64').toString('utf8'))\n : {};\n\n const updatedClientContext = {\n ...parsedClientContext,\n custom: {\n ...parsedClientContext.custom,\n ...propagatedContext,\n },\n };\n\n const encodedClientContext = Buffer.from(\n JSON.stringify(updatedClientContext)\n ).toString('base64');\n\n // The length of client context is capped at 3583 bytes of base64 encoded data\n // (https://docs.aws.amazon.com/lambda/latest/dg/API_Invoke.html#API_Invoke_RequestSyntax)\n if (encodedClientContext.length > 3583) {\n diag.warn(\n 'lambda instrumentation: cannot set context propagation on lambda invoke parameters due to ClientContext length limitations.'\n );\n return clientContext;\n }\n\n return encodedClientContext;\n } catch (e) {\n diag.debug(\n 'lambda instrumentation: failed to set context propagation on ClientContext',\n e\n );\n return clientContext;\n }\n};\n"]}
|
|
@@ -17,29 +17,28 @@ exports.SnsServiceExtension = void 0;
|
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
19
|
const api_1 = require("@opentelemetry/api");
|
|
20
|
-
const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
|
|
21
20
|
const semconv_1 = require("../semconv");
|
|
21
|
+
const semconv_obsolete_1 = require("../semconv-obsolete");
|
|
22
22
|
const MessageAttributes_1 = require("./MessageAttributes");
|
|
23
23
|
class SnsServiceExtension {
|
|
24
24
|
requestPreSpanHook(request, _config) {
|
|
25
25
|
let spanKind = api_1.SpanKind.CLIENT;
|
|
26
26
|
let spanName = `SNS ${request.commandName}`;
|
|
27
27
|
const spanAttributes = {
|
|
28
|
-
[
|
|
28
|
+
[semconv_1.ATTR_MESSAGING_SYSTEM]: 'aws.sns',
|
|
29
29
|
};
|
|
30
30
|
if (request.commandName === 'Publish') {
|
|
31
31
|
spanKind = api_1.SpanKind.PRODUCER;
|
|
32
|
-
spanAttributes[
|
|
33
|
-
|
|
32
|
+
spanAttributes[semconv_obsolete_1.ATTR_MESSAGING_DESTINATION_KIND] =
|
|
33
|
+
semconv_obsolete_1.MESSAGING_DESTINATION_KIND_VALUE_TOPIC;
|
|
34
34
|
const { TopicArn, TargetArn, PhoneNumber } = request.commandInput;
|
|
35
|
-
spanAttributes[
|
|
36
|
-
|
|
37
|
-
// ToDO: Use SEMATTRS_MESSAGING_DESTINATION_NAME when implemented
|
|
35
|
+
spanAttributes[semconv_obsolete_1.ATTR_MESSAGING_DESTINATION] = this.extractDestinationName(TopicArn, TargetArn, PhoneNumber);
|
|
36
|
+
// ToDO: Use ATTR_MESSAGING_DESTINATION_NAME when implemented
|
|
38
37
|
spanAttributes['messaging.destination.name'] =
|
|
39
38
|
TopicArn || TargetArn || PhoneNumber || 'unknown';
|
|
40
39
|
spanName = `${PhoneNumber
|
|
41
40
|
? 'phone_number'
|
|
42
|
-
: spanAttributes[
|
|
41
|
+
: spanAttributes[semconv_obsolete_1.ATTR_MESSAGING_DESTINATION]} send`;
|
|
43
42
|
}
|
|
44
43
|
const topicArn = request.commandInput?.TopicArn;
|
|
45
44
|
if (topicArn) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sns.js","sourceRoot":"","sources":["../../../src/services/sns.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,4CAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"sns.js","sourceRoot":"","sources":["../../../src/services/sns.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,4CAAwE;AACxE,wCAA2E;AAC3E,0DAI6B;AAM7B,2DAA+D;AAG/D,MAAa,mBAAmB;IAC9B,kBAAkB,CAChB,OAA0B,EAC1B,OAAoC;QAEpC,IAAI,QAAQ,GAAa,cAAQ,CAAC,MAAM,CAAC;QACzC,IAAI,QAAQ,GAAG,OAAO,OAAO,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAe;YACjC,CAAC,+BAAqB,CAAC,EAAE,SAAS;SACnC,CAAC;QAEF,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;YACrC,QAAQ,GAAG,cAAQ,CAAC,QAAQ,CAAC;YAE7B,cAAc,CAAC,kDAA+B,CAAC;gBAC7C,yDAAsC,CAAC;YACzC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;YAClE,cAAc,CAAC,6CAA0B,CAAC,GAAG,IAAI,CAAC,sBAAsB,CACtE,QAAQ,EACR,SAAS,EACT,WAAW,CACZ,CAAC;YACF,6DAA6D;YAC7D,cAAc,CAAC,4BAA4B,CAAC;gBAC1C,QAAQ,IAAI,SAAS,IAAI,WAAW,IAAI,SAAS,CAAC;YAEpD,QAAQ,GAAG,GACT,WAAW;gBACT,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,cAAc,CAAC,6CAA0B,CAC/C,OAAO,CAAC;SACT;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC;QAChD,IAAI,QAAQ,EAAE;YACZ,cAAc,CAAC,gCAAsB,CAAC,GAAG,QAAQ,CAAC;SACnD;QAED,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,cAAc;YACd,QAAQ;YACR,QAAQ;SACT,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,OAA0B;QAC5C,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;YACrC,MAAM,qBAAqB,GACzB,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;YAClD,IAAI,qBAAqB,EAAE;gBACzB,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC,GAAG,IAAA,4CAAwB,EAClE,qBAAqB,CACtB,CAAC;aACH;SACF;IACH,CAAC;IAED,YAAY,CACV,QAA4B,EAC5B,IAAU,EACV,MAAc,EACd,MAAmC;QAEnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;QACzC,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,YAAY,CAAC,gCAAsB,EAAE,QAAQ,CAAC,CAAC;SACrD;IACH,CAAC;IAED,sBAAsB,CACpB,QAAgB,EAChB,SAAiB,EACjB,WAAmB;QAEnB,IAAI,QAAQ,IAAI,SAAS,EAAE;YACzB,MAAM,GAAG,GAAG,QAAQ,IAAI,SAAS,CAAC;YAClC,IAAI;gBACF,OAAO,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;aAChD;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,GAAG,CAAC;aACZ;SACF;aAAM,IAAI,WAAW,EAAE;YACtB,OAAO,WAAW,CAAC;SACpB;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AAxFD,kDAwFC","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, Tracer, SpanKind, Attributes } from '@opentelemetry/api';\nimport { ATTR_AWS_SNS_TOPIC_ARN, ATTR_MESSAGING_SYSTEM } from '../semconv';\nimport {\n ATTR_MESSAGING_DESTINATION,\n ATTR_MESSAGING_DESTINATION_KIND,\n MESSAGING_DESTINATION_KIND_VALUE_TOPIC,\n} from '../semconv-obsolete';\nimport {\n NormalizedRequest,\n NormalizedResponse,\n AwsSdkInstrumentationConfig,\n} from '../types';\nimport { injectPropagationContext } from './MessageAttributes';\nimport { RequestMetadata, ServiceExtension } from './ServiceExtension';\n\nexport class SnsServiceExtension implements ServiceExtension {\n requestPreSpanHook(\n request: NormalizedRequest,\n _config: AwsSdkInstrumentationConfig\n ): RequestMetadata {\n let spanKind: SpanKind = SpanKind.CLIENT;\n let spanName = `SNS ${request.commandName}`;\n const spanAttributes: Attributes = {\n [ATTR_MESSAGING_SYSTEM]: 'aws.sns',\n };\n\n if (request.commandName === 'Publish') {\n spanKind = SpanKind.PRODUCER;\n\n spanAttributes[ATTR_MESSAGING_DESTINATION_KIND] =\n MESSAGING_DESTINATION_KIND_VALUE_TOPIC;\n const { TopicArn, TargetArn, PhoneNumber } = request.commandInput;\n spanAttributes[ATTR_MESSAGING_DESTINATION] = this.extractDestinationName(\n TopicArn,\n TargetArn,\n PhoneNumber\n );\n // ToDO: Use ATTR_MESSAGING_DESTINATION_NAME when implemented\n spanAttributes['messaging.destination.name'] =\n TopicArn || TargetArn || PhoneNumber || 'unknown';\n\n spanName = `${\n PhoneNumber\n ? 'phone_number'\n : spanAttributes[ATTR_MESSAGING_DESTINATION]\n } send`;\n }\n\n const topicArn = request.commandInput?.TopicArn;\n if (topicArn) {\n spanAttributes[ATTR_AWS_SNS_TOPIC_ARN] = topicArn;\n }\n\n return {\n isIncoming: false,\n spanAttributes,\n spanKind,\n spanName,\n };\n }\n\n requestPostSpanHook(request: NormalizedRequest): void {\n if (request.commandName === 'Publish') {\n const origMessageAttributes =\n request.commandInput['MessageAttributes'] ?? {};\n if (origMessageAttributes) {\n request.commandInput['MessageAttributes'] = injectPropagationContext(\n origMessageAttributes\n );\n }\n }\n }\n\n responseHook(\n response: NormalizedResponse,\n span: Span,\n tracer: Tracer,\n config: AwsSdkInstrumentationConfig\n ): void {\n const topicArn = response.data?.TopicArn;\n if (topicArn) {\n span.setAttribute(ATTR_AWS_SNS_TOPIC_ARN, topicArn);\n }\n }\n\n extractDestinationName(\n topicArn: string,\n targetArn: string,\n phoneNumber: string\n ): string {\n if (topicArn || targetArn) {\n const arn = topicArn ?? targetArn;\n try {\n return arn.substring(arn.lastIndexOf(':') + 1);\n } catch (err) {\n return arn;\n }\n } else if (phoneNumber) {\n return phoneNumber;\n } else {\n return 'unknown';\n }\n }\n}\n"]}
|
|
@@ -27,7 +27,7 @@ class SqsServiceExtension {
|
|
|
27
27
|
let spanKind = api_1.SpanKind.CLIENT;
|
|
28
28
|
let spanName;
|
|
29
29
|
const spanAttributes = {
|
|
30
|
-
[
|
|
30
|
+
[semconv_1.ATTR_MESSAGING_SYSTEM]: 'aws_sqs',
|
|
31
31
|
[semconv_1.ATTR_MESSAGING_DESTINATION_NAME]: queueName,
|
|
32
32
|
[semantic_conventions_1.ATTR_URL_FULL]: queueUrl,
|
|
33
33
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqs.js","sourceRoot":"","sources":["../../../src/services/sqs.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,4CAQ4B;AAQ5B,
|
|
1
|
+
{"version":3,"file":"sqs.js","sourceRoot":"","sources":["../../../src/services/sqs.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 {\n Tracer,\n SpanKind,\n Span,\n propagation,\n trace,\n ROOT_CONTEXT,\n Attributes,\n} from '@opentelemetry/api';\nimport { RequestMetadata, ServiceExtension } from './ServiceExtension';\nimport type { SQS } from '../aws-sdk.types';\nimport {\n AwsSdkInstrumentationConfig,\n NormalizedRequest,\n NormalizedResponse,\n} from '../types';\nimport { ATTR_URL_FULL } from '@opentelemetry/semantic-conventions';\nimport {\n ATTR_MESSAGING_BATCH_MESSAGE_COUNT,\n ATTR_MESSAGING_DESTINATION_NAME,\n ATTR_MESSAGING_MESSAGE_ID,\n ATTR_MESSAGING_OPERATION_TYPE,\n ATTR_MESSAGING_SYSTEM,\n} from '../semconv';\nimport {\n contextGetter,\n extractPropagationContext,\n injectPropagationContext,\n addPropagationFieldsToAttributeNames,\n} from './MessageAttributes';\n\nexport class SqsServiceExtension implements ServiceExtension {\n requestPreSpanHook(\n request: NormalizedRequest,\n _config: AwsSdkInstrumentationConfig\n ): RequestMetadata {\n const queueUrl = this.extractQueueUrl(request.commandInput);\n const queueName = this.extractQueueNameFromUrl(queueUrl);\n let spanKind: SpanKind = SpanKind.CLIENT;\n let spanName: string | undefined;\n\n const spanAttributes: Attributes = {\n [ATTR_MESSAGING_SYSTEM]: 'aws_sqs',\n [ATTR_MESSAGING_DESTINATION_NAME]: queueName,\n [ATTR_URL_FULL]: queueUrl,\n };\n\n let isIncoming = false;\n\n switch (request.commandName) {\n case 'ReceiveMessage':\n {\n isIncoming = true;\n spanKind = SpanKind.CONSUMER;\n spanName = `${queueName} receive`;\n spanAttributes[ATTR_MESSAGING_OPERATION_TYPE] = 'receive';\n\n request.commandInput.MessageAttributeNames =\n addPropagationFieldsToAttributeNames(\n request.commandInput.MessageAttributeNames,\n propagation.fields()\n );\n }\n break;\n\n case 'SendMessage':\n case 'SendMessageBatch':\n spanKind = SpanKind.PRODUCER;\n spanName = `${queueName} send`;\n break;\n }\n\n return {\n isIncoming,\n spanAttributes,\n spanKind,\n spanName,\n };\n }\n\n requestPostSpanHook = (request: NormalizedRequest) => {\n switch (request.commandName) {\n case 'SendMessage':\n {\n const origMessageAttributes =\n request.commandInput['MessageAttributes'] ?? {};\n if (origMessageAttributes) {\n request.commandInput['MessageAttributes'] =\n injectPropagationContext(origMessageAttributes);\n }\n }\n break;\n\n case 'SendMessageBatch':\n {\n const entries = request.commandInput?.Entries;\n if (Array.isArray(entries)) {\n entries.forEach(\n (messageParams: {\n MessageAttributes: SQS.MessageBodyAttributeMap;\n }) => {\n messageParams.MessageAttributes = injectPropagationContext(\n messageParams.MessageAttributes ?? {}\n );\n }\n );\n }\n }\n break;\n }\n };\n\n responseHook = (\n response: NormalizedResponse,\n span: Span,\n _tracer: Tracer,\n config: AwsSdkInstrumentationConfig\n ) => {\n switch (response.request.commandName) {\n case 'SendMessage':\n span.setAttribute(ATTR_MESSAGING_MESSAGE_ID, response?.data?.MessageId);\n break;\n\n case 'SendMessageBatch':\n // TODO: How should this be handled?\n break;\n\n case 'ReceiveMessage': {\n const messages: SQS.Message[] = response?.data?.Messages || [];\n\n span.setAttribute(ATTR_MESSAGING_BATCH_MESSAGE_COUNT, messages.length);\n\n for (const message of messages) {\n const propagatedContext = propagation.extract(\n ROOT_CONTEXT,\n extractPropagationContext(\n message,\n config.sqsExtractContextPropagationFromPayload\n ),\n contextGetter\n );\n\n const spanContext = trace.getSpanContext(propagatedContext);\n\n if (spanContext) {\n span.addLink({\n context: spanContext,\n attributes: {\n [ATTR_MESSAGING_MESSAGE_ID]: message.MessageId,\n },\n });\n }\n }\n break;\n }\n }\n };\n\n extractQueueUrl = (commandInput: Record<string, any>): string => {\n return commandInput?.QueueUrl;\n };\n\n extractQueueNameFromUrl = (queueUrl: string): string | undefined => {\n if (!queueUrl) return undefined;\n\n const segments = queueUrl.split('/');\n if (segments.length === 0) return undefined;\n\n return segments[segments.length - 1];\n };\n}\n"]}
|
package/build/src/utils.js
CHANGED
|
@@ -17,7 +17,7 @@ exports.bindPromise = exports.extractAttributesFromNormalizedRequest = exports.n
|
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
19
|
const api_1 = require("@opentelemetry/api");
|
|
20
|
-
const
|
|
20
|
+
const semconv_1 = require("./semconv");
|
|
21
21
|
const enums_1 = require("./enums");
|
|
22
22
|
const removeSuffixFromStringIfExists = (str, suffixToRemove) => {
|
|
23
23
|
const suffixLength = suffixToRemove.length;
|
|
@@ -37,9 +37,9 @@ const normalizeV3Request = (serviceName, commandNameWithSuffix, commandInput, re
|
|
|
37
37
|
exports.normalizeV3Request = normalizeV3Request;
|
|
38
38
|
const extractAttributesFromNormalizedRequest = (normalizedRequest) => {
|
|
39
39
|
return {
|
|
40
|
-
[
|
|
41
|
-
[
|
|
42
|
-
[
|
|
40
|
+
[semconv_1.ATTR_RPC_SYSTEM]: 'aws-api',
|
|
41
|
+
[semconv_1.ATTR_RPC_METHOD]: normalizedRequest.commandName,
|
|
42
|
+
[semconv_1.ATTR_RPC_SERVICE]: normalizedRequest.serviceName,
|
|
43
43
|
[enums_1.AttributeNames.CLOUD_REGION]: normalizedRequest.region,
|
|
44
44
|
};
|
|
45
45
|
};
|
package/build/src/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,4CAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,4CAAkE;AAClE,uCAA+E;AAC/E,mCAAyC;AAGlC,MAAM,8BAA8B,GAAG,CAC5C,GAAW,EACX,cAAsB,EACd,EAAE;IACV,MAAM,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC;IAC3C,OAAO,GAAG,EAAE,KAAK,CAAC,CAAC,YAAY,CAAC,KAAK,cAAc;QACjD,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,YAAY,CAAC;QACzC,CAAC,CAAC,GAAG,CAAC;AACV,CAAC,CAAC;AARW,QAAA,8BAA8B,kCAQzC;AAEK,MAAM,kBAAkB,GAAG,CAChC,WAAmB,EACnB,qBAA6B,EAC7B,YAAiC,EACjC,MAA0B,EACP,EAAE;IACrB,OAAO;QACL,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QAC7C,WAAW,EAAE,IAAA,sCAA8B,EACzC,qBAAqB,EACrB,SAAS,CACV;QACD,YAAY;QACZ,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,kBAAkB,sBAe7B;AAEK,MAAM,sCAAsC,GAAG,CACpD,iBAAoC,EACxB,EAAE;IACd,OAAO;QACL,CAAC,yBAAe,CAAC,EAAE,SAAS;QAC5B,CAAC,yBAAe,CAAC,EAAE,iBAAiB,CAAC,WAAW;QAChD,CAAC,0BAAgB,CAAC,EAAE,iBAAiB,CAAC,WAAW;QACjD,CAAC,sBAAc,CAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC,MAAM;KACxD,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,sCAAsC,0CASjD;AAEK,MAAM,WAAW,GAAG,CACzB,MAAkB,EAClB,mBAA4B,EAC5B,WAAW,GAAG,CAAC,EACH,EAAE;IACd,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;IAE7B,MAAM,CAAC,IAAI,GAAG,UACZ,WAAqC,EACrC,UAAoC;QAEpC,MAAM,cAAc,GAAG,aAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QACtE,MAAM,aAAa,GAAG,aAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAIlC,IAAI,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QACvC,OAAO,WAAW,GAAG,CAAC;YACpB,CAAC,CAAC,IAAA,mBAAW,EAAC,cAAc,EAAE,mBAAmB,EAAE,WAAW,GAAG,CAAC,CAAC;YACnE,CAAC,CAAC,cAAc,CAAC;IACrB,CAAC,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAvBW,QAAA,WAAW,eAuBtB","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 { Attributes, Context, context } from '@opentelemetry/api';\nimport { ATTR_RPC_METHOD, ATTR_RPC_SERVICE, ATTR_RPC_SYSTEM } from './semconv';\nimport { AttributeNames } from './enums';\nimport { NormalizedRequest } from './types';\n\nexport const removeSuffixFromStringIfExists = (\n str: string,\n suffixToRemove: string\n): string => {\n const suffixLength = suffixToRemove.length;\n return str?.slice(-suffixLength) === suffixToRemove\n ? str.slice(0, str.length - suffixLength)\n : str;\n};\n\nexport const normalizeV3Request = (\n serviceName: string,\n commandNameWithSuffix: string,\n commandInput: Record<string, any>,\n region: string | undefined\n): NormalizedRequest => {\n return {\n serviceName: serviceName?.replace(/\\s+/g, ''),\n commandName: removeSuffixFromStringIfExists(\n commandNameWithSuffix,\n 'Command'\n ),\n commandInput,\n region,\n };\n};\n\nexport const extractAttributesFromNormalizedRequest = (\n normalizedRequest: NormalizedRequest\n): Attributes => {\n return {\n [ATTR_RPC_SYSTEM]: 'aws-api',\n [ATTR_RPC_METHOD]: normalizedRequest.commandName,\n [ATTR_RPC_SERVICE]: normalizedRequest.serviceName,\n [AttributeNames.CLOUD_REGION]: normalizedRequest.region,\n };\n};\n\nexport const bindPromise = <T = unknown>(\n target: Promise<T>,\n contextForCallbacks: Context,\n rebindCount = 1\n): Promise<T> => {\n const origThen = target.then;\n type PromiseThenParameters = Parameters<Promise<T>['then']>;\n target.then = function <TResult1 = T, TResult2 = never>(\n onFulfilled: PromiseThenParameters[0],\n onRejected: PromiseThenParameters[1]\n ): Promise<TResult1 | TResult2> {\n const newOnFulfilled = context.bind(contextForCallbacks, onFulfilled);\n const newOnRejected = context.bind(contextForCallbacks, onRejected);\n const patchedPromise = origThen.call<\n Promise<T>,\n any[],\n Promise<TResult1 | TResult2>\n >(this, newOnFulfilled, newOnRejected);\n return rebindCount > 1\n ? bindPromise(patchedPromise, contextForCallbacks, rebindCount - 1)\n : patchedPromise;\n };\n return target;\n};\n"]}
|
package/build/src/version.d.ts
CHANGED
package/build/src/version.js
CHANGED
|
@@ -17,6 +17,6 @@
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.PACKAGE_NAME = exports.PACKAGE_VERSION = void 0;
|
|
19
19
|
// this is autogenerated file, see scripts/version-update.js
|
|
20
|
-
exports.PACKAGE_VERSION = '0.
|
|
20
|
+
exports.PACKAGE_VERSION = '0.61.2';
|
|
21
21
|
exports.PACKAGE_NAME = '@opentelemetry/instrumentation-aws-sdk';
|
|
22
22
|
//# sourceMappingURL=version.js.map
|
package/build/src/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4DAA4D;AAC/C,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,YAAY,GAAG,wCAAwC,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 PACKAGE_VERSION = '0.
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4DAA4D;AAC/C,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,YAAY,GAAG,wCAAwC,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 PACKAGE_VERSION = '0.61.2';\nexport const PACKAGE_NAME = '@opentelemetry/instrumentation-aws-sdk';\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentelemetry/instrumentation-aws-sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.61.2",
|
|
4
4
|
"description": "OpenTelemetry instrumentation for `aws-sdk` and `@aws-sdk/client-*` clients for various AWS services",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aws",
|
|
@@ -41,7 +41,6 @@
|
|
|
41
41
|
"tdd": "npm run test -- --watch-extensions ts --watch",
|
|
42
42
|
"test": "nyc --no-clean mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'",
|
|
43
43
|
"test-all-versions": "tav",
|
|
44
|
-
"test-merge-coverage": "nyc merge .nyc_output coverage/coverage-final.json",
|
|
45
44
|
"version:update": "node ../../scripts/version-update.js",
|
|
46
45
|
"watch": "tsc -w"
|
|
47
46
|
},
|
|
@@ -65,7 +64,7 @@
|
|
|
65
64
|
"@aws-sdk/client-sqs": "^3.85.0",
|
|
66
65
|
"@aws-sdk/types": "^3.370.0",
|
|
67
66
|
"@opentelemetry/api": "^1.3.0",
|
|
68
|
-
"@opentelemetry/contrib-test-utils": "^0.
|
|
67
|
+
"@opentelemetry/contrib-test-utils": "^0.52.2",
|
|
69
68
|
"@opentelemetry/sdk-trace-base": "^2.0.0",
|
|
70
69
|
"@smithy/node-http-handler": "4.1.1",
|
|
71
70
|
"@types/mocha": "10.0.10",
|
|
@@ -83,5 +82,5 @@
|
|
|
83
82
|
"engines": {
|
|
84
83
|
"node": "^18.19.0 || >=20.6.0"
|
|
85
84
|
},
|
|
86
|
-
"gitHead": "
|
|
85
|
+
"gitHead": "5a5918fd4f9f16b14c9ef4d3de08ab98c20e5b46"
|
|
87
86
|
}
|