Add debug for curl initialization and DRY for linux-sanitizers

awslabs · Feb 5, 2025 · 2341fc0 · 2341fc0
1 parent eb9032c
commit 2341fc0
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 115 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -240,121 +240,6 @@ jobs:
           for test_file in $(find cproducer.dir kvsCommonCurl.dir kvsCommonLws.dir -name '*.gcno'); do gcov $test_file; done
           bash <(curl -s https://codecov.io/bash)
 
-  address-sanitizer:
-    runs-on: ubuntu-22.04
-    permissions:
-      id-token: write
-      contents: read
-    env:
-      CC: clang
-      CXX: clang++
-      AWS_KVS_LOG_LEVEL: 2
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v3
-      - name: Build repository
-        run: |
-          mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE -DADDRESS_SANITIZER=TRUE -DBUILD_COMMON_LWS=TRUE
-          make
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-          role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
-          aws-region: ${{ secrets.AWS_REGION }}
-          role-duration-seconds: 10800
-      - name: Run tests
-        run: |
-          cd build
-          ulimit -c unlimited -S
-          timeout --signal=SIGABRT 150m ./tst/producer_test --gtest_break_on_failure
-
-  undefined-behavior-sanitizer:
-    runs-on: ubuntu-22.04
-    permissions:
-      id-token: write
-      contents: read
-    env:
-      CC: clang
-      CXX: clang++
-      AWS_KVS_LOG_LEVEL: 2
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v3
-      - name: Build repository
-        run: |
-          mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE -DUNDEFINED_BEHAVIOR_SANITIZER=TRUE -DBUILD_COMMON_LWS=TRUE
-          make
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-          role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
-          aws-region: ${{ secrets.AWS_REGION }}
-          role-duration-seconds: 10800
-      - name: Run tests
-        run: |
-          cd build
-          ulimit -c unlimited -S
-          timeout --signal=SIGABRT 150m ./tst/producer_test --gtest_break_on_failure
-
-  # memory-sanitizer:
-  #   runs-on: ubuntu-20.04
-  #   permissions:
-  #     id-token: write
-  #     contents: read
-  #   env:
-  #     CC: clang
-  #     CXX: clang++
-  #     AWS_KVS_LOG_LEVEL: 2
-  #   steps:
-  #     - name: Clone repository
-  #       uses: actions/checkout@v3
-  #     - name: Configure AWS Credentials
-  #       uses: aws-actions/configure-aws-credentials@v4
-  #       with:
-  #         role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-  #         role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
-  #         aws-region: ${{ secrets.AWS_REGION }}
-  #     - name: Build repository
-  #       run: |
-  #         mkdir build && cd build
-  #         cmake .. -DBUILD_TEST=TRUE -DMEMORY_SANITIZER=TRUE -DBUILD_COMMON_LWS=TRUE
-  #         make
-  #         ulimit -c unlimited -S
-  #         timeout --signal=SIGABRT 150m ./tst/producer_test --gtest_break_on_failure
-
-  # thread-sanitizer:
-  #  runs-on: ubuntu-20.04
-  #  permissions:
-  #    id-token: write
-  #    contents: read
-  #  env:
-  #    CC: clang
-  #    CXX: clang++
-  #    AWS_KVS_LOG_LEVEL: 2
-  #  steps:
-  #    - name: Clone repository
-  #      uses: actions/checkout@v3
-  #    - name: Configure AWS Credentials
-  #      uses: aws-actions/configure-aws-credentials@v4
-  #      with:
-  #        role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
-  #        role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
-  #        aws-region: ${{ secrets.AWS_REGION }}
-  #    - name: Build repository
-  #      run: |
-  #        mkdir build && cd build
-  #        cmake .. -DBUILD_TEST=TRUE -DTHREAD_SANITIZER=TRUE -DBUILD_COMMON_LWS=TRUE
-  #        make
-  #    - name: Run tests
-  #      run: |
-  #        cd build
-  #        ulimit -c unlimited -S
-  #        timeout --signal=SIGABRT 150m ./tst/producer_test --gtest_break_on_failure
-
   ubuntu-gcc:
     runs-on: ubuntu-22.04
     env:

diff --git a/.github/workflows/linux-sanitizers.yml b/.github/workflows/linux-sanitizers.yml
@@ -0,0 +1,71 @@
+name: Linux sanitizers
+
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+    branches:
+      - develop
+      - master
+
+jobs:
+  linux-sanitizers:
+    strategy:
+      matrix:
+        sanitizer:
+          - ADDRESS_SANITIZER
+          - UNDEFINED_BEHAVIOR_SANITIZER
+          #  - THREAD_SANITIZER
+          #  - MEMORY_SANITIZER
+        config:
+          - name: With Common LWS
+            cmake_flags: "-DBUILD_TEST=ON -DBUILD_COMMON_LWS=ON"
+
+      fail-fast: false
+
+    runs-on: ubuntu-latest
+    container:
+      image: public.ecr.aws/ubuntu/ubuntu:20.04_stable
+
+    timeout-minutes: 80
+
+    env:
+      CC: clang
+      CXX: clang++
+      AWS_KVS_LOG_LEVEL: 7
+      DEBIAN_FRONTEND: noninteractive
+
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get -y install git build-essential automake pkg-config cmake clang
+
+      - name: Build repository - ${{ matrix.config.name }}
+        run: |
+          mkdir -p build
+          cd build
+          cmake .. -D${{ matrix.sanitizer }}=ON ${{ matrix.config.cmake_flags }}
+          make -j$(nproc)
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }}
+          aws-region: ${{ secrets.AWS_REGION }}
+          role-duration-seconds: 10800
+
+      - name: Run tests - ${{ matrix.config.name }}
+        working-directory: ./build
+        run: |
+          timeout --signal=SIGABRT 150m ./tst/producer_test
diff --git a/src/source/CurlApiCallbacks.c b/src/source/CurlApiCallbacks.c
@@ -148,7 +148,9 @@ STATUS createCurlApiCallbacks(PCallbacksProvider pCallbacksProvider, PCHAR regio
     CHK_STATUS(initializeSslCallbacks());
 
     // CURL global initialization
+    DLOGD("Initializing curl");
     CHK(0 == curl_global_init(CURL_GLOBAL_ALL), STATUS_CURL_LIBRARY_INIT_FAILED);
+    DLOGD("Successfully initialized curl");
 
     // Not in shutdown
     ATOMIC_STORE_BOOL(&pCurlApiCallbacks->shutdown, FALSE);