Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

go.mod: github.com/containerd/containerd v1.7.0-beta.3 #3395

Merged
merged 1 commit into from
Jan 29, 2023
Merged

go.mod: github.com/containerd/containerd v1.7.0-beta.3 #3395

merged 1 commit into from
Jan 29, 2023

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Dec 13, 2022 •
edited
Loading

AkihiroSuda
AkihiroSuda commented Dec 13, 2022
View reviewed changes
util/tracing/transform/span.go
return instrumentationScope(s.is)
}

// Deprecated: use InstrumentationScope.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Background)

@AkihiroSuda AkihiroSuda force-pushed the containerd-1.7-beta.1 branch 2 times, most recently from c6e7f9f to a980c0a Compare December 13, 2022 07:43
@AkihiroSuda AkihiroSuda marked this pull request as draft December 13, 2022 07:55
@AkihiroSuda AkihiroSuda marked this pull request as ready for review December 13, 2022 08:12
@AkihiroSuda AkihiroSuda mentioned this pull request Dec 13, 2022
Closed
@AkihiroSuda AkihiroSuda changed the title go.mod: github.com/containerd/containerd v1.7.0-beta.1 go.mod: github.com/containerd/containerd v1.7.0-beta.2 Jan 4, 2023
@AkihiroSuda AkihiroSuda force-pushed the containerd-1.7-beta.1 branch 4 times, most recently from 57b3c58 to f7e7550 Compare January 8, 2023 03:17
@AkihiroSuda
Copy link
Member Author

@tonistiigi Can we remove the status/do-not-merge label, as the master branch is now open for v0.12?

@AkihiroSuda
Copy link
Member Author

Rebased

@AkihiroSuda
go.mod: github.com/containerd/containerd v1.7.0-beta.3
d63a2bc 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda AkihiroSuda changed the title go.mod: github.com/containerd/containerd v1.7.0-beta.2 go.mod: github.com/containerd/containerd v1.7.0-beta.3 Jan 28, 2023
@AkihiroSuda
Copy link
Member Author

Updated to beta.3

tonistiigi
tonistiigi reviewed Jan 29, 2023
View reviewed changes
util/tracing/transform/instrumentation.go
@@ -6,12 +6,12 @@ import (
"go.opentelemetry.io/otel/sdk/instrumentation"
)

func instrumentationLibrary(il *commonpb.InstrumentationLibrary) instrumentation.Library {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this library has been updated a lot in the upstream. Please follow-up with full update so we get all the changes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

You meand you want to update otel again before addressing this?

Atm buildkit has copy of otel library https://github.com/moby/buildkit/tree/master/util/tracing/transform . We can't link upstream because that package was internal. Unless there is now a better way to do this we should keep this package up to date when we update otel in vendor.

Copy link
Member Author

@AkihiroSuda AkihiroSuda Jan 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, didn't get what you meant by "full update", but looks like you meant copying https://github.com/open-telemetry/opentelemetry-go/tree/main/exporters/otlp/otlptrace/internal/tracetransform to https://github.com/moby/buildkit/tree/master/util/tracing/transform

@tonistiigi tonistiigi merged commit bbb1ec0 into moby:master Jan 29, 2023
@AkihiroSuda AkihiroSuda mentioned this pull request Jan 30, 2023
Merged
@thaJeztah thaJeztah mentioned this pull request Mar 8, 2023
Closed
@tonistiigi tonistiigi mentioned this pull request Mar 29, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AkihiroSuda @tonistiigi