@cedarjs/cli 7.0.0-canary.3128 → 7.0.0-canary.3130

package/dist/commands/experimental/templates/opentelemetry.ts.template

@@ -3,12 +3,18 @@ import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'
 import { registerInstrumentations } from '@opentelemetry/instrumentation'
 import { FastifyInstrumentation } from '@opentelemetry/instrumentation-fastify'
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http'
-import { Resource } from '@opentelemetry/resources'
+import {
+  defaultResource,
+  resourceFromAttributes,
+} from '@opentelemetry/resources'
 import {
   NodeTracerProvider,
   SimpleSpanProcessor,
 } from '@opentelemetry/sdk-trace-node'
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
+import {
+  ATTR_SERVICE_NAME,
+  ATTR_SERVICE_VERSION,
+} from '@opentelemetry/semantic-conventions'
 import { PrismaInstrumentation } from '@prisma/instrumentation'
 
 import { getConfig } from '@cedarjs/project-config'
@@ -16,10 +22,10 @@ import { getConfig } from '@cedarjs/project-config'
 // You may wish to set this to DiagLogLevel.DEBUG when you need to debug opentelemetry itself
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO)
 
-const resource = Resource.default().merge(
-  new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'redwood-app',
-    [SemanticResourceAttributes.SERVICE_VERSION]: '0.0.0',
+const resource = defaultResource().merge(
+  resourceFromAttributes({
+    [ATTR_SERVICE_NAME]: 'redwood-app',
+    [ATTR_SERVICE_VERSION]: '0.0.0',
   })
 )
 
@@ -38,8 +44,8 @@ const processor = new SimpleSpanProcessor(exporter)
 
 const provider = new NodeTracerProvider({
   resource: resource,
+  spanProcessors: [processor],
 })
-provider.addSpanProcessor(processor)
 
 // Optionally register instrumentation libraries here
 registerInstrumentations({

package/dist/telemetry/index.js

@@ -22,6 +22,8 @@ async function startTelemetry() {
   isStarted = true;
   try {
     diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ERROR);
+    traceExporter = new CustomFileExporter();
+    traceProcessor = new SimpleSpanProcessor(traceExporter);
     traceProvider = new NodeTracerProvider({
       sampler: {
         shouldSample: () => {
@@ -32,11 +34,9 @@ async function startTelemetry() {
         toString: () => {
           return "AlwaysSampleWhenNotShutdown";
         }
-      }
+      },
+      spanProcessors: [traceProcessor]
     });
-    traceExporter = new CustomFileExporter();
-    traceProcessor = new SimpleSpanProcessor(traceExporter);
-    traceProvider.addSpanProcessor(traceProcessor);
     traceProvider.register();
     const cleanArgv = hideBin(process.argv);
     if (!cleanArgv.includes("sb") && !cleanArgv.includes("storybook")) {

package/dist/telemetry/resource.js

@@ -79,7 +79,7 @@ async function getResources() {
     "vscode.version": info.IDEs?.VSCode?.version,
     "cpu.count": cpu.physicalCores,
     "memory.gb": Math.round(mem.total / 1073741824),
-    "env.node_env": process.env.NODE_ENV || null,
+    "env.node_env": process.env.NODE_ENV || void 0,
     "ci.redwood": !!process.env.CEDAR_CI,
     "ci.isci": ci.isCI,
     "dev.environment": developmentEnvironment,

package/dist/telemetry/send.js

@@ -2,7 +2,10 @@ import fs from "node:fs";
 import path from "path";
 import { ExportResultCode } from "@opentelemetry/core";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
-import { Resource } from "@opentelemetry/resources";
+import {
+  defaultResource,
+  resourceFromAttributes
+} from "@opentelemetry/resources";
 import { getPaths } from "@cedarjs/project-config";
 import { getResources } from "./resource.js";
 async function main() {
@@ -20,7 +23,9 @@ async function main() {
   console.time("Computed resource information");
   const customResourceData = await getResources();
   console.timeEnd("Computed resource information");
-  const resource = Resource.default().merge(new Resource(customResourceData));
+  const resource = defaultResource().merge(
+    resourceFromAttributes(customResourceData)
+  );
   const url = process.env.CEDAR_REDIRECT_TELEMETRY || process.env.REDWOOD_REDIRECT_TELEMETRY || "https://quark.quantumparticle.io/v1/traces";
   const traceExporter = new OTLPTraceExporter({
     url

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "7.0.0-canary.3128",
+  "version": "7.0.0-canary.3130",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,23 +36,23 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.8",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "7.0.0-canary.3128",
-    "@cedarjs/babel-config": "7.0.0-canary.3128",
-    "@cedarjs/cli-helpers": "7.0.0-canary.3128",
-    "@cedarjs/internal": "7.0.0-canary.3128",
-    "@cedarjs/prerender": "7.0.0-canary.3128",
-    "@cedarjs/project-config": "7.0.0-canary.3128",
-    "@cedarjs/structure": "7.0.0-canary.3128",
-    "@cedarjs/telemetry": "7.0.0-canary.3128",
-    "@cedarjs/utils": "7.0.0-canary.3128",
-    "@cedarjs/vite": "7.0.0-canary.3128",
-    "@cedarjs/web-server": "7.0.0-canary.3128",
+    "@cedarjs/api-server": "7.0.0-canary.3130",
+    "@cedarjs/babel-config": "7.0.0-canary.3130",
+    "@cedarjs/cli-helpers": "7.0.0-canary.3130",
+    "@cedarjs/internal": "7.0.0-canary.3130",
+    "@cedarjs/prerender": "7.0.0-canary.3130",
+    "@cedarjs/project-config": "7.0.0-canary.3130",
+    "@cedarjs/structure": "7.0.0-canary.3130",
+    "@cedarjs/telemetry": "7.0.0-canary.3130",
+    "@cedarjs/utils": "7.0.0-canary.3130",
+    "@cedarjs/vite": "7.0.0-canary.3130",
+    "@cedarjs/web-server": "7.0.0-canary.3130",
     "@listr2/prompt-adapter-enquirer": "4.3.2",
     "@opentelemetry/api": "1.9.1",
-    "@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/core": "2.11.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.222.0",
+    "@opentelemetry/resources": "2.11.0",
+    "@opentelemetry/sdk-trace-node": "2.11.0",
     "@opentelemetry/semantic-conventions": "1.41.1",
     "@prisma/internals": "7.10.0",
     "ansis": "4.3.1",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.0-canary.3128",
+    "@cedarjs/framework-tools": "7.0.0-canary.3130",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.68.2",