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.

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

Merging upstream changes #50

Merged
merged 85 commits into from
Apr 2, 2024
Merged

Merging upstream changes #50

merged 85 commits into from
Apr 2, 2024

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
@puckpuck @julianocosta89
[ffs] - Allow setting initial feature flag values (open-telemetry#1319)
f25b46f 
* 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]>
@julianocosta89
Update affiliation (open-telemetry#1323)
6a142a7
@Kielek
[cartservice] Bump OTel .NET SDK to 1.7.0 together with other depende…
47d9f5d 
…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
@tranngoclam
Re-generate protobuf to fix deprecated go modules (open-telemetry#1321)
494808a
@julianocosta89
[loadgenerator and recommendationservice] Update python base image (o…
bfc18c7 
…pen-telemetry#1329)
@austinlparker
update version numbers (open-telemetry#1331)
9e624d7
@puckpuck
[grafana] - update grafana to 10.2.3 (open-telemetry#1332)
ea3fbfd 
* 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]>
@puckpuck
[currency] - fix rpc.service attribute (open-telemetry#1333)
c5484eb 
* 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]>
@puckpuck @julianocosta89
use GitHub markdown syntax (open-telemetry#1342)
c1365ed 
Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
@rlankfo @cedricziel @puckpuck
[frontendproxy] enable envoy environment resource detector (open-tele…
69a28d6 
…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]>
@puckpuck @julianocosta89
[currency] - fix metricreader export and temporality (open-telemetry#…
0051599 
…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]>
@puckpuck
update to latest helm release (open-telemetry#1341)
0d9cf78 
Signed-off-by: Pierre Tessier <[email protected]>
@puckpuck @julianocosta89
[postgres] Define and use image for postgres (open-telemetry#1338)
9ed7785 
* 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]>
@pankdev
Update wiki url (open-telemetry#1346)
c9224a9 
* Update wiki url

* [accountingservice,checkoutservice,productcatalogservice] update wiki link
@LouisParkin @julianocosta89
Fix crashlooping for two services with insufficient privileges on ope…
120381a 
…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]>
@jordibisbal8 @julianocosta89
Add browser traffic in loadgenerator and export traces in frontend (o…
022ba90 
…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]>
@mviitane @julianocosta89
Major version update (version 2.0.0) for OTel Java instrumentation (o…
ee7907f 
…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]>
@mviitane @julianocosta89
Align env variables for OTLP ports (open-telemetry#1353)
cbea332 
* Align env variables for OTLP ports. No functional changes.

* Add CHANGELOG

---------

Co-authored-by: Juliano Costa <[email protected]>
@mviitane @julianocosta89
Update dependent services - Collector, Grafana, Jaeger, Prometheus, e…
26b1710 
…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]>
@puckpuck
[opensearch] - Use opensearch exporter & remove dataprepper (open-tel…
e15affc 
…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]>
@puckpuck
[chore] update Go SDKs, & fix metrics filters and transforms (open-te…
b0c1d27 
…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]>
@tranngoclam @puckpuck
build(go): upgrade golang:1.21.6 (open-telemetry#1360)
d2eae5f 
Co-authored-by: Pierre Tessier <[email protected]>
@puckpuck
[chore] update SDKs and remove metric transforms (open-telemetry#1358)
14bc74a 
* 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]>
@austinlparker
always run cleanup job (open-telemetry#1366)
23094bf
@puckpuck @julianocosta89
[loadgenerator] fix browser traffic enabled flag (open-telemetry#1359)
d1575de 
* 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]>
@dependabot
Bump gradle/wrapper-validation-action from 1.1.0 to 2.0.1 (open-telem…
3a9e507 
…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>
@tranngoclam
chore(go): update go 1.22 (open-telemetry#1367)
059dfb9
@dependabot
Bump gradle/wrapper-validation-action from 2.0.1 to 2.1.0 (open-telem…
b8cc894 
…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>
@puckpuck @julianocosta89
[productcatalog] - allow products to be extended (open-telemetry#1363)
ab6c1a7 
* 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]>
@dependabot
Bump gradle/wrapper-validation-action from 2.1.0 to 2.1.1 (open-telem…
1c6b68b 
…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>
austinlparker and others added 27 commits February 25, 2024 10:40
@austinlparker
Merge branch 'main' into flagd-spike
16f2428
@tranngoclam @puckpuck
fix(accountingservice): fix graceful shutdown and log issues (open-te…
e07f5b2 
…lemetry#1401)

Co-authored-by: Pierre Tessier <[email protected]>
@austinlparker
Merge branch 'main' into flagd-spike
993fc7e
@austinlparker
cleanup ad service eval
9f9f258
@puckpuck @julianocosta89
only run nightly for main repo (open-telemetry#1407)
3f6958a 
Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
@tranngoclam @puckpuck @austinlparker
fix(productcatalogservice): fix graceful shutdown issues (open-teleme…
ca56690 
…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]>
@austinlparker
Merge branch 'main' into flagd-spike
e6ef65d
@austinlparker
Test: Run integration tests on PR approval (open-telemetry#1414)
940dfca 
* spike for running integration tests

* add workflow call trigger

* fix lint

* lint

* fix

* don't reinstall docker
@julianocosta89 @austinlparker
[CartService] - Add Host Detector (open-telemetry#1415)
b1e26c3 
* Add Host Detector

* changelog

---------

Co-authored-by: Austin Parker <[email protected]>
@basti1302
docs(readme): add Dash0 to the list of forks (open-telemetry#1416)
0a1ad08
@austinlparker
Merge branch 'main' into flagd-spike
c462cda
@basti1302
[frontend] update sharp to latest to avoid docker build issue on M1 (o…
71f0e96 
…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
@basti1302
[frontend] fix typo in ShippingGateway (open-telemetry#1418)
06f020c
@puckpuck
fix kafka producer spans (open-telemetry#1428)
b7c7891
@austinlparker
Merge branch 'main' into flagd-spike
24c82cf
@tranngoclam @puckpuck
chore: upgrade go.opentelemetry.io otel and contrib dependencies (ope…
71e428b 
…n-telemetry#1408)

Co-authored-by: Pierre Tessier <[email protected]>
@austinlparker
fix adservice
ff19083
@austinlparker
Merge branch 'main' into flagd-spike
52b35bf
@austinlparker
fixup gomod
d70b823
@austinlparker
add otel hooks for .net flags
75533ab
@austinlparker
add otel hooks for productcatalog
2f8861e
@julianocosta89
Remove trailing space
8430bbf
@austinlparker
add stub for python otel hook
87618d3
@tranngoclam
refactor(checkoutservice): use exception.message key from semantic co…
c8b8e08 
…nvention (open-telemetry#1430)
@austinlparker
remove unneeded key from flags
dc6d2db
@austinlparker
Merge branch 'main' into flagd-spike
334fe69
@lukekraus45
Merge branch 'flagd-spike' of github.com:austinlparker/opentelemetry-…
45a04f5 
…demo into luke/merge-upstream
@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
Reviewers

@dineshg13 dineshg13 dineshg13 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.