linting, etc

packages/core/src/ourlogs.ts

@@ -29,9 +29,9 @@ function addLog(log: Log): void {
     return;
   }
 
-  // if (!client.getOptions()._experiments?.logSupport) {
-  //   return;
-  // }
+  if (!client.getOptions()._experiments?.logSupport) {
+    return;
+  }
 
   const globalScope = getGlobalScope();
   const dsn = client.getDsn();
@@ -99,16 +99,24 @@ function valueToAttribute(key: string, value: unknown): LogAttribute {
  * A utility function to be able to create methods like Sentry.info`...`
  *
  * The first parameter is bound with, e.g., const info = captureLog.bind(null, 'info')
- * The other parameters are in the format to be passed a template, Sentry.info`hello ${world}`
+ * The other parameters are in the format to be passed a tagged template, Sentry.info`hello ${world}`
  */
 export function captureLog(level: LogSeverityLevel, messages: string[] | string, ...values: unknown[]): void {
   const message = Array.isArray(messages) ? messages.reduce((acc, str, i) => acc + str + (values[i] ?? ''), '') : messages;
-
+  const attributes = values.map<LogAttribute>((value, index) => valueToAttribute(`param${index}`, value));
+  if (Array.isArray(messages)) {
+    attributes.push({
+      key: 'sentry.template',
+      value: {
+        stringValue: messages.map((s, i) => s + (i < messages.length - 1 ? `$param${i}` : '')).join('')
+      }
+    })
+  }
   addLog({
     severityText: level,
     body: {
       stringValue: message,
     },
-    attributes: values.map<LogAttribute>((value, index) => valueToAttribute(`param${index}`, value)),
+    attributes: attributes,
   })
 }

packages/core/src/types-hoist/envelope.ts

@@ -10,7 +10,7 @@ import type { ReplayEvent, ReplayRecordingData } from './replay';
 import type { SdkInfo } from './sdkinfo';
 import type { SerializedSession, SessionAggregates } from './session';
 import type { SpanJSON } from './span';
-import { Log } from './ourlogs';
+import type { Log } from './ourlogs';
 
 // Based on: https://develop.sentry.dev/sdk/envelopes/