Merging upstream changes #50
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* remove timestamps from FeatureFlag message Signed-off-by: Pierre Tessier <[email protected]> * remove timestamps from FeatureFlag message Signed-off-by: Pierre Tessier <[email protected]> * init feature flags using sql Signed-off-by: Pierre Tessier <[email protected]> * allows initial feature flags values Signed-off-by: Pierre Tessier <[email protected]> * Update src/ffs_postgres/20-ffs_data.sql Co-authored-by: Juliano Costa <[email protected]> * Remove sporadically from cartServiceFailure --------- Signed-off-by: Pierre Tessier <[email protected]> Co-authored-by: Juliano Costa <[email protected]>
…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 <[email protected]> * update grafana to 10.2.3 Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]>
* add package name for rpc.service attribute Signed-off-by: Pierre Tessier <[email protected]> * add package name for rpc.service attribute Signed-off-by: Pierre Tessier <[email protected]> * add package name for rpc.service attribute Signed-off-by: Pierre Tessier <[email protected]> * add package name for rpc.service attribute Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]>
Signed-off-by: Pierre Tessier <[email protected]> Co-authored-by: Juliano Costa <[email protected]>
…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 <[email protected]> Co-authored-by: Pierre Tessier <[email protected]>
…1335) * default metricreader and exporter options Signed-off-by: Pierre Tessier <[email protected]> * default metricreader and exporter options Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]> Co-authored-by: Juliano Costa <[email protected]>
Signed-off-by: Pierre Tessier <[email protected]>
* define and use postgres image Signed-off-by: Pierre Tessier <[email protected]> * define and use postgres image Signed-off-by: Pierre Tessier <[email protected]> * define and use postgres image Signed-off-by: Pierre Tessier <[email protected]> * add postgres image Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]> Co-authored-by: Juliano Costa <[email protected]>
* 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 <[email protected]>
…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 <[email protected]>
…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 <[email protected]>
* Align env variables for OTLP ports. No functional changes. * Add CHANGELOG --------- Co-authored-by: Juliano Costa <[email protected]>
…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 <[email protected]>
…emetry#1356) * use opensearch native exporter Signed-off-by: Pierre Tessier <[email protected]> * cleanup opensearch config Signed-off-by: Pierre Tessier <[email protected]> * fix opensearch datasource Signed-off-by: Pierre Tessier <[email protected]> * fix opensearch datasource Signed-off-by: Pierre Tessier <[email protected]> * use opensearch exporter Signed-off-by: Pierre Tessier <[email protected]> * remove dataprepper config files Signed-off-by: Pierre Tessier <[email protected]> * remove opensearch auth details Signed-off-by: Pierre Tessier <[email protected]> * opensearch memory limits Signed-off-by: Pierre Tessier <[email protected]> * opensearch memory limits Signed-off-by: Pierre Tessier <[email protected]> * remove dataprepper Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]>
…lemetry#1357) * update go SDKs Signed-off-by: Pierre Tessier <[email protected]> * remove go metric filters and transforms Signed-off-by: Pierre Tessier <[email protected]> * remove go metric filters and transforms Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Pierre Tessier <[email protected]>
* update python sdks Signed-off-by: Pierre Tessier <[email protected]> * remove python metric transform Signed-off-by: Pierre Tessier <[email protected]> * update Python SDKs Signed-off-by: Pierre Tessier <[email protected]> * fix trailing space Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]>
* fix browser traffic enabled flag Signed-off-by: Pierre Tessier <[email protected]> * fix browser traffic enabled flag Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]> Co-authored-by: Juliano Costa <[email protected]>
…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] <[email protected]> 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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* allow products to be extended Signed-off-by: Pierre Tessier <[email protected]> * allow products to be extended Signed-off-by: Pierre Tessier <[email protected]> * fix products path Signed-off-by: Pierre Tessier <[email protected]> * fix merge conflict Signed-off-by: Pierre Tessier <[email protected]> --------- Signed-off-by: Pierre Tessier <[email protected]> Co-authored-by: Juliano Costa <[email protected]>
…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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…lemetry#1401) 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
…n-telemetry#1408) Co-authored-by: Pierre Tessier <[email protected]>
…demo into luke/merge-upstream
dineshg13
approved these changes
Mar 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.mdupdated to document new feature additionsMaintainers 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.