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

Mergeupstream #4

Merged
merged 253 commits into from
Mar 5, 2024
Merged

Mergeupstream #4

merged 253 commits into from
Mar 5, 2024

Conversation

asaharn
Copy link
Member

@asaharn asaharn commented Mar 5, 2024

Merged parent repo

isaschm and others added 30 commits June 5, 2023 11:43
…ry#914)

* Run load through frontendProxy

Signed-off-by: Pierre Tessier <[email protected]>

* Run load through frontendProxy

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* [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 <[email protected]>
Co-authored-by: Carter Socha <[email protected]>
* 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 <[email protected]>
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 <[email protected]>
* 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 <[email protected]>

* only check featureflag if env is defined

Signed-off-by: Pierre Tessier <[email protected]>

* split featureflag and kafka services

Signed-off-by: Pierre Tessier <[email protected]>

* remove feature flag env var

* remove extra definitions in test file

* split out observability

Signed-off-by: Pierre Tessier <[email protected]>

* set recommendation resources based on flag

Signed-off-by: Pierre Tessier <[email protected]>

* add start/stop scripts

Signed-off-by: Pierre Tessier <[email protected]>

* split modules

Signed-off-by: Pierre Tessier <[email protected]>

* split into modules

Signed-off-by: Pierre Tessier <[email protected]>

* allows `docker compose up` for full

* default full demo, optional minimal mode

Signed-off-by: Pierre Tessier <[email protected]>

* default full demo, optional minimal mode

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Pierre Tessier <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* 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 <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* [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 <[email protected]>
…pen-telemetry#972)

* Update Rust deps and add TelemetryResourceDetector

* Changelog

* Update min versions

---------

Co-authored-by: Austin Parker <[email protected]>
* 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 <[email protected]>
* update dependencies

* Update log4j version

---------

Co-authored-by: Juliano Costa <[email protected]>
* FraudDetectionService update

* changelog

---------

Co-authored-by: Austin Parker <[email protected]>
…elemetry#988)

* Update loadgen and add metrics

* Update RecommendationService

* changelog

---------

Co-authored-by: Austin Parker <[email protected]>
* update ruby deps

* change to slim image

---------

Co-authored-by: Juliano Costa <[email protected]>
* Update currency service OTel dependency

* changelog

---------

Co-authored-by: Austin Parker <[email protected]>
* FeatureFlagService-Update dependencies

* changelog

---------

Co-authored-by: Austin Parker <[email protected]>
* 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 <[email protected]>

* update build-images

Signed-off-by: Alex Boten <[email protected]>

* add license

Signed-off-by: Alex Boten <[email protected]>

---------

Signed-off-by: Alex Boten <[email protected]>
Signed-off-by: Alex Boten <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
Kielek and others added 26 commits February 14, 2024 10:47
* [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 <[email protected]>

* add comment for opensearch version update

Signed-off-by: Pierre Tessier <[email protected]>

* Change log to INFO

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Pierre Tessier <[email protected]>
* chore(accountingservice): use semantic convention v1.24.0

* chore(checkoutservice): use semantic convention v1.24.0

---------

Co-authored-by: Austin Parker <[email protected]>
* fix restart, add redeploy

Signed-off-by: Pierre Tessier <[email protected]>

* fix restart, add redeploy

Signed-off-by: Pierre Tessier <[email protected]>

* use service or SERVICE

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
* increase collector memory

Signed-off-by: Pierre Tessier <[email protected]>

* increase collector memory

Signed-off-by: Pierre Tessier <[email protected]>

* increase collector memory

Signed-off-by: Pierre Tessier <[email protected]>

* increase collector memory

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* nightly build and publish

Signed-off-by: Pierre Tessier <[email protected]>

* add nightly releases

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* yeet integration tests

Signed-off-by: Pierre Tessier <[email protected]>

* yeet integration tests

Signed-off-by: Pierre Tessier <[email protected]>

* yeet integration tests

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
…lemetry#1400)

* chore(checkoutservice): add producer interceptor for tracing

* chore(checkoutservice): update changelog

---------

Co-authored-by: Pierre Tessier <[email protected]>
Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
…try#1402)

* fix(productcatalogservice): fix graceful shutdown issues

* fix(productcatalogservice): update changelog

---------

Co-authored-by: Pierre Tessier <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* 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 <[email protected]>
…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
@ag-ramachandran ag-ramachandran self-requested a review March 5, 2024 08:21
@asaharn asaharn merged commit fa028c4 into main Mar 5, 2024
21 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.