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.

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

Fix X-Ray DB subsegment name with JDBC Connection String #33225

Merged
merged 1 commit into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .chloggen/awsxrayexporter_jdbc_fix.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: awsxrayexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix the DB subsegment(client span) name with JDBC conn string starts with "jdbc:"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [33225]

# (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:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# 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: []
5 changes: 4 additions & 1 deletion exporter/awsxrayexporter/internal/translator/segment.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,10 @@ func MakeSegment(span ptrace.Span, resource pcommon.Resource, indexedAttrs []str
// For database queries, the segment name convention is <db name>@<db host>
name = dbInstance.Str()
if dbURL, ok := attributes.Get(conventions.AttributeDBConnectionString); ok {
if parsed, _ := url.Parse(dbURL.Str()); parsed != nil {
// Trim JDBC connection string if starts with "jdbc:", otherwise no change
// jdbc:mysql://db.dev.example.com:3306
dbURLStr := strings.TrimPrefix(dbURL.Str(), "jdbc:")
if parsed, _ := url.Parse(dbURLStr); parsed != nil {
if parsed.Hostname() != "" {
name += "@" + parsed.Hostname()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func TestClientSpanWithDbComponent(t *testing.T) {
attributes[conventions.AttributeDBName] = "customers"
attributes[conventions.AttributeDBStatement] = spanName
attributes[conventions.AttributeDBUser] = "userprefsvc"
attributes[conventions.AttributeDBConnectionString] = "mysql://db.dev.example.com:3306"
attributes[conventions.AttributeDBConnectionString] = "jdbc:mysql://db.dev.example.com:3306"
attributes[conventions.AttributeNetPeerName] = "db.dev.example.com"
attributes[conventions.AttributeNetPeerPort] = "3306"
attributes["enterprise.app.id"] = enterpriseAppID
Expand Down