Merge branch 'main' into productcatalog.extendable-products

Author: puckpuck

CHANGELOG.md

@@ -46,6 +46,8 @@ the release.
   ([#1356](https://github.com/open-telemetry/opentelemetry-demo/pull/1356))
 * Update GO SDKs & fix metrics config
   ([#1357](https://github.com/open-telemetry/opentelemetry-demo/pull/1357))
+* Update Python SDKs
+  ([#1358](https://github.com/open-telemetry/opentelemetry-demo/pull/1358))
 * [productcatalog] allow products to be extended
   ([#1363](https://github.com/open-telemetry/opentelemetry-demo/pull/1363))
 

src/loadgenerator/requirements.txt

@@ -19,17 +19,17 @@ locust==2.18.2
 locust_plugins==3.4.0
 markupsafe==2.1.3
 msgpack==1.0.7
-opentelemetry-api==1.21.0
-opentelemetry-exporter-otlp-proto-grpc==1.21.0
-opentelemetry-instrumentation==0.42b0
-opentelemetry-instrumentation-jinja2==0.42b0
-opentelemetry-instrumentation-requests==0.42b0
-opentelemetry-instrumentation-system-metrics==0.42b0
-opentelemetry-instrumentation-urllib3==0.42b0
-opentelemetry-proto==1.21.0
-opentelemetry-sdk==1.21.0
-opentelemetry-semantic-conventions==0.42b0
-opentelemetry-util-http==0.42b0
+opentelemetry-api==1.22.0
+opentelemetry-exporter-otlp-proto-grpc==1.22.0
+opentelemetry-instrumentation==0.43b0
+opentelemetry-instrumentation-jinja2==0.43b0
+opentelemetry-instrumentation-requests==0.43b0
+opentelemetry-instrumentation-system-metrics==0.43b0
+opentelemetry-instrumentation-urllib3==0.43b0
+opentelemetry-proto==1.22.0
+opentelemetry-sdk==1.22.0
+opentelemetry-semantic-conventions==0.43b0
+opentelemetry-util-http==0.43b0
 protobuf==4.25.0
 psutil==5.9.6
 pyzmq==25.1.1

src/otelcollector/otelcol-config.yml

@@ -33,12 +33,6 @@ exporters:
 
 processors:
   batch:
-  transform:
-    metric_statements:
-      - context: metric
-        statements:
-          # FIXME: remove when this issue is resolved: https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1958
-          - set(description, "") where name == "http.client.duration"
 
 connectors:
   spanmetrics:
@@ -51,7 +45,7 @@ service:
       exporters: [otlp, debug, spanmetrics]
     metrics:
       receivers: [httpcheck/frontendproxy, otlp, spanmetrics]
-      processors: [transform, batch]
+      processors: [batch]
       exporters: [otlphttp/prometheus, debug]
     logs:
       receivers: [otlp]

src/recommendationservice/requirements.txt

@@ -1,7 +1,7 @@
 grpcio-health-checking==1.59.2
 grpcio==1.59.2
-opentelemetry-distro==0.41b0
-opentelemetry-exporter-otlp-proto-grpc==1.21.0
+opentelemetry-distro==0.43b0
+opentelemetry-exporter-otlp-proto-grpc==1.22.0
 python-dotenv==1.0.0
 python-json-logger==2.0.7
 psutil==5.9.6 # Importing this will also import opentelemetry-instrumentation-system-metrics when running opentelemetry-bootstrap