@opentelemetry/instrumentation-ioredis 0.27.1 → 0.28.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/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-ioredis-v0.27.1...instrumentation-ioredis-v0.28.0) (2022-03-02)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### ⚠ BREAKING CHANGES
|
|
7
|
+
|
|
8
|
+
* **ioredis:** net.peer.ip -> db.connection_string
|
|
9
|
+
|
|
10
|
+
### Bug Fixes
|
|
11
|
+
|
|
12
|
+
* **ioredis:** net.peer.ip -> db.connection_string ([986c349](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/986c3499b324ebdf49aabf35bc3711c91bb91ec8))
|
|
13
|
+
|
|
3
14
|
### [0.27.1](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-ioredis-v0.27.0...instrumentation-ioredis-v0.27.1) (2022-01-24)
|
|
4
15
|
|
|
5
16
|
|
|
@@ -47,4 +58,4 @@
|
|
|
47
58
|
|
|
48
59
|
* The following workspace dependencies were updated
|
|
49
60
|
* devDependencies
|
|
50
|
-
* @opentelemetry/contrib-test-utils bumped from ^0.25.0 to ^0.27.0
|
|
61
|
+
* @opentelemetry/contrib-test-utils bumped from ^0.25.0 to ^0.27.0
|
package/LICENSE
CHANGED
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
same "printed page" as the copyright notice for easier
|
|
187
187
|
identification within third-party archives.
|
|
188
188
|
|
|
189
|
-
Copyright [
|
|
189
|
+
Copyright [2022] OpenTelemetry Authors
|
|
190
190
|
|
|
191
191
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
192
|
you may not use this file except in compliance with the License.
|
|
@@ -2,7 +2,6 @@ import type * as ioredisTypes from 'ioredis';
|
|
|
2
2
|
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
|
|
3
3
|
import { IORedisInstrumentationConfig } from './types';
|
|
4
4
|
export declare class IORedisInstrumentation extends InstrumentationBase<typeof ioredisTypes> {
|
|
5
|
-
static readonly DB_SYSTEM = "redis";
|
|
6
5
|
constructor(_config?: IORedisInstrumentationConfig);
|
|
7
6
|
init(): InstrumentationNodeModuleDefinition<typeof ioredisTypes>[];
|
|
8
7
|
/**
|
|
@@ -43,7 +43,7 @@ class IORedisInstrumentation extends instrumentation_1.InstrumentationBase {
|
|
|
43
43
|
const span = instrumentation.tracer.startSpan(cmd.name, {
|
|
44
44
|
kind: api_1.SpanKind.CLIENT,
|
|
45
45
|
attributes: {
|
|
46
|
-
[semantic_conventions_1.SemanticAttributes.DB_SYSTEM]:
|
|
46
|
+
[semantic_conventions_1.SemanticAttributes.DB_SYSTEM]: semantic_conventions_1.DbSystemValues.REDIS,
|
|
47
47
|
[semantic_conventions_1.SemanticAttributes.DB_STATEMENT]: dbStatementSerializer(cmd.name, cmd.args),
|
|
48
48
|
},
|
|
49
49
|
});
|
|
@@ -62,7 +62,7 @@ class IORedisInstrumentation extends instrumentation_1.InstrumentationBase {
|
|
|
62
62
|
span.setAttributes({
|
|
63
63
|
[semantic_conventions_1.SemanticAttributes.NET_PEER_NAME]: host,
|
|
64
64
|
[semantic_conventions_1.SemanticAttributes.NET_PEER_PORT]: port,
|
|
65
|
-
[semantic_conventions_1.SemanticAttributes.
|
|
65
|
+
[semantic_conventions_1.SemanticAttributes.DB_CONNECTION_STRING]: `redis://${host}:${port}`,
|
|
66
66
|
});
|
|
67
67
|
try {
|
|
68
68
|
const result = original.apply(this, arguments);
|
|
@@ -96,7 +96,7 @@ class IORedisInstrumentation extends instrumentation_1.InstrumentationBase {
|
|
|
96
96
|
const span = instrumentation.tracer.startSpan('connect', {
|
|
97
97
|
kind: api_1.SpanKind.CLIENT,
|
|
98
98
|
attributes: {
|
|
99
|
-
[semantic_conventions_1.SemanticAttributes.DB_SYSTEM]:
|
|
99
|
+
[semantic_conventions_1.SemanticAttributes.DB_SYSTEM]: semantic_conventions_1.DbSystemValues.REDIS,
|
|
100
100
|
[semantic_conventions_1.SemanticAttributes.DB_STATEMENT]: 'connect',
|
|
101
101
|
},
|
|
102
102
|
});
|
|
@@ -104,7 +104,7 @@ class IORedisInstrumentation extends instrumentation_1.InstrumentationBase {
|
|
|
104
104
|
span.setAttributes({
|
|
105
105
|
[semantic_conventions_1.SemanticAttributes.NET_PEER_NAME]: host,
|
|
106
106
|
[semantic_conventions_1.SemanticAttributes.NET_PEER_PORT]: port,
|
|
107
|
-
[semantic_conventions_1.SemanticAttributes.
|
|
107
|
+
[semantic_conventions_1.SemanticAttributes.DB_CONNECTION_STRING]: `redis://${host}:${port}`,
|
|
108
108
|
});
|
|
109
109
|
try {
|
|
110
110
|
const client = original.apply(this, arguments);
|
|
@@ -155,5 +155,4 @@ class IORedisInstrumentation extends instrumentation_1.InstrumentationBase {
|
|
|
155
155
|
}
|
|
156
156
|
}
|
|
157
157
|
exports.IORedisInstrumentation = IORedisInstrumentation;
|
|
158
|
-
IORedisInstrumentation.DB_SYSTEM = 'redis';
|
|
159
158
|
//# sourceMappingURL=instrumentation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../src/instrumentation.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,4CAAoE;AAEpE,oEAIwC;AAExC,
|
|
1
|
+
{"version":3,"file":"instrumentation.js","sourceRoot":"","sources":["../../src/instrumentation.ts"],"names":[],"mappings":"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"}
|
package/build/src/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "0.
|
|
1
|
+
export declare const VERSION = "0.28.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-ioredis",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.28.0",
|
|
4
4
|
"description": "OpenTelemetry ioredis automatic instrumentation package.",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"types": "build/src/index.d.ts",
|
|
@@ -19,7 +19,6 @@
|
|
|
19
19
|
"prewatch": "npm run precompile",
|
|
20
20
|
"version:update": "node ../../../scripts/version-update.js",
|
|
21
21
|
"compile": "npm run version:update && tsc -p .",
|
|
22
|
-
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
|
|
23
22
|
"prepare": "npm run compile"
|
|
24
23
|
},
|
|
25
24
|
"keywords": [
|
|
@@ -57,16 +56,15 @@
|
|
|
57
56
|
"@opentelemetry/sdk-trace-base": "1.0.1",
|
|
58
57
|
"@opentelemetry/sdk-trace-node": "1.0.1",
|
|
59
58
|
"@types/mocha": "7.0.2",
|
|
60
|
-
"@types/node": "
|
|
61
|
-
"@types/sinon": "
|
|
62
|
-
"codecov": "3.8.3",
|
|
59
|
+
"@types/node": "16.11.21",
|
|
60
|
+
"@types/sinon": "10.0.9",
|
|
63
61
|
"cross-env": "7.0.3",
|
|
64
62
|
"gts": "3.1.0",
|
|
65
63
|
"ioredis": "4.27.7",
|
|
66
64
|
"mocha": "7.2.0",
|
|
67
65
|
"nyc": "15.1.0",
|
|
68
66
|
"rimraf": "3.0.2",
|
|
69
|
-
"sinon": "
|
|
67
|
+
"sinon": "13.0.1",
|
|
70
68
|
"test-all-versions": "5.0.1",
|
|
71
69
|
"ts-mocha": "8.0.0",
|
|
72
70
|
"typescript": "4.3.5"
|
|
@@ -76,5 +74,5 @@
|
|
|
76
74
|
"@opentelemetry/semantic-conventions": "^1.0.0",
|
|
77
75
|
"@types/ioredis": "4.26.6"
|
|
78
76
|
},
|
|
79
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "78717b6dda677bf737811c34df21ef0ec88c31a3"
|
|
80
78
|
}
|