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

Merging upstream changes #50

Merged
merged 85 commits into from
Apr 2, 2024
Merged

Conversation

lukekraus45
Copy link

Changes

Please provide a brief description of the changes here.

Merge Requirements

For new features contributions please make sure you have completed the following
essential items:

  • 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.

puckpuck and others added 30 commits January 8, 2024 11:30
* remove timestamps from FeatureFlag message

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

* remove timestamps from FeatureFlag message

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

* init feature flags using sql

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

* allows initial feature flags values

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

* Update src/ffs_postgres/20-ffs_data.sql

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>

* Remove sporadically from cartServiceFailure

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
…ncies (open-telemetry#1326)

* Bump .NET/.NET SDK docker images

* Bump OTel .NET SDK to 1.7.0
together with other .NET dependencies

* Changelog

* Fix changelog
* update grafana to 10.2.3

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

* update grafana to 10.2.3

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
* add package name for rpc.service attribute

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

* add package name for rpc.service attribute

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

* add package name for rpc.service attribute

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

* add package name for rpc.service attribute

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: Juliano Costa <julianocosta89@outlook.com>
…metry#1291)

* enable envoy environment resource detector for frontendproxy

* use prod envoy and add changelog

* s/v1.29.0/v1.29-latest/

* Add OTEL_RESOURCE_ATTRIBUTES to docker compose defs

---------

Co-authored-by: Cedric Ziel <cedric@cedric-ziel.com>
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
…1335)

* default metricreader and exporter options

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

* default metricreader and exporter options

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
* define and use postgres image

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

* define and use postgres image

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

* define and use postgres image

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

* add postgres image

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

---------

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

* [accountingservice,checkoutservice,productcatalogservice] update wiki link
…ntelemetry-javaagent.jar. (open-telemetry#1348)

* These two services don't run as 'nobofy' due to root user alone having read/write permission on opentelemetry-javaagent.jar. This commit fixes it.

* Updated CHANGELOG.md

* Update CHANGELOG.md

---------

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
…pen-telemetry#1345)

* Add locust_plugins as a dependency

* Increased memory constraints and introduced LOCUST_BROWSER_TRAFFIC_ENABLED environment variable

* Added playwright on load generator docker image

* Inceased delay interval in milliseconds between two consecutive exports

* Use different otel endpoint when request contains the synthetic_request=true header

* Add locust example using playwright. The header synthetic_request is set to true to identify them in the frontend

* Updated changelog

* Use the same otelName (OTEL_COLLECTOR_HOST) for both k8s and docker

* Removed select option event

* Revert - Removed select option event

* Added IS_SYNTHETIC_REQUEST window.env used to set the span web attribute in FrontendTracer.ts

---------

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
…pen-telemetry#1352)

* Major version update (version 2.0.0) for OTel Java instrumentation for
adservice, frauddetectionservice, kafka

The new Java instrumentation uses HTTP as the default export protocol. This PR changes the Java services to export HTTP instead of gRPC.

The new Java instrumentation introduces a lot of new kafka.consumer.* metrics from frauddetectionservice.

* Add CHANGELOG

* Fix CHANGELOG. Update docker-compose.minimal.yml

---------

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
* Align env variables for OTLP ports. No functional changes.

* Add CHANGELOG

---------

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
…tc. (open-telemetry#1354)

* Update dependent services - Collector, Grafana, Jaeger, Prometheus, etc.

Move those external service image paths and versions to .env file to make it easier to update them in the future for multiple docker compose files.

* Add CHANGELOG

---------

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
…emetry#1356)

* use opensearch native exporter

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

* cleanup opensearch config

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

* fix opensearch datasource

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

* fix opensearch datasource

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

* use opensearch exporter

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

* remove dataprepper config files

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

* remove opensearch auth details

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

* opensearch memory limits

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

* opensearch memory limits

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

* remove dataprepper

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
…lemetry#1357)

* update go SDKs

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

* remove go metric filters and transforms

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

* remove go metric filters and transforms

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
* update python sdks

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

* remove python metric transform

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

* update Python SDKs

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

* fix trailing space

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
* fix browser traffic enabled flag

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

* fix browser traffic enabled flag

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

---------

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

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.1.0 to 2.0.1.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](gradle/wrapper-validation-action@v1.1.0...v2.0.1)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…etry#1373)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](gradle/wrapper-validation-action@v2.0.1...v2.1.0)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* allow products to be extended

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

* allow products to be extended

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

* fix products path

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

* fix merge conflict

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

---------

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

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](gradle/wrapper-validation-action@v2.1.0...v2.1.1)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
austinlparker and others added 27 commits February 25, 2024 10:40
…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
@dineshg13 dineshg13 merged commit 69eba1f into DataDog:prod Apr 2, 2024
3 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.