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
7 changes: 5 additions & 2 deletions .github/actions/telemetry_check/check.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ console.log(
// Setup fake telemetry server
const server = http.createServer((req, res) => {
let data = ''

req.on('data', (chunk) => {
data += chunk
})

req.on('end', () => {
res.writeHead(200)
res.end()
console.log('Telemetry packet received')
console.log('Telemetry packet received', data)

process.exit(0)
})
})
Expand All @@ -35,7 +38,7 @@ try {
const mode = process.argv[process.argv.indexOf('--mode') + 1]
let exitCode = 0
switch (mode) {
case 'crwa':
case 'cca':
exitCode = await exec(
`yarn node ./packages/create-cedar-app/dist/create-cedar-app.js ../project-for-telemetry --typescript true --git false --no-yarn-install`,
)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/telemetry-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
- name: Set up job
uses: ./.github/actions/set-up-job

- name: 📢 Listen for telemetry (CRWA)
run: node ./.github/actions/telemetry_check/check.mjs --mode crwa
- name: 📢 Listen for telemetry (CCA)
run: node ./.github/actions/telemetry_check/check.mjs --mode cca

- name: 📢 Listen for telemetry (CLI)
run: node ./.github/actions/telemetry_check/check.mjs --mode cli
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@babel/core": "^7.26.10",
"@cedarjs/project-config": "workspace:*",
"@cedarjs/telemetry": "workspace:*",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/api": "1.9.0",
"ansis": "4.2.0",
"dotenv": "16.6.1",
"dotenv-defaults": "5.0.2",
Expand Down
12 changes: 6 additions & 6 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
"@cedarjs/telemetry": "workspace:*",
"@cedarjs/web-server": "workspace:*",
"@listr2/prompt-adapter-enquirer": "2.0.16",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/core": "1.22.0",
"@opentelemetry/exporter-trace-otlp-http": "0.49.1",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/sdk-trace-node": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/core": "1.30.1",
"@opentelemetry/exporter-trace-otlp-http": "0.57.2",
"@opentelemetry/resources": "1.30.1",
"@opentelemetry/sdk-trace-node": "1.30.1",
"@opentelemetry/semantic-conventions": "1.38.0",
"@prisma/internals": "6.19.1",
"ansis": "4.2.0",
"archiver": "7.0.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/create-cedar-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"@babel/plugin-transform-typescript": "^7.26.8",
"@cedarjs/framework-tools": "workspace:*",
"@cedarjs/tui": "workspace:*",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/exporter-trace-otlp-http": "0.49.1",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/sdk-trace-node": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/exporter-trace-otlp-http": "0.57.2",
"@opentelemetry/resources": "1.30.1",
"@opentelemetry/sdk-trace-node": "1.30.1",
"@opentelemetry/semantic-conventions": "1.38.0",
"@types/babel__core": "7.20.5",
"@types/klaw-sync": "6.0.5",
"ansis": "4.2.0",
Expand Down
8 changes: 6 additions & 2 deletions packages/create-cedar-app/src/telemetry.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,12 @@ export async function shutdownTelemetry() {
await traceProvider?.shutdown()
await traceProcessor?.shutdown()
await traceExporter?.shutdown()
} catch {
// We silence this error for user experience
} catch (error) {
// We silence this error for user experience unless verbose telemetry is
// enabled
if (process.env.REDWOOD_VERBOSE_TELEMETRY) {
console.error('Telemetry: shutdown error', error)
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@graphql-tools/schema": "10.0.31",
"@graphql-tools/utils": "10.11.0",
"@graphql-yoga/plugin-persisted-operations": "3.18.0",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/api": "1.9.0",
"core-js": "3.47.0",
"graphql": "16.12.0",
"graphql-scalars": "1.25.0",
Expand Down
Loading
Loading