Merge branch 'master' of github.com:apache/apisix into bfsf-nil-check

apache · Nov 21, 2024 · 961bd23 · 961bd23
2 parents 8163dc3 + a6412d2
commit 961bd23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/ci/linux_openresty_tongsuo_runner.sh b/ci/linux_openresty_tongsuo_runner.sh
@@ -45,6 +45,7 @@ case_opt=$1
 
 case ${case_opt} in
 before_install)
+    # shellcheck disable=SC2218
     before_install
     ;;
 esac

diff --git a/ci/pod/otelcol-contrib/config.yaml b/ci/pod/otelcol-contrib/config.yaml
@@ -19,7 +19,9 @@ receivers:
   otlp:
     protocols:
       grpc:
+        endpoint: 0.0.0.0:4317
       http:
+        endpoint: 0.0.0.0:4318
 exporters:
   file:
     path: /etc/otelcol-contrib/data-otlp.json