Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

* Fixed `SetVerboseDatabaseStatements` losing the script text for `EVAL`/`EVALSHA`
commands with StackExchange.Redis 3.2.0+.
([#5223](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/5223))

## 1.18.0-beta.2

Released 2026-Sep-10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,48 @@ internal static class RedisProfilerEntryToActivityConverter
{
#pragma warning disable IDE0370 // Suppression is unnecessary
var profiledCommandType = Type.GetType("StackExchange.Redis.Profiling.ProfiledCommand, StackExchange.Redis", throwOnError: true)!;
var scriptMessageType = Type.GetType("StackExchange.Redis.RedisDatabase+ScriptEvalMessage, StackExchange.Redis", throwOnError: true)!;

// StackExchange.Redis 3.2.0 (StackExchange/StackExchange.Redis#3211) renamed the private,
// array-based message type behind ScriptEvaluate(string, RedisKey[], RedisValue[]) from
// "ScriptEvalMessage" to "ScriptEvaluateMessage" (its "script" field is unchanged), and
// reused the "ScriptEvalMessage" name for a new pooled-buffer type (field "_script") behind
// the new ScriptEvaluateResp* APIs. Both type names and both field names are resolved below
// so the script text is reported regardless of which StackExchange.Redis version is loaded.
var scriptEvalMessageType = Type.GetType("StackExchange.Redis.RedisDatabase+ScriptEvalMessage, StackExchange.Redis", throwOnError: false);
var scriptEvaluateMessageType = Type.GetType("StackExchange.Redis.RedisDatabase+ScriptEvaluateMessage, StackExchange.Redis", throwOnError: false);
#pragma warning restore IDE0370 // Suppression is unnecessary

var messageDelegate = CreateFieldGetter<object>(profiledCommandType, "Message", BindingFlags.NonPublic | BindingFlags.Instance);
var scriptDelegate = CreateFieldGetter<string>(scriptMessageType, "script", BindingFlags.NonPublic | BindingFlags.Instance);
var bindingFlags = BindingFlags.NonPublic | BindingFlags.Instance;

var messageDelegate = CreateFieldGetter<object>(profiledCommandType, "Message", bindingFlags);
var commandAndKeyFetcher = new PropertyFetcher<string>("CommandAndKey");

var scriptDelegatesByType = new Dictionary<Type, Func<object, string?>>();

if (scriptEvalMessageType != null)
{
var getter =
CreateFieldGetter<string>(scriptEvalMessageType, "script", bindingFlags) ??
CreateFieldGetter<string>(scriptEvalMessageType, "_script", bindingFlags);

if (getter != null)
{
scriptDelegatesByType[scriptEvalMessageType] = getter;
}
}

if (scriptEvaluateMessageType != null)
{
var getter =
CreateFieldGetter<string>(scriptEvaluateMessageType, "script", bindingFlags) ??
CreateFieldGetter<string>(scriptEvaluateMessageType, "_script", bindingFlags);

if (getter != null)
{
scriptDelegatesByType[scriptEvaluateMessageType] = getter;
}
}

if (messageDelegate == null)
{
return new Func<object, (string?, string?)>(source => (null, null));
Expand All @@ -55,11 +90,9 @@ internal static class RedisProfilerEntryToActivityConverter
return (null, null);
}

string? script = null;
if (message.GetType() == scriptMessageType)
{
script = scriptDelegate?.Invoke(message);
}
var script = scriptDelegatesByType.TryGetValue(message.GetType(), out var scriptDelegate)
? scriptDelegate(message)
: null;

return GetCommandAndKey(commandAndKeyFetcher, message, out var value) ? (value, script) : (null, script);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" />
<PackageReference Include="OpenTelemetry" />
<PackageReference Include="StackExchange.Redis" VersionOverride="3.1.31" />
<PackageReference Include="StackExchange.Redis" VersionOverride="3.2.1" />
<PackageReference Include="Testcontainers.Redis" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="OpenTelemetry.Exporter.InMemory" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
<PackageReference Include="StackExchange.Redis" VersionOverride="3.1.31" />
<PackageReference Include="StackExchange.Redis" VersionOverride="3.2.1" />
<PackageReference Include="Testcontainers.Redis" />
</ItemGroup>

Expand Down
Loading