-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Customized handler parser in Dubbo provider filter. #1555
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4bb9590
Customized handler parser in Dubbo provider filter.
cityiron f2b7759
1. rename to DubboOriginParser#parse
cityiron 9396092
1. rename to DubboOriginParser#parse
cityiron 6dcf059
Merge remote-tracking branch 'origin/dubbo_origin' into dubbo_origin
cityiron 0ade21b
1. add license header
cityiron d2e5f51
effect on SentinelDubboProviderFilterTest when mvn integration-test, …
cityiron aa5e8f6
make code clearer.
cityiron 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 hidden or 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 hidden or 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
34 changes: 34 additions & 0 deletions
34
...src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/origin/DefaultDubboOriginParser.java
This file contains hidden or 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,34 @@ | ||
| /* | ||
| * Copyright 1999-2020 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
| package com.alibaba.csp.sentinel.adapter.dubbo.origin; | ||
|
|
||
| import com.alibaba.csp.sentinel.adapter.dubbo.DubboUtils; | ||
| import com.alibaba.dubbo.rpc.Invocation; | ||
| import com.alibaba.dubbo.rpc.Invoker; | ||
|
|
||
| /** | ||
| * Default Dubbo origin parse. | ||
| * | ||
| * @author tiecheng | ||
| */ | ||
| public class DefaultDubboOriginParser implements DubboOriginParser { | ||
|
|
||
| @Override | ||
| public String parse(Invoker<?> invoker, Invocation invocation) { | ||
| return DubboUtils.getApplication(invocation, ""); | ||
| } | ||
|
|
||
| } | ||
38 changes: 38 additions & 0 deletions
38
...dapter/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/origin/DubboOriginParser.java
This file contains hidden or 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,38 @@ | ||
| /* | ||
| * Copyright 1999-2020 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
| package com.alibaba.csp.sentinel.adapter.dubbo.origin; | ||
|
|
||
| import com.alibaba.csp.sentinel.context.Context; | ||
| import com.alibaba.dubbo.rpc.Invocation; | ||
| import com.alibaba.dubbo.rpc.Invoker; | ||
|
|
||
| /** | ||
| * Customized origin parse in Dubbo provider filter. {@link Context#getOrigin()} | ||
| * | ||
| * @author tiecheng | ||
| */ | ||
| public interface DubboOriginParser { | ||
|
|
||
| /** | ||
| * Handle the origin parse. | ||
| * | ||
| * @param invoker Dubbo invoker | ||
| * @param invocation Dubbo invocation | ||
| * @return parse result | ||
| */ | ||
| String parse(Invoker<?> invoker, Invocation invocation); | ||
|
|
||
| } |
37 changes: 37 additions & 0 deletions
37
...rc/main/java/com/alibaba/csp/sentinel/adapter/dubbo/origin/DubboOriginParserRegistry.java
This file contains hidden or 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,37 @@ | ||
| /* | ||
| * Copyright 1999-2020 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
| package com.alibaba.csp.sentinel.adapter.dubbo.origin; | ||
|
|
||
| /** | ||
| * Global origin parser registry for Dubbo. | ||
| * | ||
| * @author tiecheng | ||
| */ | ||
| public final class DubboOriginParserRegistry { | ||
|
|
||
| private static volatile DubboOriginParser dubboOriginParser = new DefaultDubboOriginParser(); | ||
|
|
||
| public static DubboOriginParser getDubboOriginParser() { | ||
| return dubboOriginParser; | ||
| } | ||
|
|
||
| public static void setDubboOriginParser(DubboOriginParser dubboOriginParser) { | ||
| DubboOriginParserRegistry.dubboOriginParser = dubboOriginParser; | ||
| } | ||
|
|
||
| private DubboOriginParserRegistry() {} | ||
|
|
||
| } |
74 changes: 74 additions & 0 deletions
74
.../src/test/java/com/alibaba/csp/sentinel/adapter/dubbo/origin/DubboOriginRegistryTest.java
This file contains hidden or 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,74 @@ | ||
| /* | ||
| * Copyright 1999-2020 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed 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 | ||
| * | ||
| * https://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. | ||
| */ | ||
| package com.alibaba.csp.sentinel.adapter.dubbo.origin; | ||
|
|
||
| import com.alibaba.csp.sentinel.adapter.dubbo.DubboUtils; | ||
| import com.alibaba.dubbo.rpc.Invocation; | ||
| import com.alibaba.dubbo.rpc.Invoker; | ||
| import com.alibaba.dubbo.rpc.RpcInvocation; | ||
| import org.junit.After; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| /** | ||
| * @author tiecheng | ||
| */ | ||
| public class DubboOriginRegistryTest { | ||
|
|
||
| @After | ||
| public void cleanUp() { | ||
| DubboOriginParserRegistry.setDubboOriginParser(new DefaultDubboOriginParser()); | ||
| } | ||
|
|
||
| @Test(expected = IllegalArgumentException.class) | ||
| public void testDefaultOriginParserFail() { | ||
| DubboOriginParserRegistry.getDubboOriginParser().parse(null, null); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDefaultOriginParserSuccess() { | ||
| RpcInvocation invocation = new RpcInvocation(); | ||
| String dubboName = "sentinel"; | ||
| invocation.setAttachment(DubboUtils.DUBBO_APPLICATION_KEY, dubboName); | ||
| String origin = DubboOriginParserRegistry.getDubboOriginParser().parse(null, invocation); | ||
| Assert.assertEquals(dubboName, origin); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCustomOriginParser() { | ||
| DubboOriginParserRegistry.setDubboOriginParser(new DubboOriginParser() { | ||
| @Override | ||
| public String parse(Invoker<?> invoker, Invocation invocation) { | ||
| return invocation.getAttachment(DubboUtils.DUBBO_APPLICATION_KEY, "default") + "_" + invocation | ||
| .getMethodName(); | ||
| } | ||
| }); | ||
|
|
||
| RpcInvocation invocation = new RpcInvocation(); | ||
| String origin = DubboOriginParserRegistry.getDubboOriginParser().parse(null, invocation); | ||
| Assert.assertEquals("default_null", origin); | ||
|
|
||
| String dubboName = "sentinel"; | ||
| invocation.setAttachment(DubboUtils.DUBBO_APPLICATION_KEY, dubboName); | ||
| origin = DubboOriginParserRegistry.getDubboOriginParser().parse(null, invocation); | ||
| Assert.assertEquals(dubboName + "_null", origin); | ||
|
|
||
| invocation.setMethodName("hello"); | ||
| origin = DubboOriginParserRegistry.getDubboOriginParser().parse(null, invocation); | ||
| Assert.assertEquals(dubboName + "_hello", origin); | ||
| } | ||
|
|
||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.