-
Notifications
You must be signed in to change notification settings - Fork 26.5k
[compatible] Zipkin compatible #3728 #4014
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 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
a0a8422
fix #2842. remove duplicate SPI definitions for 2.7.x
cvictory 98b2f4b
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory 19824c3
fix: rename the thread name from DubboRegistryFailedRetryTimer to Dub…
cvictory 05b158d
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory 6b6023f
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory fbc167d
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory 9a96ac2
Merge branch 'master' of github.com:apache/incubator-dubbo
cvictory d2c5ffc
fix compatible with zipkin. #3728
cvictory c5f29a1
Merge branch 'master' of github.com:apache/incubator-dubbo into zip_c…
cvictory 13cb6a1
revert the licence and fix conflict
cvictory 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
25 changes: 25 additions & 0 deletions
25
dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseCallback.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,25 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF 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. | ||
| */ | ||
|
|
||
| package com.alibaba.dubbo.remoting.exchange; | ||
|
|
||
| /** | ||
| * 2019-04-18 | ||
| */ | ||
| @Deprecated | ||
| public interface ResponseCallback extends org.apache.dubbo.remoting.exchange.ResponseCallback { | ||
| } |
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
29 changes: 29 additions & 0 deletions
29
dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureAdapter.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,29 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF 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. | ||
| */ | ||
|
|
||
| package com.alibaba.dubbo.rpc.protocol.dubbo; | ||
|
|
||
| import org.apache.dubbo.remoting.exchange.ResponseFuture; | ||
|
|
||
| /** | ||
| * 2019-04-18 | ||
| */ | ||
| public class FutureAdapter<V> extends org.apache.dubbo.rpc.protocol.dubbo.FutureAdapter<V> { | ||
| public FutureAdapter(ResponseFuture future) { | ||
| super(future); | ||
| } | ||
| } |
88 changes: 88 additions & 0 deletions
88
dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/support/RpcUtils.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,88 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF 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. | ||
| */ | ||
|
|
||
| package com.alibaba.dubbo.rpc.support; | ||
|
|
||
| import com.alibaba.dubbo.common.URL; | ||
| import com.alibaba.dubbo.rpc.Invocation; | ||
|
|
||
| import java.lang.reflect.Method; | ||
| import java.lang.reflect.Type; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * 2019-04-18 | ||
| */ | ||
| public class RpcUtils extends org.apache.dubbo.rpc.support.RpcUtils { | ||
|
|
||
|
|
||
| public static Class<?> getReturnType(Invocation invocation) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.getReturnType(invocation); | ||
| } | ||
|
|
||
| // TODO why not get return type when initialize Invocation? | ||
| public static Type[] getReturnTypes(Invocation invocation) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.getReturnTypes(invocation); | ||
| } | ||
|
|
||
| public static Long getInvocationId(Invocation inv) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.getInvocationId(inv); | ||
| } | ||
|
|
||
| /** | ||
| * Idempotent operation: invocation id will be added in async operation by default | ||
| * | ||
| * @param url | ||
| * @param inv | ||
| */ | ||
| public static void attachInvocationIdIfAsync(URL url, Invocation inv) { | ||
| org.apache.dubbo.rpc.support.RpcUtils.attachInvocationIdIfAsync(url.getOriginalURL(), inv); | ||
| } | ||
|
|
||
|
|
||
| public static String getMethodName(Invocation invocation) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.getMethodName(invocation); | ||
| } | ||
|
|
||
| public static Object[] getArguments(Invocation invocation) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.getArguments(invocation); | ||
| } | ||
|
|
||
| public static Class<?>[] getParameterTypes(Invocation invocation) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.getParameterTypes(invocation); | ||
| } | ||
|
|
||
| public static boolean isAsync(URL url, Invocation inv) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.isAsync(url.getOriginalURL(), inv); | ||
| } | ||
|
|
||
| public static boolean isReturnTypeFuture(Invocation inv) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.isReturnTypeFuture(inv); | ||
| } | ||
|
|
||
| public static boolean hasFutureReturnType(Method method) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.hasFutureReturnType(method); | ||
| } | ||
|
|
||
| public static boolean isOneway(URL url, Invocation inv) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.isOneway(url.getOriginalURL(), inv); | ||
| } | ||
|
|
||
| public static Map<String, String> getNecessaryAttachments(Invocation inv) { | ||
| return org.apache.dubbo.rpc.support.RpcUtils.getNecessaryAttachments(inv); | ||
| } | ||
| } |
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
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.