-
Notifications
You must be signed in to change notification settings - Fork 333
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.
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
Add FreeRedis Diagnostics #547
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
126 changes: 126 additions & 0 deletions
126
src/SkyApm.Diagnostics.FreeRedis/FreeRedisPluginConfig.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| /* | ||
| * Licensed to the SkyAPM under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The SkyAPM licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
|
|
||
| namespace SkyApm.Diagnostics.FreeRedis | ||
| { | ||
| internal static class FreeRedisPluginConfig | ||
| { | ||
| internal static HashSet<String> OPERATION_MAPPING_WRITE = new HashSet<string>() { | ||
| "GETSET", | ||
| "SET", | ||
| "SETBIT", | ||
| "SETEX ", | ||
| "SETNX ", | ||
| "SETRANGE", | ||
| "STRLEN ", | ||
| "MSET", | ||
| "MSETNX ", | ||
| "PSETEX", | ||
| "INCR ", | ||
| "INCRBY ", | ||
| "INCRBYFLOAT", | ||
| "DECR ", | ||
| "DECRBY ", | ||
| "APPEND ", | ||
| "HMSET", | ||
| "HSET", | ||
| "HSETNX ", | ||
| "HINCRBY", | ||
| "HINCRBYFLOAT", | ||
| "HDEL", | ||
| "RPOPLPUSH", | ||
| "RPUSH", | ||
| "RPUSHX", | ||
| "LPUSH", | ||
| "LPUSHX", | ||
| "LREM", | ||
| "LTRIM", | ||
| "LSET", | ||
| "BRPOPLPUSH", | ||
| "LINSERT", | ||
| "SADD", | ||
| "SDIFF", | ||
| "SDIFFSTORE", | ||
| "SINTERSTORE", | ||
| "SISMEMBER", | ||
| "SREM", | ||
| "SUNION", | ||
| "SUNIONSTORE", | ||
| "SINTER", | ||
| "ZADD", | ||
| "ZINCRBY", | ||
| "ZINTERSTORE", | ||
| "ZRANGE", | ||
| "ZRANGEBYLEX", | ||
| "ZRANGEBYSCORE", | ||
| "ZRANK", | ||
| "ZREM", | ||
| "ZREMRANGEBYLEX", | ||
| "ZREMRANGEBYRANK", | ||
| "ZREMRANGEBYSCORE", | ||
| "ZREVRANGE", | ||
| "ZREVRANGEBYSCORE", | ||
| "ZREVRANK", | ||
| "ZUNIONSTORE", | ||
| "XADD", | ||
| "XDEL", | ||
| "DEL", | ||
| "XTRIM" | ||
| }; | ||
| internal static HashSet<String> OPERATION_MAPPING_READ = new HashSet<string>(){ | ||
| "GET", | ||
| "GETRANGE", | ||
| "GETBIT ", | ||
| "MGET", | ||
| "HVALS", | ||
| "HKEYS", | ||
| "HLEN", | ||
| "HEXISTS", | ||
| "HGET", | ||
| "HGETALL", | ||
| "HMGET", | ||
| "BLPOP", | ||
| "BRPOP", | ||
| "LINDEX", | ||
| "LLEN", | ||
| "LPOP", | ||
| "LRANGE", | ||
| "RPOP", | ||
| "SCARD", | ||
| "SRANDMEMBER", | ||
| "SPOP", | ||
| "SSCAN", | ||
| "SMOVE", | ||
| "ZLEXCOUNT", | ||
| "ZSCORE", | ||
| "ZSCAN", | ||
| "ZCARD", | ||
| "ZCOUNT", | ||
| "XGET", | ||
| "GET", | ||
| "XREAD", | ||
| "XLEN", | ||
| "XRANGE", | ||
| "XREVRANGE" | ||
| }; | ||
| } | ||
| } |
122 changes: 122 additions & 0 deletions
122
src/SkyApm.Diagnostics.FreeRedis/FreeRedisTracingDiagnosticProcessor.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Licensed to the SkyAPM under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The SkyAPM licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| using FreeRedis; | ||
| using SkyApm; | ||
| using SkyApm.Common; | ||
| using SkyApm.Config; | ||
| using SkyApm.Diagnostics; | ||
| using SkyApm.Tracing; | ||
| using SkyApm.Tracing.Segments; | ||
| using System; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Text.RegularExpressions; | ||
|
|
||
| namespace SkyApm.Diagnostics.FreeRedis | ||
| { | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// FreeRedisTracingDiagnosticProcessor | ||
| /// </summary> | ||
| public class FreeRedisTracingDiagnosticProcessor : ITracingDiagnosticProcessor | ||
| { | ||
|
|
||
| #region Const | ||
|
|
||
| public const string ComponentName = "FreeRedis"; | ||
|
|
||
| public const string FreeRedis_Notice = "FreeRedis.Notice"; | ||
|
|
||
| #endregion | ||
|
|
||
| public string ListenerName => "FreeRedisDiagnosticListener"; | ||
|
|
||
| private readonly ITracingContext _tracingContext; | ||
| private readonly ILocalSegmentContextAccessor _localSegmentContextAccessor; | ||
| private readonly TracingConfig _tracingConfig; | ||
| public FreeRedisTracingDiagnosticProcessor(ITracingContext tracingContext, | ||
| ILocalSegmentContextAccessor localSegmentContextAccessor, IConfigAccessor configAccessor) | ||
| { | ||
| _tracingContext = tracingContext; | ||
| _localSegmentContextAccessor = localSegmentContextAccessor; | ||
| _tracingConfig = configAccessor.Get<TracingConfig>(); | ||
| } | ||
|
|
||
|
|
||
| #region Notice | ||
| [DiagnosticName(FreeRedis_Notice)] | ||
| public void Notice([Object] NoticeEventArgs eventData) | ||
| { | ||
| var ans = Analysis(eventData.Log); | ||
| if (ans == null) return; | ||
| var context = _tracingContext.CreateExitSegmentContext(ans[2], ans[0]); | ||
| context.Span.SpanLayer = SpanLayer.CACHE; | ||
| context.Span.Component = Components.Free_Redis; | ||
| context.Span.AddTag(Tags.CACHE_TYPE, "FreeRedis"); | ||
| context.Span.AddTag(Tags.CACHE_OP, parseOperation(ans[2])); | ||
| context.Span.AddTag(Tags.CACHE_CMD, ans[1]); | ||
| context.Span.AddTag("result", ans[3]); | ||
| context.Span.AddTag("exec_time", ans[4]); | ||
| if (eventData?.Exception != null) | ||
| context.Span.ErrorOccurred(eventData.Exception, _tracingConfig); | ||
| _tracingContext.Release(context); | ||
| } | ||
| #endregion | ||
| private static String parseOperation(String cmd) | ||
| { | ||
| if (FreeRedisPluginConfig.OPERATION_MAPPING_READ.Contains(cmd)) | ||
| { | ||
| return "read"; | ||
| } | ||
| if (FreeRedisPluginConfig.OPERATION_MAPPING_WRITE.Contains(cmd)) | ||
| { | ||
| return "write"; | ||
| } | ||
| return string.Empty; | ||
| } | ||
| private static Regex anRex = new Regex("(.+)\\s>\\s(([A-Z]+)\\s*.*?)\\r\\n(.*?)\\r\\n\\((\\d+)ms\\)\\r\\n"); | ||
| /// <summary> | ||
| /// Analysis | ||
| /// </summary> | ||
| /// <param name="cmd"></param> | ||
| /// <returns>[address,cmd,op,result,exectime]</returns> | ||
| public static string[] Analysis(string cmd) | ||
| { | ||
| if (!(cmd == null || !cmd.Contains(">"))) | ||
| { | ||
| if (anRex.IsMatch(cmd)) | ||
| { | ||
| var matchs = anRex.Match(cmd); | ||
| if (matchs.Success && matchs.Groups.Count > 5) | ||
| { | ||
| return new string[] { | ||
| matchs.Groups[1].Value, | ||
| matchs.Groups[2].Value, | ||
| matchs.Groups[3].Value, | ||
| matchs.Groups[4].Value, | ||
| matchs.Groups[5].Value, | ||
| }; | ||
| } | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/SkyApm.Diagnostics.FreeRedis/SkyApm.Diagnostics.FreeRedis.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="..\..\build\common.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks> | ||
| <AssemblyName>$(PackagePrefix).Diagnostics.FreeRedis</AssemblyName> | ||
| <PackageId>$(PackagePrefix).Diagnostics.FreeRedis</PackageId> | ||
| <PackageTags>SkyWalking;APM;Diagnostics;FreeRedis</PackageTags> | ||
| <Description>SkyApm.Diagnostics.FreeRedis notifies of FreeRedis requests.</Description> | ||
| <RootNamespace>SkyApm.Diagnostics.FreeRedis</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="FreeRedis" Version="1.0.1" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\SkyApm.Utilities.DependencyInjection\SkyApm.Utilities.DependencyInjection.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
59 changes: 59 additions & 0 deletions
59
src/SkyApm.Diagnostics.FreeRedis/SkyWalkingBuilderExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Licensed to the SkyAPM under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The SkyAPM licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| using FreeRedis; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using SkyApm; | ||
| using SkyApm.Utilities.DependencyInjection; | ||
| using System; | ||
| using System.Diagnostics; | ||
|
|
||
| namespace SkyApm.Diagnostics.FreeRedis | ||
| { | ||
|
|
||
| public static class SkyWalkingBuilderExtensions | ||
| { | ||
| public static readonly DiagnosticListener dl = new DiagnosticListener("FreeRedisDiagnosticListener"); | ||
|
|
||
| public static SkyApmExtensions AddFreeRedis(this SkyApmExtensions extensions, RedisClient redisClient, bool includeAuth = false) | ||
| { | ||
| if (extensions == null) | ||
| { | ||
| throw new ArgumentNullException(nameof(extensions)); | ||
| } | ||
| extensions.Services.AddSingleton<ITracingDiagnosticProcessor, FreeRedisTracingDiagnosticProcessor>(); | ||
| if (redisClient != null) | ||
| { | ||
| ConfigAop(redisClient, includeAuth); | ||
| } | ||
| return extensions; | ||
| } | ||
|
|
||
|
|
||
| public static void ConfigAop(RedisClient redisClient, bool includeAuth = false) | ||
| { | ||
| redisClient.Notice += (s, e) => | ||
| { | ||
| if (!string.IsNullOrWhiteSpace(e.Log) && (includeAuth || (!e.Log.Contains("> AUTH ")))) | ||
| { | ||
| dl.Write(FreeRedisTracingDiagnosticProcessor.FreeRedis_Notice, e); | ||
| } | ||
| }; | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@guochen2 Please register 3018 ID in the main repository.