From 34684c7b1a934a46cc42073b3d349a7cebd197c7 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Mon, 6 Jan 2025 23:06:45 +0000 Subject: [PATCH] removed obsolete functions and structures --- .../Implementation/AWSServiceHelper.cs | 64 ------------------- .../AWSTracingPipelineHandler.cs | 20 ------ 2 files changed, 84 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSServiceHelper.cs b/src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSServiceHelper.cs index 6a5f07e4..12419a1a 100644 --- a/src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSServiceHelper.cs +++ b/src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSServiceHelper.cs @@ -50,70 +50,6 @@ internal class AWSServiceHelper { "DataSourceId", AWSSemanticConventions.AttributeAWSBedrockDataSourceId }, }; - // for Bedrock Agent operations, we map each supported operation to one resource: Agent, DataSource, or KnowledgeBase - internal static List BedrockAgentAgentOps = new List - { - "CreateAgentActionGroup", - "CreateAgentAlias", - "DeleteAgentActionGroup", - "DeleteAgentAlias", - "DeleteAgent", - "DeleteAgentVersion", - "GetAgentActionGroup", - "GetAgentAlias", - "GetAgent", - "GetAgentVersion", - "ListAgentActionGroups", - "ListAgentAliases", - "ListAgentKnowledgeBases", - "ListAgentVersions", - "PrepareAgent", - "UpdateAgentActionGroup", - "UpdateAgentAlias", - "UpdateAgent", - }; - - internal static List BedrockAgentKnowledgeBaseOps = new List - { - "AssociateAgentKnowledgeBase", - "CreateDataSource", - "DeleteKnowledgeBase", - "DisassociateAgentKnowledgeBase", - "GetAgentKnowledgeBase", - "GetKnowledgeBase", - "ListDataSources", - "UpdateAgentKnowledgeBase", - }; - - internal static List BedrockAgentDataSourceOps = new List - { - "DeleteDataSource", - "GetDataSource", - "UpdateDataSource", - }; - - internal static IReadOnlyDictionary OperationNameToResourceMap() - { - var operationClassMap = new Dictionary(); - - foreach (var op in BedrockAgentKnowledgeBaseOps) - { - operationClassMap[op] = "KnowledgeBaseId"; - } - - foreach (var op in BedrockAgentDataSourceOps) - { - operationClassMap[op] = "DataSourceId"; - } - - foreach (var op in BedrockAgentAgentOps) - { - operationClassMap[op] = "AgentId"; - } - - return operationClassMap; - } - internal static string GetAWSServiceName(IRequestContext requestContext) => Utils.RemoveAmazonPrefixFromServiceName(requestContext.ServiceMetaData.ServiceId); diff --git a/src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSTracingPipelineHandler.cs b/src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSTracingPipelineHandler.cs index 91ea9118..f0ad6c51 100644 --- a/src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSTracingPipelineHandler.cs +++ b/src/OpenTelemetry.Instrumentation.AWS/Implementation/AWSTracingPipelineHandler.cs @@ -252,26 +252,6 @@ private static void AddResponseSpecificInformation(Activity activity, IResponseC } } - private static void AddBedrockAgentResponseAttribute(Activity activity, AmazonWebServiceResponse response, string parameter) - { - var responseObject = response.GetType().GetProperty(Utils.RemoveSuffix(parameter, "Id")); - if (responseObject != null) - { - var attributeObject = responseObject.GetValue(response); - if (attributeObject != null) - { - var property = attributeObject.GetType().GetProperty(parameter); - if (property != null) - { - if (AWSServiceHelper.ParameterAttributeMap.TryGetValue(parameter, out var attribute)) - { - activity.SetTag(attribute, property.GetValue(attributeObject)); - } - } - } - } - } - private static void AddStatusCodeToActivity(Activity activity, int status_code) { activity.SetTag(AWSSemanticConventions.AttributeHttpStatusCode, status_code);