add

Author: aminalaee

aws_lambda_opentelemetry/constants.py

@@ -1,6 +1,2 @@
-# OTEL Configuration
-OTEL_SERVICE_NAME = "OTEL_SERVICE_NAME"
-OTEL_RESOURCE_ATTRIBUTES = "OTEL_RESOURCE_ATTRIBUTES"
-
 # AWS Lambda Configuration
 LAMBDA_INITIALIZATION_TYPE = "AWS_LAMBDA_INITIALIZATION_TYPE"

aws_lambda_opentelemetry/trace/helpers.py

@@ -1,5 +1,6 @@
 from functools import wraps
 
+from aws_lambda_powertools.utilities.typing import LambdaContext
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.trace import (
     SpanKind,
@@ -9,7 +10,6 @@
     get_tracer_provider,
 )
 
-from aws_lambda_opentelemetry.typing.context import LambdaContext
 from aws_lambda_opentelemetry.utils import AwsAttributesExtractor
 
 

aws_lambda_opentelemetry/typing/__init__.py

@@ -2,6 +2,7 @@
 import os
 from abc import ABC, abstractmethod
 
+from aws_lambda_powertools.utilities.typing import LambdaContext
 from opentelemetry import trace
 from opentelemetry.semconv._incubating.attributes.cloud_attributes import (
     CLOUD_RESOURCE_ID,
@@ -40,7 +41,6 @@
 from opentelemetry.semconv.attributes.user_agent_attributes import USER_AGENT_ORIGINAL
 
 from aws_lambda_opentelemetry import constants
-from aws_lambda_opentelemetry.typing.context import LambdaContext
 
 _is_cold_start = True
 
@@ -91,7 +91,7 @@ def get_attributes(self, event: dict, context: LambdaContext) -> dict:
         return {
             FAAS_INVOCATION_ID: context.aws_request_id,
             FAAS_INVOKED_NAME: context.function_name,
-            FAAS_INVOKED_REGION: context.region,
+            FAAS_INVOKED_REGION: os.getenv("AWS_DEFAULT_REGION"),
             FAAS_INVOKED_PROVIDER: FaasInvokedProviderValues.AWS.value,
             FAAS_MAX_MEMORY: context.memory_limit_in_mb,
             FAAS_VERSION: context.function_version,

aws_lambda_opentelemetry/typing/context.py

@@ -29,10 +29,11 @@ classifiers = [
   "Operating System :: OS Independent",
 ]
 dependencies = [
-    "opentelemetry-api>=1.0.0",
-    "opentelemetry-exporter-otlp-proto-common>=1.0.0",
-    "opentelemetry-sdk>=1.0.0",
-    "uuid-utils>=0.12.0",
+    "aws-lambda-powertools>=3.0.0,<4.0.0",
+    "opentelemetry-api>=1.0.0,<2.0",
+    "opentelemetry-exporter-otlp-proto-common>=1.0.0,<2.0",
+    "opentelemetry-sdk>=1.0.0,<2.0",
+    "uuid-utils>=0.12.0,<1.0",
 ]
 
 [dependency-groups]

aws_lambda_opentelemetry/utils.py

@@ -2,8 +2,7 @@
 from pathlib import Path
 
 import pytest
-
-from aws_lambda_opentelemetry.typing.context import LambdaContext
+from aws_lambda_powertools.utilities.typing import LambdaContext
 
 
 class MockLambdaContext(LambdaContext):

pyproject.toml

@@ -2,12 +2,12 @@
 
 import opentelemetry.trace
 import pytest
+from aws_lambda_powertools.utilities.typing import LambdaContext
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter
 
 from aws_lambda_opentelemetry.trace import instrument_handler
-from aws_lambda_opentelemetry.typing.context import LambdaContext
 
 exporter = InMemorySpanExporter()
 provider = TracerProvider()

tests/conftest.py

@@ -1,10 +1,10 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from aws_lambda_powertools.utilities.typing import LambdaContext
 from opentelemetry.sdk.trace import Span
 
 from aws_lambda_opentelemetry import utils
-from aws_lambda_opentelemetry.typing.context import LambdaContext
 
 
 class TestColdStart:
@@ -152,7 +152,7 @@ def test_general_attributes(self, lambda_context: LambdaContext):
         attributes = span.set_attributes.call_args_list[0][0][0]
         assert attributes["faas.invocation_id"] == lambda_context.aws_request_id
         assert attributes["faas.invoked_name"] == lambda_context.function_name
-        assert attributes["faas.invoked_region"] == lambda_context.region
+        assert attributes["faas.invoked_region"] is None
         assert attributes["faas.invoked_provider"] == "aws"
         assert attributes["faas.max_memory"] == lambda_context.memory_limit_in_mb
         assert attributes["faas.version"] == lambda_context.function_version