Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/node-core/src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ function getDefaultOptions() {
let apiBaseUrl = process.env.JUDOSCALE_URL
let containerID

if (process.env.DYNO) {
if (process.env.JUDOSCALE_CONTAINER) {
containerID = process.env.JUDOSCALE_CONTAINER
} else if (process.env.DYNO) {
containerID = process.env.DYNO
} else if (process.env.RENDER_INSTANCE_ID) {
apiBaseUrl ||= `https://adapter.judoscale.com/api/${process.env.RENDER_SERVICE_ID}`
Expand Down
13 changes: 13 additions & 0 deletions packages/node-core/test/config.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ describe('Config', () => {
beforeEach(() => {
delete process.env.JUDOSCALE_URL
delete process.env.JUDOSCALE_LOG_LEVEL
delete process.env.JUDOSCALE_CONTAINER
delete process.env.DYNO
delete process.env.RENDER_INSTANCE_ID
delete process.env.RENDER_SERVICE_ID
Expand Down Expand Up @@ -67,6 +68,18 @@ describe('Config', () => {
expect(new Config()).toHaveProperty('container', 'random-replica-uuid')
})

test('has container property via JUDOSCALE_CONTAINER', () => {
process.env.JUDOSCALE_CONTAINER = 'custom-container-id'
expect(new Config()).toHaveProperty('container', 'custom-container-id')
})

test('JUDOSCALE_CONTAINER takes priority over platform-specific env vars', () => {
process.env.JUDOSCALE_CONTAINER = 'custom-container-id'
process.env.DYNO = 'web.123'
process.env.FLY_MACHINE_ID = 'fly-machine-id'
expect(new Config()).toHaveProperty('container', 'custom-container-id')
})

test('has version property', () => {
expect(new Config().version).toMatch(/\d+\.\d+\.\d+/)
})
Expand Down