diff --git a/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-consumer/pom.xml b/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-consumer/pom.xml index eabe971f..68a94ff5 100644 --- a/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-consumer/pom.xml +++ b/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-consumer/pom.xml @@ -6,12 +6,13 @@ joylive-demo-grpc ${revision} + joylive-demo-grpc-consumer - 1.60.0 2.2.4.RELEASE Hoxton.SR1 + 1.29.0 2.2.0.RELEASE 2.8.0.RELEASE 1.8 @@ -41,12 +42,6 @@ pom import - - io.grpc - grpc-all - ${grpc-all.version} - import - @@ -58,18 +53,6 @@ ${revision} - - - io.grpc - grpc-all - - - - io.grpc - grpc-netty-shaded - 1.60.0 - - org.springframework.boot diff --git a/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-provider/pom.xml b/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-provider/pom.xml index 9228e372..68ddc843 100644 --- a/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-provider/pom.xml +++ b/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-provider/pom.xml @@ -12,7 +12,7 @@ 2.2.4.RELEASE Hoxton.SR1 - 1.60.0 + 1.29.0 2.2.0.RELEASE 2.8.0.RELEASE 1.8 diff --git a/joylive-plugin/joylive-router/joylive-router-grpc/src/main/java/com/jd/live/agent/plugin/router/gprc/definition/ClusterDefinition.java b/joylive-plugin/joylive-router/joylive-router-grpc/src/main/java/com/jd/live/agent/plugin/router/gprc/definition/ClusterDefinition.java index db164e9d..d35231d3 100644 --- a/joylive-plugin/joylive-router/joylive-router-grpc/src/main/java/com/jd/live/agent/plugin/router/gprc/definition/ClusterDefinition.java +++ b/joylive-plugin/joylive-router/joylive-router-grpc/src/main/java/com/jd/live/agent/plugin/router/gprc/definition/ClusterDefinition.java @@ -1,66 +1,66 @@ -/* - * Copyright © ${year} ${owner} (${email}) - * - * 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.jd.live.agent.plugin.router.gprc.definition; - -import com.jd.live.agent.core.bytekit.matcher.MatcherBuilder; -//import com.jd.live.agent.core.extension.annotation.ConditionalOnClass; -//import com.jd.live.agent.core.extension.annotation.ConditionalOnProperty; -import com.jd.live.agent.core.extension.annotation.Extension; -import com.jd.live.agent.core.inject.annotation.Inject; -import com.jd.live.agent.core.inject.annotation.Injectable; -import com.jd.live.agent.core.parser.ObjectParser; -import com.jd.live.agent.core.plugin.definition.InterceptorDefinition; -import com.jd.live.agent.core.plugin.definition.InterceptorDefinitionAdapter; -import com.jd.live.agent.core.plugin.definition.PluginDefinitionAdapter; -//import com.jd.live.agent.governance.config.GovernanceConfig; -import com.jd.live.agent.governance.invoke.InvocationContext; -import com.jd.live.agent.plugin.router.gprc.interceptor.ClusterInterceptor; - -@Injectable -@Extension(value = "GrpcClusterDefinition") -//@ConditionalOnProperty(name = GovernanceConfig.CONFIG_FLOW_CONTROL_ENABLED, matchIfMissing = true) -//@ConditionalOnProperty(name = GovernanceConfig.CONFIG_LIVE_SOFARPC_ENABLED, matchIfMissing = true) -//@ConditionalOnClass(ClusterDefinition.TYPE_ABSTRACT_CLUSTER) -public class ClusterDefinition extends PluginDefinitionAdapter { - - protected static final String TYPE_ABSTRACT_CLUSTER = "com.alipay.sofa.rpc.client.AbstractCluster"; - - private static final String METHOD_DO_INVOKE = "doInvoke"; - - private static final String[] ARGUMENT_DO_INVOKE = new String[]{ - "com.alipay.sofa.rpc.core.request.SofaRequest" - }; - - @Inject(InvocationContext.COMPONENT_INVOCATION_CONTEXT) - private InvocationContext context; - - @Inject(ObjectParser.JSON) - private ObjectParser parser; - - public ClusterDefinition() { - System.out.println("----> ClusterDefinition"); - this.matcher = () -> MatcherBuilder.isSubTypeOf(TYPE_ABSTRACT_CLUSTER) - .and(MatcherBuilder.not(MatcherBuilder.isAbstract())); - this.interceptors = new InterceptorDefinition[]{ - new InterceptorDefinitionAdapter( - MatcherBuilder.named(METHOD_DO_INVOKE) - .and(MatcherBuilder.arguments(ARGUMENT_DO_INVOKE)), - () -> new ClusterInterceptor(context, parser) - ) - }; - } - -} +///* +// * Copyright © ${year} ${owner} (${email}) +// * +// * 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.jd.live.agent.plugin.router.gprc.definition; +// +//import com.jd.live.agent.core.bytekit.matcher.MatcherBuilder; +////import com.jd.live.agent.core.extension.annotation.ConditionalOnClass; +////import com.jd.live.agent.core.extension.annotation.ConditionalOnProperty; +//import com.jd.live.agent.core.extension.annotation.Extension; +//import com.jd.live.agent.core.inject.annotation.Inject; +//import com.jd.live.agent.core.inject.annotation.Injectable; +//import com.jd.live.agent.core.parser.ObjectParser; +//import com.jd.live.agent.core.plugin.definition.InterceptorDefinition; +//import com.jd.live.agent.core.plugin.definition.InterceptorDefinitionAdapter; +//import com.jd.live.agent.core.plugin.definition.PluginDefinitionAdapter; +////import com.jd.live.agent.governance.config.GovernanceConfig; +//import com.jd.live.agent.governance.invoke.InvocationContext; +//import com.jd.live.agent.plugin.router.gprc.interceptor.ClusterInterceptor; +// +//@Injectable +//@Extension(value = "GrpcClusterDefinition") +////@ConditionalOnProperty(name = GovernanceConfig.CONFIG_FLOW_CONTROL_ENABLED, matchIfMissing = true) +////@ConditionalOnProperty(name = GovernanceConfig.CONFIG_LIVE_SOFARPC_ENABLED, matchIfMissing = true) +////@ConditionalOnClass(ClusterDefinition.TYPE_ABSTRACT_CLUSTER) +//public class ClusterDefinition extends PluginDefinitionAdapter { +// +// protected static final String TYPE_ABSTRACT_CLUSTER = "com.alipay.sofa.rpc.client.AbstractCluster"; +// +// private static final String METHOD_DO_INVOKE = "doInvoke"; +// +// private static final String[] ARGUMENT_DO_INVOKE = new String[]{ +// "com.alipay.sofa.rpc.core.request.SofaRequest" +// }; +// +// @Inject(InvocationContext.COMPONENT_INVOCATION_CONTEXT) +// private InvocationContext context; +// +// @Inject(ObjectParser.JSON) +// private ObjectParser parser; +// +// public ClusterDefinition() { +// System.out.println("----> ClusterDefinition"); +// this.matcher = () -> MatcherBuilder.isSubTypeOf(TYPE_ABSTRACT_CLUSTER) +// .and(MatcherBuilder.not(MatcherBuilder.isAbstract())); +// this.interceptors = new InterceptorDefinition[]{ +// new InterceptorDefinitionAdapter( +// MatcherBuilder.named(METHOD_DO_INVOKE) +// .and(MatcherBuilder.arguments(ARGUMENT_DO_INVOKE)), +// () -> new ClusterInterceptor(context, parser) +// ) +// }; +// } +// +//} diff --git a/joylive-plugin/joylive-router/joylive-router-grpc/src/main/resources/META-INF/services/com.jd.live.agent.core.plugin.definition.PluginDefinition b/joylive-plugin/joylive-router/joylive-router-grpc/src/main/resources/META-INF/services/com.jd.live.agent.core.plugin.definition.PluginDefinition index c19cce3a..ec994059 100644 --- a/joylive-plugin/joylive-router/joylive-router-grpc/src/main/resources/META-INF/services/com.jd.live.agent.core.plugin.definition.PluginDefinition +++ b/joylive-plugin/joylive-router/joylive-router-grpc/src/main/resources/META-INF/services/com.jd.live.agent.core.plugin.definition.PluginDefinition @@ -1,2 +1,2 @@ -com.jd.live.agent.plugin.router.gprc.definition.ClusterDefinition +#com.jd.live.agent.plugin.router.gprc.definition.ClusterDefinition com.jd.live.agent.plugin.router.gprc.definition.GrpcClientCallDefinition