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.
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
[client, consumer] Move client features to consumerconnection #9996
Open
TylerHelmuth
wants to merge
2
commits into
open-telemetry:main
Choose a base branch
from
TylerHelmuth:client-move-to-consumer
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Use this changelog template to create an entry for release notes. | ||
|
||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: deprecation | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) | ||
component: collector/client | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: Deprecates collector/client. Use `consumerconnection` instead. | ||
|
||
# One or more tracking issues or pull requests related to the change | ||
issues: [9996] | ||
|
||
# (Optional) One or more lines of additional information to render under the primary note. | ||
# These lines will be padded with 2 spaces and then inserted directly into the document. | ||
# Use pipe (|) for multiline entries. | ||
subtext: | ||
|
||
# Optional: The change log or logs in which this entry should be included. | ||
# e.g. '[user]' or '[user, api]' | ||
# Include 'user' if the change is relevant to end users. | ||
# Include 'api' if there is a change to a library API. | ||
# Default: '[user]' | ||
change_logs: [api] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -86,6 +86,8 @@ import ( | |||||
type ctxKey struct{} | ||||||
|
||||||
// Info contains data related to the clients connecting to receivers. | ||||||
// | ||||||
// Deprecated: [v0.99.0] Use consumerconn.Info instead | ||||||
type Info struct { | ||||||
// Addr for the client connecting to this collector. Available in a | ||||||
// best-effort basis, and generally reliable for receivers making use of | ||||||
|
@@ -103,6 +105,8 @@ type Info struct { | |||||
|
||||||
// AuthData represents the authentication data as seen by authenticators tied to | ||||||
// the receivers. | ||||||
// | ||||||
// Deprecated: [v0.99.0] Use consumerconn.AuthData instead | ||||||
type AuthData interface { | ||||||
// GetAttribute returns the value for the given attribute. Authenticator | ||||||
// implementations might define different data types for different | ||||||
|
@@ -114,16 +118,21 @@ type AuthData interface { | |||||
GetAttributeNames() []string | ||||||
} | ||||||
|
||||||
// Deprecated: [v0.99.0] Use consumerconn.MetadataHostName instead | ||||||
const MetadataHostName = "Host" | ||||||
|
||||||
// NewContext takes an existing context and derives a new context with the | ||||||
// client.Info value stored on it. | ||||||
// | ||||||
// Deprecated: [v0.99.0] Use consumerconnection.NewContextWithConnection instead | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
func NewContext(ctx context.Context, c Info) context.Context { | ||||||
return context.WithValue(ctx, ctxKey{}, c) | ||||||
} | ||||||
|
||||||
// FromContext takes a context and returns a ClientInfo from it. | ||||||
// When a ClientInfo isn't present, a new empty one is returned. | ||||||
// | ||||||
// Deprecated: [v0.99.0] Use consumerconn.InfoFromContext instead | ||||||
func FromContext(ctx context.Context) Info { | ||||||
c, ok := ctx.Value(ctxKey{}).(Info) | ||||||
if !ok { | ||||||
|
@@ -133,11 +142,15 @@ func FromContext(ctx context.Context) Info { | |||||
} | ||||||
|
||||||
// Metadata is an immutable map, meant to contain request metadata. | ||||||
// | ||||||
// Deprecated: [v0.99.0] Use consumerconn.Metadata instead | ||||||
type Metadata struct { | ||||||
data map[string][]string | ||||||
} | ||||||
|
||||||
// NewMetadata creates a new Metadata object to use in Info. | ||||||
// | ||||||
// Deprecated: [v0.99.0] Use consumerconn.NewMetadata instead | ||||||
func NewMetadata(md map[string][]string) Metadata { | ||||||
c := make(map[string][]string, len(md)) | ||||||
for k, v := range md { | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.