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.

Sign up for GitHub

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 for mac m2 #764

Merged
merged 3 commits into from
Mar 1, 2023
Merged

[chore] update for mac m2 #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b65883
update for mac m2
puckpuck Feb 28, 2023
26011fe
update for mac m2
puckpuck Mar 1, 2023
ac14f57
Merge branch 'main' into work_with_mac_m2
julianocosta89 Mar 1, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ tls_certificate_check and bump to OTP-25
([#759](https://github.com/open-telemetry/opentelemetry-demo/issues/759))
* Use browserDetector to populate browser info to frontend-web telemetry
([#760](https://github.com/open-telemetry/opentelemetry-demo/pull/760))
* [chore] update for Mac M2 architecture
([#764](https://github.com/open-telemetry/opentelemetry-demo/pull/764))

## v0.1.0

Expand Down
2 changes: 1 addition & 1 deletion src/adservice/src/main/java/oteldemo/AdService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private void start() throws IOException {
new IllegalStateException(
"environment vars: FEATURE_FLAG_GRPC_SERVICE_ADDR must not be null"));
FeatureFlagServiceBlockingStub featureFlagServiceStub =
FeatureFlagServiceGrpc.newBlockingStub(
oteldemo.FeatureFlagServiceGrpc.newBlockingStub(
ManagedChannelBuilder.forTarget(featureFlagServiceAddr).usePlaintext().build());

server =
Expand Down
1 change: 1 addition & 0 deletions src/emailservice/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ GEM

PLATFORMS
arm64-darwin-21
arm64-darwin-22

DEPENDENCIES
net-smtp (~> 0.3)
Expand Down
2 changes: 1 addition & 1 deletion src/recommendationservice/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
grpcio-health-checking==1.43.0
grpcio==1.43.0
grpcio==1.51.3
opentelemetry-distro==0.36b0
opentelemetry-exporter-otlp-proto-grpc==1.15.0
python-dotenv==0.21.0
Expand Down