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

fix(rum-core): fix for merge utility function #1555

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

david-luna
Copy link
Member

The merge utility function was producing bogs values when certain payload is passed. This PR fixes it

Copy link
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

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

Thanks @david-luna code changes LGTM, Need to fix some of the tests as well.

@@ -55694,7 +55694,7 @@
},
"packages/rum": {
"name": "@elastic/apm-rum",
"version": "5.16.0",
"version": "5.16.1",
Copy link
Member

Choose a reason for hiding this comment

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

weird why you got this change?

Copy link
Member Author

Choose a reason for hiding this comment

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

I got it just after npm i on a clean checkout

@david-luna
Copy link
Member Author

Thanks @david-luna code changes LGTM, Need to fix some of the tests as well.

the intent of the change was to provide exactly the same behaviour & without changing the API but the internal implementation (so no need to change the tests). I haven't tested locally and relied on the CI since the docker compose command referred in the docs did not work.

NODEJS_VERSION=18.16.0 STACK_VERSION=8.6.1 docker compose -f ./dev-utils/docker-compose.yml up -d apm-server
WARN[0000] The "USER_ID" variable is not set. Defaulting to a blank string. 
WARN[0000] The "BUILD_NUMBER" variable is not set. Defaulting to a blank string. 
WARN[0000] The "BRANCH_NAME" variable is not set. Defaulting to a blank string. 
WARN[0000] The "CI" variable is not set. Defaulting to a blank string. 
WARN[0000] The "REPORT_FILE" variable is not set. Defaulting to a blank string. 
WARN[0000] The "REPORT_FILE" variable is not set. Defaulting to a blank string. 
WARN[0000] The "SCOPE" variable is not set. Defaulting to a blank string. 
WARN[0000] The "APM_SERVER_URL" variable is not set. Defaulting to a blank string. 
WARN[0000] The "KIBANA_URL" variable is not set. Defaulting to a blank string. 
WARN[0000] The "BUILD_NUMBER" variable is not set. Defaulting to a blank string. 
WARN[0000] The "BRANCH_NAME" variable is not set. Defaulting to a blank string. 
WARN[0000] The "CI" variable is not set. Defaulting to a blank string. 
WARN[0000] The "SAUCE_USERNAME" variable is not set. Defaulting to a blank string. 
WARN[0000] The "SAUCE_ACCESS_KEY" variable is not set. Defaulting to a blank string. 
WARN[0000] The "MODE" variable is not set. Defaulting to a blank string. 
WARN[0000] The "GOAL" variable is not set. Defaulting to a blank string. 
WARN[0000] The "WORKSPACE" variable is not set. Defaulting to a blank string. 
WARN[0000] The "BASE_DIR" variable is not set. Defaulting to a blank string. 
WARN[0000] The "USER_ID" variable is not set. Defaulting to a blank string. 
WARN[0000] The "BUILD_NUMBER" variable is not set. Defaulting to a blank string. 
WARN[0000] The "BRANCH_NAME" variable is not set. Defaulting to a blank string. 
WARN[0000] The "CI" variable is not set. Defaulting to a blank string. 
WARN[0000] The "REPORT_FILE" variable is not set. Defaulting to a blank string. 
WARN[0000] The "REPORT_FILE" variable is not set. Defaulting to a blank string. 
WARN[0000] The "USER_ID" variable is not set. Defaulting to a blank string. 
WARN[0000] /Users/david/Documents/repos/el/apm-agent-rum-js/dev-utils/docker-compose.yml: the attribute `version` is obsolete, it will be ignored, please remove it to avoid potential confusion 
no such service: apm-server

am I doing something wrong? Does the documentation need an update?

@vigneshshanmugam
Copy link
Member

@david-luna Unfortunately I haven't tested anything in the midterm as well, But seems to happen on other PR's as well - #1546. @v1v Have you seen this one before?

@v1v
Copy link
Member

v1v commented Dec 12, 2024

not really, maybe the current docker-compose in the GH runner is not supporting the version set in the docker-compose.yml? or the other way around, the version installed locally is too new?

@david-luna
Copy link
Member Author

there was a problem in the code, so CI caught the defects on the fix. With the last commit I made some progress but now it seems CI has trouble connection to saucelabs
https://github.com/elastic/apm-agent-rum-js/actions/runs/12317196104/job/34379154854?pr=1555

excerpt of the logs

node-puppeteer  | Running: runSauceTests(packages/rum, true, build:e2e, test:unit, test:e2e:supported, test:e2e:failsafe) 
node-puppeteer  | [Static Server] - serving on:  /app/packages/rum 8000
node-puppeteer  | [Backend Server] - serving on:  8003
node-puppeteer  | [APM Server Proxy] - For http://localhost:8200 on: 8001
node-puppeteer  | Opening local tunnel using Sauce Connect
node-puppeteer  | Starting sc with args: -u XXXXXXXX -k XXXXXXXX --no-ssl-bump-domains all --tunnel-identifier  --readyfile /tmp/sc-launcher-readyfile -x https://saucelabs.com/rest/v1
node-puppeteer  | Could not start Sauce Connect. Exit code 1 signal: null
node-puppeteer  | Opening local tunnel using Sauce Connect
node-puppeteer  | Starting sc with args: -u XXXXXXXX -k XXXXXXXX --no-ssl-bump-domains all --tunnel-identifier  --readyfile /tmp/sc-launcher-readyfile -x https://saucelabs.com/rest/v1
node-puppeteer  | Could not start Sauce Connect. Exit code 1 signal: null
node-puppeteer  | Opening local tunnel using Sauce Connect
node-puppeteer  | Starting sc with args: -u XXXXXXXX -k XXXXXXXX --no-ssl-bump-domains all --tunnel-identifier  --readyfile /tmp/sc-launcher-readyfile -x https://saucelabs.com/rest/v1
node-puppeteer  | Could not start Sauce Connect. Exit code 1 signal: null
node-puppeteer  | Opening local tunnel using Sauce Connect
node-puppeteer  | Starting sc with args: -u XXXXXXXX -k XXXXXXXX --no-ssl-bump-domains all --tunnel-identifier  --readyfile /tmp/sc-launcher-readyfile -x https://saucelabs.com/rest/v1
node-puppeteer  | Sauce connect Error Error: Could not start Sauce Connect. Exit code 1 signal: null
node-puppeteer  |     at ChildProcess.<anonymous> (/app/node_modules/sauce-connect-launcher/lib/sauce-connect-launcher.js:566:12)
node-puppeteer  |     at ChildProcess.emit (node:events:517:28)
node-puppeteer  |     at ChildProcess.emit (node:domain:489:12)
node-puppeteer  |     at ChildProcess._handle.onexit (node:internal/child_process:292:12)
node-puppeteer  | Running cleanups: 1
node-puppeteer  | ERROR: "test:sauce" exited with 1.
node-puppeteer  | lerna ERR! npm run test exited 1 in '@elastic/apm-rum'
Aborting on container exit...

@vigneshshanmugam
Copy link
Member

@v1v We rotated the saucelabs tokens, may be the tests are not working be due to that? I believe we have the apm-ci user on the saucelabs organization, If not I can add that which should unblock us here. Please suggest.

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.

3 participants