Merge remote-tracking branch 'upstream/main' into feat/withRetry

Author: Alex Wang

.github/scripts/ci-checks.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -e
 

.gitignore

@@ -31,7 +31,7 @@ dist/
 
 .kiro/
 
-*/build/*
-*/*.zip
+**/build/
+**/*.zip
 
 .env

packages/aws-durable-execution-sdk-python-examples/pyproject.toml

@@ -15,15 +15,6 @@ dependencies = [
 [tool.hatch.build.targets.wheel]
 packages = ["src"]
 
-[tool.pytest.ini_options]
-testpaths = ["test"]
-addopts = "-v --strict-markers"
-pythonpath = ["."]
-markers = [
-  "example: marks tests as example tests (deselect with '-m \"not example\"')",
-  "durable_execution: marks tests that use the durable_runner fixture (not used for test selection)",
-]
-
 [tool.hatch.envs.examples.scripts]
 cli = "python cli.py {args}"
 bootstrap = "python cli.py bootstrap"

packages/aws-durable-execution-sdk-python-otel/README.md

@@ -2,9 +2,11 @@
 
 OpenTelemetry instrumentation for the [AWS Durable Execution SDK for Python](https://github.com/aws/aws-durable-execution-sdk-python).
 
+> **Note:** v0.1.0 reserves the package name. Instrumentation lands in v0.2.0.
+
 ## Overview
 
-This package provides automatic OpenTelemetry tracing for durable execution workflows, giving you visibility into step execution, waits, retries, and overall workflow performance.
+This package will provide automatic OpenTelemetry tracing for durable execution workflows, giving you visibility into step execution, waits, retries, and overall workflow performance.
 
 ## Installation
 
@@ -15,20 +17,12 @@ pip install aws-durable-execution-sdk-python-otel
 ## Quick Start
 
 ```python
-from aws_durable_execution_sdk_python import DurableContext, durable_execution
-from aws_durable_execution_sdk_python_otel import instrument_durable_execution
-
-# Instrument the SDK (call once at module load)
-instrument_durable_execution()
+from aws_durable_execution_sdk_python_otel import __version__
 
-@durable_execution
-def handler(event: dict, context: DurableContext) -> dict:
-    # Steps, waits, and invokes are automatically traced
-    result = context.step(lambda _: do_work(), name="my-step")
-    return {"result": result}
+print(__version__)
 ```
 
-## Features
+## Planned Features (v0.2.0)
 
 - Automatic span creation for steps, waits, invokes, and child contexts
 - Replay-aware tracing (distinguishes fresh executions from replays)

packages/aws-durable-execution-sdk-python-otel/pyproject.toml

@@ -80,7 +80,3 @@ lines-after-imports = 2
   "SIM117",
   "TRY301",
 ]
-
-[tool.pytest.ini_options]
-testpaths = ["tests"]
-addopts = "-v --strict-markers"

packages/aws-durable-execution-sdk-python/pyproject.toml

@@ -73,16 +73,3 @@ lines-after-imports = 2
   "SIM117",
   "TRY301",
 ]
-
-[tool.pytest.ini_options]
-# Declare custom markers to avoid warnings with --strict-markers
-markers = [
-  # Used for test selection with -m example
-  "example: marks tests as example tests (deselect with '-m \"not example\"')",
-  # Used for configuration - passes handler and lambda_function_name to durable_runner fixture
-  "durable_execution: marks tests that use the durable_runner fixture (not used for test selection)",
-]
-# Default test discovery paths
-testpaths = ["tests"]
-# Default options for all test runs
-addopts = "-v --strict-markers"

packages/aws-durable-execution-sdk-python/tests/operation/map_test.py

@@ -1162,9 +1162,9 @@ def create_id(self, i):
             parent_call = mock_serialize.call_args_list[2]
             assert parent_call[1]["serdes"] is custom_serdes
             assert isinstance(parent_call[1]["value"], BatchResult)
+            assert parent_call[1]["value"] is result
     finally:
         importlib.reload(child)
-        assert parent_call[1]["value"] is result
 
 
 def test_map_with_empty_list_should_exit_early():

pyproject.toml

@@ -22,13 +22,19 @@ cov = "pytest --cov-report=term-missing --cov {args}"
 examples-integration = "pytest --runner-mode=cloud -m example packages/aws-durable-execution-sdk-python-examples/test/ -v {args}"
 
 [tool.pytest.ini_options]
-addopts = "--import-mode=importlib"
+# Declare custom markers to avoid warnings with --strict-markers
+addopts = "-v --strict-markers --import-mode=importlib"
 testpaths = [
     "packages/aws-durable-execution-sdk-python/tests",
     "packages/aws-durable-execution-sdk-python-otel/tests",
     "packages/aws-durable-execution-sdk-python-examples/test",
 ]
-
+markers = [
+  # Used for test selection with -m example
+  "example: marks tests as example tests (deselect with '-m \"not example\"')",
+  # Used for configuration - passes handler and lambda_function_name to durable_runner fixture
+  "durable_execution: marks tests that use the durable_runner fixture (not used for test selection)",
+]
 
 [tool.hatch.envs.types]
 workspace.members = ["packages/*"]