Mergeupstream #4

asaharn · 2024-03-05T07:26:02Z

Merged parent repo

…emetry#909) Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

…ry#914) * Run load through frontendProxy Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * Run load through frontendProxy Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io>

* [cartservice] Update OTel .NET to 1.5.0 * [cartservice] Simplify resource configuration TelemetrySdk and EnvVariable are defaults * Update changelog

* [cartservice] Update to .NET 7 * Add changelog entry * Avoid trimming application due open-telemetry/opentelemetry-dotnet#4600

* accountingservice: commit generated code bump deps * license-checker to ignore genproto * Update README.md * Add comment to tools.go * checkoutservice: commit generated code bump dependencies * productcatalogservice: commit generated code bump dependencies

* Add renovate.json * only update otel deps * update renovate config * update renovate config --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: austinlparker <austin@ap2.io> Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>

* File scope namespaces * Sort modifiers * Remove redundant type declaration * Avoid hiding variables * join declaration and assignment * Use standard .NET convention for fields and consts * inline out variable * object initializer * collection initializer * drop unused using * drop unused parameters * remove redundant field initializer --------- Co-authored-by: Austin Parker <austin@ap2.io>

We would very much like to add [Axiom](axiom.co) to the list of vendors in the README. I linked a public demo dashboard that is feed by the demo.

…nd expose /oltp-http/ endpoint to frontendproxy (open-telemetry#938) Co-authored-by: Austin Parker <austin@ap2.io>

* WIP splitting up services - splits up services into multiple docker files - experiment with changing service definition for checkout service when kafka is enabled todo: [ ] fix checkout service to work without kafka [ ] fix services that error without feature flag service [ ] provide noop config for collector when observability backends are disabled * send to kafka only if defined Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * only check featureflag if env is defined Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * split featureflag and kafka services Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * remove feature flag env var * remove extra definitions in test file * split out observability Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * set recommendation resources based on flag Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * add start/stop scripts Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * split modules Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * split into modules Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * allows `docker compose up` for full * default full demo, optional minimal mode Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * default full demo, optional minimal mode Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io>

* Adding a user purchasing product trace-based test case * Adding more tests * Adding run script * Fixed yaml lint issues * Adding license header to the files * Adding trace-based tests for more services * Updating tests and adding them on the same format as the integration tests * Fixed payment tests * Fixing e2e web tests * Fixing details found by yamllint * Updating trace-based tests to refer a protobuf file instead of embedding it * Fixed data types for email test and improved test time * Structured tests per service * Added tests for frontend service following endpoints used on loadgenerator * fixing yaml lint issues * Fixing small issues on tests

* [cartservice] Update OTel .NET to 1.5.1 * Update .NET docker images * Update changelog * Update alpine version --------- Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com> Co-authored-by: Austin Parker <austin@ap2.io>

* [chore] build images for PRs * Add missing "on:" * Fix input type * Add license header * Do not fail fast * test: comment cache-from * Revert: test: comment cache-from * Comment featureflagservice build * Revert "[cartservice] Update OTel .NET to 1.5.1 (open-telemetry#957)" This reverts commit 814a4e9. --------- Co-authored-by: Austin Parker <austin@ap2.io>

…pen-telemetry#972) * Update Rust deps and add TelemetryResourceDetector * Changelog * Update min versions --------- Co-authored-by: Austin Parker <austin@ap2.io>

Co-authored-by: Austin Parker <austin@ap2.io>

* update dotnet builder version * update docker version * fix yaml lint * change builder image * try different qemu container * disable static web assets entirely * fix build issue * split stages and increase loglevel --------- Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>

* update dependencies * Update log4j version --------- Co-authored-by: Juliano Costa <julianocosta89@outlook.com>

* FraudDetectionService update * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

…elemetry#988) * Update loadgen and add metrics * Update RecommendationService * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

* update ruby deps * change to slim image --------- Co-authored-by: Juliano Costa <julianocosta89@outlook.com>

* Update currency service OTel dependency * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

* FeatureFlagService-Update dependencies * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

* update collector to build image using ocb The collector in this repository now uses the otel collector builder to build a custom binary which it embeds in a docker container for the demo. Still to do: - [ ] update curl command to pull builder for specific architectures - [ ] allow passing the version of the builder to use Signed-off-by: Alex Boten <alex@boten.ca> * update build-images Signed-off-by: Alex Boten <aboten@lightstep.com> * add license Signed-off-by: Alex Boten <aboten@lightstep.com> --------- Signed-off-by: Alex Boten <alex@boten.ca> Signed-off-by: Alex Boten <aboten@lightstep.com> Co-authored-by: Austin Parker <austin@ap2.io>

…sting (open-telemetry#997)

* [cartservice] bump dependencies * [cartservice] Bump .NET to 8.0.2 * changelog

* Add OTel logs to currencyservice * line break * changelog * Move OPENTELEMETRY_CPP_VERSION back * set opensearch version and timestamp field Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * add comment for opensearch version update Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * Change log to INFO --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

…1387)

* chore(accountingservice): use semantic convention v1.24.0 * chore(checkoutservice): use semantic convention v1.24.0 --------- Co-authored-by: Austin Parker <austin@ap2.io>

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* fix restart, add redeploy Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * fix restart, add redeploy Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * use service or SERVICE Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* increase collector memory Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * increase collector memory Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * increase collector memory Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * increase collector memory Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io>

* nightly build and publish Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * add nightly releases Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io>

* yeet integration tests Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * yeet integration tests Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * yeet integration tests Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io>

…lemetry#1400) * chore(checkoutservice): add producer interceptor for tracing * chore(checkoutservice): update changelog --------- Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

…lemetry#1401) Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Juliano Costa <julianocosta89@outlook.com>

…try#1402) * fix(productcatalogservice): fix graceful shutdown issues * fix(productcatalogservice): update changelog --------- Co-authored-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io>

* spike for running integration tests * add workflow call trigger * fix lint * lint * fix * don't reinstall docker

* Add Host Detector * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

…pen-telemetry#1417) Building the frontend container image on an Apple M1 would result in the following error during docker build: 15.56 > Build error occurred 15.56 [Error: ENOENT: no such file or directory, copyfile '/app/node_modules/sharp/build/Release/sharp-darwin-arm64v8.node' -> '/app/.next/standalone/node_modules/sharp/build/Release/sharp-darwin-arm64v8.node'] { 15.56 errno: -2, 15.56 code: 'ENOENT', 15.56 syscall: 'copyfile', 15.56 path: '/app/node_modules/sharp/build/Release/sharp-darwin-arm64v8.node', 15.56 dest: '/app/.next/standalone/node_modules/sharp/build/Release/sharp-darwin-arm64v8.node' 15.56 } Updating sharp to v0.33.x avoids this problem, as that version includes pre-built sharp binaries for various platforms, see https://sharp.pixelplumbing.com/changelog#v0330---29th-november-2023

…n-telemetry#1408) Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

isaschm and others added 30 commits June 5, 2023 11:43

Regenerate kubernetes manifest and add autogenerate comment (open-tel…

b099531

…emetry#909) Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

Fix error sh in README.md (open-telemetry#926)

1cf4e77

[cartservice] Update .NET OTel to 1.5.0 (open-telemetry#935)

985e18b

* [cartservice] Update OTel .NET to 1.5.0 * [cartservice] Simplify resource configuration TelemetrySdk and EnvVariable are defaults * Update changelog

[cartservice] Update to .NET 7 (open-telemetry#942)

846ae2d

* [cartservice] Update to .NET 7 * Add changelog entry * Avoid trimming application due open-telemetry/opentelemetry-dotnet#4600

Add Axiom to list of vendors (open-telemetry#963)

51dcd8b

We would very much like to add [Axiom](axiom.co) to the list of vendors in the README. I linked a public demo dashboard that is feed by the demo.

[frontendproxy] Add opentelemetry_collector_http to envoy's cluster a…

c1e66b8

…nd expose /oltp-http/ endpoint to frontendproxy (open-telemetry#938) Co-authored-by: Austin Parker <austin@ap2.io>

fix frontend tests (open-telemetry#950)

ec804cc

[shippingservice] Update Rust deps and add TelemetryResourceDetector (o…

28a6c74

…pen-telemetry#972) * Update Rust deps and add TelemetryResourceDetector * Changelog * Update min versions --------- Co-authored-by: Austin Parker <austin@ap2.io>

shippingservice-missing-cargolock-update (open-telemetry#982)

092ee18

fix: update frontendproxy's env for minimal (open-telemetry#983)

f174613

chore: update JS dependency (open-telemetry#978)

1296ae1

Co-authored-by: Austin Parker <austin@ap2.io>

Run Checks on main (open-telemetry#973)

556b1f2

Co-authored-by: Austin Parker <austin@ap2.io>

rollback to dnf6 (open-telemetry#990)

c9c6fb8

Update AdService Dependencies (open-telemetry#986)

ac78734

* update dependencies * Update log4j version --------- Co-authored-by: Juliano Costa <julianocosta89@outlook.com>

[FraudDetectionService] update dependencies (open-telemetry#987)

25800da

* FraudDetectionService update * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

[LoadGenerator & RecommendatationService] update dependencies (open-t…

0831bc6

…elemetry#988) * Update loadgen and add metrics * Update RecommendationService * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

Update Email Service Dependencies (open-telemetry#989)

fbc5308

* update ruby deps * change to slim image --------- Co-authored-by: Juliano Costa <julianocosta89@outlook.com>

[currencyService] Update OTel dependency (open-telemetry#991)

3bcf333

* Update currency service OTel dependency * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

[FeatureFlagService] Update dependencies (open-telemetry#992)

dc37327

* FeatureFlagService-Update dependencies * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

fix(tests): removing analyzer-rules as required gate for Tracebasedte…

78604e0

…sting (open-telemetry#997)

Kielek and others added 26 commits February 14, 2024 10:47

[cartservice] Bump .NET to 8.0.2 (open-telemetry#1380)

e37e626

* [cartservice] bump dependencies * [cartservice] Bump .NET to 8.0.2 * changelog

Add Google Cloud fork to demos list (open-telemetry#1381)

371b36f

prep for release (open-telemetry#1379)

9d77fdf

refactor(checkoutservice): reuse grpc service client (open-telemetry#…

e8e3553

…1387)

chore: use semantic convention v1.24.0 (open-telemetry#1385)

6eab783

* chore(accountingservice): use semantic convention v1.24.0 * chore(checkoutservice): use semantic convention v1.24.0 --------- Co-authored-by: Austin Parker <austin@ap2.io>

bump dependencies (open-telemetry#1390)

59e0528

Update trace test sem conv (open-telemetry#1394)

64eb66e

update to 1.8.0 release (open-telemetry#1395)

6f38f5f

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

use nightly releases (open-telemetry#1399)

6bd2ede

Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Austin Parker <austin@ap2.io>

chore(checkoutservice): add producer interceptor for tracing (open-te…

cf7bac7

…lemetry#1400) * chore(checkoutservice): add producer interceptor for tracing * chore(checkoutservice): update changelog --------- Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

fix(accountingservice): fix graceful shutdown and log issues (open-te…

e07f5b2

…lemetry#1401) Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

only run nightly for main repo (open-telemetry#1407)

3f6958a

Signed-off-by: Pierre Tessier <pierre@pierretessier.com> Co-authored-by: Juliano Costa <julianocosta89@outlook.com>

Test: Run integration tests on PR approval (open-telemetry#1414)

940dfca

* spike for running integration tests * add workflow call trigger * fix lint * lint * fix * don't reinstall docker

[CartService] - Add Host Detector (open-telemetry#1415)

b1e26c3

* Add Host Detector * changelog --------- Co-authored-by: Austin Parker <austin@ap2.io>

docs(readme): add Dash0 to the list of forks (open-telemetry#1416)

0a1ad08

[frontend] fix typo in ShippingGateway (open-telemetry#1418)

06f020c

fix kafka producer spans (open-telemetry#1428)

b7c7891

chore: upgrade go.opentelemetry.io otel and contrib dependencies (ope…

71e428b

…n-telemetry#1408) Co-authored-by: Pierre Tessier <pierre@pierretessier.com>

Merge remote-tracking branch 'upstream/main' into mergeupstream

a985983

ag-ramachandran self-requested a review March 5, 2024 08:21

ag-ramachandran approved these changes Mar 5, 2024

View reviewed changes

added spanmetrics after upstream merge

2ed4621

asaharn merged commit fa028c4 into main Mar 5, 2024
21 of 22 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mergeupstream #4

Mergeupstream #4

asaharn commented Mar 5, 2024 •

edited

Loading

Mergeupstream #4

Mergeupstream #4

Conversation

asaharn commented Mar 5, 2024 • edited Loading

asaharn commented Mar 5, 2024 •

edited

Loading