Removed aws.lambda.function.arn and aws.lambda.function.name.

Author: lukeina2z

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/lmbd.py

@@ -16,7 +16,7 @@
 import inspect
 import json
 import re
-from typing import Dict, Final
+from typing import Dict
 
 from opentelemetry.instrumentation.botocore.extensions.types import (
     _AttributeMapT,
@@ -32,11 +32,6 @@
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace.span import Span
 
-# Work is underway to add these two keys to the SemConv AWS registry, in line with other AWS resources.
-# https://github.com/open-telemetry/semantic-conventions/blob/main/docs/registry/attributes/aws.md#amazon-lambda-attributes
-AWS_LAMBDA_FUNCTION_ARN: Final = "aws.lambda.function.arn"
-AWS_LAMBDA_FUNCTION_NAME: Final = "aws.lambda.function.name"
-
 
 class _LambdaOperation(abc.ABC):
     @classmethod
@@ -128,9 +123,6 @@ def __init__(self, call_context: _AwsSdkCallContext):
         self._op = _OPERATION_MAPPING.get(call_context.operation)
 
     def extract_attributes(self, attributes: _AttributeMapT):
-        function_name = _OpInvoke._parse_function_name(self._call_context)
-        if function_name:
-            attributes[AWS_LAMBDA_FUNCTION_NAME] = function_name
         resource_mapping_id = self._call_context.params.get("UUID")
         if resource_mapping_id:
             attributes[AWS_LAMBDA_RESOURCE_MAPPING_ID] = resource_mapping_id
@@ -159,8 +151,3 @@ def on_success(
             span.set_attribute(
                 AWS_LAMBDA_RESOURCE_MAPPING_ID, resource_mapping_id
             )
-
-        lambda_configuration = result.get("Configuration", {})
-        function_arn = lambda_configuration.get("FunctionArn")
-        if function_arn:
-            span.set_attribute(AWS_LAMBDA_FUNCTION_ARN, function_arn)

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_lambda.py

@@ -16,7 +16,6 @@
 import json
 import sys
 import zipfile
-from typing import Final
 from unittest import mock
 
 import botocore.session
@@ -36,9 +35,6 @@
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace.span import Span
 
-AWS_LAMBDA_FUNCTION_ARN: Final = "aws.lambda.function.arn"
-AWS_LAMBDA_FUNCTION_NAME: Final = "aws.lambda.function.name"
-
 
 def get_as_zip_file(file_name, content):
     zip_output = io.BytesIO()
@@ -220,14 +216,7 @@ def test_get_function(self):
         self.assertEqual(
             "GetFunction", span.attributes[SpanAttributes.RPC_METHOD]
         )
-        self.assertEqual(
-            "lambda-function-name-foo",
-            span.attributes[AWS_LAMBDA_FUNCTION_NAME],
-        )
 
-        function_arn = span.attributes.get(AWS_LAMBDA_FUNCTION_ARN)
-        self.assertIsNotNone(function_arn)
-        self.assertIn("lambda-function-name-foo", function_arn)
         self.assertIsNone(span.attributes.get(AWS_LAMBDA_RESOURCE_MAPPING_ID))
 
     @mock_aws
@@ -253,9 +242,6 @@ def test_create_event_source_mapping(self):
             "CreateEventSourceMapping",
             span.attributes[SpanAttributes.RPC_METHOD],
         )
-        self.assertEqual(
-            "MyLambdaFnFoo", span.attributes[AWS_LAMBDA_FUNCTION_NAME]
-        )
 
         uuid = span.attributes.get(AWS_LAMBDA_RESOURCE_MAPPING_ID)
         self.assertIsNotNone(uuid)
@@ -293,5 +279,3 @@ def test_get_event_source_mapping(self):
         uuid = span.attributes.get(AWS_LAMBDA_RESOURCE_MAPPING_ID)
         self.assertIsNotNone(uuid)
         self.assertEqual(expected_uuid, uuid)
-        self.assertIsNone(span.attributes.get(AWS_LAMBDA_FUNCTION_ARN))
-        self.assertIsNone(span.attributes.get(AWS_LAMBDA_FUNCTION_NAME))