DEVPROD-13165 Add expanded remote path to otel for s3 commands (#8598)

evergreen-ci · Jan 8, 2025 · de4bd8b · de4bd8b
1 parent 4f10f6a
commit de4bd8b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/agent/command/s3_get.go b/agent/command/s3_get.go
@@ -29,6 +29,7 @@ var (
 	s3GetBucketAttribute               = fmt.Sprintf("%s.bucket", s3GetAttribute)
 	s3GetTemporaryCredentialsAttribute = fmt.Sprintf("%s.temporary_credentials", s3GetAttribute)
 	s3GetRemoteFileAttribute           = fmt.Sprintf("%s.remote_file", s3GetAttribute)
+	s3GetExpandedRemoteFileAttribute   = fmt.Sprintf("%s.expanded_remote_file", s3GetAttribute)
 )
 
 // s3get is a command to fetch a resource from an S3 bucket and download it to
@@ -181,6 +182,7 @@ func (c *s3get) Execute(ctx context.Context,
 		attribute.String(s3GetBucketAttribute, c.Bucket),
 		attribute.Bool(s3GetTemporaryCredentialsAttribute, c.AwsSessionToken != ""),
 		attribute.String(s3GetRemoteFileAttribute, c.remoteFile),
+		attribute.String(s3GetExpandedRemoteFileAttribute, c.RemoteFile),
 	)
 
 	// create pail bucket

diff --git a/agent/command/s3_put.go b/agent/command/s3_put.go
@@ -35,7 +35,8 @@ var (
 	s3PutTemporaryCredentialsAttribute = fmt.Sprintf("%s.temporary_credentials", s3PutAttribute)
 	s3PutVisibilityAttribute           = fmt.Sprintf("%s.visibility", s3PutAttribute)
 	s3PutPermissionsAttribute          = fmt.Sprintf("%s.permissions", s3PutAttribute)
-	s3PutRemotePathAttribute           = fmt.Sprintf("%s.remote_path", s3PutAttribute)
+	s3PutRemoteFileAttribute           = fmt.Sprintf("%s.remote_file", s3PutAttribute)
+	s3PutExpandedRemoteFileAttribute   = fmt.Sprintf("%s.expanded_remote_file", s3PutAttribute)
 )
 
 // s3pc is a command to put a resource to an S3 bucket and download it to
@@ -310,7 +311,8 @@ func (s3pc *s3put) Execute(ctx context.Context,
 		attribute.Bool(s3PutTemporaryCredentialsAttribute, s3pc.AwsSessionToken != ""),
 		attribute.String(s3PutVisibilityAttribute, s3pc.Visibility),
 		attribute.String(s3PutPermissionsAttribute, s3pc.Permissions),
-		attribute.String(s3PutRemotePathAttribute, s3pc.remoteFile),
+		attribute.String(s3PutRemoteFileAttribute, s3pc.remoteFile),
+		attribute.String(s3PutExpandedRemoteFileAttribute, s3pc.RemoteFile),
 	)
 
 	s3pc.internalBuckets = conf.InternalBuckets

diff --git a/config.go b/config.go
@@ -37,7 +37,7 @@ var (
 
 	// Agent version to control agent rollover. The format is the calendar date
 	// (YYYY-MM-DD).
-	AgentVersion = "2025-01-02"
+	AgentVersion = "2025-01-07"
 )
 
 const (