Dev

.github/workflows/plugins-jdk17-test.0.yaml

@@ -79,6 +79,7 @@ jobs:
           - grizzly-2.3.x-4.x-workthreadpool-scenario
           - jetty-11.x-scenario
           - jetty-10.x-scenario
+          - spring-ai-1.x-scenario
     steps:
       - uses: actions/checkout@v2
         with:

.github/workflows/plugins-test.0.yaml

@@ -68,42 +68,42 @@ jobs:
       matrix:
         case:
           - activemq-scenario
-          - agent-so11y-scenario
-          - apm-toolkit-trace-scenario
-          - apm-toolkit-tracer-scenario
-          - armeria-0.96minus-scenario
-          - armeria-0.96plus-scenario
-          - avro-scenario
-          - asynchttpclient-scenario
-          - canal-scenario
-          - cassandra-java-driver-3.x-scenario
-          - customize-scenario
-          - correlation-autotag-scenario
-          - dubbo-2.5.x-scenario
-          - dubbo-2.7.x-scenario
-          - dubbo-3.x-scenario
-          - ehcache-2.x-scenario
-          - elasticsearch-5.x-scenario
-          - elasticsearch-rest-high-level-6.x-scenario
-          - elasticsearch-transport-6.x-scenario
-          - elasticsearch-7.x-scenario
-          - exception-checker-spring-scenario
-          - exception-checker-tomcat-scenario
-          - feign-scenario
-          - finagle-17.10.x-scenario
-          - finagle-6.44.x-scenario
-          - gateway-2.1.x-scenario
-          - gateway-2.0.x-scenario
-          - grpc-scenario
-          - grpc-1.59.x-1.70.x-scenario
-          - grpc-1.30.x-1.39.x-scenario
-          - gson-scenario
-          - guava-cache-scenario
-          - elasticjob-3.x-scenario
-          - springmvc-reactive-scenario
-          - springmvc-reactive-devtools-scenario
-          - fastjson-scenario
-          - jackson-scenario
+#          - agent-so11y-scenario
+#          - apm-toolkit-trace-scenario
+#          - apm-toolkit-tracer-scenario
+#          - armeria-0.96minus-scenario
+#          - armeria-0.96plus-scenario
+#          - avro-scenario
+#          - asynchttpclient-scenario
+#          - canal-scenario
+#          - cassandra-java-driver-3.x-scenario
+#          - customize-scenario
+#          - correlation-autotag-scenario
+#          - dubbo-2.5.x-scenario
+#          - dubbo-2.7.x-scenario
+#          - dubbo-3.x-scenario
+#          - ehcache-2.x-scenario
+#          - elasticsearch-5.x-scenario
+#          - elasticsearch-rest-high-level-6.x-scenario
+#          - elasticsearch-transport-6.x-scenario
+#          - elasticsearch-7.x-scenario
+#          - exception-checker-spring-scenario
+#          - exception-checker-tomcat-scenario
+#          - feign-scenario
+#          - finagle-17.10.x-scenario
+#          - finagle-6.44.x-scenario
+#          - gateway-2.1.x-scenario
+#          - gateway-2.0.x-scenario
+#          - grpc-scenario
+#          - grpc-1.59.x-1.70.x-scenario
+#          - grpc-1.30.x-1.39.x-scenario
+#          - gson-scenario
+#          - guava-cache-scenario
+#          - elasticjob-3.x-scenario
+#          - springmvc-reactive-scenario
+#          - springmvc-reactive-devtools-scenario
+#          - fastjson-scenario
+#          - jackson-scenario
     steps:
       - uses: actions/checkout@v2
         with:

.github/workflows/plugins-test.1.yaml

@@ -68,36 +68,36 @@ jobs:
       matrix:
         case:
           - h2-scenario
-          - httpasyncclient-scenario
-          - httpclient-3.x-scenario
-          - httpclient-4.3.x-scenario
-          - httpclient-5.x-scenario
-          - hutool-http-5.x-scenario
-          - hystrix-scenario
-          - sentinel-scenario
-          - influxdb-scenario
-          - jdk-http-scenario
-          - jdk-threading-scenario
-          - jedis-2.x-scenario
-          - jedis-3.1.x-plus-scenario
-          - jedis-4.x-scenario
-          - jedis-3.3.x-plus-scenario
-          - jedis-2.x-3.x-cluster-scenario
-          - jetty-scenario
-          - kafka-scenario
-          - kotlin-coroutine-scenario
-          - lettuce-scenario
-          - lettuce-6.5.x-scenario
-          - lettuce-webflux-5x-scenario
-          - mongodb-3.x-scenario
-          - mongodb-4.x-scenario
-          - netty-socketio-scenario
-          - postgresql-above9.4.1207-scenario
-          - mssql-jtds-scenario
-          - mssql-jdbc-scenario
-          - mybatis-3.x-scenario
-          - resteasy-4.x-scenario
-          - netty-http-4.1.x-scenario
+#          - httpasyncclient-scenario
+#          - httpclient-3.x-scenario
+#          - httpclient-4.3.x-scenario
+#          - httpclient-5.x-scenario
+#          - hutool-http-5.x-scenario
+#          - hystrix-scenario
+#          - sentinel-scenario
+#          - influxdb-scenario
+#          - jdk-http-scenario
+#          - jdk-threading-scenario
+#          - jedis-2.x-scenario
+#          - jedis-3.1.x-plus-scenario
+#          - jedis-4.x-scenario
+#          - jedis-3.3.x-plus-scenario
+#          - jedis-2.x-3.x-cluster-scenario
+#          - jetty-scenario
+#          - kafka-scenario
+#          - kotlin-coroutine-scenario
+#          - lettuce-scenario
+#          - lettuce-6.5.x-scenario
+#          - lettuce-webflux-5x-scenario
+#          - mongodb-3.x-scenario
+#          - mongodb-4.x-scenario
+#          - netty-socketio-scenario
+#          - postgresql-above9.4.1207-scenario
+#          - mssql-jtds-scenario
+#          - mssql-jdbc-scenario
+#          - mybatis-3.x-scenario
+#          - resteasy-4.x-scenario
+#          - netty-http-4.1.x-scenario
     steps:
       - uses: actions/checkout@v2
         with:

.github/workflows/plugins-test.2.yaml

@@ -67,36 +67,36 @@ jobs:
     strategy:
       matrix:
         case:
-          - okhttp-scenario
-          - play-scenario
-          - postgresql-scenario
-          - pulsar-scenario
-          - rabbitmq-scenario
-          - redisson-scenario
-          - resttemplate-4.x-scenario
-          - servicecomb-1.x-scenario
-          - servicecomb-2.x-scenario
-          - shardingsphere-3.x-scenario
-          - shardingsphere-4.0.x-scenario
-          - shardingsphere-4.x-scenario
-          - shardingsphere-5.0.0-scenario
-          - sofarpc-scenario
-          - solrj-7.x-scenario
-          - spring-3.0.x-scenario
-          - spring-cloud-feign-1.1.x-scenario
-          - spring-cloud-feign-1.2.x-scenario
-          - spring-cloud-feign-2.x-scenario
-          - spring-tx-scenario
-          - struts2.3-scenario
-          - struts2.5-scenario
-          - cxf-scenario
-          - okhttp2-scenario
-          - jersey-2.0.x-2.25.x-scenario
-          - jersey-2.26.x-2.39.x-scenario
-          - websphere-liberty-23.x-scenario
-          - nacos-client-2.x-scenario
+#          - okhttp-scenario
+#          - play-scenario
+#          - postgresql-scenario
+#          - pulsar-scenario
+#          - rabbitmq-scenario
+#          - redisson-scenario
+#          - resttemplate-4.x-scenario
+#          - servicecomb-1.x-scenario
+#          - servicecomb-2.x-scenario
+#          - shardingsphere-3.x-scenario
+#          - shardingsphere-4.0.x-scenario
+#          - shardingsphere-4.x-scenario
+#          - shardingsphere-5.0.0-scenario
+#          - sofarpc-scenario
+#          - solrj-7.x-scenario
+#          - spring-3.0.x-scenario
+#          - spring-cloud-feign-1.1.x-scenario
+#          - spring-cloud-feign-1.2.x-scenario
+#          - spring-cloud-feign-2.x-scenario
+#          - spring-tx-scenario
+#          - struts2.3-scenario
+#          - struts2.5-scenario
+#          - cxf-scenario
+#          - okhttp2-scenario
+#          - jersey-2.0.x-2.25.x-scenario
+#          - jersey-2.26.x-2.39.x-scenario
+#          - websphere-liberty-23.x-scenario
+#          - nacos-client-2.x-scenario
           - rocketmq-scenario
-          - rocketmq-5-grpc-scenario
+#          - rocketmq-5-grpc-scenario
     steps:
       - uses: actions/checkout@v2
         with:

.github/workflows/plugins-test.3.yaml

@@ -68,61 +68,61 @@ jobs:
       matrix:
         case:
           - aerospike-scenario
-          - mysql-scenario
-          - undertow-scenario
-          - webflux-scenario
-          - zookeeper-scenario
-          - spring-3.1.x-scenario
-          - spring-4.1.x-scenario
-          - spring-4.3.x-scenario
-          - spring-async-scenario
-          - vertx-core-4.x-scenario
-          - vertx-eventbus-3.x-scenario
-          - vertx-web-3.54minus-scenario
-          - vertx-web-3.6plus-scenario
-          - mariadb-scenario
-          - micronaut-http-scenario
-          - nats-2.14.x-2.16.5-scenario
-          - quasar-scenario
-          - baidu-brpc-scenario
-          - baidu-brpc-3.x-scenario
-          - retransform-class-scenario
-          - retransform-class-tomcat-scenario
-          - graphql-8.x-scenario
-          - graphql-9.x-scenario
-          - graphql-16plus-scenario
-          - graphql-12.x-15.x-scenario
-          - hbase-scenario
-          - spring-kafka-1.3.x-scenario
-          - spring-kafka-2.2.x-scenario
-          - spring-kafka-2.3.x-scenario
-          - spring-scheduled-3.x-5.x-scenario
-          - elasticjob-2.x-scenario
-          - quartz-scheduler-2.x-scenario
-          - xxl-job-2.2.0-scenario
-          - xxl-job-2.3.x-scenario
-          - thrift-scenario
-          - dbcp-2.x-scenario
-          - jsonrpc4j-1.x-scenario
-          - gateway-3.x-scenario
-          - gateway-3.x-filter-context-scenario
-          - neo4j-4.x-scenario
-          - druid-1.x-scenario
-          - hikaricp-scenario
-          - clickhouse-0.3.1-scenario
-          - clickhouse-0.3.2.x-scenario
-          - kylin-jdbc-2.6.x-3.x-4.x-scenario
-          - undertow-worker-thread-pool-scenario
-          - tomcat-thread-pool-scenario
-          - guava-eventbus-scenario
-          - shenyu-2.4.x-scenario
-          - jdk-threadpool-scenario
-          - jdk-forkjoinpool-scenario
-          - shenyu-2.4.x-dubbo-scenario
-          - grpc-generic-call-scenario
-          - shenyu-2.4.x-grpc-scenario
-          - shenyu-2.4.x-sofarpc-scenario
-          - solon-2.x-scenario
+#          - mysql-scenario
+#          - undertow-scenario
+#          - webflux-scenario
+#          - zookeeper-scenario
+#          - spring-3.1.x-scenario
+#          - spring-4.1.x-scenario
+#          - spring-4.3.x-scenario
+#          - spring-async-scenario
+#          - vertx-core-4.x-scenario
+#          - vertx-eventbus-3.x-scenario
+#          - vertx-web-3.54minus-scenario
+#          - vertx-web-3.6plus-scenario
+#          - mariadb-scenario
+#          - micronaut-http-scenario
+#          - nats-2.14.x-2.16.5-scenario
+#          - quasar-scenario
+#          - baidu-brpc-scenario
+#          - baidu-brpc-3.x-scenario
+#          - retransform-class-scenario
+#          - retransform-class-tomcat-scenario
+#          - graphql-8.x-scenario
+#          - graphql-9.x-scenario
+#          - graphql-16plus-scenario
+#          - graphql-12.x-15.x-scenario
+#          - hbase-scenario
+#          - spring-kafka-1.3.x-scenario
+#          - spring-kafka-2.2.x-scenario
+#          - spring-kafka-2.3.x-scenario
+#          - spring-scheduled-3.x-5.x-scenario
+#          - elasticjob-2.x-scenario
+#          - quartz-scheduler-2.x-scenario
+#          - xxl-job-2.2.0-scenario
+#          - xxl-job-2.3.x-scenario
+#          - thrift-scenario
+#          - dbcp-2.x-scenario
+#          - jsonrpc4j-1.x-scenario
+#          - gateway-3.x-scenario
+#          - gateway-3.x-filter-context-scenario
+#          - neo4j-4.x-scenario
+#          - druid-1.x-scenario
+#          - hikaricp-scenario
+#          - clickhouse-0.3.1-scenario
+#          - clickhouse-0.3.2.x-scenario
+#          - kylin-jdbc-2.6.x-3.x-4.x-scenario
+#          - undertow-worker-thread-pool-scenario
+#          - tomcat-thread-pool-scenario
+#          - guava-eventbus-scenario
+#          - shenyu-2.4.x-scenario
+#          - jdk-threadpool-scenario
+#          - jdk-forkjoinpool-scenario
+#          - shenyu-2.4.x-dubbo-scenario
+#          - grpc-generic-call-scenario
+#          - shenyu-2.4.x-grpc-scenario
+#          - shenyu-2.4.x-sofarpc-scenario
+#          - solon-2.x-scenario
     steps:
       - uses: actions/checkout@v2
         with:

CHANGES.md

@@ -6,6 +6,7 @@ Release Notes.
 ------------------
 
 * Added support for Lettuce reactive Redis commands.
+* Add Spring AI 1.x plugin and GenAI layer.
 
 All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/249?closed=1)
 

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

@@ -265,4 +265,34 @@ public class ComponentsDefine {
 
     public static final OfficialComponent DMDB_JDBC_DRIVER = new OfficialComponent(163, "Dmdb-jdbc-driver");
 
+    public static final OfficialComponent SPRING_AI_UNKNOWN = new OfficialComponent(164, "spring-ai-unknown");
+
+    public static final OfficialComponent SPRING_AI_ANTHROPIC = new OfficialComponent(165, "spring-ai-anthropic");
+
+    public static final OfficialComponent SPRING_AI_BEDROCK = new OfficialComponent(166, "spring-ai-aws-bedrock");
+
+    public static final OfficialComponent SPRING_AI_AZURE_OPENAI = new OfficialComponent(167, "spring-ai-azure-openai");
+
+    public static final OfficialComponent SPRING_AI_COHERE = new OfficialComponent(168, "spring-ai-cohere");
+
+    public static final OfficialComponent SPRING_AI_DEEPSEEK = new OfficialComponent(169, "spring-ai-deepseek");
+
+    public static final OfficialComponent SPRING_AI_GOOGLE_GENAI = new OfficialComponent(170, "spring-ai-gcp-genai");
+
+    public static final OfficialComponent SPRING_AI_VERTEXAI = new OfficialComponent(171, "spring-ai-gcp-vertex-ai");
+
+    public static final OfficialComponent SPRING_AI_MISTRAL_AI = new OfficialComponent(172, "spring-ai-mistral-ai");
+
+    public static final OfficialComponent SPRING_AI_OPENAI = new OfficialComponent(173, "spring-ai-openai");
+
+    public static final OfficialComponent SPRING_AI_HUGGINGFACE = new OfficialComponent(174, "spring-ai-huggingface");
+
+    public static final OfficialComponent SPRING_AI_MINIMAX = new OfficialComponent(175, "spring-ai-minimax");
+
+    public static final OfficialComponent SPRING_AI_OLLAMA = new OfficialComponent(176, "spring-ai-ollama");
+
+    public static final OfficialComponent SPRING_AI_ZHIPU_AI = new OfficialComponent(177, "spring-ai-zhipu-ai");
+
+    public static final OfficialComponent SPRING_AI = new OfficialComponent(178, "spring-ai");
+
 }