set cache hit for all get commands

Author: s1gr1d

packages/node/src/integrations/tracing/redis.ts

@@ -11,6 +11,7 @@ import {
 import type { IntegrationFn } from '@sentry/types';
 import { generateInstrumentOnce } from '../../otel/instrument';
 import {
+  GET_COMMANDS,
   calculateCacheItemSize,
   getCacheKeySafely,
   getCacheOperation,
@@ -60,7 +61,7 @@ export const instrumentRedis = generateInstrumentOnce(INTEGRATION_NAME, () => {
         span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE, cacheItemSize);
       }
 
-      if (cacheOperation === 'cache.get' && cacheItemSize !== undefined) {
+      if (GET_COMMANDS.includes(redisCommand) && cacheItemSize !== undefined) {
         span.setAttribute(SEMANTIC_ATTRIBUTE_CACHE_HIT, cacheItemSize > 0);
       }
 

packages/opentelemetry/src/utils/parseSpanDescription.ts

@@ -14,7 +14,7 @@ import {
 import type { TransactionSource } from '@sentry/types';
 import { getSanitizedUrlString, parseUrl, stripUrlQueryAndFragment } from '@sentry/utils';
 
-import { SEMANTIC_ATTRIBUTE_CACHE_HIT } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '@sentry/core';
 import type { AbstractSpan } from '../types';
 import { getSpanKind } from './getSpanKind';
 import { spanHasAttributes, spanHasName } from './spanTypes';
@@ -44,9 +44,14 @@ export function parseSpanDescription(span: AbstractSpan): SpanDescription {
     return descriptionForHttpMethod({ attributes, name, kind: getSpanKind(span) }, httpMethod);
   }
 
-  // If db.type exists then this is a database call span (unless it is cache)
   const dbSystem = attributes[SEMATTRS_DB_SYSTEM];
-  if (dbSystem && typeof attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT] !== 'boolean') {
+  const opIsCache =
+    typeof attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'string' &&
+    attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP].startsWith('cache.');
+
+  // If db.type exists then this is a database call span
+  // If the Redis DB is used as a cache, the span description should not be changed
+  if (dbSystem && (!attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] || !opIsCache)) {
     return descriptionForDbSystem({ attributes, name });
   }