@opentelemetry/instrumentation-cassandra-driver 0.29.1 → 0.31.0
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 +5 -5
- package/build/src/index.d.ts +1 -1
- package/build/src/index.js +1 -0
- package/build/src/index.js.map +1 -1
- package/build/src/instrumentation.d.ts +2 -0
- package/build/src/instrumentation.js +17 -2
- package/build/src/instrumentation.js.map +1 -1
- package/build/src/types.d.ts +23 -0
- package/build/src/version.d.ts +1 -1
- package/build/src/version.js +1 -1
- package/package.json +6 -6
- package/CHANGELOG.md +0 -86
package/README.md
CHANGED
|
@@ -39,11 +39,11 @@ await client.execute('select * from foo');
|
|
|
39
39
|
|
|
40
40
|
### Instrumentation options
|
|
41
41
|
|
|
42
|
-
| Option
|
|
43
|
-
|
|
44
|
-
| `enhancedDatabaseReporting` | `boolean`
|
|
45
|
-
| `
|
|
46
|
-
to this length.
|
|
42
|
+
| Option | Type | Default | Description |
|
|
43
|
+
|-----------------------------|--------------------------------------------------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
44
|
+
| `enhancedDatabaseReporting` | `boolean` | `false` | Whether to include database queries with spans. These can contain sensitive information when using unescaped parameters - i.e. `insert into persons (name) values ('Bob')` instead of `insert into persons (name) values (?)`. |
|
|
45
|
+
| `responseHook` | `CassandraDriverResponseCustomAttributeFunction` | `undefined` | Hook for adding custom attributes before response is handled |
|
|
46
|
+
| `maxQueryLength` | `number` | `65536` | If `enhancedDatabaseReporting` is enabled, limits the attached query strings to this length. |
|
|
47
47
|
|
|
48
48
|
### Supported versions
|
|
49
49
|
|
package/build/src/index.d.ts
CHANGED
package/build/src/index.js
CHANGED
|
@@ -26,4 +26,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
26
26
|
};
|
|
27
27
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
28
|
__exportStar(require("./instrumentation"), exports);
|
|
29
|
+
__exportStar(require("./types"), exports);
|
|
29
30
|
//# sourceMappingURL=index.js.map
|
package/build/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;AAEH,oDAAkC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;AAEH,oDAAkC;AAClC,0CAAwB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
|
|
2
2
|
import { CassandraDriverInstrumentationConfig } from './types';
|
|
3
3
|
export declare class CassandraDriverInstrumentation extends InstrumentationBase {
|
|
4
|
+
protected _config: CassandraDriverInstrumentationConfig;
|
|
4
5
|
constructor(config?: CassandraDriverInstrumentationConfig);
|
|
5
6
|
protected init(): InstrumentationNodeModuleDefinition<any>;
|
|
6
7
|
private _getMaxQueryLength;
|
|
@@ -10,5 +11,6 @@ export declare class CassandraDriverInstrumentation extends InstrumentationBase
|
|
|
10
11
|
private _getPatchedBatch;
|
|
11
12
|
private _getPatchedStream;
|
|
12
13
|
private startSpan;
|
|
14
|
+
private _callResponseHook;
|
|
13
15
|
}
|
|
14
16
|
//# sourceMappingURL=instrumentation.d.ts.map
|
|
@@ -93,7 +93,9 @@ class CassandraDriverInstrumentation extends instrumentation_1.InstrumentationBa
|
|
|
93
93
|
failSpan(span, error);
|
|
94
94
|
}
|
|
95
95
|
});
|
|
96
|
-
const wrappedPromise = wrapPromise(span, execPromise)
|
|
96
|
+
const wrappedPromise = wrapPromise(span, execPromise, (span, result) => {
|
|
97
|
+
plugin._callResponseHook(span, result);
|
|
98
|
+
});
|
|
97
99
|
return api_1.context.bind(execContext, wrappedPromise);
|
|
98
100
|
};
|
|
99
101
|
};
|
|
@@ -212,6 +214,16 @@ class CassandraDriverInstrumentation extends instrumentation_1.InstrumentationBa
|
|
|
212
214
|
attributes,
|
|
213
215
|
});
|
|
214
216
|
}
|
|
217
|
+
_callResponseHook(span, response) {
|
|
218
|
+
if (!this._config.responseHook) {
|
|
219
|
+
return;
|
|
220
|
+
}
|
|
221
|
+
instrumentation_1.safeExecuteInTheMiddle(() => this._config.responseHook(span, { response: response }), e => {
|
|
222
|
+
if (e) {
|
|
223
|
+
this._diag.error('responseHook error', e);
|
|
224
|
+
}
|
|
225
|
+
}, true);
|
|
226
|
+
}
|
|
215
227
|
}
|
|
216
228
|
exports.CassandraDriverInstrumentation = CassandraDriverInstrumentation;
|
|
217
229
|
function failSpan(span, error) {
|
|
@@ -227,10 +239,13 @@ function combineQueries(queries) {
|
|
|
227
239
|
.map(query => (typeof query === 'string' ? query : query.query))
|
|
228
240
|
.join('\n');
|
|
229
241
|
}
|
|
230
|
-
function wrapPromise(span, promise) {
|
|
242
|
+
function wrapPromise(span, promise, successCallback) {
|
|
231
243
|
return promise
|
|
232
244
|
.then(result => {
|
|
233
245
|
return new Promise(resolve => {
|
|
246
|
+
if (successCallback) {
|
|
247
|
+
successCallback(span, result);
|
|
248
|
+
}
|
|
234
249
|
span.end();
|
|
235
250
|
resolve(result);
|
|
236
251
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../src/instrumentation.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4CAO4B;AAC5B,oEAMwC;AAExC,8EAG6C;AAC7C,uCAAoC;AAIpC,MAAM,iBAAiB,GAAG,CAAC,YAAY,CAAC,CAAC;AAEzC,MAAa,8BAA+B,SAAQ,qCAAmB;
|
|
1
|
+
{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../src/instrumentation.ts"],"names":[],"mappings":"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"}
|
package/build/src/types.d.ts
CHANGED
|
@@ -1,4 +1,21 @@
|
|
|
1
1
|
import { InstrumentationConfig } from '@opentelemetry/instrumentation';
|
|
2
|
+
import { Span } from '@opentelemetry/api';
|
|
3
|
+
export interface Row {
|
|
4
|
+
get(columnName: string | number): any;
|
|
5
|
+
keys(): string[];
|
|
6
|
+
forEach(callback: (row: Row) => void): void;
|
|
7
|
+
values(): any[];
|
|
8
|
+
[key: string]: any;
|
|
9
|
+
}
|
|
10
|
+
export interface ResultSet {
|
|
11
|
+
rows: Row[];
|
|
12
|
+
}
|
|
13
|
+
export interface ResponseHookInfo {
|
|
14
|
+
response: ResultSet;
|
|
15
|
+
}
|
|
16
|
+
export interface CassandraDriverResponseCustomAttributeFunction {
|
|
17
|
+
(span: Span, responseInfo: ResponseHookInfo): void;
|
|
18
|
+
}
|
|
2
19
|
export interface CassandraDriverInstrumentationConfig extends InstrumentationConfig {
|
|
3
20
|
/**
|
|
4
21
|
* Include database statements with spans.
|
|
@@ -11,5 +28,11 @@ export interface CassandraDriverInstrumentationConfig extends InstrumentationCon
|
|
|
11
28
|
* @default 65536
|
|
12
29
|
*/
|
|
13
30
|
maxQueryLength?: number;
|
|
31
|
+
/**
|
|
32
|
+
* Function for adding custom attributes before response is handled.
|
|
33
|
+
* @param span the current span
|
|
34
|
+
* @param responseInfo array of the resulting rows. This will only return the first page of results
|
|
35
|
+
*/
|
|
36
|
+
responseHook?: CassandraDriverResponseCustomAttributeFunction;
|
|
14
37
|
}
|
|
15
38
|
//# sourceMappingURL=types.d.ts.map
|
package/build/src/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "0.
|
|
1
|
+
export declare const VERSION = "0.31.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/build/src/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentelemetry/instrumentation-cassandra-driver",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.31.0",
|
|
4
4
|
"description": "OpenTelemetry instrumentation for cassandra-driver",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"types": "build/src/index.d.ts",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"author": "OpenTelemetry Authors",
|
|
30
30
|
"license": "Apache-2.0",
|
|
31
31
|
"engines": {
|
|
32
|
-
"node": ">=
|
|
32
|
+
"node": ">=14"
|
|
33
33
|
},
|
|
34
34
|
"files": [
|
|
35
35
|
"build/src/**/*.js",
|
|
@@ -48,11 +48,11 @@
|
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@opentelemetry/api": "^1.0.0",
|
|
50
50
|
"@opentelemetry/context-async-hooks": "^1.3.1",
|
|
51
|
-
"@opentelemetry/contrib-test-utils": "^0.
|
|
51
|
+
"@opentelemetry/contrib-test-utils": "^0.32.0",
|
|
52
52
|
"@opentelemetry/sdk-trace-base": "^1.3.1",
|
|
53
53
|
"@opentelemetry/sdk-trace-node": "^1.3.1",
|
|
54
54
|
"@types/mocha": "7.0.2",
|
|
55
|
-
"@types/node": "
|
|
55
|
+
"@types/node": "18.11.7",
|
|
56
56
|
"@types/semver": "7.3.8",
|
|
57
57
|
"@types/sinon": "10.0.2",
|
|
58
58
|
"cassandra-driver": "4.6.3",
|
|
@@ -65,9 +65,9 @@
|
|
|
65
65
|
"typescript": "4.3.5"
|
|
66
66
|
},
|
|
67
67
|
"dependencies": {
|
|
68
|
-
"@opentelemetry/instrumentation": "^0.
|
|
68
|
+
"@opentelemetry/instrumentation": "^0.32.0",
|
|
69
69
|
"@opentelemetry/semantic-conventions": "^1.0.0"
|
|
70
70
|
},
|
|
71
71
|
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme",
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "bd79bd04cba3f16658caf37d9a5c65e5bd5980f6"
|
|
73
73
|
}
|
package/CHANGELOG.md
DELETED
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
# Changelog
|
|
2
|
-
|
|
3
|
-
## [0.29.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.29.0...instrumentation-cassandra-driver-v0.29.1) (2022-08-09)
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
### Bug Fixes
|
|
7
|
-
|
|
8
|
-
* avoid type imports of the instrumented package in the built assets ([#1017](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1017)) ([e265723](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/e2657232c9007a77ddc873a93e8247f99087b9c1))
|
|
9
|
-
|
|
10
|
-
## [0.29.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.28.0...instrumentation-cassandra-driver-v0.29.0) (2022-06-08)
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
### Features
|
|
14
|
-
|
|
15
|
-
* update core dependencies stable ^1.3.1 experimental ^0.29.2 ([141b155](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/141b155e344980b51264e26b26c117b2113bcef6))
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
### Dependencies
|
|
19
|
-
|
|
20
|
-
* The following workspace dependencies were updated
|
|
21
|
-
* devDependencies
|
|
22
|
-
* @opentelemetry/contrib-test-utils bumped from ^0.30.0 to ^0.31.0
|
|
23
|
-
|
|
24
|
-
## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.27.1...instrumentation-cassandra-driver-v0.28.0) (2022-05-14)
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
### Features
|
|
28
|
-
|
|
29
|
-
* add supported node versions for all packages ([#973](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/973)) ([baaacbd](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/baaacbdd35ca4baab0afae64647aa8c0380ee4b7))
|
|
30
|
-
* use Otel SDK 1.2/0.28 ([#984](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/984)) ([098c2ed](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/098c2ed6f9c5ab7bd865685018c0777245aab3b7))
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
### Bug Fixes
|
|
34
|
-
|
|
35
|
-
* don't try to shut cassandra client down if it wasn't initialized ([#966](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/966)) ([80e855a](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/80e855aa39ed10ee42cd3c839dc16a5d0449561a))
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
### Dependencies
|
|
39
|
-
|
|
40
|
-
* The following workspace dependencies were updated
|
|
41
|
-
* devDependencies
|
|
42
|
-
* @opentelemetry/contrib-test-utils bumped from 0.29.0 to ^0.30.0
|
|
43
|
-
|
|
44
|
-
### [0.27.1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.27.0...instrumentation-cassandra-driver-v0.27.1) (2022-01-24)
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
### Bug Fixes
|
|
48
|
-
|
|
49
|
-
* rename lerna's --include-filtered-dependencies option ([#817](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/817)) ([cf268e7](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/cf268e7a92b7800ad6dbec9ca77466f9ee03ee1a))
|
|
50
|
-
* use localhost for services in CI ([#816](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/816)) ([f497313](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/f4973133e86549bbca301983085cc67788a10acd))
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
### Dependencies
|
|
54
|
-
|
|
55
|
-
* The following workspace dependencies were updated
|
|
56
|
-
* devDependencies
|
|
57
|
-
* @opentelemetry/contrib-test-utils bumped from ^0.28.0 to ^0.29.0
|
|
58
|
-
|
|
59
|
-
## [0.27.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.26.0...instrumentation-cassandra-driver-v0.27.0) (2021-11-30)
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
### Features
|
|
63
|
-
|
|
64
|
-
* use latest instrumentation base ([#769](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/769)) ([7aff23e](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/7aff23ebebbe209fa3b78c2e7f513c9cd2231be4))
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
### Dependencies
|
|
68
|
-
|
|
69
|
-
* The following workspace dependencies were updated
|
|
70
|
-
* devDependencies
|
|
71
|
-
* @opentelemetry/contrib-test-utils bumped from ^0.27.0 to ^0.28.0
|
|
72
|
-
|
|
73
|
-
## [0.26.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cassandra-driver-v0.25.0...instrumentation-cassandra-driver-v0.26.0) (2021-10-22)
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
### Features
|
|
77
|
-
|
|
78
|
-
* support API and SDK 1.0 ([#706](https://www.github.com/open-telemetry/opentelemetry-js-contrib/issues/706)) ([096b694](https://www.github.com/open-telemetry/opentelemetry-js-contrib/commit/096b694bbc3079f0ab4ee0462869b10eb8185202))
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
### Dependencies
|
|
83
|
-
|
|
84
|
-
* The following workspace dependencies were updated
|
|
85
|
-
* devDependencies
|
|
86
|
-
* @opentelemetry/contrib-test-utils bumped from ^0.25.0 to ^0.27.0
|