Skip to content

Vendor gravitational/trace/trail in api#51032

Merged
rosstimothy merged 2 commits into
masterfrom
tross/vendor_trail
Jan 14, 2025
Merged

Vendor gravitational/trace/trail in api#51032
rosstimothy merged 2 commits into
masterfrom
tross/vendor_trail

Conversation

@rosstimothy
Copy link
Copy Markdown
Contributor

Pulling in the trail package directly in api will allow the trace module to shed the grpc-go dependency. This needs to land prior to gravitational/trace#112 being included in a new version of trace.

There should be no noticeable change in the api dependency tree since it already depends on grpc-go. Some additional items from the trace/internal package were also vendored within trail as needed. Additionally, some of the public api of trail that was not being consumed has been made private.

The conversion will be complete once https://github.com/gravitational/teleport.e/pull/5843 lands and a new version of trace is published and used in go.mod.

Pulling in the trail package directly in api will allow the trace
module to shed the grpc-go dependency. This needs to land prior
to gravitational/trace#112 being included
in a new version of trace.

There should be no noticable change in the api depdency tree since
it already depends on grpc-go. Some additional items from the
trace/internal package were also vendored within trail as needed.
Additionally, some of the public api of trail that was not being
consumed has been made private.
@rosstimothy rosstimothy added the no-changelog Indicates that a PR does not require a changelog entry label Jan 14, 2025
@rosstimothy rosstimothy marked this pull request as ready for review January 14, 2025 19:25
@github-actions github-actions Bot added database-access Database access related issues and PRs kubernetes-access size/md tctl tctl - Teleport admin tool labels Jan 14, 2025
Comment thread api/trail/trail.go
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is a straight copy from trace, correct? (Just checking.)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The only differences are as mentioned in the description, a few public things were made private as they weren't consumed and some items from trace/internal were also included here. The only real changes are included separately in 4f20f2d to appease the linters.

@rosstimothy rosstimothy added this pull request to the merge queue Jan 14, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jan 14, 2025
@rosstimothy rosstimothy added this pull request to the merge queue Jan 14, 2025
Merged via the queue into master with commit ef85949 Jan 14, 2025
@rosstimothy rosstimothy deleted the tross/vendor_trail branch January 14, 2025 21:23
mvbrock pushed a commit that referenced this pull request Jan 18, 2025
* Vendor gravitational/trace/trail in api

Pulling in the trail package directly in api will allow the trace
module to shed the grpc-go dependency. This needs to land prior
to gravitational/trace#112 being included
in a new version of trace.

There should be no noticable change in the api depdency tree since
it already depends on grpc-go. Some additional items from the
trace/internal package were also vendored within trail as needed.
Additionally, some of the public api of trail that was not being
consumed has been made private.

* fix: appease linters
carloscastrojumo pushed a commit to carloscastrojumo/teleport that referenced this pull request Feb 19, 2025
* Vendor gravitational/trace/trail in api

Pulling in the trail package directly in api will allow the trace
module to shed the grpc-go dependency. This needs to land prior
to gravitational/trace#112 being included
in a new version of trace.

There should be no noticable change in the api depdency tree since
it already depends on grpc-go. Some additional items from the
trace/internal package were also vendored within trail as needed.
Additionally, some of the public api of trail that was not being
consumed has been made private.

* fix: appease linters
tigrato pushed a commit that referenced this pull request Jun 24, 2025
* Vendor gravitational/trace/trail in api

Pulling in the trail package directly in api will allow the trace
module to shed the grpc-go dependency. This needs to land prior
to gravitational/trace#112 being included
in a new version of trace.

There should be no noticable change in the api depdency tree since
it already depends on grpc-go. Some additional items from the
trace/internal package were also vendored within trail as needed.
Additionally, some of the public api of trail that was not being
consumed has been made private.

* fix: appease linters
github-merge-queue Bot pushed a commit that referenced this pull request Jun 25, 2025
* Vendor gravitational/trace/trail in api (#51032)

* Vendor gravitational/trace/trail in api

Pulling in the trail package directly in api will allow the trace
module to shed the grpc-go dependency. This needs to land prior
to gravitational/trace#112 being included
in a new version of trace.

There should be no noticable change in the api depdency tree since
it already depends on grpc-go. Some additional items from the
trace/internal package were also vendored within trail as needed.
Additionally, some of the public api of trail that was not being
consumed has been made private.

* fix: appease linters

* [v17] Update github.com/gravitational/predicate dependency to v1.3.4 (#56077)

---------

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

database-access Database access related issues and PRs kubernetes-access no-changelog Indicates that a PR does not require a changelog entry size/md tctl tctl - Teleport admin tool

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants