-
Notifications
You must be signed in to change notification settings - Fork 8.1k
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
Fix #1573: Support customized origin parser in Apache Dubbo 2.7.x adapter #1617
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
cbf3d22
fix #1573
JiangZian 0bbf5fa
Refer to the previous scheme and optimize the configuration
JiangZian 95b755f
Polish Dubbo 2.7.x adapter
JiangZian ce8cd6e
add interfaceResouceName with prefix and useGroupAndVersion configura…
JiangZian 8235587
fix a unused import
JiangZian 549d35a
Get rid of unwanted dependencies
JiangZian 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
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
128 changes: 128 additions & 0 deletions
128
...src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/config/DubboAdapterGlobalConfig.java
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,128 @@ | ||
| /* | ||
| * Copyright 1999-2018 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 | ||
| * | ||
| * 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. | ||
| */ | ||
| package com.alibaba.csp.sentinel.adapter.dubbo.config; | ||
|
|
||
| import com.alibaba.csp.sentinel.adapter.dubbo.fallback.DefaultDubboFallback; | ||
| import com.alibaba.csp.sentinel.adapter.dubbo.fallback.DubboFallback; | ||
| import com.alibaba.csp.sentinel.adapter.dubbo.origin.DefaultDubboOriginParser; | ||
| import com.alibaba.csp.sentinel.adapter.dubbo.origin.DubboOriginParser; | ||
| import com.alibaba.csp.sentinel.config.SentinelConfig; | ||
| import com.alibaba.csp.sentinel.util.AssertUtil; | ||
| import com.alibaba.csp.sentinel.util.StringUtil; | ||
|
|
||
| /** | ||
| * <p> | ||
| * Responsible for dubbo service provider, consumer attribute configuration | ||
| * </p> | ||
| * | ||
| * @author lianglin | ||
| * @since 1.7.0 | ||
| */ | ||
| public final class DubboAdapterGlobalConfig { | ||
|
|
||
| private static final String TRUE_STR = "true"; | ||
|
|
||
| public static final String DUBBO_RES_NAME_WITH_PREFIX_KEY = "csp.sentinel.dubbo.resource.use.prefix"; | ||
| public static final String DUBBO_PROVIDER_RES_NAME_PREFIX_KEY = "csp.sentinel.dubbo.resource.provider.prefix"; | ||
| public static final String DUBBO_CONSUMER_RES_NAME_PREFIX_KEY = "csp.sentinel.dubbo.resource.consumer.prefix"; | ||
|
|
||
| private static final String DEFAULT_DUBBO_PROVIDER_PREFIX = "dubbo:provider:"; | ||
| private static final String DEFAULT_DUBBO_CONSUMER_PREFIX = "dubbo:consumer:"; | ||
|
|
||
| public static final String DUBBO_INTERFACE_GROUP_VERSION_ENABLED = "csp.sentinel.dubbo.interface.group.version.enabled"; | ||
| public static final String TRACE_BIZ_EXCEPTION_ENABLED = "csp.sentinel.dubbo.trace.biz.exception.enabled"; | ||
|
|
||
| private static volatile DubboFallback consumerFallback = new DefaultDubboFallback(); | ||
| private static volatile DubboFallback providerFallback = new DefaultDubboFallback(); | ||
| private static volatile DubboOriginParser originParser = new DefaultDubboOriginParser(); | ||
|
|
||
|
|
||
| public static boolean isUsePrefix() { | ||
| return TRUE_STR.equalsIgnoreCase(SentinelConfig.getConfig(DUBBO_RES_NAME_WITH_PREFIX_KEY)); | ||
| } | ||
|
|
||
| public static String getDubboProviderResNamePrefixKey() { | ||
| if (isUsePrefix()) { | ||
| String config = SentinelConfig.getConfig(DUBBO_PROVIDER_RES_NAME_PREFIX_KEY); | ||
| return StringUtil.isNotBlank(config) ? config : DEFAULT_DUBBO_PROVIDER_PREFIX; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static String getDubboConsumerResNamePrefixKey() { | ||
| if (isUsePrefix()) { | ||
| String config = SentinelConfig.getConfig(DUBBO_CONSUMER_RES_NAME_PREFIX_KEY); | ||
| return StringUtil.isNotBlank(config) ? config : DEFAULT_DUBBO_CONSUMER_PREFIX; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public static Boolean getDubboInterfaceGroupAndVersionEnabled() { | ||
| return TRUE_STR.equalsIgnoreCase(SentinelConfig.getConfig(DUBBO_INTERFACE_GROUP_VERSION_ENABLED)); | ||
| } | ||
|
|
||
| public static Boolean getDubboBizExceptionTraceEnabled() { | ||
| String traceBizExceptionEnabled = SentinelConfig.getConfig(TRACE_BIZ_EXCEPTION_ENABLED); | ||
| if (StringUtil.isNotBlank(traceBizExceptionEnabled)) { | ||
| return TRUE_STR.equalsIgnoreCase(traceBizExceptionEnabled); | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| public static DubboFallback getConsumerFallback() { | ||
| return consumerFallback; | ||
| } | ||
|
|
||
| public static void setConsumerFallback(DubboFallback consumerFallback) { | ||
| AssertUtil.notNull(consumerFallback, "consumerFallback cannot be null"); | ||
| DubboAdapterGlobalConfig.consumerFallback = consumerFallback; | ||
| } | ||
|
|
||
| public static DubboFallback getProviderFallback() { | ||
| return providerFallback; | ||
| } | ||
|
|
||
| public static void setProviderFallback(DubboFallback providerFallback) { | ||
| AssertUtil.notNull(providerFallback, "providerFallback cannot be null"); | ||
| DubboAdapterGlobalConfig.providerFallback = providerFallback; | ||
| } | ||
|
|
||
| /** | ||
| * Get the origin parser of Dubbo adapter. | ||
| * | ||
| * @return the origin parser | ||
| * @since 1.8.0 | ||
| */ | ||
| public static DubboOriginParser getOriginParser() { | ||
| return originParser; | ||
| } | ||
|
|
||
| /** | ||
| * Set the origin parser of Dubbo adapter. | ||
| * | ||
| * @param originParser the origin parser | ||
| * @since 1.8.0 | ||
| */ | ||
| public static void setOriginParser(DubboOriginParser originParser) { | ||
| AssertUtil.notNull(originParser, "originParser cannot be null"); | ||
| DubboAdapterGlobalConfig.originParser = originParser; | ||
| } | ||
|
|
||
| private DubboAdapterGlobalConfig() {} | ||
|
|
||
| } |
Oops, something went wrong.
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.
getMethodResourceNamehas prefix configuration function,interfaceResouceNamemay also need this, andgetInterfaceResourceNamecan be added.Also refer to PR of dubbo-adaptor of 2.6.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.
Ok, this piece is really my incomplete consideration, thank you for correcting, and it has been fixed
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.
So modest, very nice work! 👍