Commit c4766ecb authored by Lei Zhiyuan's avatar Lei Zhiyuan Committed by 吴晟
Browse files

Add sofa rpc plugin integration (#1210) 

* sofa rpc integration

* remove unused class and method,add component defination

* only support after sofa rpc 5.4.0

* set sofarpc componentId be 32

* Add document of component library settings and incuating features abstract. (#1185)

* sofa rpc integration

* Update UI licenses (#1189)

* Update UI licenses for beta version

* Update FAQ doc (#1184)

* update faq doc

* update faq

* update faq

* Update readme for beta release. (#1191)

* New english readme.

* New chinese readme.

* Fix #1186 Webapp read timeout config (#1192)

* Updat ui (#1197)

* Change the intercept point of block call way (#1190)

* Change the buired point of block call way

* Support future way and change the operation name of span

* Update screenshot for new release. (#1209)

* remove unused class and method,add component defination

* only support after sofa rpc 5.4.0

* set sofarpc componentId be 32

* sofa rpc integration

* remove unused class and method,add component defination

* only support after sofa rpc 5.4.0

* set sofarpc componentId be 32

* sofa rpc integration

* remove unused class and method,add component defination

* change parent pom version

* remove unused dependency
parent 7c305fe0

apm-collector/apm-collector-boot/src/main/resources/component-libraries.yml

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ kafka-consumer: 
mongodb-driver:

  id: 42

  languages: Java

SOFARPC:

  id: 43

  languages: Java



# .NET/.NET Core components

# [3000, 4000) for C#/.NET only

apm-collector/apm-collector-configuration/collector-configuration-provider/src/test/resources/component-libraries.yml

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ Hystrix: 
Jedis:

  id: 30

  languages: Java

SOFARPC:

  id: 43

  languages: Java





# Component Server mapping defines the server display names of some components

apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java

+5 −2
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ public class ComponentsDefine { 


    public static final OfficialComponent MONGO_DRIVER = new OfficialComponent(42, "mongodb-driver");



    public static final OfficialComponent SOFARPC =  new OfficialComponent(43, "SOFARPC");



    private static ComponentsDefine INSTANCE = new ComponentsDefine();



    private String[] components;
@@ -99,7 +101,7 @@ public class ComponentsDefine { 
    }



    public ComponentsDefine() {

        components = new String[43];

        components = new String[44];

        addComponent(TOMCAT);

        addComponent(HTTPCLIENT);

        addComponent(DUBBO);
@@ -132,6 +134,7 @@ public class ComponentsDefine { 
        addComponent(KAFKA_PRODUCER);

        addComponent(KAFKA_CONSUMER);

        addComponent(MONGO_DRIVER);

        addComponent(SOFARPC);

    }



    private void addComponent(OfficialComponent component) {

apm-sniffer/apm-sdk-plugin/pom.xml

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
        <module>kafka-v1-plugin</module>

        <module>servicecomb-plugin</module>

        <module>hystrix-1.x-plugin</module>

        <module>sofarpc-plugin</module>

    </modules>

    <packaging>pom</packaging>

apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml

0 → 100644
+65 −0
Original line number Diff line number Diff line 
<!--

  ~ 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.

  ~

  -->



<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>

        <artifactId>apm-sdk-plugin</artifactId>

        <groupId>org.apache.skywalking</groupId>

        <version>5.0.0-beta2-SNAPSHOT</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>sofa-rpc-plugin</artifactId>

    <packaging>jar</packaging>



    <name>sofarpc-plugin</name>

    <url>http://maven.apache.org</url>



    <properties>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

    </properties>



    <dependencies>

        <dependency>

            <groupId>com.alipay.sofa</groupId>

            <artifactId>sofa-rpc-all</artifactId>

            <version>5.4.0</version>

            <scope>provided</scope>

        </dependency>



    </dependencies>

    <build>

        <plugins>

            <plugin>

                <!-- 源码插件 -->

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-source-plugin</artifactId>

                <!-- 发布时自动将源码同时发布的配置 -->

                <executions>

                    <execution>

                        <id>attach-sources</id>

                        <phase>none</phase>

                        <goals>

                            <goal>jar</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>

</project>