Fix merge with upstream (OTel demo)

[osullivandonal]

Bug Report

Which version of the demo you are using?
be48109

Symptom

We currently have a github workflow to sync with upstream, see here, this is disabled atm as this fails. The failure is due to merge conflicts.

What is the expected behavior?

Expect that the sync is successful

What is the actual behavior?

Sync with upstream fails with merge conflicts

Reproduce

You can view the Scheduled Merge upstream here.

Additional Context

This is usually due to the package.lock.json causing conflicts, this is because the payment service in the elastic otel demo contains a elastic specific dependency compaired to upstream, see here.

Proposed fix

First fix the payment service issue by using npm install on sync to fix conflicts?

Remove the sync job and automate a PR to open once a week to do the sync, the merge can be automated if no conflicts are present.

_{Tip: React with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding +1 or me too, to help us triage it. Learn more here.}

[osullivandonal]

Reopening as the workflow failed, see https://github.com/elastic/opentelemetry-demo/actions/runs/21243752334/job/61127707129

  BRANCH_NAME="auto-merge/upstream-$(date +%Y%m%d-%H%M%S)"
  echo "branch_name=${BRANCH_NAME}" >> $GITHUB_OUTPUT
  
  git checkout -b "${BRANCH_NAME}" upstream/main
  git push origin "${BRANCH_NAME}"
  shell: /usr/bin/bash -e {0}
Switched to a new branch 'auto-merge/upstream-20260122-094824'
branch 'auto-merge/upstream-20260122-094824' set up to track 'upstream/main'.
remote: Permission to elastic/opentelemetry-demo.git denied to elastic-apm-tech.
fatal: unable to access 'https://github.com/elastic/opentelemetry-demo/': The requested URL returned error: 403
Error: Process completed with exit code 128.

[osullivandonal]

The robots team have a issue open with the platform team to allow us to our current workflow without having to create a PAT (Personal Access Token), see slack thread here.