Skip to content

[opentelemetry-auto-laravel] fix: serialization error when calls internal Redis::Pipeline command #331

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 2 commits into from
Feb 25, 2025
Merged

[opentelemetry-auto-laravel] fix: serialization error when calls internal Redis::Pipeline command #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8de6e80
fix: add ability to escape error, when serialized parameter is closur…
090809 Feb 15, 2025
be13ae0
tests: add pipeline serialization test case
090809 Feb 17, 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
12 changes: 11 additions & 1 deletion src/Instrumentation/Laravel/src/Watchers/RedisCommand/Serializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,17 @@ public static function serializeCommand(string $command, array $params): string
}

// In some cases (for example when using LUA scripts) arrays are valid parameters
$paramsToSerialize = array_map(function ($param) { return is_array($param) ? json_encode($param) : $param; }, $paramsToSerialize);
// In additional cases, Closure are also valid parameters (Pipeline command)
$paramsToSerialize = array_map(
static function ($param) {
return match (true) {
is_array($param) => json_encode($param),
is_callable($param) => 'Callable',
default => $param,
};
},
$paramsToSerialize
);

return $command . ' ' . implode(' ', $paramsToSerialize);
}
Expand Down
2 changes: 2 additions & 0 deletions src/Instrumentation/Laravel/tests/Unit/Watches/RedisCommand/SerializerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,7 @@ public function serializeCases(): iterable

// Parameters of array type
yield ['EVAL', ['param1', 'param2', ['arg1', 'arg2']], 'EVAL param1 param2 ["arg1","arg2"]'];

yield ['pipeline', [function () {}], 'pipeline Callable'];
}
}
Loading