diff --git a/.azure/dockers/ob/linux/Dockerfile b/.azure/dockers/ob/linux/Dockerfile index 9607c8b86..43f77fa99 100644 --- a/.azure/dockers/ob/linux/Dockerfile +++ b/.azure/dockers/ob/linux/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y apt-transport-https \ wget && \ wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \ apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \ - apt-add-repository ppa:lttng/stable-2.12 && \ + apt-add-repository ppa:lttng/stable-2.13 && \ apt-get update && apt-get install -y tzdata && apt-get install -y \ build-essential \ gcc-arm-linux-gnueabihf \ diff --git a/.azure/templates/test-distribution.yml b/.azure/templates/test-distribution.yml index ca1e857b4..4fb12adaf 100644 --- a/.azure/templates/test-distribution.yml +++ b/.azure/templates/test-distribution.yml @@ -23,7 +23,7 @@ jobs: itemPattern: distribution/*.deb downloadPath: $(Build.SourcesDirectory) - pwsh: | - sudo apt-add-repository ppa:lttng/stable-2.12 + sudo apt-add-repository ppa:lttng/stable-2.13 sudo apt-get update sudo apt-get install -y lttng-tools sudo dpkg -i $(Build.SourcesDirectory)/distribution/libmsquic_2.2.0_amd64.deb diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index efd11481e..45a7f4d0d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: # Install dependencies and build submodules before starting analysis. - run: | - sudo apt-add-repository ppa:lttng/stable-2.12 + sudo apt-add-repository ppa:lttng/stable-2.13 sudo apt-get update sudo apt-get install -y liblttng-ust-dev libnuma-dev sudo sh scripts/install-powershell-docker.sh diff --git a/docs/BUILD.md b/docs/BUILD.md index 36bbe97fb..2f9dda3de 100644 --- a/docs/BUILD.md +++ b/docs/BUILD.md @@ -161,7 +161,7 @@ Note at minimum CMake 3.16 is required. Instructions for installing a the newest The following are generally required. Actual installations may vary. ``` -sudo apt-add-repository ppa:lttng/stable-2.12 +sudo apt-add-repository ppa:lttng/stable-2.13 sudo apt-get update sudo apt-get install cmake sudo apt-get install build-essential diff --git a/docs/Diagnostics.md b/docs/Diagnostics.md index c8a9c3616..70eb84969 100644 --- a/docs/Diagnostics.md +++ b/docs/Diagnostics.md @@ -19,7 +19,7 @@ On Windows, MsQuic leverages manifested [ETW](https://docs.microsoft.com/en-us/w On Linux, MsQuic leverages [LTTng](https://lttng.org/features/) for its logging. Some dependencies, such as babeltrace, lttng, and clog2text_lttng are required. The simplest way to install all dependencies is by running `./scripts/prepare-machine.ps1 -ForTest`, but if you only want to collect the traces on the machine, the **minimal dependencies** are: ``` -sudo apt-add-repository ppa:lttng/stable-2.12 +sudo apt-add-repository ppa:lttng/stable-2.13 sudo apt-get update sudo apt-get install -y lttng-tools ``` @@ -135,7 +135,7 @@ As already indicated, there are lots of ways to collect ETW traces. Feel free to ## Linux ### All in one command -This script wraps collecting trace then converting to text as well +This script wraps collecting trace then converting to text as well **WARN**: This wrapper doesn't work with `./scripts/test.ps1` etc. as it is also creating lttng session internally. ```sh cd ${MSQUIC_PATH} @@ -194,7 +194,7 @@ and it must be placed in the same directory as the `msquic.so`. Building `clog2text_lttng`: ``` -apt install --no-install-recommends -y dotnet-runtime-6.0 dotnet-sdk-6.0 dotnet-host +apt install --no-install-recommends -y dotnet-runtime-6.0 dotnet-sdk-6.0 dotnet-host git submodule update --init submodules/clog dotnet build submodules/clog/src/clog2text/clog2text_lttng/ -c Release export PATH=$PWD/submodules/clog/src/clog2text/clog2text_lttng/bin/Release/net6.0/:$PATH diff --git a/scripts/log.ps1 b/scripts/log.ps1 index e8d14d9cc..7c40271dc 100644 --- a/scripts/log.ps1 +++ b/scripts/log.ps1 @@ -142,7 +142,7 @@ if ($IsLinux) { try { lttng version | Out-Null } catch { Write-Host "Installing lttng" - sudo apt-add-repository ppa:lttng/stable-2.12 + sudo apt-add-repository ppa:lttng/stable-2.13 sudo apt-get update sudo apt-get install -y lttng-tools sudo apt-get install -y liblttng-ust-dev diff --git a/scripts/prepare-machine.ps1 b/scripts/prepare-machine.ps1 index 25eb9af2f..fb1c6f644 100644 --- a/scripts/prepare-machine.ps1 +++ b/scripts/prepare-machine.ps1 @@ -526,7 +526,7 @@ if ($IsLinux) { } if ($ForBuild) { - sudo apt-add-repository ppa:lttng/stable-2.12 -y + sudo apt-add-repository ppa:lttng/stable-2.13 -y sudo apt-get update -y sudo apt-get install -y cmake sudo apt-get install -y build-essential @@ -547,7 +547,7 @@ if ($IsLinux) { } if ($ForTest) { - sudo apt-add-repository ppa:lttng/stable-2.12 -y + sudo apt-add-repository ppa:lttng/stable-2.13 -y sudo apt-get update -y sudo apt-get install -y lttng-tools sudo apt-get install -y liblttng-ust-dev