From 3fdb51b378ddf6882ccf4f9c52723de6bd92ea0e Mon Sep 17 00:00:00 2001
From: "Mengyi Zhou (bjrara)" <zmengyi@amazon.com>
Date: Thu, 5 Dec 2024 09:18:28 -0800
Subject: [PATCH] [awsxrayexporter] Generate url section in xray segment when
 net.peer.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
https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/35375.

<!--Describe what testing was performed and which tests were added.-->
#### Testing
Unit test
---
 .../awsxrayexporter-fix-segment-gen.yaml      | 27 +++++++++++++++++++
 .../internal/translator/http.go               |  1 +
 .../internal/translator/http_test.go          |  1 +
 3 files changed, 29 insertions(+)
 create mode 100644 .chloggen/awsxrayexporter-fix-segment-gen.yaml

diff --git a/.chloggen/awsxrayexporter-fix-segment-gen.yaml b/.chloggen/awsxrayexporter-fix-segment-gen.yaml
new file mode 100644
index 000000000000..77e4ad6ed1aa
--- /dev/null
+++ b/.chloggen/awsxrayexporter-fix-segment-gen.yaml
@@ -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]
diff --git a/exporter/awsxrayexporter/internal/translator/http.go b/exporter/awsxrayexporter/internal/translator/http.go
index e761eae7e00f..b83ccb105b77 100644
--- a/exporter/awsxrayexporter/internal/translator/http.go
+++ b/exporter/awsxrayexporter/internal/translator/http.go
@@ -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 {
diff --git a/exporter/awsxrayexporter/internal/translator/http_test.go b/exporter/awsxrayexporter/internal/translator/http_test.go
index 92fb6b50bc30..4361c33e967e 100644
--- a/exporter/awsxrayexporter/internal/translator/http_test.go
+++ b/exporter/awsxrayexporter/internal/translator/http_test.go
@@ -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)