Skip to content

feat(instrumentation-redis)!: consolidate redis v2,3 and redis v4 instrumentation to one package #2915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Jul 2, 2025
Merged

feat(instrumentation-redis)!: consolidate redis v2,3 and redis v4 instrumentation to one package #2915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f44b587
refactor(instrumentation-redis): support multi versions as seprate in…
blumamir May 28, 2025
e776bc6
Merge remote-tracking branch 'upstream/main' into redis-consolidation
blumamir Jun 7, 2025
2329836
fix(redis): unit tests for new setup
blumamir Jun 7, 2025
65b09d0
chore: add redis-4 impl to redis inst
blumamir Jun 7, 2025
ca617a5
test: fix redis tests with v4
blumamir Jun 7, 2025
4ecf3a8
fix: redis docs to include consolidated version
blumamir Jun 7, 2025
537cd34
chore: lint:fix
blumamir Jun 7, 2025
de9f42e
chore: fix compile
blumamir Jun 7, 2025
b99ef55
chore: fix description in package.json
blumamir Jun 7, 2025
5279606
fix: running tav
blumamir Jun 8, 2025
63638da
fix(redis): v4 test compile
blumamir Jun 8, 2025
1ec39b4
chore: resolve lint with knip ignore
blumamir Jun 8, 2025
5b2c10b
chore: add v prefix when using multiple versions
blumamir Jun 8, 2025
3945aab
chore: add deprecation warning to redis-4
blumamir Jun 8, 2025
f46e166
v4: drop DEFAULT_CONFIG handling, it is handled in the parent RedisIn…
trentm Jun 26, 2025
8a52338
move testing of redis v2/v3 to 'npm run test-all-versions'; fix tests…
trentm Jun 26, 2025
e49a8ec
Merge branch 'main' into trentm-redis-consolidation-alt
trentm Jun 26, 2025
9b0fc9e
use a diff name here to see if git picks up on src/instrumentation.ts…
trentm Jun 26, 2025
79cd098
remove old instr-redis-4 sources, so git can pick up on the move of t…
trentm Jun 26, 2025
d50bc22
loosen types on v2/v3 tests (mostly) to not have to have v3 redis typ…
trentm Jun 26, 2025
91c4262
drop @types/redis dep; fix release-please config
trentm Jun 26, 2025
0d6f1ef
another release-please config update
trentm Jun 26, 2025
d2fa3a2
drop instr-redis-4 from auto-instrumentations-node
trentm Jun 26, 2025
7408ca1
flail to fix "npm run compile" for test/v4/redis.test.ts
trentm Jun 27, 2025
33399f3
remove 'extraneous' package-lock section for dropped instrumentation-…
trentm Jun 27, 2025
f8e7b93
update README about moved sources and link to the latest release sour…
trentm Jun 27, 2025
f61c339
Merge branch 'main' into trentm-redis-consolidation-alt
trentm Jun 27, 2025
aef400b
drop some unneeded type casting
trentm Jun 27, 2025
de0d5bf
import cleanup from review feedback
trentm Jun 27, 2025
3f925be
can use more accurate "import type" here
trentm Jun 27, 2025
dc6e6fc
Merge branch 'main' into trentm-redis-consolidation-alt
trentm Jun 27, 2025
b74a0aa
Merge branch 'main' into trentm-redis-consolidation-alt
blumamir Jul 2, 2025
ebcca8b
remove final references to the redis-4 instrumentation (from Amir's r…
trentm Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/component-label-map.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,6 @@ pkg:instrumentation-redis:
- plugins/node/opentelemetry-instrumentation-redis/**
- packages/opentelemetry-test-utils/**
- packages/opentelemetry-redis-common/**
pkg:instrumentation-redis-4:
- changed-files:
- any-glob-to-any-file:
- plugins/node/opentelemetry-instrumentation-redis-4/**
- packages/opentelemetry-test-utils/**
- packages/opentelemetry-redis-common/**
pkg:instrumentation-restify:
- changed-files:
- any-glob-to-any-file:
Expand Down
2 changes: 0 additions & 2 deletions .github/component_owners.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@ components:
- maryliag
plugins/node/opentelemetry-instrumentation-pino:
- seemk
plugins/node/opentelemetry-instrumentation-redis-4:
- blumamir
plugins/node/opentelemetry-instrumentation-redis:
- blumamir
plugins/node/opentelemetry-instrumentation-restify: []
Expand Down
1 change: 0 additions & 1 deletion .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"plugins/node/opentelemetry-instrumentation-pg": "0.54.0",
"plugins/node/opentelemetry-instrumentation-pino": "0.49.0",
"plugins/node/opentelemetry-instrumentation-redis": "0.49.1",
"plugins/node/opentelemetry-instrumentation-redis-4": "0.49.0",
"plugins/node/opentelemetry-instrumentation-restify": "0.48.1",
"plugins/node/opentelemetry-instrumentation-router": "0.47.0",
"plugins/node/opentelemetry-instrumentation-winston": "0.47.0",
Expand Down
1 change: 0 additions & 1 deletion metapackages/auto-instrumentations-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
"@opentelemetry/instrumentation-pg": "^0.54.0",
"@opentelemetry/instrumentation-pino": "^0.49.0",
"@opentelemetry/instrumentation-redis": "^0.49.1",
"@opentelemetry/instrumentation-redis-4": "^0.49.0",
"@opentelemetry/instrumentation-restify": "^0.48.1",
"@opentelemetry/instrumentation-router": "^0.47.0",
"@opentelemetry/instrumentation-runtime-node": "^0.16.0",
Expand Down
6 changes: 2 additions & 4 deletions metapackages/auto-instrumentations-node/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
import { OracleInstrumentation } from '@opentelemetry/instrumentation-oracledb';
import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino';
import { RedisInstrumentation as RedisInstrumentationV2 } from '@opentelemetry/instrumentation-redis';
import { RedisInstrumentation as RedisInstrumentationV4 } from '@opentelemetry/instrumentation-redis-4';
import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis';
import { RestifyInstrumentation } from '@opentelemetry/instrumentation-restify';
import { RouterInstrumentation } from '@opentelemetry/instrumentation-router';
import { RuntimeNodeInstrumentation } from '@opentelemetry/instrumentation-runtime-node';
Expand Down Expand Up @@ -128,8 +127,7 @@ const InstrumentationMap = {
'@opentelemetry/instrumentation-oracledb': OracleInstrumentation,
'@opentelemetry/instrumentation-pg': PgInstrumentation,
'@opentelemetry/instrumentation-pino': PinoInstrumentation,
'@opentelemetry/instrumentation-redis': RedisInstrumentationV2,
'@opentelemetry/instrumentation-redis-4': RedisInstrumentationV4,
'@opentelemetry/instrumentation-redis': RedisInstrumentation,
'@opentelemetry/instrumentation-restify': RestifyInstrumentation,
'@opentelemetry/instrumentation-router': RouterInstrumentation,
'@opentelemetry/instrumentation-runtime-node': RuntimeNodeInstrumentation,
Expand Down
Loading