From 1a0960f7c34c30fc9bf04195576655deed645fa1 Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Tue, 9 Jan 2024 18:21:58 +0800
Subject: [PATCH 01/12] Update NOTICE

---
 .github/workflows/pecl.yml | 2 +-
 .github/workflows/rust.yml | 2 +-
 NOTICE                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pecl.yml b/.github/workflows/pecl.yml
index 4384173..354489b 100644
--- a/.github/workflows/pecl.yml
+++ b/.github/workflows/pecl.yml
@@ -72,7 +72,7 @@ jobs:
         run: brew install protobuf
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.26.0
         with:
           php-version: ${{ matrix.version.php }}
           tools: php-config
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index eaa2b12..b66adb3 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -111,7 +111,7 @@ jobs:
         run: brew install protobuf
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.26.0
         with:
           php-version: ${{ matrix.flag.php_version }}
           tools: php-config, composer:v2
diff --git a/NOTICE b/NOTICE
index c68c699..04d6ba5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache SkyWalking
-Copyright 2017-2023 The Apache Software Foundation
+Copyright 2017-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

From 74ace5552318d09c437a213f477649ce7b372dd2 Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Thu, 11 Jan 2024 18:09:18 +0800
Subject: [PATCH 02/12] Try new swoole version in CI

---
 .github/workflows/pecl.yml |  4 ++--
 .github/workflows/rust.yml | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pecl.yml b/.github/workflows/pecl.yml
index 354489b..1e29d3e 100644
--- a/.github/workflows/pecl.yml
+++ b/.github/workflows/pecl.yml
@@ -51,7 +51,7 @@ jobs:
           - macos-12
         version:
           - php: "8.2"
-            swoole: "5.0.0"
+            swoole: "5.1.1"
         option:
           - 'enable-cargo-debug=\"no\" enable-kafka-reporter=\"no\"'
           - 'enable-cargo-debug=\"no\" enable-kafka-reporter=\"yes\"'
@@ -72,7 +72,7 @@ jobs:
         run: brew install protobuf
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.26.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.version.php }}
           tools: php-config
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b66adb3..8ca7c31 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -75,23 +75,23 @@ jobs:
             enable_zend_observer: "On"
             cargo_features: ""
           - php_version: "8.1"
-            swoole_version: "5.0.0"
+            swoole_version: "5.1.1"
             enable_zend_observer: "Off"
             cargo_features: ""
           - php_version: "8.1"
-            swoole_version: "5.0.0"
+            swoole_version: "5.1.1"
             enable_zend_observer: "On"
             cargo_features: ""
           - php_version: "8.2"
-            swoole_version: "5.0.0"
+            swoole_version: "5.1.1"
             enable_zend_observer: "Off"
             cargo_features: ""
           - php_version: "8.2"
-            swoole_version: "5.0.0"
+            swoole_version: "5.1.1"
             enable_zend_observer: "On"
             cargo_features: ""
           - php_version: "8.2"
-            swoole_version: "5.0.0"
+            swoole_version: "5.1.1"
             enable_zend_observer: "On"
             cargo_features: "--features kafka-reporter"
 
@@ -111,7 +111,7 @@ jobs:
         run: brew install protobuf
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.26.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.flag.php_version }}
           tools: php-config, composer:v2

From 2d253821fc98c91d4dfc2bf3de1f44b2dc4e8f45 Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Fri, 12 Jan 2024 14:50:01 +0800
Subject: [PATCH 03/12] Update mysql version in CI

---
 docker-compose.yml | 2 +-
 docker/Dockerfile  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 228b29d..b67961c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       retries: 10
 
   mysql:
-    image: mysql:5.7.39
+    image: mysql:5.7.42-debian
     ports:
       - "3306:3306"
     environment:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7205614..ba68d0e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,7 +20,7 @@ ARG SKYWALKING_AGENT
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.64.0
+    RUST_VERSION=1.65.0
 
 
 RUN apt update \
@@ -40,4 +40,4 @@ LABEL org.opencontainers.image.source=https://github.com/apache/skywalking-php
 LABEL org.opencontainers.image.description="The PHP Agent for Apache SkyWalking, which provides the native tracing abilities for PHP project."
 LABEL org.opencontainers.image.licenses="Apache 2.0"
 COPY --from=builder /usr/local/etc/php/conf.d/docker-php-ext-skywalking_agent.ini /usr/local/etc/php/conf.d/
-COPY --from=builder /usr/local/lib/php/extensions/no-debug-non-zts-20210902/skywalking_agent.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/
\ No newline at end of file
+COPY --from=builder /usr/local/lib/php/extensions/no-debug-non-zts-20210902/skywalking_agent.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/

From 81a0c082bbeb32ccce75c1882abc57a77eea4f2b Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Fri, 12 Jan 2024 15:40:42 +0800
Subject: [PATCH 04/12] Add mysql health check for CI

---
 docker-compose.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index b67961c..d4a7985 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,6 +32,11 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=password
       - MYSQL_DATABASE=skywalking
+    healthcheck:
+      test: [ "CMD", "mysqlcheck", "-h127.0.0.1", "-P3306", "-uroot", "-ppassword", "--all-databases" ]
+      interval: 10s
+      timeout: 5s
+      retries: 10
 
   redis:
     image: bitnami/redis:7.0.4

From 25db0add1693ebf01bdd91dba48c39a86140a375 Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Mon, 15 Jan 2024 10:46:24 +0800
Subject: [PATCH 05/12] Fix CI

---
 .github/workflows/rust.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 8ca7c31..10e1150 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -182,12 +182,14 @@ jobs:
           mkdir -p ~/.docker/cli-plugins
           ln -sfn $(brew --prefix)/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
 
-          colima start
+          colima start --network-address
 
           # For test containers to find the Colima socket
           # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running
           sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
 
+          colima list
+
       # Build mixture for cargo test.
       - name: Docker compose
         run: docker compose up -d --wait

From b1ec7b97e3118109be593834dd0de9256f72810b Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Mon, 15 Jan 2024 13:38:34 +0800
Subject: [PATCH 06/12] Fix CI

---
 .github/workflows/rust.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 10e1150..cb45e2b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -182,7 +182,8 @@ jobs:
           mkdir -p ~/.docker/cli-plugins
           ln -sfn $(brew --prefix)/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
 
-          colima start --network-address
+          brew install colima
+          colima start
 
           # For test containers to find the Colima socket
           # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running

From cd330e11961989af812b463d93972a0a0347e405 Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Mon, 15 Jan 2024 14:00:55 +0800
Subject: [PATCH 07/12] Fix CI

---
 .github/workflows/rust.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index cb45e2b..2175089 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -193,7 +193,9 @@ jobs:
 
       # Build mixture for cargo test.
       - name: Docker compose
-        run: docker compose up -d --wait
+        run: |
+          docker compose up -d --wait
+          docker compose ps
 
       # Try cargo test.
       - name: Cargo test

From b58594deef24fe40b385e28f4de7744b7c0e8ae3 Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Mon, 15 Jan 2024 14:31:40 +0800
Subject: [PATCH 08/12] Fix CI

---
 .github/workflows/rust.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2175089..ccf613c 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -185,9 +185,9 @@ jobs:
           brew install colima
           colima start
 
-          # For test containers to find the Colima socket
-          # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running
-          sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
+          # # For test containers to find the Colima socket
+          # # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running
+          # sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
 
           colima list
 
@@ -212,7 +212,9 @@ jobs:
       # Rebuild the mixture when cargo test failed.
       - name: Docker compose restart
         if: steps.cargo-test-step.outcome != 'success'
-        run: docker compose restart
+        run: |
+          docker compose restart
+          docker compose ps
 
       # Delay before retry.
       - name: Delay

From 8f32bfc3ee2f10d59a63e73bdaf10414f27e49fe Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Mon, 15 Jan 2024 15:01:12 +0800
Subject: [PATCH 09/12] Fix CI

---
 .github/workflows/rust.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ccf613c..68cb9a2 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -235,6 +235,7 @@ jobs:
       - name: View logs
         if: always()
         run: |
+          docker compose ps
           cat /tmp/*.log
 
   fmt:

From be60b27a381853414786758b07beba60822b0aec Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Tue, 16 Jan 2024 11:00:26 +0800
Subject: [PATCH 10/12] Fix CI

---
 .github/workflows/rust.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 68cb9a2..573518d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -182,12 +182,12 @@ jobs:
           mkdir -p ~/.docker/cli-plugins
           ln -sfn $(brew --prefix)/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
 
-          brew install colima
+          brew install colima@0.6.2
           colima start
 
-          # # For test containers to find the Colima socket
-          # # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running
-          # sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
+          # For test containers to find the Colima socket
+          # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running
+          sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
 
           colima list
 

From 728f249a78adf3e8c7aeb9281ec54826d6bd77d4 Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Thu, 18 Jan 2024 09:20:25 +0800
Subject: [PATCH 11/12] Fix CI

---
 .github/workflows/rust.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 573518d..71c46b9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -182,7 +182,6 @@ jobs:
           mkdir -p ~/.docker/cli-plugins
           ln -sfn $(brew --prefix)/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
 
-          brew install colima@0.6.2
           colima start
 
           # For test containers to find the Colima socket

From 5cc991ebf22f08e089d47f5835a63554367ca017 Mon Sep 17 00:00:00 2001
From: jmjoy <jmjoy@apache.org>
Date: Thu, 18 Jan 2024 10:21:14 +0800
Subject: [PATCH 12/12] Fix CI

---
 .github/workflows/rust.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 71c46b9..10a1e66 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -51,7 +51,8 @@ jobs:
       matrix:
         os:
           - ubuntu-20.04
-          - macos-12
+          # TODO Temporarily remove macos and wait for the docker container's connection refused problem to be resolved.
+          # - macos-12
         flag:
           # Many composer dependencies need PHP 7.2+
           - php_version: "7.2"