upstream merges #98
Merged
upstream merges #98
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
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
…nto opensearch-observability-otel # Conflicts: # docker-compose.yml
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
merge external changes
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
…nto opensearch-observability-otel
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
update from main
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
[currencyservice] Fix OTel C++ build and update OTel version (open-telemetry#886)
…pensearch / dashboards Signed-off-by: YANGDB <yang.db.dev@gmail.com>
…nto opensearch-observability-otel
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
…data-prep Otel Opensearch data prep
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
…y#865) * update rust version and dependencies * Changelog --------- Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
# Conflicts: # docker-compose.yml
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
…-metrics' into opensearch-monitoring-prometheus-metrics
…ng-prometheus-metrics # Conflicts: # .github/workflows/build-images.yml # CHANGELOG.md # docker-compose.minimal.yml # docker-compose.yml # src/adservice/build.gradle # src/adservice/src/main/java/oteldemo/AdService.java # src/frauddetectionservice/build.gradle.kts # src/otelcollector/otelcol-config.yml # src/recommendationservice/recommendation_server.py # test/tracetesting/payment-service/valid-credit-card.yaml # test/tracetesting/tracetest-provision.yaml
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
* fix: Fixing tracetest configuration * fix: Fixing tracetest configuration Signed-off-by: Oscar Reyes <oscar-rreyes1@hotmail.com> --------- Signed-off-by: Oscar Reyes <oscar-rreyes1@hotmail.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
# Conflicts: # docker-compose.yml # src/otelcollector/otelcol-config.yml
- remove 'opensearch integration' service - update the opensearch dashboard - add opensearch+dashboard to the minimized docker-compose.yml Signed-off-by: YANGDB <yang.db.dev@gmail.com>
- remove 'opensearch integration' service - update the opensearch dashboard - add opensearch+dashboard to the minimized docker-compose.yml Signed-off-by: YANGDB <yang.db.dev@gmail.com>
- 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 <yang.db.dev@gmail.com>
- 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 <yang.db.dev@gmail.com>
- 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 <yang.db.dev@gmail.com>
- 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 <yang.db.dev@gmail.com>
- 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 <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
# Conflicts: # docker-compose.minimal.yml # docker-compose.yml # src/adservice/build.gradle # src/frauddetectionservice/build.gradle.kts # src/loadgenerator/requirements.txt # src/prometheus/prometheus-config.yaml
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
Upstream merges
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.