Add AWS instrumentation for DynamoDB and disable HTTP instrumentation for Sentry requests

.changeset/little-bottles-battle.md

@@ -0,0 +1,5 @@
+---
+"@saleor/apps-otel": minor
+---
+
+Properly disable HTTP instrumentation for Sentry requests. Added `AwsInstrumentation` factory that can be used to auto instrument DynamoDB calls.

.changeset/lovely-zoos-grab.md

@@ -0,0 +1,6 @@
+---
+"saleor-app-segment": patch
+"saleor-app-avatax": patch
+---
+
+Use `AwsInstrumentation` to auto instrument DynamoDB calls

apps/avatax/src/instrumentations/otel-node.ts

@@ -1,5 +1,6 @@
 import { ATTR_SERVICE_VERSION } from "@opentelemetry/semantic-conventions";
 import { ATTR_DEPLOYMENT_ENVIRONMENT_NAME } from "@opentelemetry/semantic-conventions/incubating";
+import { createAwsInstrumentation } from "@saleor/apps-otel/src/aws-instrumentation-factory";
 import { createBatchSpanProcessor } from "@saleor/apps-otel/src/batch-span-processor-factory";
 import { createHttpInstrumentation } from "@saleor/apps-otel/src/http-instrumentation-factory";
 import { registerOTel } from "@vercel/otel";
@@ -23,5 +24,5 @@
       accessToken: env.OTEL_ACCESS_TOKEN,
     }),
   ],
-  instrumentations: [createHttpInstrumentation()],
+  instrumentations: [createAwsInstrumentation(), createHttpInstrumentation()],
 });

apps/segment/src/instrumentations/otel-node.ts

@@ -1,5 +1,6 @@
 import { ATTR_SERVICE_VERSION } from "@opentelemetry/semantic-conventions";
 import { ATTR_DEPLOYMENT_ENVIRONMENT_NAME } from "@opentelemetry/semantic-conventions/incubating";
+import { createAwsInstrumentation } from "@saleor/apps-otel/src/aws-instrumentation-factory";
 import { createBatchSpanProcessor } from "@saleor/apps-otel/src/batch-span-processor-factory";
 import { createHttpInstrumentation } from "@saleor/apps-otel/src/http-instrumentation-factory";
 import { registerOTel } from "@vercel/otel";
@@ -23,5 +24,5 @@
       accessToken: env.OTEL_ACCESS_TOKEN,
     }),
   ],
-  instrumentations: [createHttpInstrumentation()],
+  instrumentations: [createAwsInstrumentation(), createHttpInstrumentation()],
 });

package.json

@@ -29,6 +29,7 @@
     "@opentelemetry/api-logs": "0.57.2",
     "@opentelemetry/instrumentation": "0.57.2",
     "@opentelemetry/instrumentation-http": "0.57.2",
+    "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
     "@opentelemetry/sdk-logs": "0.57.2",
     "@opentelemetry/exporter-trace-otlp-http": "0.57.2",
     "@opentelemetry/sdk-trace-node": "1.30.1",

packages/otel/package.json

@@ -12,6 +12,8 @@
     "@opentelemetry/semantic-conventions": "../../node_modules/@opentelemetry/semantic-conventions",
     "@opentelemetry/sdk-trace-node": "../../node_modules/@opentelemetry/sdk-trace-node",
     "@opentelemetry/exporter-trace-otlp-http": "../../node_modules/@opentelemetry/exporter-trace-otlp-http",
+    "@opentelemetry/instrumentation-http": "../../node_modules/@opentelemetry/instrumentation-http",
+    "@opentelemetry/instrumentation-aws-sdk": "../../node_modules/@opentelemetry/instrumentation-aws-sdk",
     "urql": "4.0.4",
     "@saleor/app-sdk": "link:../../node_modules/@saleor/app-sdk"
   },

packages/otel/src/aws-instrumentation-factory.ts

@@ -0,0 +1,7 @@
+import { AwsInstrumentation } from "@opentelemetry/instrumentation-aws-sdk";
+
+export const createAwsInstrumentation = () => {
+  return new AwsInstrumentation({
+    suppressInternalInstrumentation: true,
+  });
+};

packages/otel/src/http-instrumentation-factory.ts

@@ -4,7 +4,6 @@
   return new HttpInstrumentation({
     requireParentforIncomingSpans: true,
     requireParentforOutgoingSpans: true,
-    ignoreOutgoingRequestHook: (request) =>
-      request.hostname === "ingest.sentry.io" || request.path === "/v1/logs",
+    ignoreOutgoingRequestHook: (request) => request.hostname?.includes("ingest.sentry.io") ?? false,
   });
 };

packages/otel/src/otel-urql-exchange-factory.ts

@@ -2,6 +2,8 @@ import { context, Span, SpanKind, SpanStatusCode, Tracer } from "@opentelemetry/
 import { ATTR_URL_FULL } from "@opentelemetry/semantic-conventions/incubating";
 import { type CombinedError, makeOperation, mapExchange, Operation } from "urql";
 
+import { ObservabilityAttributes } from "./observability-attributes";
+
 type Definition = {
   name: {
     value: string;
@@ -54,7 +56,7 @@ export const createOtelUrqlExchange = (args: { tracer: Tracer }) => {
 
       span.setAttribute(GraphQLAttributeNames.OPERATION_KEY, operation.key);
 
-      span.setAttribute("saleorApiUrl", operation.context.url);
+      span.setAttribute(ObservabilityAttributes.SALEOR_API_URL, operation.context.url);
 
       span.setAttribute(ATTR_URL_FULL, operation.context.url);