Merge branch 'main' into issue_2686

Author: ocelotl

instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-instrumentation == 0.48b0.dev",
-  "opentelemetry-propagator-aws-xray == 1.0.1",
+  "opentelemetry-propagator-aws-xray ~= 1.0.1",
   "opentelemetry-semantic-conventions == 0.48b0.dev",
 ]
 

instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-instrumentation == 0.48b0.dev",
   "opentelemetry-semantic-conventions == 0.48b0.dev",
-  "opentelemetry-propagator-aws-xray == 1.0.1",
+  "opentelemetry-propagator-aws-xray ~= 1.0.1",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-grpc/test-requirements-1.txt

@@ -1,17 +1,13 @@
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 grpcio==1.63.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
-packaging==23.2
-pluggy==1.4.0
+packaging==24.0
+pluggy==1.5.0
 protobuf==3.20.3
-py==1.11.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
-pytest-asyncio==0.23.5
-pytest-benchmark==4.0.0
+pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.9.0
 wrapt==1.16.0

propagator/opentelemetry-propagator-aws-xray/src/opentelemetry/propagators/aws/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"

sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "2.0.1"
+__version__ = "2.0.2"