Skip to content

otel: bump dependencies to v1.11.2/v0.37.0#3361

Merged
tonistiigi merged 1 commit intomoby:masterfrom
errordeveloper:bump-otel
Feb 7, 2023
Merged

otel: bump dependencies to v1.11.2/v0.37.0#3361
tonistiigi merged 1 commit intomoby:masterfrom
errordeveloper:bump-otel

Conversation

@errordeveloper
Copy link
Copy Markdown
Contributor

@errordeveloper errordeveloper commented Dec 6, 2022

I am intending to cleanup some of the OTel helpers, so I figured it'd be good to start by updating the deps, e.g. there is a chance some helper logic buildkit carries had been implemented ustream.

@errordeveloper errordeveloper force-pushed the bump-otel branch 2 times, most recently from 9d82ddf to 9a693bf Compare December 6, 2022 12:37
@errordeveloper errordeveloper changed the title Bump otel dependencies to v1.11.2/v0.37.0 otel: bump dependencies to v1.11.2/v0.37.0 Dec 6, 2022
tonistiigi
tonistiigi previously approved these changes Dec 6, 2022
@errordeveloper
Copy link
Copy Markdown
Contributor Author

errordeveloper commented Dec 13, 2022

@tonistiigi the CI is failing with this:

error: cannot merge resource due to conflicting Schema URL

Any pointers to what that might be about?

@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Jan 30, 2023

error: cannot merge resource due to conflicting Schema URL

Fixed in #3395

@AkihiroSuda AkihiroSuda reopened this Jan 30, 2023
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
@errordeveloper
Copy link
Copy Markdown
Contributor Author

@jedevc I've rebased just now, looks like very unrelated failures:

FAIL: TestIntegration/TestDiffCircularSymlinks/worker=containerd-rootless (79.64s)
FAIL: TestIntegration/TestDiffSymlinkOverridesSymlink/worker=containerd-rootless (100.19s)
FAIL: TestIntegration/TestDiffCircularSymlinks/worker=containerd (76.67s)
FAIL: TestIntegration/TestDiffCircularParentDirSymlinks/worker=containerd-1.6 (55.98s)

@jedevc jedevc requested a review from tonistiigi February 7, 2023 11:01
@tonistiigi tonistiigi merged commit ecc5937 into moby:master Feb 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants