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

Rebase upstream 1.11.1 #157

Closed
wants to merge 191 commits into from
Closed

Rebase upstream 1.11.1 #157

wants to merge 191 commits into from

Conversation

damemi
Copy link
Contributor

@damemi damemi commented Aug 26, 2024 •
edited
Loading

Did the following:

$ git fetch upstream
$ git fetch gcp
$ git checkout gcp/main
$ git rebase 1.11.1

Resolved conflicts during rebase, including:

  • README (minor)
  • CONTRIBUTING (minor)
  • kubernetes/opentelemetry-demo.yaml (more complex, but we generate this file now -- used git rm to remove from conflicting commits and added one commit at end to regenerate)
  • Github workflows which were removed in Pull request target updates #139

julianocosta89 and others added 30 commits February 16, 2024 11:56
@julianocosta89 @puckpuck
[currencyservice] Add OTLP logs (#1378)
816ee5a 
* Add OTel logs to currencyservice

* line break

* changelog

* Move OPENTELEMETRY_CPP_VERSION back

* set opensearch version and timestamp field

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

* add comment for opensearch version update

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

* Change log to INFO

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
@austinlparker
prep for release (#1379)
9d77fdf
@tranngoclam
refactor(checkoutservice): reuse grpc service client (#1387)
e8e3553
@tranngoclam @austinlparker
chore: use semantic convention v1.24.0 (#1385)
6eab783 
* chore(accountingservice): use semantic convention v1.24.0

* chore(checkoutservice): use semantic convention v1.24.0

---------

Co-authored-by: Austin Parker <austin@ap2.io>
@julianocosta89
bump dependencies (#1390)
59e0528
@julianocosta89
Update trace test sem conv (#1394)
64eb66e
@puckpuck
update to 1.8.0 release (#1395)
6f38f5f 
Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
@puckpuck
[chore] make: fix restart, add redeploy targets (#1397)
f9053b7 
* fix restart, add redeploy

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

* fix restart, add redeploy

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

* use service or SERVICE

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
@puckpuck @austinlparker
[chore] - memory for collector and jaeger (#1396)
0d7e94b 
* increase collector memory

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

* increase collector memory

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

* increase collector memory

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

* increase collector memory

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Austin Parker <austin@ap2.io>
@puckpuck
[chore]: nightly build and publish (#1398)
1b9b117 
* nightly build and publish

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

* add nightly releases

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
@puckpuck @austinlparker
use nightly releases (#1399)
6bd2ede 
Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Austin Parker <austin@ap2.io>
@puckpuck @austinlparker
[chore]: remove integration tests (#1406)
ef31bfd 
* yeet integration tests

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

* yeet integration tests

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

* yeet integration tests

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Austin Parker <austin@ap2.io>
@tranngoclam @puckpuck
chore(checkoutservice): add producer interceptor for tracing (#1400)
cf7bac7 
* chore(checkoutservice): add producer interceptor for tracing

* chore(checkoutservice): update changelog

---------

Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
@tranngoclam @puckpuck
fix(accountingservice): fix graceful shutdown and log issues (#1401)
e07f5b2 
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
@puckpuck @julianocosta89
only run nightly for main repo (#1407)
3f6958a 
Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
@tranngoclam @puckpuck @austinlparker
fix(productcatalogservice): fix graceful shutdown issues (#1402)
ca56690 
* 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>
@austinlparker
Test: Run integration tests on PR approval (#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 (#1415)
b1e26c3 
* Add Host Detector

* changelog

---------

Co-authored-by: Austin Parker <austin@ap2.io>
@basti1302
docs(readme): add Dash0 to the list of forks (#1416)
0a1ad08
@basti1302
[frontend] update sharp to latest to avoid docker build issue on M1 (…
71f0e96 
…#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 (#1418)
06f020c
@puckpuck
fix kafka producer spans (#1428)
b7c7891
@tranngoclam @puckpuck
chore: upgrade go.opentelemetry.io otel and contrib dependencies (#1408)
71e428b 
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
@tranngoclam
refactor(checkoutservice): use exception.message key from semantic co…
c8b8e08 
…nvention (#1430)
@austinlparker @justinabrahms @julianocosta89
Remove Feature Flag Service in favor of OpenFeature + flagd (#1388)
ce4ad93 
* replace featureflag service with flagd

* remove ff from gha

* update changelog

* fix sanity checker

* add python

* fix sanity

* add flagd provider to python

* Update src/adservice/build.gradle

Co-authored-by: Justin Abrahms <justin@abrah.ms>

* cleanup ad service eval

* fix adservice

* fixup gomod

* add otel hooks for .net flags

* add otel hooks for productcatalog

* Remove trailing space

* add stub for python otel hook

* remove unneeded key from flags

---------

Co-authored-by: Justin Abrahms <justin@abrah.ms>
Co-authored-by: Juliano Costa <juliano.costa@datadoghq.com>
@tranngoclam @julianocosta89 @austinlparker
refactor(checkoutservice): remove unused replace directive (#1431)
0ac4db7 
Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
Co-authored-by: Austin Parker <austin@ap2.io>
@puckpuck @austinlparker
[chore]: make stop target for all profiles (#1427)
c076a66 
* stop does all profiles

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

* stop does all profiles

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

* fix stop target

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

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Austin Parker <austin@ap2.io>
@fvlankvelt @austinlparker
Cache playwright browsers outside root home to allow container to run…
e82863b 
… as non-root (#1429)

Co-authored-by: Austin Parker <austin@ap2.io>
@fsolleza @austinlparker @puckpuck
build protobuf in dockerfile for all services (#1386)
0c80094 
* generate protobuf in docker build for accountingservice, checkoutservice, currencyservice, and productcatalogservice

* fix build context

---------

Co-authored-by: Austin Parker <austin@ap2.io>
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
@adrielp
[chore] add Liatrio to list of vendor demos (#1442)
c6f4471
damemi and others added 22 commits August 26, 2024 17:27
@damemi
Add GCP collector config, readme, samples
4842ac9
@damemi
Add GCP collector config, readme, samples
72cd55c
@damemi
Fix make start after rebase
54435a4
@damemi
Remove filter/ottl and transform processors for 1.8.0 chart
3984388
@damemi
Update helm steps to install 0.29.1
a791642
@damemi
Update local k8s manifests to match GCP values
1b7a282
@damemi
Update README
299fc75
@damemi
Use same collector SA name in helm+manifest
c1b7048
@damemi
Helm install to same namespace as kubectl (to keep IAM/WI setup steps…
3733ab3 
… aligned)
@damemi
readme copy-paste
d70e40f
@damemi
reflow long lines
12eb60d
@damemi
Add Cloud Build deploy config (GoogleCloudPlatform#50)
e2ebebb 
* Add Cloud Build deploy config

* Add cloudbuild-deploy.yaml to ignore licenses check
@damemi
Add PROJECT_ID env var substitution (GoogleCloudPlatform#69)
336f46b
@dashpole @damemi
register frontendproxy service with service directory for uptime chec…
918f3f5 
…ks (GoogleCloudPlatform#82)
@quentinmit @damemi
Use helmfile to regenerate the k8s YAML
0ee5790
@quentinmit @damemi
Script to deploy k8s resources to an arbitrary namespace.
cb1d16a
@quentinmit @damemi
Pass the namespace to k8sattributes in CI
2609b26
@damemi
Pull request target updates (GoogleCloudPlatform#139)
1f9d1e0 
* Remove unused github workflows

* Update CODEOWNERS
@damemi
Double-export traces to Google Cloud and OTLP endpoints (GoogleCloudP…
ed215fd 
…latform#101)

* Double-export traces to GCP and OTLP endpoint

* make generate-kubernetes-manifests

* Add helm-diff to prereqs

* Use custom fork of collector (for now)

* Set values in cloudbuild-deploy

* Move everything to helm file

* Use a single values file because they were overwriting each other

* Fix helmfile flags for deploy

* Add gcp.project_id resource attribute

* Rename new processor/exporter

* Remove blank strings by default

* Rename gotmpl file

* Remove custom collector image and fix nil check for endpoint
@damemi
Bump helm chart to 0.32 and collector to 0.105.0 (GoogleCloudPlatform…
9471a5f 
…#147)
@quentinmit @damemi
Switch to Workload Identity Federation for GKE
fc96a9e
@damemi
make generate-kubernetes-manifests
8288e84
@damemi damemi changed the title Rebase 8262024 Rebase upstream 1.11.1 Aug 26, 2024
@damemi damemi mentioned this pull request Aug 26, 2024
Merged
@damemi damemi marked this pull request as ready for review August 26, 2024 17:52
@damemi damemi requested a review from a team as a code owner August 26, 2024 17:52
dashpole
dashpole approved these changes Aug 26, 2024
View reviewed changes
Copy link
Collaborator

@dashpole dashpole left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not a real approval

@damemi damemi closed this Aug 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dashpole dashpole dashpole 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.