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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the autoinstrumenter binary
ARG TAG=0.2.6@sha256:547007f27e8323ace60428fe02cb29a512e312fd23e706dd4e061e63c80e4167
ARG TAG=0.2.9@sha256:5dc5c5d80515637e31dd3095e60b76fec8fd8793962240eb0bc8d9b201011417
FROM ghcr.io/open-telemetry/obi-generator:${TAG} AS builder

# TODO: embed software version in executable
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ IMG ?= $(IMG_REGISTRY)/$(IMG_ORG)/$(IMG_NAME):$(VERSION)

# The generator is a container image that provides a reproducible environment for
# building eBPF binaries
GEN_IMG ?= ghcr.io/open-telemetry/obi-generator:0.2.6
GEN_IMG ?= ghcr.io/open-telemetry/obi-generator:0.2.9

OCI_BIN ?= docker

Expand Down
2 changes: 1 addition & 1 deletion configs/offsets/gin/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/configs/offsets/gin

go 1.25.6
go 1.25.7

require github.com/gin-gonic/gin v1.11.0

Expand Down
2 changes: 1 addition & 1 deletion configs/offsets/kafkago/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/configs/offsets/kafkago

go 1.25.6
go 1.25.7

require github.com/segmentio/kafka-go v0.4.50

Expand Down
2 changes: 1 addition & 1 deletion configs/offsets/mongo/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/configs/offsets/mongo

go 1.25.6
go 1.25.7

require go.mongodb.org/mongo-driver v1.17.9

Expand Down
2 changes: 1 addition & 1 deletion configs/offsets/mongov2/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/configs/offsets/mongov2

go 1.25.6
go 1.25.7

require go.mongodb.org/mongo-driver/v2 v2.3.1

Expand Down
2 changes: 1 addition & 1 deletion configs/offsets/mux/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module go.opentelemetry.io/obi/configs/offsets/mux

go 1.25.6
go 1.25.7

require github.com/gorilla/mux v1.8.1
2 changes: 1 addition & 1 deletion configs/offsets/mysql/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/configs/offsets/mysql

go 1.25.6
go 1.25.7

require github.com/go-sql-driver/mysql v1.8.1

Expand Down
2 changes: 1 addition & 1 deletion configs/offsets/otelsdk/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/configs/offsets/otelsdk

go 1.25.6
go 1.25.7

require go.opentelemetry.io/otel v1.37.0

Expand Down
2 changes: 1 addition & 1 deletion configs/offsets/redis/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/configs/offsets/redis

go 1.25.6
go 1.25.7

require github.com/redis/go-redis/v9 v9.14.1

Expand Down
2 changes: 1 addition & 1 deletion configs/offsets/sarama/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/configs/offsets/sarama

go 1.25.6
go 1.25.7

require github.com/IBM/sarama v1.46.3

Expand Down
2 changes: 1 addition & 1 deletion configs/offsets/shopify/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/configs/offsets/shopify

go 1.25.6
go 1.25.7

require github.com/Shopify/sarama v1.37.1

Expand Down
28 changes: 28 additions & 0 deletions devdocs/go-version-upgrade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Upgrading the Go Version

When upgrading to a newer Go version, one or two PRs are needed:

- First, ensure obi-generator golang image is bumped in
[generator.Dockerfile](../generator.Dockerfile).
- Either wait for your PR merge to main, or if on a source branch (not a fork),
run the [Publish OBI Docker Generator Image](https://github.com/open-telemetry/opentelemetry-ebpf-instrumentation/actions/workflows/generator-image.yml)
action. Ensure `Use workflow from` is correct (`main` or your source branch), leave tag override empty.
- **Ensure the workflow completes successfully**, otherwise checks will fail in
your next PR. This workflow will only work from main and source brances.

- Then, once the new obi-generator image is available ([check here](https://github.com/open-telemetry/opentelemetry-ebpf-instrumentation/pkgs/container/obi-generator)):
- Update the [Makefile](../Makefile) `GEN_IMG` to the new `obi-generator` tag.

- Update the [Dockerfile](../Dockerfile) `TAG` to the new `obi-generator` tag.

- In `go.mod` files only: search/replace `go i.j.k` with `go x.y.z`, where
`i.j.k` is your current version and `x.y.z` is your new version.

- [Find the index digest](https://hub.docker.com/_/golang/tags) for your new
multi-platform golang image, and search/replace the entire `FROM golang:...`
line. This should cover the Dockerfiles.

- Search entire codebase for any remaining references for old version `i.j.k`
and fix as needed.

- Raise final PR to bump to `x.y.z`.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi

go 1.25.6
go 1.25.7

require (
github.com/AlessandroPomponio/go-gibberish v0.0.0-20191004143433-a2d4156f0396
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/go_grpc_server_mux

go 1.25.6
go 1.25.7

require (
golang.org/x/net v0.38.0
Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/go_otel/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/go_otel

go 1.25.6
go 1.25.7

require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0
Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/go_otel_grpc/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/go_otel_grpc

go 1.25.6
go 1.25.7

require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/go_http2/client

go 1.25.6
go 1.25.7

require golang.org/x/net v0.38.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/go_http2/server

go 1.25.6
go 1.25.7

require golang.org/x/net v0.38.0

Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/gokafka-seg/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gokafka-seg

go 1.25.6
go 1.25.7

require github.com/segmentio/kafka-go v0.4.50

Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/gokafka/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gokafka

go 1.25.6
go 1.25.7

require github.com/IBM/sarama v1.43.2

Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/gomongo/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gomongo

go 1.25.6
go 1.25.7

require go.mongodb.org/mongo-driver v1.17.9

Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/gomongov2/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gomongov2

go 1.25.6
go 1.25.7

require go.mongodb.org/mongo-driver/v2 v2.3.1

Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/gomqtt/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gomqtt

go 1.25.6
go 1.25.7

require github.com/eclipse/paho.mqtt.golang v1.5.1

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gomysql-otelsql

go 1.25.6
go 1.25.7

require (
github.com/XSAM/otelsql v0.35.0
Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/gomysql-tls/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gomysql

go 1.25.6
go 1.25.7

require github.com/go-sql-driver/mysql v1.9.3

Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/gomysql/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gomysql

go 1.25.6
go 1.25.7

require github.com/go-sql-driver/mysql v1.9.3

Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/gopgx/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gopgx

go 1.25.6
go 1.25.7

require github.com/jackc/pgx/v5 v5.7.2

Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/goredis/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/goredis

go 1.25.6
go 1.25.7

require github.com/redis/go-redis/v9 v9.5.5

Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/gosql/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module go.opentelemetry.io/obi/internal/test/integration/components/gosql

go 1.25.6
go 1.25.7

require github.com/lib/pq v1.10.9
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module go.opentelemetry.io/obi/internal/test/integration/components/wrapper

go 1.25.6
go 1.25.7
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25.6@sha256:fc24d3881a021e7b968a4610fc024fba749f98fe5c07d4f28e6cfa14dc65a84c AS builder
FROM golang:1.25.7@sha256:85c0ab0b73087fda36bf8692efe2cf67c54a06d7ca3b49c489bbff98c9954d64 AS builder

WORKDIR /src/go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/backend

go 1.25.6
go 1.25.7

require (
github.com/caarlos0/env/v7 v7.1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25.6@sha256:fc24d3881a021e7b968a4610fc024fba749f98fe5c07d4f28e6cfa14dc65a84c AS builder
FROM golang:1.25.7@sha256:85c0ab0b73087fda36bf8692efe2cf67c54a06d7ca3b49c489bbff98c9954d64 AS builder

WORKDIR /src

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25.6@sha256:fc24d3881a021e7b968a4610fc024fba749f98fe5c07d4f28e6cfa14dc65a84c AS builder
FROM golang:1.25.7@sha256:85c0ab0b73087fda36bf8692efe2cf67c54a06d7ca3b49c489bbff98c9954d64 AS builder

WORKDIR /src

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/old_grpc/worker

go 1.25.6
go 1.25.7

require (
github.com/caarlos0/env/v7 v7.1.0
Expand Down
2 changes: 1 addition & 1 deletion internal/test/integration/components/sqlclient/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/integration/components/sqlclient

go 1.25.6
go 1.25.7

require modernc.org/sqlite v1.25.0

Expand Down
2 changes: 1 addition & 1 deletion internal/test/oats/http/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/oats/http

go 1.25.6
go 1.25.7

require (
github.com/grafana/oats v0.0.3
Expand Down
2 changes: 1 addition & 1 deletion internal/test/oats/kafka/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/oats/kafka

go 1.25.6
go 1.25.7

require (
github.com/grafana/oats v0.0.3
Expand Down
2 changes: 1 addition & 1 deletion internal/test/oats/mongo/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/oats/mongo

go 1.25.6
go 1.25.7

require (
github.com/grafana/oats v0.0.3
Expand Down
2 changes: 1 addition & 1 deletion internal/test/oats/redis/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/oats/redis

go 1.25.6
go 1.25.7

require (
github.com/grafana/oats v0.0.3
Expand Down
2 changes: 1 addition & 1 deletion internal/test/oats/sql/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/test/oats/sql

go 1.25.6
go 1.25.7

require (
github.com/grafana/oats v0.0.3
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/obi/internal/tools

go 1.25.6
go 1.25.7

require (
github.com/cilium/ebpf v0.20.0
Expand Down