encoders: assorted improvements

.github/workflows/build.yaml

@@ -47,17 +47,32 @@ jobs:
           yum install -y cmake3
         shell: bash
 
-      - name: Clone repo with submodules (1.8.3 version of Git)
+      - name: Clone repo without submodules (1.8.3 version of Git)
         run: |
-          git clone --recursive https://github.com/fluent/cprofiles.git
+          git clone https://github.com/fluent/cprofiles.git
         shell: bash
 
+      - name: Check out the branch (1.8.3 version of Git)
+        env:
+          BRANCH_NAME: ${{ github.head_ref }}
+        run: |
+          git checkout "$BRANCH_NAME"
+        shell: bash
+        working-directory: cprofiles
+
+      - name: Fetch the appropriate sub modules
+        run: |
+          git submodule init
+          git submodule update
+        shell: bash
+        working-directory: cprofiles
+
       - name: Run compilation
         run: |
-          cmake3 -DCPROF_DEV=on .
+          cmake3 -DCPROF_DEV=on ../
           make
         shell: bash
-        working-directory: cprofiles
+        working-directory: cprofiles/build
 
   build-unix-arm64:
     name: Build sources on arm64 for ${{ matrix.os }} - ${{ matrix.compiler }}
@@ -87,9 +102,10 @@ jobs:
             file \
             make
             export CC=${{ env.compiler }}
-            cmake -DCTR_TESTS=On .
-            make all
-            CTEST_OUTPUT_ON_FAILURE=1 make test
+            cd build
+            cmake -DCPROF_TESTS=On ../
+            cmake --build .
+            CTEST_OUTPUT_ON_FAILURE=1 ctest
         env:
           CC: ${{ matrix.compiler }}
 
@@ -111,10 +127,11 @@ jobs:
       - name: Build on ${{ matrix.os }} with ${{ matrix.compiler }}
         run: |
           echo "CC = $CC, CXX = $CXX"
-          cmake -DCTR_TESTS=On .
-          make all
-          CTEST_OUTPUT_ON_FAILURE=1 make test
+          cmake -DCPROF_TESTS=On ../
+          cmake --build .
+          CTEST_OUTPUT_ON_FAILURE=1 ctest
         shell: bash
+        working-directory: build
         env:
           CC: ${{ matrix.compiler }}
 
@@ -142,5 +159,5 @@ jobs:
         with:
           preset: ${{ matrix.preset }}
           # dependencies_debian: ''
-          cmakeflags: '-DCTR_TESTS=On -DCMT_DEV=on .'
+          cmakeflags: '-DCPROF_TESTS=On -DCPROF_DEV=on .'
           build_command: make all

.gitignore

@@ -0,0 +1,3 @@
+*~
+.vscode/*
+build/*

.gitmodules

@@ -4,3 +4,4 @@
 [submodule "lib/fluent-otel-proto"]
 	path = lib/fluent-otel-proto
 	url = https://github.com/fluent/fluent-otel-proto
+

CMakeLists.txt

@@ -138,14 +138,16 @@ endif()
 # Configure header files
 configure_file(
   "${PROJECT_SOURCE_DIR}/include/cprofiles/cprof_info.h.in"
-  "${PROJECT_SOURCE_DIR}/include/cprofiles/cprof_info.h"
+  "${PROJECT_BINARY_DIR}/include/cprofiles/cprof_info.h"
   )
 
 configure_file(
   "${PROJECT_SOURCE_DIR}/include/cprofiles/cprof_version.h.in"
-  "${PROJECT_SOURCE_DIR}/include/cprofiles/cprof_version.h"
+  "${PROJECT_BINARY_DIR}/include/cprofiles/cprof_version.h"
   )
 
+include_directories("${PROJECT_BINARY_DIR}/include/")
+
 # Installation Directories
 # ========================
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
@@ -215,7 +217,7 @@ endif()
 # fluent-otel-proto
 if (NOT CPROF_HAVE_FLUENT_OTEL_PROTO)
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/${CPROF_PATH_LIB_FLUENT_OTEL_PROTO}/include)
-  CPROF_OPTION(FLUENT_PROTO_METRICS   "on")
+  CPROF_OPTION(FLUENT_PROTO_PROFILES "on")
   CPROF_OPTION(FLUENT_PROTO_EXAMPLES "off")
   add_subdirectory(lib/fluent-otel-proto)
   CPROF_DEFINITION(CPROF_HAVE_FLUENT_OTEL_PROTO)