Skip to content

解决【dubbo3.0子调用mock结果为null，取不到录制数据】的问题 https://github.com/arextest/are… #491

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

解决【dubbo3.0子调用mock结果为null，取不到录制数据】的问题 https://github.com/arextest/are… #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions ...ation/dubbo/arex-dubbo-alibaba/src/main/java/io/arex/inst/dubbo/alibaba/DubboAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package io.arex.inst.dubbo.alibaba;

import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.remoting.exchange.ResponseCallback;
import com.alibaba.dubbo.remoting.exchange.ResponseFuture;
import com.alibaba.dubbo.rpc.*;
import com.alibaba.dubbo.rpc.protocol.dubbo.FutureAdapter;
import com.alibaba.dubbo.rpc.support.ProtocolUtils;
import com.alibaba.dubbo.rpc.support.RpcUtils;
import io.arex.agent.bootstrap.ctx.TraceTransmitter;
import io.arex.agent.bootstrap.model.Mocker;
import io.arex.agent.bootstrap.util.ReflectUtil;
import io.arex.inst.dubbo.common.AbstractAdapter;
import io.arex.inst.runtime.log.LogManager;
import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.rpc.support.ProtocolUtils;
import java.util.Collections;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.lang.reflect.Method;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.Future;

Expand All @@ -38,7 +38,11 @@ public static DubboAdapter of(Invoker<?> invoker, Invocation invocation) {

@Override
public String getServiceName() {
Copy link
Collaborator

@lucas-myx lucas-myx Jun 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

/**
  * format：group/interface:version
  * method：org.alibaba.dubbo.common.URL#buildKey()
  */
 @Override
 public String getServiceName() {

return getUrl().getServiceInterface();
/*
format：group/interface:version
method：org.apache.dubbo.common.BaseServiceMetadata#buildServiceKey() | org.apache.dubbo.common.URL#buildKey()
*/
return getUrl().getServiceKey();
}

/**
Expand Down
6 changes: 5 additions & 1 deletion ...n/dubbo/arex-dubbo-apache-v2/src/main/java/io/arex/inst/dubbo/apache/v2/DubboAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ public static DubboAdapter of(Invoker<?> invoker, Invocation invocation) {

@Override
public String getServiceName() {
return getUrl().getServiceInterface();
/*
format：group/interface:version
method：org.apache.dubbo.common.BaseServiceMetadata#buildServiceKey() | org.apache.dubbo.common.URL#buildKey()
*/
return getUrl().getServiceKey();
}

/**
Expand Down
1 change: 1 addition & 0 deletions ...n/dubbo/arex-dubbo-apache-v3/src/main/java/io/arex/inst/dubbo/apache/v3/DubboAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public static DubboAdapter of(Invoker<?> invoker, Invocation invocation) {

@Override
public String getServiceName() {
// format：group/interface:version
return invocation.getTargetServiceUniqueName();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not use getUrl().getServiceKey()?

}

Expand Down
26 changes: 25 additions & 1 deletion ...tion/dubbo/arex-dubbo-common/src/main/java/io/arex/inst/dubbo/common/AbstractAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,31 @@ public Map<String, String> getRequestHeaders() {
}

public String getPath() {
return StringUtil.defaultIfEmpty(getAttachment("path"), getServiceName());
return StringUtil.defaultIfEmpty(this.getServiceNameWithVersion(), this.getServiceName());
}

/**
* <p>Illustrate: Splicing serviceName and version
* <p>Fix Bug: https://github.com/arextest/arex-agent-java/issues/490
* <p>Notice: This method maybe affect ignore [path] config！ Especially when a dubbo service exists multiple versions！
*/
protected String getServiceNameWithVersion(){
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this method can directly use this.getServiceName(), there is no need to parse it again?

String serviceName = this.getAttachment("path");
if (StringUtil.isBlank(serviceName)){
return null;
}
String group = this.getValByKey("group");
String version = this.getAttachment("version");
// splicing：group/interface:version
StringBuilder serviceKey = new StringBuilder();
if (!StringUtil.isBlank(group)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!StringUtil.isBlank -> StringUtil.isNotEmpty

serviceKey.append(group).append("/");
}
serviceKey.append(serviceName);
if (!StringUtil.isBlank(version)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!StringUtil.isBlank -> StringUtil.isNotEmpty

serviceKey.append(":").append(version);
}
return serviceKey.toString();
}

/**
Expand Down