Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/src/otel/otel_sdk/nodeps-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TODO: move these dependencies to requirements.txt when they stopped relying on a pinned version of
# opentelemetry-propagator-aws-xray
opentelemetry-instrumentation-aws-lambda==0.60b1
opentelemetry-instrumentation-aws-lambda==0.61b0
opentelemetry-instrumentation-botocore==0.60b1
2 changes: 1 addition & 1 deletion python/src/otel/tests/nodeps-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
opentelemetry-instrumentation-aws-lambda==0.60b1
opentelemetry-instrumentation-aws-lambda==0.61b0
8 changes: 5 additions & 3 deletions python/src/otel/tests/test_otel.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,16 @@


class MockLambdaContext:
def __init__(self, aws_request_id, invoked_function_arn):
def __init__(self, aws_request_id, invoked_function_arn, function_name):
self.invoked_function_arn = invoked_function_arn
self.aws_request_id = aws_request_id
self.function_name = function_name


MOCK_LAMBDA_CONTEXT = MockLambdaContext(
aws_request_id="mock_aws_request_id",
invoked_function_arn="arn:aws:lambda:us-west-2:123456789012:function:my-function",
function_name="my-function",
)

MOCK_XRAY_TRACE_ID = 0x5FB7331105E8BB83207FA31D4D9CDB4C
Expand Down Expand Up @@ -188,7 +190,7 @@ def setUp(self):
"os.environ",
{
AWS_LAMBDA_EXEC_WRAPPER: "mock_aws_lambda_exec_wrapper",
AWS_LAMBDA_FUNCTION_NAME: "test-func",
AWS_LAMBDA_FUNCTION_NAME: "my-function",
_HANDLER: "mocks.lambda_function.handler",
},
)
Expand Down Expand Up @@ -237,7 +239,7 @@ def test_active_tracing(self):

self.assertEqual(len(spans), 1)
span = spans[0]
self.assertEqual(span.name, os.environ[ORIG_HANDLER])
self.assertEqual(span.name, MOCK_LAMBDA_CONTEXT.function_name)
self.assertEqual(span.get_span_context().trace_id, MOCK_XRAY_TRACE_ID)
self.assertEqual(span.kind, SpanKind.SERVER)
self.assertSpanHasAttributes(
Expand Down
Loading