Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v7
with:
go-version: 1.26
- uses: actions/checkout@v2
cache: false
- uses: actions/checkout@v7
with:
submodules: true
- name: Build SkyWalking Go agent
run: make -C test/e2e build
- name: Upload agent binary
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: skywalking-go-agent
path: test/e2e/dist/
Expand All @@ -52,15 +53,15 @@ jobs:
- name: Kafka
path: test/e2e/case/kafka/e2e.yaml
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
with:
submodules: true
- name: Download agent binary
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: skywalking-go-agent
path: test/e2e/dist/
- name: Run E2E Tests
uses: apache/skywalking-infra-e2e@7e4b5b68716fdb7b79b21fa8908f9db497e1b115
uses: apache/skywalking-infra-e2e@56ac8befeb5f910f2dc9339e65d07cd18953f90e
with:
e2e-file: ${{ matrix.case.path }}
32 changes: 19 additions & 13 deletions .github/workflows/plugin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ jobs:
timeout-minutes: 60
steps:
- name: Set up Go 1.26
uses: actions/setup-go@v2
uses: actions/setup-go@v7
with:
go-version: 1.26
cache: false
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
env:
Expand All @@ -52,12 +53,12 @@ jobs:
# 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
- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v7
with:
submodules: true
- name: Build
run: make -C test/plugins build
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
name: Upload Test Base
with:
name: test-tools-${{ matrix.os }}
Expand Down Expand Up @@ -110,10 +111,10 @@ jobs:
- so11y
- cross-goroutine
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
with:
submodules: true
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: test-tools-ubuntu-latest
path: test/plugins/dist
Expand All @@ -126,14 +127,18 @@ jobs:
- name: Install docker-compose
shell: bash
run: |
if ! command docker-compose 2>&1 > /dev/null; then
echo "Installing docker-compose"
sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
# Docker Compose v1 is end of life, and Docker 29 raised the minimum
# API version it accepts, so route docker-compose to the runner's
# Compose v2 plugin instead of downloading Compose v1.29.2.
if ! command -v docker-compose > /dev/null 2>&1; then
echo "Installing a docker-compose wrapper for the Docker Compose plugin"
printf '#!/bin/sh\nexec docker compose "$@"\n' | sudo tee /usr/local/bin/docker-compose > /dev/null
sudo chmod +x /usr/local/bin/docker-compose
fi
docker-compose version
- name: Run Test
run: bash test/plugins/run.sh ${{ matrix.case }}
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
name: Upload Agent
if: ${{ failure() }}
with:
Expand All @@ -148,17 +153,18 @@ jobs:
runs-on: macos-12
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
with:
submodules: true
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: test-tools-macos-12
path: test/plugins/dist
- name: Set up Go 1.26
uses: actions/setup-go@v2
uses: actions/setup-go@v7
with:
go-version: 1.26
cache: false
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
env:
Expand Down Expand Up @@ -189,7 +195,7 @@ jobs:
fi
- name: Run Test
run: bash test/plugins/run.sh short_versions_gin
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
name: Upload Agent
if: ${{ failure() }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
env:
VERSION: ${{ github.sha }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7
with:
submodules: true
- name: Log in to the Container registry
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0
with:
registry: ${{ env.HUB }}
username: ${{ github.actor }}
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/skywalking-go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ jobs:
timeout-minutes: 60
steps:
- name: Set up Go 1.26
uses: actions/setup-go@v2
uses: actions/setup-go@v7
with:
go-version: 1.26
cache: false
- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v7
with:
submodules: true
- name: Check License
Expand All @@ -55,11 +56,12 @@ jobs:
timeout-minutes: 60
steps:
- name: Set up Go ${{ matrix.go-version }}
uses: actions/setup-go@v2
uses: actions/setup-go@v7
with:
go-version: ${{ matrix.go-version }}
cache: false
- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v7
with:
submodules: true
- name: Get dependencies
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/windows-plugin-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
go version

- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
submodules: true

Expand Down Expand Up @@ -135,9 +135,10 @@ jobs:
sudo cp -rf ~/repo/* /mnt/d/a/skywalking-go

- name: Windows Set up Go 1.26
uses: actions/setup-go@v2
uses: actions/setup-go@v7
with:
go-version: 1.26
cache: false
- name: WSL Setup Tools
shell: wsl-run {0}
run: |
Expand All @@ -154,7 +155,7 @@ jobs:
head -n -2 Makefile > temp && rm Makefile && mv temp Makefile
make build os=windows
bash run.sh http
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
name: Upload Agent
if: ${{ failure() }}
with:
Expand Down
4 changes: 3 additions & 1 deletion .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ header:
# Symlink to .claude/skills; the pinned license-eye recurses forever on directory symlinks.
- '.agents/skills'
- 'licenses'
- 'dist/licenses'
- '**/go.mod'
- '**/go.sum'
- 'go.work'
Expand All @@ -35,6 +36,7 @@ header:
- 'NOTICE'
- '.gitignore'
- 'dist/LICENSE.tpl'
- 'tools/release/LICENSE.tpl'
- '**/*.tmpl'
- 'tools/go-agent/tools/testdata/*'
- 'VERSION'
Expand All @@ -46,4 +48,4 @@ header:

dependency:
files:
- go.mod
- tools/go-agent/go.mod
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Release Notes.
* rocketmq: end the exit span of a failed `SendSync`, which stayed open and kept the segment from being reported, and do not panic on a send without messages.
* kratos: do not panic in the client middleware when a body-less HTTP call reads the reply header into a nil `http.Header`. Since kratos v2.7.2, that header is sent as the request header.
* go-micro: do not fail a call, stream, or publish when its exit span cannot be created, for example a call with an empty service name and `client.WithAddress`. The call runs untraced, and the peer of the caller's span does not change.
* Bump vulnerable dependencies in the agent module, the reporter (`plugins/core`), and the go-agent tool. `github.com/klauspost/compress` moves from v1.15.9 to v1.18.7 to fix CVE-2026-63209, `golang.org/x/net` moves from v0.61.0 to v0.62.0 to fix GO-2026-6860 and GO-2026-6866, and `github.com/sirupsen/logrus` in the go-agent tool moves from v1.9.0 to v1.9.4 to fix CVE-2025-65637.

#### Unsupported Library Versions

Expand Down
65 changes: 29 additions & 36 deletions dist/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -208,35 +208,6 @@ notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.

========================================================================
MIT licenses
========================================================================

The following components are provided under the MIT License. See project link for details.
The text of each license is also included at licenses/license-[project].txt.

github.com/benbjohnson/clock v1.1.0 MIT
github.com/dave/jennifer v1.5.0 MIT
github.com/kr/pretty v0.3.0 MIT
github.com/kr/text v0.2.0 MIT
github.com/sergi/go-diff v1.2.0 MIT
github.com/sirupsen/logrus v1.9.0 MIT
github.com/stretchr/objx v0.5.0 MIT
github.com/stretchr/testify v1.8.2 MIT
go.uber.org/atomic v1.9.0 MIT
go.uber.org/goleak v1.1.12 MIT
go.uber.org/multierr v1.8.0 MIT
go.uber.org/zap v1.24.0 MIT

========================================================================
MIT and BSD-3-Clause licenses
========================================================================

The following components are provided under the MIT and BSD-3-Clause License. See project link for details.
The text of each license is also included at licenses/license-[project].txt.

github.com/dave/dst v0.27.2 MIT and BSD-3-Clause

========================================================================
BSD-2-Clause licenses
========================================================================
Expand All @@ -255,12 +226,11 @@ The following components are provided under the BSD-3-Clause License. See projec
The text of each license is also included at licenses/license-[project].txt.

github.com/pmezard/go-difflib v1.0.0 BSD-3-Clause
github.com/rogpeppe/go-internal v1.10.0 BSD-3-Clause
golang.org/x/mod v0.9.0 BSD-3-Clause
golang.org/x/sync v0.1.0 BSD-3-Clause
golang.org/x/sys v0.8.0 BSD-3-Clause
golang.org/x/text v0.9.0 BSD-3-Clause
golang.org/x/tools v0.7.0 BSD-3-Clause
github.com/rogpeppe/go-internal v1.9.0 BSD-3-Clause
golang.org/x/mod v0.42.0 BSD-3-Clause
golang.org/x/sys v0.49.0 BSD-3-Clause
golang.org/x/text v0.43.0 BSD-3-Clause
golang.org/x/tools v0.52.0 BSD-3-Clause

========================================================================
ISC licenses
Expand All @@ -271,11 +241,34 @@ The text of each license is also included at licenses/license-[project].txt.

github.com/davecgh/go-spew v1.1.1 ISC

========================================================================
MIT licenses
========================================================================

The following components are provided under the MIT License. See project link for details.
The text of each license is also included at licenses/license-[project].txt.

github.com/kr/pretty v0.3.0 MIT
github.com/sirupsen/logrus v1.9.4 MIT
github.com/stretchr/testify v1.10.0 MIT
go.uber.org/atomic v1.9.0 MIT
go.uber.org/multierr v1.8.0 MIT
go.uber.org/zap v1.24.0 MIT

========================================================================
MIT and Apache-2.0 licenses
========================================================================

The following components are provided under the MIT and Apache-2.0 License. See project link for details.
The text of each license is also included at licenses/license-[project].txt.

gopkg.in/yaml.v3 v3.0.1 MIT and Apache-2.0
gopkg.in/yaml.v3 v3.0.1 MIT and Apache-2.0

========================================================================
MIT and BSD-3-Clause licenses
========================================================================

The following components are provided under the MIT and BSD-3-Clause License. See project link for details.
The text of each license is also included at licenses/license-[project].txt.

github.com/dave/dst v0.27.2 MIT and BSD-3-Clause
21 changes: 0 additions & 21 deletions dist/licenses/license-github.com-benbjohnson-clock.txt

This file was deleted.

21 changes: 0 additions & 21 deletions dist/licenses/license-github.com-dave-jennifer.txt

This file was deleted.

19 changes: 0 additions & 19 deletions dist/licenses/license-github.com-kr-text.txt

This file was deleted.

Loading
Loading