Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] update SDKs and remove metric transforms #1358

Merged
merged 6 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ the release.
([#1353](https://github.com/open-telemetry/opentelemetry-demo/pull/1353))
* Update dependent services - Collector, Grafana, Jaeger, Prometheus, etc.
([#1354](https://github.com/open-telemetry/opentelemetry-demo/pull/1354))
* Update Python SDKs
([#1358](https://github.com/open-telemetry/opentelemetry-demo/pull/1358))

## 1.7.2

Expand Down
22 changes: 11 additions & 11 deletions src/loadgenerator/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 1 addition & 16 deletions src/otelcollector/otelcol-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,6 @@ exporters:

processors:
batch:
filter/ottl:
error_mode: ignore
metrics:
metric:
# FIXME: remove when a Metrics View is implemented in the checkout and productcatalog components
# or when this issue is resolved: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/3071
- 'name == "rpc.server.duration"'
transform:
metric_statements:
- context: metric
statements:
# FIXME: remove when this issue is resolved: https://github.com/open-telemetry/opentelemetry-java/issues/4834
- set(description, "") where name == "queueSize"
# 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:
Expand All @@ -59,7 +44,7 @@ service:
exporters: [otlp, debug, spanmetrics]
metrics:
receivers: [httpcheck/frontendproxy, otlp, spanmetrics]
processors: [filter/ottl, transform, batch]
processors: [batch]
exporters: [otlphttp/prometheus, debug]
logs:
receivers: [otlp]
Expand Down
4 changes: 2 additions & 2 deletions src/recommendationservice/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Loading