Skip to content

Commit

Permalink
Update latest upstream patch (#92)
Browse files Browse the repository at this point in the history
* fix data-prepper image to a stable version
update fluent-bit.conf parser to emmit a different field name
adding support for prometheus-opensearch exporter
* add error wrapping for integration script
* [frontendproxy] Add opentelemetry_collector_http to envoy's cluster and expose /oltp-http/ endpoint to frontendproxy (open-telemetry#938)

Co-authored-by: Austin Parker <[email protected]>

* splitting up services into modules (open-telemetry#872)

* 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]>

* Add trace based testing examples (open-telemetry#877)

* 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

* fix frontend tests (open-telemetry#950)

* [cartservice] Update OTel .NET to 1.5.1 (open-telemetry#957)

* [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 (open-telemetry#955)

* [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]>

* [shippingservice] Update Rust deps and add TelemetryResourceDetector (open-telemetry#972)

* Update Rust deps and add TelemetryResourceDetector

* Changelog

* Update min versions

---------

Co-authored-by: Austin Parker <[email protected]>

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

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

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

Co-authored-by: Austin Parker <[email protected]>

* Run Checks on main (open-telemetry#973)

Co-authored-by: Austin Parker <[email protected]>

* Fix flaky cartservice build (open-telemetry#984)

* 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]>

* rollback to dnf6 (open-telemetry#990)

* Update AdService Dependencies (open-telemetry#986)

* update dependencies

* Update log4j version

---------

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

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

* FraudDetectionService update

* changelog

---------

Co-authored-by: Austin Parker <[email protected]>

* [LoadGenerator & RecommendatationService] update dependencies (open-telemetry#988)

* Update loadgen and add metrics

* Update RecommendationService

* changelog

---------

Co-authored-by: Austin Parker <[email protected]>

* Update Email Service Dependencies (open-telemetry#989)

* update ruby deps

* change to slim image

---------

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

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

* Update currency service OTel dependency

* changelog

---------

Co-authored-by: Austin Parker <[email protected]>

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

* FeatureFlagService-Update dependencies

* changelog

---------

Co-authored-by: Austin Parker <[email protected]>

* update collector to build image using ocb (open-telemetry#944)

* 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]>

* fix(tests): removing analyzer-rules as required gate for Tracebasedtesting (open-telemetry#997)

* fix(tests): updating valid card validation expected status code (open-telemetry#998)

Co-authored-by: Austin Parker <[email protected]>

* chore(deps): update dependency stackexchange.redis to v2.6.122 (open-telemetry#1004)

* fix(tests): removing unused env var on trace-based tests (open-telemetry#1002)

Co-authored-by: Austin Parker <[email protected]>

* TARGETARCH cannot have a default value, and set GOARCH similarly (open-telemetry#1014)

* chore: Update PHP Dependencies (open-telemetry#1009)

* update dependencies

1

* Update CHANGELOG.md

---------

Co-authored-by: Juliano Costa <[email protected]>
Co-authored-by: Austin Parker <[email protected]>

* update readme (open-telemetry#1016)

* chore(deps): update dependency click to v8.1.6 (open-telemetry#999)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: Carter Socha <[email protected]>

* chore(deps): update dependency deprecated to v1.2.14 (open-telemetry#1003)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <[email protected]>

* chore(deps): update docker/build-push-action action to v3.3.1 (open-telemetry#1005)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <[email protected]>

* fix(deps): update dependency com.google.api.grpc:proto-google-common-protos to v2.22.1 (open-telemetry#1012)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <[email protected]>

* chore(deps): update dependency configargparse to v1.5.5 (open-telemetry#1000)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* chore(deps): update dotnet monorepo (open-telemetry#1006)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Juliano Costa <[email protected]>
Co-authored-by: Austin Parker <[email protected]>

* wrapper-validation-action from 1.0.6 to 1.1.0 (open-telemetry#1026)

* chore(deps): update opentelemetry-dotnet monorepo to v1.5.1 (open-telemetry#1008)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>

* fix(deps): update dependency @grpc/grpc-js to v1.8.18 (open-telemetry#1010)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>

* fix(deps): update dependency cookies-next to v2.1.2 (open-telemetry#1022)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>

* fix(deps): update dependency org.apache.kafka:kafka-clients to v3.5.1 (open-telemetry#1023)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>

* fix(deps): update dependency php-di/php-di to v7.0.3 (open-telemetry#1024)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>

* update upstream changes

Signed-off-by: YANGDB <[email protected]>

* update upstream changes

Signed-off-by: YANGDB <[email protected]>

* update opensearch for 2.9

Signed-off-by: YANGDB <[email protected]>

* issue open-telemetry#1030 is addressed please check it. (open-telemetry#1031)

* Update docker-compose.minimal.yml

* Update docker-compose.minimal.yml

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

* Update docker-compose.minimal.yml

* Update docker-compose.minimal.yml

* Remove spaces

---------

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

* fix(deps): update dependency react-query to v3.39.3 (open-telemetry#1025)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>

* [PaymentService] - Update node to LTS version and bump deps (open-telemetry#1029)

* Update node to LTS version and bump deps

* changelog

* Changelog

* Add Guance observability vendor (open-telemetry#1039)

* Pin eclipse for renovate (open-telemetry#1028)

* pin eclipse image

* add comments

---------

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

* Update trace based tests run script (open-telemetry#1018)

* chore(tests): allow partial runs on trace-based test scripts

* Adding option to run trace-based tests for selected services

* Updating testing README

* Fixing sanity checks

* Fixing lint issues

* Apply suggestions from code review

Co-authored-by: Adnan Rahić <[email protected]>

* Update README.md with suggestions

* Updating Changelog

* Fixing linter issue

* Fixed changelog

---------

Co-authored-by: Adnan Rahić <[email protected]>
Co-authored-by: Carter Socha <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* update cadence (open-telemetry#1047)

* update cadence

* update every other

* Line break should be LF (open-telemetry#1049)

* Revert collector back to contrib distribution (open-telemetry#1048)

* Revert collector back to contrib distribution

* fix(deps): update dependency styled-components to v5.3.11 (open-telemetry#1037)

* chore(deps): update composer docker tag to v2.5 (open-telemetry#1041)

* chore(deps): update config-no-service (open-telemetry#1042)

* chore(deps): update dependency @types/node to v18.17.3 (open-telemetry#1046)

* chore(deps): update dotnet monorepo (open-telemetry#1051)

* chore(deps): update dependency configargparse to v1.5.5 (open-telemetry#1043)

* fix(deps): update opentelemetry-js monorepo (open-telemetry#1038)

* fix(deps): update dependency com.google.api.grpc:proto-google-common-protos to v2.22.1 (open-telemetry#1045)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <[email protected]>

* fix(deps): update dependency @grpc/grpc-js to v1.8.18 (open-telemetry#1044)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: Carter Socha <[email protected]>

* add path check to gha (open-telemetry#1052)

* add path check to gha

* get path from dockerfile

* fix lint

* override skip on push

* remove set_output usages

* fix lint

* fix

---------

Co-authored-by: Carter Socha <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* fix(deps): update opentelemetry-js monorepo (open-telemetry#1064)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <[email protected]>

* chore(deps): update config-no-service (open-telemetry#1056)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <[email protected]>

* chore(deps): update dotnet monorepo (open-telemetry#1059)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Juliano Costa <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: Carter Socha <[email protected]>

* fix(deps): update dependency php-di/php-di to v7.0.3 (open-telemetry#1060)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: Carter Socha <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* chore(deps): update dependency configargparse to v1.5.5 (open-telemetry#1062)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* fix(deps): update dependency com.google.api.grpc:proto-google-common-protos to v2.22.1 (open-telemetry#1065)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Carter Socha <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* [frontend] Update dependencies (open-telemetry#1054)

* [frontend] Update dependencies

* changelog

---------

Co-authored-by: Carter Socha <[email protected]>

* Typo URL for FrontendProxy (open-telemetry#1075)

* [frontendproxy] Fix typo URL endpoint for FrontendProxy

* Update changelog

* Add Axoflow to vendors in README.md (open-telemetry#1076)

Signed-off-by: Attila Szakacs <[email protected]>

* [cartservice] Drop Local cart store (open-telemetry#1081)

* chore: update trace based tests to test stream events (open-telemetry#1072)

* Add Logz.io to listing of Demos featuring the Astronomy Shop on README.md (open-telemetry#1082)

Adding Logz.io to the 'Demos featuring the Astronomy Shop' listing.
Inserted per alphabetical order.
Link provided with reference.

* Upgrade Shopify/sarama to IBM/sarama (open-telemetry#1083)

* Update Telemetry Components (open-telemetry#1085)

* Update Telemetry Components

* changelog

---------

Co-authored-by: Carter Socha <[email protected]>

* Make Microsoft.AspNetCore.TestHost package compatible with .NET6 (open-telemetry#1084)

Fixes NU1202	Package Microsoft.AspNetCore.TestHost 7.0.7 is not compatible with net6.0

Co-authored-by: Carter Socha <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* Add link reference (open-telemetry#1088)

* [cartservice] Support for Logs (open-telemetry#1086)

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

* Fix TraceTest after IBM/sarama upgrade (open-telemetry#1096)

* Fix TraceTest after IBM/sarama upgrade

* changelog

* chore(deps): update dependency @types/react to v18.2.21 (open-telemetry#1077)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>

* chore(deps): update dependency eslint-config-next to v13.4.19 (open-telemetry#1078)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>

* update dashboards (open-telemetry#1098)

Co-authored-by: Carter Socha <[email protected]>

* readme: add Tracetest to demos featuring the astronomy shop (open-telemetry#1113)

* prep for 1.5 release (open-telemetry#1089)

* prep for 1.5 release

* update dashboards

* force build to test

* fix gha

* revert ff comment

* roll back OTP version

* fix ff

* fix build

* clarify arm runner status

---------

Co-authored-by: Carter Socha <[email protected]>

* update docker login (open-telemetry#1117)

* inherit secretsy (open-telemetry#1118)

* remove extraneous quote (open-telemetry#1119)

* update quoteservice for php Release Candidate (open-telemetry#1114)

* update quoteservice for php Release Candidate
- update dependencies to use RC1 and latest versions of other packages
- update code to work with RC1
- refactor Dockerfile to allow local dev, and document how

* update changelog

* markdown lint

* adding container detector

* adding logging, enabling internal metrics

* Add env var to docker-compose.minimal

---------

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

* [cartservice] Bump OTel .NET SDK to 1.6.0 (open-telemetry#1115)

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

* chore(grafana): slugify dashboard name (open-telemetry#1121)

* chore(deps): update dependency flask to v2.3.3 (open-telemetry#1128)

* chore(deps): update dependency flask to v2.3.3

* Required werkzeug update (open-telemetry#1129)

* GHA: checks workflow: explicitly pass inputs to build-images (open-telemetry#1130)

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Mikko Viitanen <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
Co-authored-by: Michele Azzolari <[email protected]>

* fix(otelcol) prometheus metrics export descriptions (open-telemetry#1120)

* fix prom metrics export descriptions

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

* fix prom metrics export descriptions

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

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* Update java agent version. (open-telemetry#1132)

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

* 1.5 release (open-telemetry#1133)

* (chore) update dependency versions (open-telemetry#1146)

* update dependency versions

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

* update dependency versions

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

* update dependency versions

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

* update dependency versions

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

---------

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

* (otelcol): metrics filter and transform (open-telemetry#1134)

* metrics filter and transform

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

* remove filtered metric

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

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* (prometheus) Add OTLP write support (open-telemetry#1149)

* fix indent (open-telemetry#1152)

* OpenSearch Spike (open-telemetry#1151)

* add opensearch

* fix env

* fix yamllint

* fix lint

* fix errors in datasource

* remove stdout export

* add httpcheck receiver example (open-telemetry#1162)

* add httpcheck receiver example

This PR adds the httpcheck receiver to the demo to produce a synthetic
check against the frontendproxy endpoint.

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

* add changelog

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

---------

Signed-off-by: Alex Boten <[email protected]>
Co-authored-by: Austin Parker <[email protected]>

* (grafana): update grafana dashboards (open-telemetry#1150)

* update grafana dashboards

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

* update grafana dashboards

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

---------

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

* Fix logic in GHA (open-telemetry#1172)

* fix logic

* refactor logic

* remove extra fi

* update collector configuration to use debug exporter (open-telemetry#1148)

* update collector configuration to use debug exporter

This replaces references to the logging exporter with
the debug exporter.

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

* revert changes to kubernetes/opentelemetry-demo.yaml

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

---------

Signed-off-by: Alex Boten <[email protected]>
Co-authored-by: Pierre Tessier <[email protected]>

* (chore): merge otel o11y config (open-telemetry#1173)

* merge otel o11y config

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

* merge otel o11y config

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

* Update otelcol-config-extras.yml

Fixed lint

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>

* Add Cedric Ziel to list of approvers (open-telemetry#1184)

* update upstream changes
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml

Signed-off-by: YANGDB <[email protected]>

* update upstream changes
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml

Signed-off-by: YANGDB <[email protected]>

* update upstream changes
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>

* update upstream changes
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>

* update upstream changes
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>

* update upstream changes
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>

* update upstream changes
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>

* remove https in favor of http

Signed-off-by: YANGDB <[email protected]>

* restore https

Signed-off-by: YANGDB <[email protected]>

* update data-prepper config files

Signed-off-by: YANGDB <[email protected]>

---------

Signed-off-by: YANGDB <[email protected]>
Signed-off-by: Pierre Tessier <[email protected]>
Signed-off-by: Alex Boten <[email protected]>
Signed-off-by: Alex Boten <[email protected]>
Signed-off-by: Attila Szakacs <[email protected]>
Co-authored-by: Chi Ma <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: Josh Lee <[email protected]>
Co-authored-by: Pierre Tessier <[email protected]>
Co-authored-by: Daniel Baptista Dias <[email protected]>
Co-authored-by: Piotr Kiełkowicz <[email protected]>
Co-authored-by: Carter Socha <[email protected]>
Co-authored-by: Robert Pająk <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
Co-authored-by: Alex Boten <[email protected]>
Co-authored-by: Oscar Reyes <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Miel Donkers <[email protected]>
Co-authored-by: calmius <[email protected]>
Co-authored-by: Vaishali Kirtikumar Nile <[email protected]>
Co-authored-by: Harlon <[email protected]>
Co-authored-by: Adnan Rahić <[email protected]>
Co-authored-by: Attila Szakacs <[email protected]>
Co-authored-by: Dotan Horovits <[email protected]>
Co-authored-by: Cedric Ziel <[email protected]>
Co-authored-by: Brett McBride <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
Co-authored-by: Mikko Viitanen <[email protected]>
Co-authored-by: Michele Azzolari <[email protected]>
  • Loading branch information
1 parent dbe873a commit 81f29d2
Show file tree
Hide file tree
Showing 160 changed files with 15,212 additions and 14,071 deletions.
14 changes: 7 additions & 7 deletions .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Images
IMAGE_VERSION=1.4.0
IMAGE_VERSION=1.5.0
IMAGE_NAME=ghcr.io/open-telemetry/demo

# Demo Platform
Expand All @@ -11,7 +11,7 @@ OTEL_COLLECTOR_HOST=otelcol
OTEL_COLLECTOR_PORT_GRPC=4317
OTEL_COLLECTOR_PORT_HTTP=4318
OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/oltp-http/v1/traces
PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/traces

# OpenTelemetry Resource Definitions
OTEL_RESOURCE_ATTRIBUTES="service.namespace=opentelemetry-demo"
Expand Down Expand Up @@ -65,7 +65,7 @@ FRONTEND_PROXY_ADDR=frontend-proxy:${ENVOY_PORT}
# Load Generator
LOCUST_WEB_PORT=8089
LOCUST_USERS=10
LOCUST_HOST=http://${FRONTEND_PROXY_ADDR}
LOCUST_HOST=http://${NGINX_ADDR}
LOCUST_WEB_HOST=loadgenerator
LOCUST_AUTOSTART=true
LOCUST_HEADLESS=false
Expand Down Expand Up @@ -118,12 +118,12 @@ PROMETHEUS_SERVICE_HOST=prometheus
PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}

# OpenSearch versionins
VERSION=2.8.0
OPENSEARCH_VERSION=2.11.0

# OpenSearch Node1
OPENSEARCH1_PORT=9200
OPENSEARCH1_HOST=opensearch-node1
OPENSEARCH1_ADDR=${OPENSEARCH1_HOST}:${OPENSEARCH1_PORT}
OPENSEARCH_PORT=9200
OPENSEARCH_HOST=opensearch
OPENSEARCH_ADDR=${OPENSEARCH_HOST}:${OPENSEARCH_PORT}

# OpenSearch Dashboard
OPENSEARCH_DASHBOARD_PORT=5601
Expand Down
2 changes: 1 addition & 1 deletion .github/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Backend supportive services
- See [description](https://opentelemetry.io/docs/demo/services/load-generator/)
- [Frontend Nginx Proxy](http://nginx:90) *(replacement for _Frontend-Proxy_)*
- See [description](../src/nginx-otel/README.md)
- [OpenSearch](https://opensearch-node1:9200)
- [OpenSearch](https://opensearch:9200)
- See [description](https://github.com/opensearch-project/opentelemetry-demo/blob/12d52cbb23bbf4226f6de2dfec840482a0a7d054/docker-compose.yml#L697)
- [Dashboards](http://opensearch-dashboards:5601)
- See [description](https://github.com/opensearch-project/opentelemetry-demo/blob/12d52cbb23bbf4226f6de2dfec840482a0a7d054/docker-compose.yml#L747)
Expand Down
50 changes: 36 additions & 14 deletions .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

on:
push:
paths:
- 'src/**'
- 'test/**'
workflow_call:
inputs:
push:
Expand All @@ -10,7 +15,7 @@ on:
type: boolean
version:
description: The version used when tagging the image
default: dev
default: 'dev'
required: false
type: string

Expand Down Expand Up @@ -45,10 +50,13 @@ jobs:
- file: ./src/emailservice/Dockerfile
tag_suffix: emailservice
context: ./src/emailservice
# TODO: https://github.com/open-telemetry/opentelemetry-demo/issues/956
# - file: ./src/featureflagservice/Dockerfile
# tag_suffix: featureflagservice
# context: ./
# NOTE:
# https://github.com/open-telemetry/opentelemetry-demo/issues/956
# Until dedicated ARM runners are available for GHA we cannot upgrade
# OTP/Elixir versions. Please do not change the OTP/Elixir versions.
- file: ./src/featureflagservice/Dockerfile
tag_suffix: featureflagservice
context: ./
- file: ./src/frontend/Dockerfile
tag_suffix: frontend
context: ./
Expand Down Expand Up @@ -93,34 +101,48 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Check for changes and set push options
id: check_changes
run: |
DOCKERFILE_DIR=$(dirname ${{ matrix.file_tag.file }})
FILES_CHANGED=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} -- $DOCKERFILE_DIR)
FORCE_PUSH=${{ inputs.push }}
if [ "$FORCE_PUSH" = true ]; then
echo "Force push is enabled, proceeding with build."
echo "skip='false'" >> "$GITHUB_OUTPUT"
elif [ -z "$FILES_CHANGED" ]; then
echo "No changes in ${{ matrix.file_tag.context }}, skipping build."
echo "skip='true'" >> "$GITHUB_OUTPUT"
else
echo "Changes detected in ${{ matrix.file_tag.context }}, proceeding with build."
echo "skip='false'" >> "$GITHUB_OUTPUT"
fi
- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
if: ${{ inputs.push }}

- name: Log in to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
if: ${{ inputs.push }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

with:
image: tonistiigi/binfmt:master
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
config-inline: |
[worker.oci]
max-parallelism = 2
max-parallelism = 2
- name: Matrix Build and push demo images
uses: docker/[email protected]
if: steps.check_changes.outputs.skip == 'false'
uses: docker/[email protected]
with:
context: ${{ matrix.file_tag.context }}
file: ${{ matrix.file_tag.file }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@
name: Checks

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
workflow_dispatch:

jobs:
build_images:
uses: ./.github/workflows/build-images.yml
with:
push: false
version: 'dev'

markdownlint:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: gradle/wrapper-validation-action@v1.0.6
- uses: gradle/wrapper-validation-action@v1.1.0
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ jobs:
uses: ./.github/workflows/build-images.yml
with:
push: true
version: ${{ github.event.release.tag_name }}"
version: ${{ github.event.release.tag_name }}
secrets: inherit
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ src/shippingservice/target/
/src/featureflagservice/src/ffs_demo_pb.erl
/src/featureflagservice/src/ffs_service_*.erl
/src/featureflagservice/src/oteldemo_*.erl
/src/frauddetectionservice/src/main/proto
/src/frontend/pb/
/src/frontend/protos/
/src/paymentservice/demo.proto
Expand Down
61 changes: 61 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,31 @@ release.

## Unreleased

* update PHP quoteservice to use RC1
([#1114](https://github.com/open-telemetry/opentelemetry-demo/pull/1114))
* [cartservice] update .NET package to 1.6.0 release
([#1115](https://github.com/open-telemetry/opentelemetry-demo/pull/1115))
* Set metric description to blank for rpc.server.duration and queueSize
([#1120](https://github.com/open-telemetry/opentelemetry-demo/pull/1120))
* sluggify Grafana dashboard name
([#1121](https://github.com/open-telemetry/opentelemetry-demo/pull/1121))
* [kafka frauddetection adservice] update java agent versions
([#1132](https://github.com/open-telemetry/opentelemetry-demo/pull/1132))
* update dependent components to latest versions
([#1146](https://github.com/open-telemetry/opentelemetry-demo/pull/1146))
* [prometheus] Enabled support for the OTLP write receiver
([#1149](https://github.com/open-telemetry/opentelemetry-demo/pull/1149))
* [grafana] fix dashboard metric names and update settings
([#1150](https://github.com/open-telemetry/opentelemetry-demo/pull/1150))
* [otelcol] add httpcheck receiver for synthetic check of frontendproxy
([#1162](https://github.com/open-telemetry/opentelemetry-demo/pull/1162))
* [otelcol] merge configuration files for base and observability configs
([#1173](https://github.com/open-telemetry/opentelemetry-demo/pull/1173))

## 1.5.0

* update trace-based tests to test stream events
([#1072](https://github.com/open-telemetry/opentelemetry-demo/pull/1072))
* Add cartServiceFailure feature flag triggering Cart Service errors
([#824](https://github.com/open-telemetry/opentelemetry-demo/pull/824))
* [paymentservice] update JS SDKs to 1.12.0/0.38.0
Expand Down Expand Up @@ -45,10 +70,46 @@ release.
([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/935))
* [cartservice] update service to .NET 7
([#942](https://github.com/open-telemetry/opentelemetry-demo/pull/942))
* [tests] Add trace-based testing examples
([#877](https://github.com/open-telemetry/opentelemetry-demo/pull/877))
* Introduce minimal mode to run demo
([#872](https://github.com/open-telemetry/opentelemetry-demo/pull/872))
* [frontendproxy]Envoy expose a route for the collector to route frontend spans
([#938](https://github.com/open-telemetry/opentelemetry-demo/pull/938))
* [frontend] update JS SDKs to 1.15.0/0.41.0
([#853](https://github.com/open-telemetry/opentelemetry-demo/pull/853))
* [shippingservice] Update Rust dependencies and add TelemetryResourceDetector
([#972](https://github.com/open-telemetry/opentelemetry-demo/pull/972))
* Update frontendproxy's env for minimal
([#983](https://github.com/open-telemetry/opentelemetry-demo/pull/983))
* [FeatureFlagService] Update dependencies
([#992](https://github.com/open-telemetry/opentelemetry-demo/pull/992))
* [currencyService] Update OTel dependency
([#991](https://github.com/open-telemetry/opentelemetry-demo/pull/991))
* [LoadGenerator & RecommendatationService] update dependencies
([#988](https://github.com/open-telemetry/opentelemetry-demo/pull/988))
* [FraudDetectionService] Updated Kotlin version and OTel dependencies
([#987](https://github.com/open-telemetry/opentelemetry-demo/pull/987))
* [quoteservice] update php dependencies
([#1009](https://github.com/open-telemetry/opentelemetry-demo/pull/1009))
* [tests] Update trace-based tests run script
([#1018](https://github.com/open-telemetry/opentelemetry-demo/pull/1018))
* [PaymentService] Update node to LTS version and bump deps
([#1029](https://github.com/open-telemetry/opentelemetry-demo/pull/1029))
* [frontend] Update dependencies
([#1054](https://github.com/open-telemetry/opentelemetry-demo/pull/1054))
* [frontendproxy] Fix typo URL endpoint for FrontendProxy
([#1075](https://github.com/open-telemetry/opentelemetry-demo/pull/1075))
* [checkoutservice] Upgrade Shopify/sarama to IBM/sarama
([#1083](https://github.com/open-telemetry/opentelemetry-demo/pull/1083))
* [accountingservice] Upgrade Shopify/sarama to IBM/sarama
([#1083](https://github.com/open-telemetry/opentelemetry-demo/pull/1083))
* Update Telemetry Components
([#1085](https://github.com/open-telemetry/opentelemetry-demo/pull/1085))
* [cartservice] Support for logs
([#1086](https://github.com/open-telemetry/opentelemetry-demo/pull/1086))
* [TraceTests] Update span attributes to align with new IBM/sarama instrumentation
([#1096](https://github.com/open-telemetry/opentelemetry-demo/pull/1096))

## 1.4.0

Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ install-tools: $(MISSPELL)
npm install
@echo "All tools installed"

.PHONY: build
build:
docker compose build

.PHONY: build-and-push-dockerhub
build-and-push-dockerhub:
docker compose --env-file .dockerhub.env -f docker-compose.yml build
Expand All @@ -97,7 +101,7 @@ run-tests:
docker compose run traceBasedTests

run-tracetesting:
docker compose run traceBasedTests
docker compose run traceBasedTests ${SERVICES_TO_TEST}

.PHONY: generate-protobuf
generate-protobuf:
Expand Down
56 changes: 44 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,23 @@ We welcome any vendor to fork the project to demonstrate their services and
adding a link below. The community is committed to maintaining the project and
keeping it up to date for you.

| | | |
| ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
| [AlibabaCloud LogService](https://github.com/aliyun-sls/opentelemetry-demo) | [Elastic](https://github.com/elastic/opentelemetry-demo) | [OpenSearch](https://github.com/opensearch-project/opentelemetry-demo) |
| [AppDynamics](https://www.appdynamics.com/blog/cloud/how-to-observe-opentelemetry-demo-app-in-appdynamics-cloud/) | [Grafana Labs](https://github.com/grafana/opentelemetry-demo) | [Sentry](https://github.com/getsentry/opentelemetry-demo) |
| [Aspecto](https://github.com/aspecto-io/opentelemetry-demo) | [Helios](https://otelsandbox.gethelios.dev) | [Splunk](https://github.com/signalfx/opentelemetry-demo) |
| [Axiom](https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces) | [Honeycomb.io](https://github.com/honeycombio/opentelemetry-demo) | [Sumo Logic](https://www.sumologic.com/blog/common-opentelemetry-demo-application/) |
| [Azure Data Explorer](https://github.com/Azure/Azure-kusto-opentelemetry-demo) | [Instana](https://github.com/instana/opentelemetry-demo) | [TelemetryHub](https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend) |
| [Coralogix](https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix) | [Kloudfuse](https://github.com/kloudfuse/opentelemetry-demo) | [Teletrace](https://github.com/teletrace/opentelemetry-demo) |
| [Datadog](https://github.com/DataDog/opentelemetry-demo) | [Lightstep](https://github.com/lightstep/opentelemetry-demo) | [Uptrace](https://github.com/uptrace/uptrace/tree/master/example/opentelemetry-demo) |
| [Dynatrace](https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/) | [New Relic](https://github.com/newrelic/opentelemetry-demo) | |
| | | |
|-----------------------------------------|-----------------------------|----------------------------------------------------------------|
| [AlibabaCloud LogService][AlibabaCloud] | [Elastic][Elastic] | [OpenSearch][OpenSearch] |
| [AppDynamics][AppDynamics] | [Grafana Labs][GrafanaLabs] | [Sentry][Sentry] |
| [Aspecto][Aspecto] | [Guance][Guance] | [ServiceNow Cloud Observability][ServiceNowCloudObservability] |
| [Axiom][Axiom] | [Helios][Helios] | [Splunk][Splunk] |
| [Axoflow][Axoflow] | [Honeycomb.io][Honeycombio] | [Sumo Logic][SumoLogic] |
| [Azure Data Explorer][Azure] | [Instana][Instana] | [TelemetryHub][TelemetryHub] |
| [Coralogix][Coralogix] | [Kloudfuse][Kloudfuse] | [Teletrace][Teletrace] |
| [Datadog][Datadog] | [Logz.io][Logzio] | [Tracetest][Tracetest] |
| [Dynatrace][Dynatrace] | [New Relic][NewRelic] | [Uptrace][Uptrace] |

## Contributing

To get involved with the project see our [CONTRIBUTING](CONTRIBUTING.md)
documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are Mondays at
8:15 AM PST and anyone is welcome.
documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are every other
Monday at 8:30 AM PST and anyone is welcome.

## Project leadership

Expand All @@ -83,6 +84,7 @@ documentation. Our [SIG Calls](CONTRIBUTING.md#join-a-sig-call) are Mondays at
[Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
([@open-telemetry/demo-approvers](https://github.com/orgs/open-telemetry/teams/demo-approvers)):

- [Cedric Ziel](https://github.com/cedricziel) Grafana Labs
- [Mikko Viitanen](https://github.com/mviitane), Dynatrace
- [Penghan Wang](https://github.com/wph95), AppDynamics
- [Reiley Yang](https://github.com/reyang), Microsoft
Expand All @@ -98,3 +100,33 @@ Emeritus:
[![contributors](https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-demo)](https://github.com/open-telemetry/opentelemetry-demo/graphs/contributors)

[docs]: https://opentelemetry.io/docs/demo/

<!-- Links for Demos featuring the Astronomy Shop section -->

[AlibabaCloud]: https://github.com/aliyun-sls/opentelemetry-demo
[AppDynamics]: https://www.appdynamics.com/blog/cloud/how-to-observe-opentelemetry-demo-app-in-appdynamics-cloud/
[Aspecto]: https://github.com/aspecto-io/opentelemetry-demo
[Axiom]: https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces
[Axoflow]: https://axoflow.com/opentelemetry-support-in-more-detail-in-axosyslog-and-syslog-ng/
[Azure]: https://github.com/Azure/Azure-kusto-opentelemetry-demo
[Coralogix]: https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix
[Datadog]: https://github.com/DataDog/opentelemetry-demo
[Dynatrace]: https://www.dynatrace.com/news/blog/opentelemetry-demo-application-with-dynatrace/
[Elastic]: https://github.com/elastic/opentelemetry-demo
[GrafanaLabs]: https://github.com/grafana/opentelemetry-demo
[Guance]: https://github.com/GuanceCloud/opentelemetry-demo
[Helios]: https://otelsandbox.gethelios.dev
[Honeycombio]: https://github.com/honeycombio/opentelemetry-demo
[Instana]: https://github.com/instana/opentelemetry-demo
[Kloudfuse]: https://github.com/kloudfuse/opentelemetry-demo
[Logzio]: https://logz.io/learn/how-to-run-opentelemetry-demo-with-logz-io/
[NewRelic]: https://github.com/newrelic/opentelemetry-demo
[OpenSearch]: https://github.com/opensearch-project/opentelemetry-demo
[Sentry]: https://github.com/getsentry/opentelemetry-demo
[ServiceNowCloudObservability]: https://docs.lightstep.com/otel/quick-start-operator#send-data-from-the-opentelemetry-demo
[Splunk]: https://github.com/signalfx/opentelemetry-demo
[SumoLogic]: https://www.sumologic.com/blog/common-opentelemetry-demo-application/
[TelemetryHub]: https://github.com/TelemetryHub/opentelemetry-demo/tree/telemetryhub-backend
[Teletrace]: https://github.com/teletrace/opentelemetry-demo
[Tracetest]: https://github.com/kubeshop/opentelemetry-demo
[Uptrace]: https://github.com/uptrace/uptrace/tree/master/example/opentelemetry-demo
2 changes: 1 addition & 1 deletion add_hosts_locally.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
IP="127.0.0.1"

# The hostname you want to associate with the IP address
OPENSEARCH_HOST="opensearch-node1"
OPENSEARCH_HOST="opensearch"
OPENSEARCH_DASHBOARD="opensearch-dashboards"
OTEL_STORE="frontend"
FEATURE_FLAG_SERVICE="feature-flag-service"
Expand Down
Loading

0 comments on commit 81f29d2

Please sign in to comment.