Skip to content

Commit

Permalink
[awsxrayexporter] Generate url section in xray segment when net.peer.…
Browse files Browse the repository at this point in the history
…name is available (#36530)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
Generate url section in X-Ray segment when net.peer.name is available

<!-- Issue number (e.g. #1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
Fixes
#35375.

<!--Describe what testing was performed and which tests were added.-->
#### Testing
Unit test
  • Loading branch information
bjrara authored Dec 5, 2024
1 parent 4a465fd commit 3fdb51b
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 0 deletions.
27 changes: 27 additions & 0 deletions .chloggen/awsxrayexporter-fix-segment-gen.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: enhancement

# 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: "Generate url section in xray segment when `net.peer.name` is available"

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

# (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: [user]
1 change: 1 addition & 0 deletions exporter/awsxrayexporter/internal/translator/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ func makeHTTP(span ptrace.Span) (map[string]pcommon.Value, *awsxray.HTTPData) {
hasHTTPRequestURLAttributes = true
case conventions.AttributeNetPeerName:
urlParts[key] = value.Str()
hasHTTPRequestURLAttributes = true
case conventions.AttributeNetPeerPort:
urlParts[key] = value.Str()
if len(urlParts[key]) == 0 {
Expand Down
1 change: 1 addition & 0 deletions exporter/awsxrayexporter/internal/translator/http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ func TestClientSpanWithPeerAttributes(t *testing.T) {

assert.NotNil(t, httpData)
assert.NotNil(t, filtered)
assert.NotNil(t, httpData.Request.URL)

assert.Equal(t, "10.8.17.36", *httpData.Request.ClientIP)

Expand Down

0 comments on commit 3fdb51b

Please sign in to comment.