vendor: go.opentelemetry.io/otel v1.28.0, go.opentelemetry.io/contrib v0.53.0 #48757

thaJeztah · 2024-10-25T11:24:51Z

needed for vendor: github.com/containerd/containerd v1.7.23, hcsshim v0.12.8 #48544

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

aligning all related packages to v1.28.0 as well Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah · 2024-10-25T11:27:35Z

FWIW, not sure if it's still important to align "semconv" versions as well; here's what's currently used;

testutil/helpers.go                                                                                                        semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/github.com/containerd/containerd/tracing/tracing.go                                                                 semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/github.com/moby/buildkit/util/tracing/detect/resource.go                                                            semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/github.com/moby/buildkit/util/tracing/tracing.go                                                                    semconv "go.opentelemetry.io/otel/semconv/v1.17.0"

vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/config.go                               semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go                          semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go                       semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/semconv.go                              semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/stats_handler.go                        semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/clienttrace.go                         semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go                           semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/internal/semconvutil/httpconv.go       semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/internal/semconvutil/netconv.go        semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv/util.go                           semconvNew "go.opentelemetry.io/otel/semconv/v1.24.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv/v1.20.0.go                           semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv/v1.24.0.go                        semconvNew "go.opentelemetry.io/otel/semconv/v1.24.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil/httpconv.go                      semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil/netconv.go                       semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/transport.go:                                         semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
vendor/go.opentelemetry.io/otel/sdk/resource/builtin.go                                                                    semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
vendor/go.opentelemetry.io/otel/sdk/resource/container.go                                                                  semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
vendor/go.opentelemetry.io/otel/sdk/resource/env.go                                                                        semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
vendor/go.opentelemetry.io/otel/sdk/resource/host_id.go                                                                    semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
vendor/go.opentelemetry.io/otel/sdk/resource/os.go                                                                         semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
vendor/go.opentelemetry.io/otel/sdk/resource/process.go                                                                    semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
vendor/go.opentelemetry.io/otel/sdk/trace/span.go                                                                          semconv "go.opentelemetry.io/otel/semconv/v1.26.0"

thaJeztah · 2024-10-25T11:37:31Z

In the BuildKit repository it looks like this; looks like util/tracing is aligning with contrib/instrumentation there;

util/tracing/detect/resource.go:                                                                                      semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
util/tracing/tracing.go:                                                                                              semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/github.com/containerd/containerd/tracing/tracing.go:                                                           semconv "go.opentelemetry.io/otel/semconv/v1.21.0"

vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/config.go:                         semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go:                    semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go:                 semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/semconv.go:                        semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/stats_handler.go:                  semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/clienttrace.go:                   semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go:                     semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/internal/semconvutil/httpconv.go: semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/internal/semconvutil/netconv.go:  semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/handler.go:                                      semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil/httpconv.go:                semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil/netconv.go:                 semconv "go.opentelemetry.io/otel/semconv/v1.17.0"

vendor/go.opentelemetry.io/otel/exporters/jaeger/jaeger.go:                                                           semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/go.opentelemetry.io/otel/sdk/resource/builtin.go:                                                              semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/go.opentelemetry.io/otel/sdk/resource/container.go:                                                            semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/go.opentelemetry.io/otel/sdk/resource/env.go:                                                                  semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/go.opentelemetry.io/otel/sdk/resource/host_id.go:                                                              semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/go.opentelemetry.io/otel/sdk/resource/os.go:                                                                   semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/go.opentelemetry.io/otel/sdk/resource/process.go:                                                              semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
vendor/go.opentelemetry.io/otel/sdk/trace/span.go:                                                                    semconv "go.opentelemetry.io/otel/semconv/v1.21.0"

thaJeztah · 2024-10-29T10:35:40Z

Bringing this one in (after discussion on Slack, looks like this should be OK to go)

thaJeztah added 3 commits October 25, 2024 12:59

vendor: google.golang.org/genproto/googleapis/api f6361c86f094

070d6c7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

vendor: go.opentelemetry.io/otel v1.28.0

d9a2ca7

aligning all related packages to v1.28.0 as well Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

vendor: go.opentelemetry.io/contrib/instrumentation/xxx v0.53.0

f2a3acc

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah added status/2-code-review area/metrics area/metrics/otel area/dependencies labels Oct 25, 2024

thaJeztah added this to the 28.0.0 milestone Oct 25, 2024

thaJeztah mentioned this pull request Oct 28, 2024

util/tracing: switch to semconv v0.21.0 moby/buildkit#5460

Merged

vvoland approved these changes Oct 29, 2024

View reviewed changes

thaJeztah merged commit 571d659 into moby:master Oct 29, 2024
172 checks passed

thaJeztah deleted the bump_otel_v0.28_v0.53 branch October 29, 2024 10:35

thaJeztah mentioned this pull request Oct 30, 2024

vendor: github.com/containerd/containerd v1.7.23, hcsshim v0.12.8 #48544

Merged

6 tasks

thaJeztah mentioned this pull request Nov 25, 2024

[27.x backport] vendor: update buildkit to v0.18.2 #48949

Merged

5 tasks

thaJeztah mentioned this pull request Dec 19, 2024

[27.x backport] vendor: go.opentelemetry.io/otel v1.28.0, go.opentelemetry.io/contrib v0.53.0 #49134

Merged

thaJeztah added the process/cherry-picked label Dec 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

vendor: go.opentelemetry.io/otel v1.28.0, go.opentelemetry.io/contrib v0.53.0 #48757

vendor: go.opentelemetry.io/otel v1.28.0, go.opentelemetry.io/contrib v0.53.0 #48757

thaJeztah commented Oct 25, 2024

Uh oh!

thaJeztah commented Oct 25, 2024 •

edited

Loading

Uh oh!

thaJeztah commented Oct 25, 2024

Uh oh!

thaJeztah commented Oct 29, 2024

Uh oh!

Uh oh!

Uh oh!

vendor: go.opentelemetry.io/otel v1.28.0, go.opentelemetry.io/contrib v0.53.0 #48757

vendor: go.opentelemetry.io/otel v1.28.0, go.opentelemetry.io/contrib v0.53.0 #48757

Conversation

thaJeztah commented Oct 25, 2024

Uh oh!

thaJeztah commented Oct 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah commented Oct 25, 2024

Uh oh!

thaJeztah commented Oct 29, 2024

Uh oh!

Uh oh!

Uh oh!

thaJeztah commented Oct 25, 2024 •

edited

Loading