Skip to content
Draft
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ test-tsan: ## Run all the tests, with thread sanitizer.

.PHONY: go-mod-tidy
go-mod-tidy: ## Ensure that go are cleaned up.
go mod tidy -compat=1.21
go mod tidy -compat=1.24

.PHONY: go-mod-ensure
go-mod-ensure: ## Ensure that go dependencies exist.
Expand Down
8 changes: 4 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pl_go_overrides()

go_download_sdk(
name = "go_sdk",
version = "1.24.6",
version = "1.25.7",
)

go_rules_dependencies()
Expand Down Expand Up @@ -220,8 +220,8 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
gazelle_dependencies(go_sdk = "go_sdk")

go_download_sdk(
name = "go_sdk_1_23",
version = "1.23.12",
name = "go_sdk_1_24",
version = "1.24.13",
)

# The go_sdk_boringcrypto SDK is used for testing boringcrypto specific functionality (TLS tracing).
Expand All @@ -234,7 +234,7 @@ go_download_sdk(
go_download_sdk(
name = "go_sdk_boringcrypto",
experiments = ["boringcrypto"],
version = "1.23.11",
version = "1.24.12",
)

pip_parse(
Expand Down
16 changes: 16 additions & 0 deletions bazel/container_images.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,14 @@ def stirling_test_images():
digest = "sha256:0f14818a1046dfdb7d5ac27e173d99e071219897a1d9969c8d7604acbd0d9541",
)

# Tag: 1.0
# Arch: linux/amd64
_container_image(
name = "golang_1_23_https_server_with_buildinfo",
repository = "golang_1_23_https_server_with_buildinfo",
digest = "sha256:df8ad6fd2cc2c45b7e6713dd365be908f77f006c190c7f79f74b38338b550544",
)

# Tag: 1.0
# Arch: linux/amd64
_container_image(
Expand Down Expand Up @@ -367,3 +375,11 @@ def stirling_test_images():
repository = "golang_1_22_grpc_server_with_buildinfo",
digest = "sha256:67adba5e8513670fa37bd042862e7844f26239e8d2997ed8c3b0aa527bc04cc3",
)

# Tag: 1.0
# Arch: linux/amd64
_container_image(
name = "golang_1_23_grpc_server_with_buildinfo",
repository = "golang_1_23_grpc_server_with_buildinfo",
digest = "sha256:7950a79e492dbdbe18608db5829a129754df5b6b5cb9d6ba822cfd91c43ba61a",
)
6 changes: 3 additions & 3 deletions bazel/pl_build_system.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
load("@rules_python//python:defs.bzl", "py_test")
load("//bazel:toolchain_transitions.bzl", "qemu_interactive_runner")

pl_boringcrypto_go_sdk = ["1.23.11"]
pl_go_test_versions = ["1.18", "1.19", "1.20", "1.21", "1.22"]
pl_supported_go_sdk_versions = ["1.23", "1.24"]
pl_boringcrypto_go_sdk = ["1.24.12"]
pl_go_test_versions = ["1.18", "1.19", "1.20", "1.21", "1.22", "1.23"]
pl_supported_go_sdk_versions = ["1.24", "1.25"]

# The last version in this list corresponds to the boringcrypto go sdk version.
# This list is used for generating container libraries and other version-specific targets.
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,10 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/bazelbuild/rules_docker/archive/0e9c3b068d05f20adf7ccdea486fcb27e71593f3.tar.gz"],
),
io_bazel_rules_go = dict(
sha256 = "f74c98d6df55217a36859c74b460e774abc0410a47cc100d822be34d5f990f16",
sha256 = "68af54cb97fbdee5e5e8fe8d210d15a518f9d62abfd71620c3eaff3b26a5ff86",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.47.1/rules_go-v0.47.1.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.47.1/rules_go-v0.47.1.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
],
),
io_bazel_rules_k8s = dict(
Expand Down
8 changes: 4 additions & 4 deletions docker.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DOCKER_IMAGE_TAG=202512082352
LINTER_IMAGE_DIGEST=441fc5a65697dab0b38627d5afde9e38da6812f1a5b98732b224161c23238e73
DEV_IMAGE_DIGEST=cac2e8a1c3e70dde4e5089b2383b2e11cc022af467ee430c12416eb42066fbb7
DEV_IMAGE_WITH_EXTRAS_DIGEST=e84f82d62540e1ca72650f8f7c9c4fe0b32b64a33f04cf0b913b9961527c9e30
DOCKER_IMAGE_TAG=202602200429
LINTER_IMAGE_DIGEST=78b2af6f23375e9b8f048d03c6cb1de139636104f31f8d5a0c7e7afaa12f2fae
DEV_IMAGE_DIGEST=ca94c1abe72e89afed95ee1c6497604e5a65f36ac4f5221b9b19a890657c7f96
DEV_IMAGE_WITH_EXTRAS_DIGEST=a0cf945bb588860f25229482503547ad1a390e7c42d91936cdaa79e2ee018b9f
7 changes: 3 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module px.dev/pixie

go 1.24.6
go 1.25.7

require (
cloud.google.com/go v0.81.0
Expand Down Expand Up @@ -163,7 +163,7 @@ require (
github.com/goccy/go-yaml v1.9.8 // indirect
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic v0.6.9 // indirect
Expand Down Expand Up @@ -276,7 +276,7 @@ require (
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.29.1 // indirect
google.golang.org/protobuf v1.36.3 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/launchdarkly/go-jsonstream.v1 v1.0.1 // indirect
Expand Down Expand Up @@ -310,7 +310,6 @@ replace (
github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.20.0
// Upgrade after https://github.com/golang/mock/pull/601 makes it into a release
github.com/golang/mock => github.com/golang/mock v1.5.0
github.com/golang/protobuf => github.com/golang/protobuf v1.5.2
github.com/google/go-cmp => github.com/google/go-cmp v0.5.5
google.golang.org/api => google.golang.org/api v0.43.0
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
Expand Down
30 changes: 27 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,25 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g=
github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
Expand Down Expand Up @@ -1327,12 +1344,19 @@ google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM=
google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
10 changes: 5 additions & 5 deletions go_deps.bzl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 69 additions & 4 deletions src/shared/services/pgtest/pgtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
package pgtest

import (
"bufio"
"fmt"
"os"
"regexp"
"time"

"github.com/golang-migrate/migrate"
"github.com/golang-migrate/migrate/database/postgres"
Expand All @@ -33,6 +37,27 @@ import (
"px.dev/pixie/src/shared/services/pg"
)

// selfContainerID returns the current Docker container ID by parsing
// /proc/self/mountinfo. Docker bind-mounts /etc/hostname from
// /var/lib/docker/containers/<id>/hostname, exposing the container ID.
// Returns empty string if not running inside a Docker container.
func selfContainerID() string {
f, err := os.Open("/proc/self/mountinfo")
if err != nil {
return ""
}
defer f.Close()

re := regexp.MustCompile(`/containers/([a-f0-9]{64})/hostname`)
scanner := bufio.NewScanner(f)
for scanner.Scan() {
if m := re.FindStringSubmatch(scanner.Text()); m != nil {
return m[1]
}
}
return ""
}

// SetupTestDB sets up a test database instance and applies migrations.
func SetupTestDB(schemaSource *bindata.AssetSource) (*sqlx.DB, func(), error) {
var db *sqlx.DB
Expand Down Expand Up @@ -69,18 +94,58 @@ func SetupTestDB(schemaSource *bindata.AssetSource) (*sqlx.DB, func(), error) {
if err != nil {
return nil, nil, fmt.Errorf("Failed to run docker pool: %w", err)
}
// Set a 5 minute expiration on resources.
err = resource.Expire(300)
// Set a 15 minute expiration on resources (extended for debugging).
err = resource.Expire(900)
if err != nil {
return nil, nil, err
}

viper.Set("postgres_port", resource.GetPort("5432/tcp"))
viper.Set("postgres_hostname", resource.Container.NetworkSettings.Gateway)
// When running inside a container (e.g. CI), the postgres container is on
// a different Docker network and we can't reach it via host port mapping.
// Detect this and connect postgres to our network instead.
pgHost := resource.Container.NetworkSettings.Gateway
pgPort := resource.GetPort("5432/tcp")
selfID := selfContainerID()
log.Infof("selfContainerID: %q", selfID)
if selfID != "" {
selfContainer, err := pool.Client.InspectContainer(selfID)
if err != nil {
return nil, nil, fmt.Errorf("failed to inspect self container %s: %w", selfID, err)
}
for netName, net := range selfContainer.NetworkSettings.Networks {
if netName == "host" {
continue
}
err := pool.Client.ConnectNetwork(net.NetworkID, docker.NetworkConnectionOptions{
Container: resource.Container.ID,
})
if err != nil {
return nil, nil, fmt.Errorf("failed to connect postgres to network %s: %w", netName, err)
}
// Re-inspect to get the postgres container's IP on our network.
updated, err := pool.Client.InspectContainer(resource.Container.ID)
if err != nil {
return nil, nil, fmt.Errorf("failed to re-inspect postgres container: %w", err)
}
resource.Container = updated
if pgNet, ok := updated.NetworkSettings.Networks[netName]; ok {
pgHost = pgNet.IPAddress
pgPort = "5432"
log.Infof("pgHost set to %s:%s via network %s", pgHost, pgPort, netName)
}
break
}
}
if pgHost == "" {
pgHost = "localhost"
}
viper.Set("postgres_port", pgPort)
viper.Set("postgres_hostname", pgHost)
viper.Set("postgres_db", dbName)
viper.Set("postgres_username", "postgres")
viper.Set("postgres_password", "secret")

pool.MaxWait = 10 * time.Minute
if err = pool.Retry(func() error {
log.Info("trying to connect")
db = pg.MustCreateDefaultPostgresDB()
Expand Down
16 changes: 8 additions & 8 deletions src/stirling/obj_tools/dwarf_reader_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@
#include "src/common/testing/testing.h"
#include "src/stirling/utils/detect_application.h"

constexpr std::string_view kTestGo1_23Binary =
"src/stirling/obj_tools/testdata/go/test_go_1_23_binary";
constexpr std::string_view kTestGo1_24Binary =
"src/stirling/obj_tools/testdata/go/test_go_1_23_binary";
"src/stirling/obj_tools/testdata/go/test_go_1_24_binary";
constexpr std::string_view kTestGo1_25Binary =
"src/stirling/obj_tools/testdata/go/test_go_1_25_binary";
constexpr std::string_view kGoGRPCServer =
"src/stirling/testing/demo_apps/go_grpc_tls_pl/server/golang_1_24_grpc_tls_server_binary";
constexpr std::string_view kCppBinary = "src/stirling/obj_tools/testdata/cc/test_exe_/test_exe";
constexpr std::string_view kGoBinaryUnconventional =
"src/stirling/obj_tools/testdata/go/sockshop_payments_service";

const auto kCPPBinaryPath = px::testing::BazelRunfilePath(kCppBinary);
const auto kGo1_23BinaryPath = px::testing::BazelRunfilePath(kTestGo1_23Binary);
const auto kGo1_24BinaryPath = px::testing::BazelRunfilePath(kTestGo1_24Binary);
const auto kGo1_25BinaryPath = px::testing::BazelRunfilePath(kTestGo1_25Binary);
const auto kGoServerBinaryPath = px::testing::BazelRunfilePath(kGoGRPCServer);
const auto kGoBinaryUnconventionalPath = px::testing::BazelRunfilePath(kGoBinaryUnconventional);

Expand Down Expand Up @@ -563,10 +563,10 @@ INSTANTIATE_TEST_SUITE_P(CppDwarfReaderParameterizedTest, CppDwarfReaderTest,
DwarfReaderTestParam{kCPPBinaryPath, false}));

INSTANTIATE_TEST_SUITE_P(GolangDwarfReaderParameterizedTest, GolangDwarfReaderTest,
::testing::Values(DwarfReaderTestParam{kGo1_23BinaryPath, true},
DwarfReaderTestParam{kGo1_23BinaryPath, false},
DwarfReaderTestParam{kGo1_24BinaryPath, true},
DwarfReaderTestParam{kGo1_24BinaryPath, false}));
::testing::Values(DwarfReaderTestParam{kGo1_24BinaryPath, true},
DwarfReaderTestParam{kGo1_24BinaryPath, false},
DwarfReaderTestParam{kGo1_25BinaryPath, true},
DwarfReaderTestParam{kGo1_25BinaryPath, false}));

INSTANTIATE_TEST_SUITE_P(GolangDwarfReaderParameterizedIndexTest, GolangDwarfReaderIndexTest,
::testing::Values(true, false));
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/obj_tools/go_syms_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ TEST(ReadGoBuildInfoTest, BuildinfoEndianAgnostic) {
ASSERT_OK_AND_ASSIGN(std::unique_ptr<ElfReader> elf_reader, ElfReader::Create(kPath));
ASSERT_OK_AND_ASSIGN(auto pair, ReadGoBuildInfo(elf_reader.get()));
auto version = pair.first;
EXPECT_THAT(version, StrEq("1.24.6"));
EXPECT_THAT(version, StrEq("1.24.13"));
}

TEST(ReadGoBuildInfoTest, BuildinfoLittleEndian) {
Expand Down
2 changes: 1 addition & 1 deletion src/stirling/obj_tools/testdata/go/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ filegroup(
# TODO(ddelnano): rules_go doesn't support populating .buildinfo with dependency information (https://github.com/bazel-contrib/rules_go/issues/3090).
# Once this is supported, test_buildinfo_with_mods should be replaced with a bazel built binary.
"test_buildinfo_with_mods",
":test_go_1_23_binary",
":test_go_1_24_binary",
":test_go_1_25_binary",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ BAZEL_BUILD_CMD="bazel build --compilation_mode=opt"

TEST_EXE_BASE_DIR="bazel-bin/src/stirling/source_connectors/socket_tracer/protocols/http2/testing"

GRPC_CLIENT_LABEL="src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client:golang_1_23_grpc_client"
GRPC_CLIENT_EXE="${TEST_EXE_BASE_DIR}/go_grpc_client/golang_1_23_grpc_client"
GRPC_CLIENT_LABEL="src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client:golang_1_24_grpc_client"
GRPC_CLIENT_EXE="${TEST_EXE_BASE_DIR}/go_grpc_client/golang_1_24_grpc_client"

GRPC_SERVER_LABEL="src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server:golang_1_23_grpc_server"
GRPC_SERVER_EXE="${TEST_EXE_BASE_DIR}/go_grpc_server/golang_1_23_grpc_server"
GRPC_SERVER_LABEL="src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server:golang_1_24_grpc_server"
GRPC_SERVER_EXE="${TEST_EXE_BASE_DIR}/go_grpc_server/golang_1_24_grpc_server"

STIRLING_WRAPPER_LABEL="src/stirling/binaries:stirling_wrapper"
STIRLING_WRAPPER_EXE="bazel-bin/src/stirling/binaries/stirling_wrapper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ pl_cc_bpf_test(
name = "dynamic_bpftrace_connector_bpf_test",
srcs = ["dynamic_bpftrace_connector_bpf_test.cc"],
data = [
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server:golang_1_23_grpc_server_with_certs",
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server:golang_1_24_grpc_server_with_certs",
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server:golang_1_25_grpc_server_with_certs",
],
tags = [
"cpu:16",
Expand Down
Loading
Loading