Skip to content

Commit 773a781

Browse files
MrAliasMrAlias
authored
Merge branch 'main' into otelglobal_collect_user_tracer_name
2 parents 2d04a93 + 024038a commit 773a781

File tree

19 files changed

+198
-185
lines changed

19 files changed

+198
-185
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
password: ${{ secrets.GITHUB_TOKEN }}
2929

3030
- name: Set up QEMU
31-
uses: docker/setup-qemu-action@v3.0.0
31+
uses: docker/setup-qemu-action@v3.1.0
3232

3333
- name: Set up Docker Buildx
34-
uses: docker/setup-buildx-action@v3.3.0
34+
uses: docker/setup-buildx-action@v3.4.0
3535

3636
- name: Extract metadata (tags, labels) for Docker
3737
id: meta
@@ -42,7 +42,7 @@ jobs:
4242
ghcr.io/${{ github.repository }}/${{ env.IMAGE_NAME }}
4343
4444
- name: Build and push
45-
uses: docker/build-push-action@v6.2.0
45+
uses: docker/build-push-action@v6.3.0
4646
with:
4747
push: true
4848
tags: ${{ steps.meta.outputs.tags }}

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
1616
--mount=type=cache,target=/go/pkg \
1717
make build
1818

19-
FROM gcr.io/distroless/base-debian12@sha256:786007f631d22e8a1a5084c5b177352d9dcac24b1e8c815187750f70b24a9fc6
19+
FROM gcr.io/distroless/base-debian12@sha256:1aae189e3baecbb4044c648d356ddb75025b2ba8d14cdc9c2a19ba784c90bfb9
2020
COPY --from=builder /app/otel-go-instrumentation /
2121
CMD ["/otel-go-instrumentation"]

‎examples/httpPlusdb/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.4
1+
FROM golang:1.22.5
22
WORKDIR /app
33
COPY ./*.go .
44
RUN go mod init main

‎examples/kafka-go/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.4
1+
FROM golang:1.22.5
22
WORKDIR /app
33
COPY . .
44
RUN go build -o main

‎examples/kafka-go/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ go 1.22.0
44

55
require (
66
github.com/segmentio/kafka-go v0.4.47
7-
go.opentelemetry.io/otel v1.27.0
8-
go.opentelemetry.io/otel/trace v1.27.0
7+
go.opentelemetry.io/otel v1.28.0
8+
go.opentelemetry.io/otel/trace v1.28.0
99
)
1010

1111
require (
12-
github.com/go-logr/logr v1.4.1 // indirect
12+
github.com/go-logr/logr v1.4.2 // indirect
1313
github.com/go-logr/stdr v1.2.2 // indirect
1414
github.com/klauspost/compress v1.15.9 // indirect
1515
github.com/pierrec/lz4/v4 v4.1.15 // indirect
16-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
16+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
1717
)

‎examples/kafka-go/go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
44
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
5-
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
6-
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
5+
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
6+
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
77
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
88
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
99
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -29,12 +29,12 @@ github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3k
2929
github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
3030
github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
3131
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
32-
go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg=
33-
go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ=
34-
go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik=
35-
go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak=
36-
go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw=
37-
go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4=
32+
go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
33+
go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
34+
go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
35+
go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
36+
go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
37+
go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
3838
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3939
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
4040
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=

‎examples/rolldice/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.4
1+
FROM golang:1.22.5
22
WORKDIR /app
33
COPY ./*.go .
44
RUN go mod init main

‎go.mod‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ require (
2727
github.com/hashicorp/go-version v1.7.0
2828
github.com/pkg/errors v0.9.1
2929
github.com/stretchr/testify v1.9.0
30-
go.opentelemetry.io/contrib/exporters/autoexport v0.52.0
31-
go.opentelemetry.io/otel v1.27.0
32-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0
33-
go.opentelemetry.io/otel/sdk v1.27.0
34-
go.opentelemetry.io/otel/trace v1.27.0
30+
go.opentelemetry.io/contrib/exporters/autoexport v0.53.0
31+
go.opentelemetry.io/otel v1.28.0
32+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0
33+
go.opentelemetry.io/otel/sdk v1.28.0
34+
go.opentelemetry.io/otel/trace v1.28.0
3535
go.uber.org/zap v1.27.0
3636
golang.org/x/arch v0.8.0
37-
golang.org/x/sys v0.21.0
37+
golang.org/x/sys v0.22.0
3838
gopkg.in/yaml.v3 v3.0.1
3939
)
4040

@@ -43,29 +43,35 @@ require (
4343
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4444
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4545
github.com/davecgh/go-spew v1.1.1 // indirect
46+
github.com/google/uuid v1.6.0 // indirect
4647
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
48+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4749
github.com/pmezard/go-difflib v1.0.0 // indirect
4850
github.com/prometheus/client_golang v1.19.1 // indirect
4951
github.com/prometheus/client_model v0.6.1 // indirect
50-
github.com/prometheus/common v0.53.0 // indirect
51-
github.com/prometheus/procfs v0.15.0 // indirect
52-
go.opentelemetry.io/contrib/bridges/prometheus v0.52.0 // indirect
53-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.27.0 // indirect
54-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0 // indirect
55-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
56-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
57-
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
58-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.27.0 // indirect
59-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect
60-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
61-
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
62-
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
52+
github.com/prometheus/common v0.55.0 // indirect
53+
github.com/prometheus/procfs v0.15.1 // indirect
54+
go.opentelemetry.io/contrib/bridges/prometheus v0.53.0 // indirect
55+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
56+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
57+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
58+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
59+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
60+
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
61+
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.4.0 // indirect
62+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 // indirect
63+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
64+
go.opentelemetry.io/otel/log v0.4.0 // indirect
65+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
66+
go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect
67+
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
68+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
6369
go.uber.org/multierr v1.11.0 // indirect
6470
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
65-
golang.org/x/net v0.25.0 // indirect
66-
golang.org/x/text v0.15.0 // indirect
67-
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
68-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
69-
google.golang.org/grpc v1.64.0 // indirect
70-
google.golang.org/protobuf v1.34.1 // indirect
71+
golang.org/x/net v0.26.0 // indirect
72+
golang.org/x/text v0.16.0 // indirect
73+
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
74+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
75+
google.golang.org/grpc v1.65.0 // indirect
76+
google.golang.org/protobuf v1.34.2 // indirect
7177
)

0 commit comments

Comments
 (0)