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

[chore] rebase from upstream #7

Merged
merged 125 commits into from
Feb 14, 2024
Merged

[chore] rebase from upstream #7

merged 125 commits into from
Feb 14, 2024

Conversation

puckpuck
Copy link
Collaborator

Get back in sync with upstream changes

mviitane and others added 30 commits September 18, 2023 20:00
* 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]>
* 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]>
* add opensearch

* fix env

* fix yamllint

* fix lint

* fix errors in datasource

* remove stdout export
* 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]>
* 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

* refactor logic

* remove extra fi
…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]>
* 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]>
…emetry#1183)

* Update AdService to Java version 21

* Add log and update dependencies

* Bump java agent

* Changelog

* lint
* jaeger spm and prometheus

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

* jaeger spm and prometheus

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

---------

Signed-off-by: Pierre Tessier <[email protected]>
…mes (open-telemetry#1182)

* chore: pinning tracebased test version and adding files as volumes

* update changelog

* Update CHANGELOG.md

---------

Co-authored-by: Juliano Costa <[email protected]>
Co-authored-by: Pierre Tessier <[email protected]>
…etry#1180)

* Enable client spans in envoy proxy

* Changelog

* Update CHANGELOG.md

* Update envoy version

---------

Co-authored-by: Juliano Costa <[email protected]>
* add opensearch dashboard panel

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

* add opensearch dashboard panel

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

---------

Signed-off-by: Pierre Tessier <[email protected]>
* workaround: disable grpc metrics

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

* workaround: disable grpc metrics

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

---------

Signed-off-by: Pierre Tessier <[email protected]>
…telemetry#1214)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Austin Parker <[email protected]>
austinlparker and others added 27 commits January 16, 2024 09:14
* 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]>
* 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]>
* 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>
# Conflicts:
#	src/otelcollector/otelcol-config-extras.yml
@puckpuck puckpuck requested a review from a team as a code owner February 14, 2024 04:43
@puckpuck puckpuck merged commit 84bb671 into main Feb 14, 2024
22 of 23 checks passed
@puckpuck puckpuck deleted the chore.upstream-rebase branch February 14, 2024 04:45
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.