Merge branch 'master' into docs-improve-oidc

Author: kayx23

.asf.yaml

@@ -16,10 +16,12 @@
 #
 
 github:
-    description: The Cloud-Native API Gateway
+    description: The Cloud-Native API Gateway and AI Gateway
     homepage: https://apisix.apache.org/blog/
     labels:
       - api-gateway
+      - ai-gateway
+      - ai
       - cloud-native
       - nginx
       - luajit
@@ -38,7 +40,6 @@ github:
       - docker
       - kubernetes-ingress
       - kubernetes-ingress-controller
-      - service-mesh
 
     enabled_merge_buttons:
       squash:  true
@@ -53,6 +54,10 @@ github:
           dismiss_stale_reviews: true
           require_code_owner_reviews: true
           required_approving_review_count: 3
+      release/3.12:
+        required_pull_request_reviews:
+          require_code_owner_reviews: true
+          required_approving_review_count: 3
       release/3.11:
         required_pull_request_reviews:
           require_code_owner_reviews: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,12 @@
 <!-- Please include a summary of the change and which issue is fixed. -->
 <!-- Please also include relevant motivation and context. -->
 
-Fixes # (issue)
+#### Which issue(s) this PR fixes:
+<!--
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+-->
+Fixes #
 
 ### Checklist
 

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-20.04
+          - ubuntu-latest
         os_name:
           - linux_openresty
         events_module:
@@ -143,15 +143,22 @@ jobs:
         run: |
           cur_dir=$(pwd)
           sudo apt update
-          sudo apt install -y maven
+          sudo apt install -y maven openjdk-8-jdk
+          sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
+          export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+          export PATH=$JAVA_HOME/bin:$PATH
           cd t/lib/dubbo-backend
           mvn package
           cd dubbo-backend-provider/target
-          java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
+          java \
+            -Djava.net.preferIPv4Stack=true \
+            -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
           cd $cur_dir/t/lib/dubbo-serialization-backend
           mvn package
           cd dubbo-serialization-backend-provider/target
-          java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
+          java \
+            -Djava.net.preferIPv4Stack=true \
+            -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
 
       - name: Build xDS library
         if: steps.test_env.outputs.type == 'last'

.github/workflows/cli.yml

@@ -63,4 +63,6 @@ jobs:
             ./ci/${{ matrix.job_name }}_runner.sh do_install
 
       - name: Linux Script
-        run: sudo ./ci/${{ matrix.job_name }}_runner.sh script
+        run: |
+          sudo chmod +x /home/runner
+          sudo ./ci/${{ matrix.job_name }}_runner.sh script

.github/workflows/gm-cron.yaml.disabled

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-20.04
+          - ubuntu-latest
         os_name:
           - linux_openresty_tongsuo
         test_dir:
@@ -126,15 +126,22 @@ jobs:
         run: |
           cur_dir=$(pwd)
           sudo apt update
-          sudo apt install -y maven
+          sudo apt install -y maven openjdk-8-jdk
+          sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
+          export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+          export PATH=$JAVA_HOME/bin:$PATH
           cd t/lib/dubbo-backend
           mvn package
           cd dubbo-backend-provider/target
-          java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
+          java \
+            -Djava.net.preferIPv4Stack=true \
+            -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
           cd $cur_dir/t/lib/dubbo-serialization-backend
           mvn package
           cd dubbo-serialization-backend-provider/target
-          java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
+          java \
+            -Djava.net.preferIPv4Stack=true \
+            -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
 
       - name: Build xDS library
         if: steps.test_env.outputs.type == 'last'

.github/workflows/gm.yml.disabled

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-20.04
+          - ubuntu-latest
         os_name:
           - linux_openresty_tongsuo
         test_dir:

.github/workflows/http3.yml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-20.04
+          - ubuntu-latest
         os_name:
           - linux_openresty
         events_module:
@@ -144,15 +144,22 @@ jobs:
         run: |
           cur_dir=$(pwd)
           sudo apt update
-          sudo apt install -y maven
+          sudo apt install -y maven openjdk-8-jdk
+          sudo update-java-alternatives --set java-1.8.0-openjdk-amd64
+          export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+          export PATH=$JAVA_HOME/bin:$PATH
           cd t/lib/dubbo-backend
           mvn package
           cd dubbo-backend-provider/target
-          java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
+          java \
+            -Djava.net.preferIPv4Stack=true \
+            -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
           cd $cur_dir/t/lib/dubbo-serialization-backend
           mvn package
           cd dubbo-serialization-backend-provider/target
-          java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
+          java \
+            -Djava.net.preferIPv4Stack=true \
+            -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
 
       - name: Build xDS library
         if: steps.test_env.outputs.type == 'last'

.github/workflows/kubernetes-ci.yml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-20.04
+          - ubuntu-latest
         os_name:
           - linux_openresty
 

.github/workflows/redhat-ci.yaml

@@ -18,7 +18,7 @@ permissions:
 jobs:
   test_apisix:
     name: run ci on redhat ubi
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 90
     strategy:
       fail-fast: false
@@ -101,11 +101,15 @@ jobs:
         cd t/lib/dubbo-backend
         mvn package
         cd dubbo-backend-provider/target
-        java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
+        java \
+            -Djava.net.preferIPv4Stack=true \
+            -jar dubbo-demo-provider.one-jar.jar > /tmp/java.log &
         cd $cur_dir/t/lib/dubbo-serialization-backend
         mvn package
         cd dubbo-serialization-backend-provider/target
-        java -Djava.net.preferIPv4Stack=true -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
+        java \
+            -Djava.net.preferIPv4Stack=true \
+            -jar dubbo-demo-provider.one-jar.jar > /tmp/java2.log &
 
     - name: Build xDS library
       if: steps.test_env.outputs.type == 'last'

.github/workflows/source-install.yml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-20.04
+          - ubuntu-latest
         os_platform:
           - ubuntu
           - redhat

.github/workflows/tars-ci.yml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - ubuntu-20.04
+          - ubuntu-latest
         os_name:
           - linux_openresty
 

.ignore_words

@@ -7,3 +7,5 @@ nd
 hel
 nulll
 smove
+aks
+nin

.requirements

@@ -17,4 +17,4 @@
 
 APISIX_PACKAGE_NAME=apisix
 
-APISIX_RUNTIME=1.2.1
+APISIX_RUNTIME=1.3.0

CHANGELOG.md

@@ -23,6 +23,7 @@ title: Changelog
 
 ## Table of Contents
 
+- [3.12.0](#3120)
 - [3.11.0](#3110)
 - [3.10.0](#3100)
 - [3.9.0](#390)
@@ -78,6 +79,68 @@ title: Changelog
 - [0.7.0](#070)
 - [0.6.0](#060)
 
+## 3.12.0
+
+### Change
+
+- replace plugin attribute with plugin metadata in `opentelemetry` plugin [#11940](https://github.com/apache/apisix/pull/11940)
+- add expiration time for all Prometheus metrics [#11838](https://github.com/apache/apisix/pull/11838)
+- allow workflow config without case [#11787](https://github.com/apache/apisix/pull/11787)
+- refactor: ai-content-moderation to ai-aws-content-moderation (#12010)
+- rectify business logic/code in ai-proxy [#12055](https://github.com/apache/apisix/pull/12055)
+
+### Bugfixes
+
+- Fix: resync etcd when a lower revision is found [#12015](https://github.com/apache/apisix/pull/12015)
+- Fix: remove model options' `stream` default value [#12013](https://github.com/apache/apisix/pull/12013)
+- Fix: grpc-web response contains two trailer chunks [#11988](https://github.com/apache/apisix/pull/11988)
+- Fix: event_id is nil in chaitin-waf [#11651](https://github.com/apache/apisix/pull/11651)
+- Fix: race condition problem while update upstream.nodes [#11916](https://github.com/apache/apisix/pull/11916)
+- Fix: `upstream_obj.upstream` should not be a string [#11932](https://github.com/apache/apisix/pull/11932)
+- Fix: query params in override.endpoint not being sent to LLMs [#11863](https://github.com/apache/apisix/pull/11863)
+- Fix: corrupt data in routes() response due to healthchecker data [#11844](https://github.com/apache/apisix/pull/11844)
+- Fix: deepcopy should copy same table exactly only once [#11861](https://github.com/apache/apisix/pull/11861)
+- Fix: disallow empty key configuration attributes [#11852](https://github.com/apache/apisix/pull/11852)
+- Fix: etcd watch restart when receive invalid revision [#11833](https://github.com/apache/apisix/pull/11833)
+- Fix: missing parsed_url nil check [#11637](https://github.com/apache/apisix/pull/11637)
+- Fix: use `plugin.get` to fetch plugin configured in multi-auth plugin [#11794](https://github.com/apache/apisix/pull/11794)
+- Fix: allow special characters in uri params [#11788](https://github.com/apache/apisix/pull/11788)
+- Fix: add nil check to conf in body-transformer [#11768](https://github.com/apache/apisix/pull/11768)
+- Fix: use max_req_body_bytes field in custom_format [#11771](https://github.com/apache/apisix/pull/11771)
+- Fix: health checker can't be released due to health parent being released early [#11760](https://github.com/apache/apisix/pull/11760)
+- Fix: use right modifiedIndex for consumer when use credential [#11649](https://github.com/apache/apisix/pull/11649)
+
+### Core
+
+- upgrade openresty version to v1.27.11 [#11936](https://github.com/apache/apisix/pull/11936)
+- Support the use of system-provided CA certs in `ssl_trusted_certificate` [#11809](https://github.com/apache/apisix/pull/11809)
+- support _meta.pre_function to execute custom logic before execution of each phase [#11793](https://github.com/apache/apisix/pull/11793)
+- support anonymous consumer [#11917](https://github.com/apache/apisix/pull/11917)
+- accelerate the creation of the consumer cache [#11840](https://github.com/apache/apisix/pull/11840)
+- replace 'string.find' with 'core.string.find' [#11886](https://github.com/apache/apisix/pull/11886)
+- workflow plugin registration [#11832](https://github.com/apache/apisix/pull/11832)
+
+### Plugins
+
+- refactor ai-proxy and ai-proxy-multi [#12030](https://github.com/apache/apisix/pull/12030)
+- support embeddings API [#12062](https://github.com/apache/apisix/pull/12062)
+- implement rate limiting based fallback strategy [#12047](https://github.com/apache/apisix/pull/12047)
+- ai-rate-limiting plugin [#12037](https://github.com/apache/apisix/pull/12037)
+- add `valid_issuers` field in `openid-connect` plugin [#12002](https://github.com/apache/apisix/pull/12002)
+- add ai-prompt-guard plugin [#12008](https://github.com/apache/apisix/pull/12008)
+- add jwt audience validator [#11987](https://github.com/apache/apisix/pull/11987)
+- store JWT in the request context [#11675](https://github.com/apache/apisix/pull/11675)
+- support proxying openai compatible LLMs [#12004](https://github.com/apache/apisix/pull/12004)
+- add `ai-proxy-multi` plugin [#11986](https://github.com/apache/apisix/pull/11986) [#12030](https://github.com/apache/apisix/pull/12030)
+- make rate limiting response header names configurable [#11831](https://github.com/apache/apisix/pull/11831)
+- support mulipart content-type in `body-transformer` [#11767](https://github.com/apache/apisix/pull/11767)
+- plugins in multi-auth returns error instead of logging it [#11775](https://github.com/apache/apisix/pull/11775)
+- support configuring `key_claim_name` [#11772](https://github.com/apache/apisix/pull/11772)
+- add Total request per second panel in grafana dashboard [#11692](https://github.com/apache/apisix/pull/11692)
+- add ai-rag plugin [#11568](https://github.com/apache/apisix/pull/11568)
+- add ai-content-moderation plugin [#11541](https://github.com/apache/apisix/pull/11541)
+- use setmetatable to set hidden variables without effecting serialisation [#11770](https://github.com/apache/apisix/pull/11770)
+
 ## 3.11.0
 
 ### Change

Makefile

@@ -374,17 +374,14 @@ install: runtime
 	$(ENV_INSTALL) -d $(ENV_INST_LUADIR)/apisix/plugins/ai-proxy
 	$(ENV_INSTALL) apisix/plugins/ai-proxy/*.lua $(ENV_INST_LUADIR)/apisix/plugins/ai-proxy
 
-	$(ENV_INSTALL) -d $(ENV_INST_LUADIR)/apisix/plugins/ai-proxy/drivers
-	$(ENV_INSTALL) apisix/plugins/ai-proxy/drivers/*.lua $(ENV_INST_LUADIR)/apisix/plugins/ai-proxy/drivers
+	$(ENV_INSTALL) -d $(ENV_INST_LUADIR)/apisix/plugins/ai-drivers
+	$(ENV_INSTALL) apisix/plugins/ai-drivers/*.lua $(ENV_INST_LUADIR)/apisix/plugins/ai-drivers
 
 	$(ENV_INSTALL) -d $(ENV_INST_LUADIR)/apisix/plugins/ai-rag/embeddings
 	$(ENV_INSTALL) apisix/plugins/ai-rag/embeddings/*.lua $(ENV_INST_LUADIR)/apisix/plugins/ai-rag/embeddings
 	$(ENV_INSTALL) -d $(ENV_INST_LUADIR)/apisix/plugins/ai-rag/vector-search
 	$(ENV_INSTALL) apisix/plugins/ai-rag/vector-search/*.lua $(ENV_INST_LUADIR)/apisix/plugins/ai-rag/vector-search
 
-	# ai-content-moderation plugin
-	$(ENV_INSTALL) -d $(ENV_INST_LUADIR)/apisix/plugins/ai
-	$(ENV_INSTALL) apisix/plugins/ai/*.lua $(ENV_INST_LUADIR)/apisix/plugins/ai
 
 	$(ENV_INSTALL) bin/apisix $(ENV_INST_BINDIR)/apisix
 

NOTICE

@@ -1,5 +1,5 @@
 Apache APISIX
-Copyright 2019-2024 The Apache Software Foundation
+Copyright 2019-2025 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

README.md

@@ -17,7 +17,7 @@
 #
 -->
 
-# Apache APISIX API Gateway
+# Apache APISIX API Gateway ｜ AI Gateway
 
 <img src="./logos/apisix-white-bg.jpg" alt="APISIX logo" height="150px" align="right" />
 
@@ -32,7 +32,9 @@
 
 APISIX API Gateway provides rich traffic management features such as load balancing, dynamic upstream, canary release, circuit breaking, authentication, observability, and more.
 
-You can use **APISIX API Gateway** to handle traditional north-south traffic,
+APISIX can serve as an **AI Gateway** through its flexible plugin system, providing AI proxying, load balancing for LLMs, retries and fallbacks, token-based rate limiting, and robust security to ensure the efficiency and reliability of AI agents.
+
+You can use APISIX API Gateway to handle traditional north-south traffic,
 as well as east-west traffic between services.
 It can also be used as a [k8s ingress controller](https://github.com/apache/apisix-ingress-controller).