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

Jump to bottom

Upstream update #195

Draft

YANG-DB wants to merge 211 commits into opensearch-project:main from YANG-DB:upstream-update-nov2024

Member

YANG-DB commented Nov 19, 2024

Changes

Upstream OpenTelemetry Demo merges Nov 2024

CHANGELOG.md updated to document new feature additions
Appropriate documentation updates in the docs
Appropriate Helm chart updates in the helm-charts

Maintainers will not merge until the above have been completed. If you're unsure
which docs need to be changed ping the
@open-telemetry/demo-approvers.

adnanrahic and others added 30 commits

November 14, 2023 13:59


          chore: add env var for pinning trace-based test tool version (open-te…

f8413fd

…lemetry#1239)

* chore: add env var for pinning tracetesting image version

* chore: add odd profile and start command

* chore: fix yamllint

* chore: update changelog

* chore: update makefile comments


          Shippingservice: update release image to match builder (open-telemetr…

c9efc8a

…y#1243)

fixes open-telemetry#1240


          chore(deps): update checkoutservice (open-telemetry#1245)

962234a

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


          chore(deps): update featureflagservice (open-telemetry#1224)

bf5a0a8

* chore(deps): update featureflagservice

* use Phoenix 1.6 style (open-telemetry#1238)

* use Phoenix 1.6 style

Phoenix 1.7 has deprecated Phoenix.View in favor
of Phoenix.Component and moved the get_flash
function out of controllers, making us call it
directly

* fix deprecated LV stuff

Some things have changed in LV, these changes
should address that.

- some helpers have moved to Phoenix.Component (live_flash)
- some syntax changes let={f} vs :let={f}
- live_title_tag is now .live_title

---------

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


          chore(deps): update accountingservice (open-telemetry#1244)

4f5c2cf

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


          chore(deps): update confluentinc/cp-kafka docker tag to v7.5.2 (open-…

bde0ff3

…telemetry#1246)

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


          chore(deps): update kubeshop/tracetest docker tag to v0.14.6 (open-te…

e57b00c

…lemetry#1247)

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


          Update loadgen dependencies (open-telemetry#1274)

840bfc3

* Update loadgen dependencies, fix renovate PR

* Update changelog

---------

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


          chore(deps): update loadgenerator (open-telemetry#1248)

665d75e

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


          chore(deps): update dependency monolog/monolog to v3.5.0 (open-teleme…

0ad8d79

…try#1250)

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


          chore(deps): update dependency opentelemetry-exporter-otlp-proto-grpc…

1e960fd

… to v1.21.0 (open-telemetry#1251)

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


          chore(deps): update frontend (open-telemetry#1252)

a66080b

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


          chore(deps): update paymentservice (open-telemetry#1253)

f1dbe22

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


          chore(deps): update productcatalogservice (open-telemetry#1254)

620cbda

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


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

fc4170c

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


          chore(deps): update loadgenerator (open-telemetry#1258)

d2e0db5

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


          Added web browser traffic in loadgenerator (open-telemetry#1266)

fd448b5

* Added playwright on load generator docker image

* Added locust plugins as a dependency

* Increased memory constrains and introduced LOCUST_BROWSER_TRAFFIC_ENABLED environment variable

* Added playwright user to generate browser traffic

* Updated changelog message

* Added skipping line + renamed event

* Downgraded greenlet to 3.0.0

---------

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


          chore(deps): update node docker tag to v21 (open-telemetry#1259)

6d7b978

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


          run tracetesting on successful build (open-telemetry#1278)

c9750dc

* add CI

* fix lint

* fix name

* fix run

* change calling behavior

* add job names

* change secret

* inherit secrets

* change to pull_request_target

* remove secret inheritance

* change to run on pr merge


          switch to pull_request_target (open-telemetry#1279)

7ae2cd2


          add docker and update token (open-telemetry#1280)

c0f4899


          build before test and add badge (open-telemetry#1281)

eb1708f


          Bump action docker/setup-qemu-action@v3 (from v2) (open-telemetry#1277)

df66cb7

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


          chore(deps): update plugin com.github.johnrengelman.shadow to v8 (ope…

5f8a8e9

…n-telemetry#1260)

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


          currencyservice: update opentelemetry-cpp to 1.12.0 (open-telemetry#1275

1ce768f


          currencyservice: bring back multistage build (open-telemetry#1276)

1bb3324


          chore(deps): update cartservice (open-telemetry#1249)

bef6a64

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


          cartservice: Add .NET process metrics (open-telemetry#1265)

18942fb

* add .NET process metrics

* CHANGELOG entry

---------

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


          Replace deplecated function in otelgrpc for go (open-telemetry#1284)


          [accountingservice] add attributes to kafka spans (open-telemetry#1286)

* add attributes to kafka spans

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

* add attributes to kafka spans

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

---------

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

rogercoll and others added 11 commits

June 3, 2024 15:47


          chore: introduce .env.override for docker-compose (open-telemetry#1584)

b2f6fbf

* chore: introduce .env.override for docker-compose

* parametrize docker compose cmd and env files

---------

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


          [chore] release prep: update dependencies for all services (open-tele…

2ca2be6

…metry#1591)

* update dependencies

* Adjust Rust dependency

* Restore flagd env var

---------

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


          chore: Add service version to OTEL_RESOURCE_ATTRIBUTES (open-telemetr…

d75c9d8

…y#1594)

* chore: Add service version to OTEL_RESOURCE_ATTRIBUTES

* changelog


          [checkout] fix kafka restart (open-telemetry#1590)

cc29172

* fix kafka acks

* Update src/checkoutservice/main.go

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

* align attribute names with semantic conventions

* checkout: recover from kafka restart

---------

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


          Update demo image version (open-telemetry#1597)

7e4f1f6

* Update image version

* latest otel col contrib

* Update minor version


          updated buildx config (open-telemetry#1596)

9dc4a67


          Bump docker/build-push-action from 5.0.0 to 5.4.0 (open-telemetry#1598)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.0.0 to 5.4.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v5.0.0...v5.4.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>


          chore: configure renovate to bump image deps (open-telemetry#1599)

a61ab14

* chore: configure renovate to bump image deps

* chore: add tracetest and opensearch to renovate


          fix: start-minimal make target (open-telemetry#1604)

6fd371c

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


          Merge remote-tracking branch 'upstream/main' into upstream-update-nov…

b9c042e

…2024

# Conflicts:
#	.env
#	docker-compose.minimal.yml
#	docker-compose.yml
#	src/cartservice/src/cartservice.csproj
#	src/currencyservice/Dockerfile
#	src/dataprepper/data-prepper-config.yaml
#	src/frontend/package-lock.json
#	src/frontend/package.json
#	src/loadgenerator/requirements.txt
#	src/otelcollector/otelcol-config.yml
#	src/prometheus/prometheus-config.yaml


          upstream merge

25fbd98

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

YANG-DB requested review from ps48, kavithacm, derek-ho, joshuali925, dai-chen, mengweieric, vmmusings and Swiddis as code owners

November 19, 2024 17:16

YANG-DB marked this pull request as draft

November 19, 2024 17:16

github-actions bot commented Nov 27, 2024

This PR was marked stale due to lack of activity. It will be closed in 7 days.

github-actions bot added the Stale label

github-actions bot commented Dec 4, 2024

Closed as inactive. Feel free to reopen if this PR is still being worked on.

github-actions bot closed this

YANG-DB reopened this

github-actions bot removed the Stale label

YANG-DB added 2 commits

December 9, 2024 10:38


          Merge branch 'main' into upstream-update-nov2024

d90a269

# Conflicts:
#	src/otelcollector/otelcol-config.yml


          merge with recent changes

be67383

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

github-actions bot commented Dec 17, 2024

This PR was marked stale due to lack of activity. It will be closed in 7 days.

github-actions bot added the Stale label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

ps48 Awaiting requested review from ps48 ps48 is a code owner

kavithacm Awaiting requested review from kavithacm kavithacm is a code owner

derek-ho Awaiting requested review from derek-ho derek-ho is a code owner

joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

dai-chen Awaiting requested review from dai-chen dai-chen is a code owner

mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

vmmusings Awaiting requested review from vmmusings

Swiddis Awaiting requested review from Swiddis Swiddis is a code owner

Labels

39 participants