Description of changes:

These changes support AWS Resources with different CFN Identifier formats. This new attribute will have the key aws.remote.resource.cfn.primary.identifier.

More context can be found in the comments of this closed PR: #261

In most cases, this new attribute should have the same value as the existing attribute aws.remote.resource.identifier.

However, there are some edge cases we must handle as seen in this PR:

• AWS::SQS::Queue
  • https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sqs-queue.html
  • The CFN Id should be the URL of the Queue.
• AWS::Bedrock::DataSource
  • https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-datasource.html
  • The CFN Id should be a compound value where the knowledge base Id and the data source Id are separated by |

Also updated Bedrock Agent request parameters to also include Knowledge Base ID: https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/bedrock-agent/client/get_data_source.html

Test Plan:

Set up a client-server with auto-instrumentation to verify that the correct span data is being generated.

Unit tests for instrumentation

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.