Merge pull request #437 from solarwinds/dependabot/npm_and_yarn/otel-2e6c22d1ce

raphael-theriault-swi · web-flow · commit 822f06b2d164 · 2024-08-30T10:49:34.000-07:00
Bump the otel group across 1 directory with 23 updates
diff --git a/.yarn/versions/4d7013a1.yml b/.yarn/versions/4d7013a1.yml
@@ -0,0 +1,12 @@
+releases:
+  "@solarwinds-apm/compat": minor
+  "@solarwinds-apm/histogram": minor
+  "@solarwinds-apm/instrumentations": minor
+  "@solarwinds-apm/sampling": minor
+  "@solarwinds-apm/sdk": minor
+  "@solarwinds-apm/test": minor
+  solarwinds-apm: minor
+
+declined:
+  - "@solarwinds-apm/bindings"
+  - "@solarwinds-apm/dependencies"
diff --git a/packages/compat/package.json b/packages/compat/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/semantic-conventions": "~1.25.0",
+    "@opentelemetry/semantic-conventions": "~1.27.0",
     "@solarwinds-apm/eslint-config": "workspace:^",
     "@solarwinds-apm/rollup-config": "workspace:^",
     "@solarwinds-apm/test": "workspace:^",
diff --git a/packages/histogram/package.json b/packages/histogram/package.json
@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/sdk-metrics": "~1.25.0",
+    "@opentelemetry/sdk-metrics": "~1.26.0",
     "@solarwinds-apm/eslint-config": "workspace:^",
     "@solarwinds-apm/rollup-config": "workspace:^",
     "@types/node": "^16.13.0",
diff --git a/packages/instrumentations/package.json b/packages/instrumentations/package.json
@@ -36,7 +36,7 @@
     "release": "node ../../scripts/publish.js"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "~0.52.0",
+    "@opentelemetry/instrumentation": "~0.53.0",
     "@opentelemetry/instrumentation-amqplib": "^0.41.0",
     "@opentelemetry/instrumentation-aws-lambda": "^0.43.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.43.0",
@@ -51,16 +51,16 @@
     "@opentelemetry/instrumentation-fs": "^0.14.0",
     "@opentelemetry/instrumentation-generic-pool": "^0.38.0",
     "@opentelemetry/instrumentation-graphql": "^0.42.0",
-    "@opentelemetry/instrumentation-grpc": "~0.52.0",
+    "@opentelemetry/instrumentation-grpc": "~0.53.0",
     "@opentelemetry/instrumentation-hapi": "^0.40.0",
-    "@opentelemetry/instrumentation-http": "~0.52.0",
+    "@opentelemetry/instrumentation-http": "~0.53.0",
     "@opentelemetry/instrumentation-ioredis": "^0.42.0",
     "@opentelemetry/instrumentation-knex": "^0.39.0",
     "@opentelemetry/instrumentation-koa": "^0.42.0",
     "@opentelemetry/instrumentation-lru-memoizer": "^0.39.0",
     "@opentelemetry/instrumentation-memcached": "^0.38.0",
     "@opentelemetry/instrumentation-mongodb": "^0.46.0",
-    "@opentelemetry/instrumentation-mongoose": "^0.40.0",
+    "@opentelemetry/instrumentation-mongoose": "^0.41.0",
     "@opentelemetry/instrumentation-mysql": "^0.40.0",
     "@opentelemetry/instrumentation-mysql2": "^0.40.0",
     "@opentelemetry/instrumentation-nestjs-core": "^0.39.0",
@@ -72,12 +72,12 @@
     "@opentelemetry/instrumentation-restify": "^0.40.0",
     "@opentelemetry/instrumentation-router": "^0.39.0",
     "@opentelemetry/instrumentation-socket.io": "^0.41.0",
-    "@opentelemetry/instrumentation-tedious": "^0.12.0",
+    "@opentelemetry/instrumentation-tedious": "^0.13.0",
     "@opentelemetry/instrumentation-winston": "^0.39.0",
     "@opentelemetry/resource-detector-aws": "^1.3.1",
     "@opentelemetry/resource-detector-azure": "^0.2.4",
-    "@opentelemetry/resource-detector-container": "^0.3.1",
-    "@opentelemetry/resources": "~1.25.0",
+    "@opentelemetry/resource-detector-container": "^0.4.0",
+    "@opentelemetry/resources": "~1.26.0",
     "@opentelemetry/winston-transport": "^0.5.0",
     "@solarwinds-apm/module": "workspace:^"
   },
diff --git a/packages/sampling/package.json b/packages/sampling/package.json
@@ -37,7 +37,7 @@
     "test": "swtest -p test/tsconfig.json -c src"
   },
   "dependencies": {
-    "@opentelemetry/sdk-trace-base": "~1.25.0"
+    "@opentelemetry/sdk-trace-base": "~1.26.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.3.0"
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/sdk-metrics": "~1.25.0",
+    "@opentelemetry/sdk-metrics": "~1.26.0",
     "@solarwinds-apm/eslint-config": "workspace:^",
     "@solarwinds-apm/rollup-config": "workspace:^",
     "@solarwinds-apm/test": "workspace:^",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -36,10 +36,10 @@
     "test": "swtest -p test/tsconfig.json -c src"
   },
   "dependencies": {
-    "@opentelemetry/core": "~1.25.0",
-    "@opentelemetry/sdk-metrics": "~1.25.0",
-    "@opentelemetry/sdk-trace-base": "~1.25.0",
-    "@opentelemetry/semantic-conventions": "~1.25.0",
+    "@opentelemetry/core": "~1.26.0",
+    "@opentelemetry/sdk-metrics": "~1.26.0",
+    "@opentelemetry/sdk-trace-base": "~1.26.0",
+    "@opentelemetry/semantic-conventions": "~1.27.0",
     "@solarwinds-apm/bindings": "workspace:^",
     "@solarwinds-apm/dependencies": "workspace:^",
     "@solarwinds-apm/histogram": "workspace:^",
@@ -66,11 +66,11 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "~0.52.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "~0.52.0",
-    "@opentelemetry/instrumentation": "~0.52.0",
-    "@opentelemetry/resources": "~1.25.0",
-    "@opentelemetry/sdk-trace-node": "~1.25.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "~0.53.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "~0.53.0",
+    "@opentelemetry/instrumentation": "~0.53.0",
+    "@opentelemetry/resources": "~1.26.0",
+    "@opentelemetry/sdk-trace-node": "~1.26.0",
     "@solarwinds-apm/eslint-config": "workspace:^",
     "@solarwinds-apm/test": "workspace:^",
     "@types/json-stringify-safe": "^5.0.3",
diff --git a/packages/solarwinds-apm/package.json b/packages/solarwinds-apm/package.json
@@ -59,18 +59,18 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.10.6",
-    "@opentelemetry/api-logs": "~0.52.0",
-    "@opentelemetry/core": "~1.25.0",
-    "@opentelemetry/exporter-logs-otlp-proto": "~0.52.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "~0.52.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "~0.52.0",
-    "@opentelemetry/instrumentation": "~0.52.0",
-    "@opentelemetry/resources": "~1.25.0",
-    "@opentelemetry/sdk-logs": "~0.52.0",
-    "@opentelemetry/sdk-metrics": "~1.25.0",
-    "@opentelemetry/sdk-trace-base": "~1.25.0",
-    "@opentelemetry/sdk-trace-node": "~1.25.0",
-    "@opentelemetry/semantic-conventions": "~1.25.0",
+    "@opentelemetry/api-logs": "~0.53.0",
+    "@opentelemetry/core": "~1.26.0",
+    "@opentelemetry/exporter-logs-otlp-proto": "~0.53.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "~0.53.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "~0.53.0",
+    "@opentelemetry/instrumentation": "~0.53.0",
+    "@opentelemetry/resources": "~1.26.0",
+    "@opentelemetry/sdk-logs": "~0.53.0",
+    "@opentelemetry/sdk-metrics": "~1.26.0",
+    "@opentelemetry/sdk-trace-base": "~1.26.0",
+    "@opentelemetry/sdk-trace-node": "~1.26.0",
+    "@opentelemetry/semantic-conventions": "~1.27.0",
     "@solarwinds-apm/bindings": "workspace:^",
     "@solarwinds-apm/instrumentations": "workspace:^",
     "@solarwinds-apm/lazy": "workspace:^",
diff --git a/packages/solarwinds-apm/src/processing/response-time.ts b/packages/solarwinds-apm/src/processing/response-time.ts
@@ -29,11 +29,12 @@ import {
   type SpanProcessor,
 } from "@opentelemetry/sdk-trace-base"
 import {
-  SEMATTRS_HTTP_METHOD,
-  SEMATTRS_HTTP_STATUS_CODE,
+  ATTR_HTTP_REQUEST_METHOD,
+  ATTR_HTTP_RESPONSE_STATUS_CODE,
 } from "@opentelemetry/semantic-conventions"
 import { lazy } from "@solarwinds-apm/lazy"
 
+import { ATTR_HTTP_METHOD, ATTR_HTTP_STATUS_CODE } from "../semattrs.old.js"
 import { isRootOrEntry } from "./parent-span.js"
 import { TRANSACTION_NAME_ATTRIBUTE } from "./transaction-name.js"
 
@@ -73,7 +74,12 @@ export class ResponseTimeProcessor
 
     const copy = [TRANSACTION_NAME_ATTRIBUTE]
     if (span.kind === SpanKind.SERVER) {
-      copy.push(SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_STATUS_CODE)
+      copy.push(
+        ATTR_HTTP_REQUEST_METHOD,
+        ATTR_HTTP_RESPONSE_STATUS_CODE,
+        ATTR_HTTP_METHOD,
+        ATTR_HTTP_STATUS_CODE,
+      )
     }
     for (const a of copy) {
       if (a in span.attributes) {
diff --git a/packages/solarwinds-apm/src/processing/transaction-name.ts b/packages/solarwinds-apm/src/processing/transaction-name.ts
@@ -21,11 +21,12 @@ import {
   type SpanProcessor,
 } from "@opentelemetry/sdk-trace-base"
 import {
-  SEMATTRS_HTTP_ROUTE,
-  SEMATTRS_HTTP_TARGET,
+  ATTR_HTTP_ROUTE,
+  ATTR_URL_PATH,
 } from "@opentelemetry/semantic-conventions"
 import { type SwConfiguration } from "@solarwinds-apm/sdk"
 
+import { ATTR_HTTP_TARGET } from "../semattrs.old.js"
 import { getRootOrEntry, isRootOrEntry } from "./parent-span.js"
 
 export const TRANSACTION_NAME_ATTRIBUTE = "sw.transaction"
@@ -98,12 +99,14 @@ export class TransactionNameProcessor
 export function computedTransactionName(span: ReadableSpan): string {
   if (typeof process.env.AWS_LAMBDA_FUNCTION_NAME === "string") {
     return process.env.AWS_LAMBDA_FUNCTION_NAME
-  } else if (typeof span.attributes[SEMATTRS_HTTP_ROUTE] === "string") {
-    return span.attributes[SEMATTRS_HTTP_ROUTE]
-  } else if (typeof span.attributes[SEMATTRS_HTTP_TARGET] === "string") {
+  } else if (typeof span.attributes[ATTR_HTTP_ROUTE] === "string") {
+    return span.attributes[ATTR_HTTP_ROUTE]
+  } else if (typeof span.attributes[ATTR_URL_PATH] === "string") {
     // split on slashes and keep the first 3 segments
     // where the first segment is an empty string before the first slash
-    return span.attributes[SEMATTRS_HTTP_TARGET].split("/", 3).join("/")
+    return span.attributes[ATTR_URL_PATH].split("/", 3).join("/")
+  } else if (typeof span.attributes[ATTR_HTTP_TARGET] === "string") {
+    return span.attributes[ATTR_HTTP_TARGET].split("/", 3).join("/")
   } else {
     return span.name
   }
diff --git a/packages/solarwinds-apm/src/sampling/sampler.ts b/packages/solarwinds-apm/src/sampling/sampler.ts
@@ -21,9 +21,9 @@ import {
   SpanKind,
 } from "@opentelemetry/api"
 import {
-  SEMATTRS_HTTP_SCHEME,
-  SEMATTRS_HTTP_TARGET,
-  SEMATTRS_NET_HOST_NAME,
+  ATTR_SERVER_ADDRESS,
+  ATTR_URL_PATH,
+  ATTR_URL_SCHEME,
 } from "@opentelemetry/semantic-conventions"
 import {
   type LocalSettings,
@@ -35,6 +35,11 @@ import {
 import { type SwConfiguration } from "@solarwinds-apm/sdk"
 
 import { HEADERS_STORAGE } from "../propagation/headers.js"
+import {
+  ATTR_HTTP_SCHEME,
+  ATTR_HTTP_TARGET,
+  ATTR_NET_HOST_NAME,
+} from "../semattrs.old.js"
 
 /**
  * Abstract core sampler to extend from other samplers
@@ -80,9 +85,15 @@ export abstract class Sampler extends OboeSampler {
 
     const kind = SpanKind[spanKind]
 
-    const scheme = attributes[SEMATTRS_HTTP_SCHEME]?.toString()
-    const address = attributes[SEMATTRS_NET_HOST_NAME]?.toString()
-    const path = attributes[SEMATTRS_HTTP_TARGET]?.toString()
+    const scheme = (
+      attributes[ATTR_URL_SCHEME] ?? attributes[ATTR_HTTP_SCHEME]
+    )?.toString()
+    const address = (
+      attributes[ATTR_SERVER_ADDRESS] ?? attributes[ATTR_NET_HOST_NAME]
+    )?.toString()
+    const path = (
+      attributes[ATTR_URL_PATH] ?? attributes[ATTR_HTTP_TARGET]
+    )?.toString()
 
     let identifier: string
     if (scheme && address && path) {
diff --git a/packages/solarwinds-apm/src/semattrs.old.ts b/packages/solarwinds-apm/src/semattrs.old.ts
@@ -0,0 +1,23 @@
+/*
+Copyright 2023-2024 SolarWinds Worldwide, LLC.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export {
+  SEMATTRS_HTTP_METHOD as ATTR_HTTP_METHOD,
+  SEMATTRS_HTTP_SCHEME as ATTR_HTTP_SCHEME,
+  SEMATTRS_HTTP_STATUS_CODE as ATTR_HTTP_STATUS_CODE,
+  SEMATTRS_HTTP_TARGET as ATTR_HTTP_TARGET,
+  SEMATTRS_NET_HOST_NAME as ATTR_NET_HOST_NAME,
+} from "@opentelemetry/semantic-conventions"
diff --git a/packages/solarwinds-apm/test/processing/response-time.test.ts b/packages/solarwinds-apm/test/processing/response-time.test.ts
@@ -21,17 +21,22 @@ import {
   type HistogramMetricData,
 } from "@opentelemetry/sdk-metrics"
 import {
-  SEMATTRS_HTTP_METHOD,
-  SEMATTRS_HTTP_ROUTE,
-  SEMATTRS_HTTP_STATUS_CODE,
-  SEMATTRS_HTTP_TARGET,
+  ATTR_HTTP_REQUEST_METHOD,
+  ATTR_HTTP_RESPONSE_STATUS_CODE,
+  ATTR_HTTP_ROUTE,
+  ATTR_URL_PATH,
 } from "@opentelemetry/semantic-conventions"
 import { type SwConfiguration } from "@solarwinds-apm/sdk"
 import { describe, expect, it, otel } from "@solarwinds-apm/test"
 
 import { ParentSpanProcessor } from "../../src/processing/parent-span.js"
 import { ResponseTimeProcessor } from "../../src/processing/response-time.js"
 import { TransactionNameProcessor } from "../../src/processing/transaction-name.js"
+import {
+  ATTR_HTTP_METHOD,
+  ATTR_HTTP_STATUS_CODE,
+  ATTR_HTTP_TARGET,
+} from "../../src/semattrs.old.js"
 
 const responseTime = async () => {
   const metrics = await otel.metrics()
@@ -78,17 +83,49 @@ describe("ResponseTimeProcessor", () => {
       {
         kind: SpanKind.SERVER,
         attributes: {
-          [SEMATTRS_HTTP_METHOD]: "GET",
-          [SEMATTRS_HTTP_ROUTE]: "/hello/:name",
-          [SEMATTRS_HTTP_TARGET]: "/hello/world",
+          [ATTR_HTTP_REQUEST_METHOD]: "GET",
+          [ATTR_HTTP_ROUTE]: "/hello/:name",
+          [ATTR_URL_PATH]: "/hello/world",
+        },
+      },
+      (span) => {
+        tracer.startActiveSpan("operation", (span) => {
+          span.end()
+        })
+
+        span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, 200)
+        span.end()
+      },
+    )
+
+    const { value, attributes } = await responseTime()
+    expect(attributes).to.deep.equal({
+      "sw.is_error": false,
+      "sw.transaction": "/hello/:name",
+      [ATTR_HTTP_REQUEST_METHOD]: "GET",
+      [ATTR_HTTP_RESPONSE_STATUS_CODE]: 200,
+    })
+    expect(value).to.be.greaterThan(0)
+  })
+
+  it("records response time for deprecated server spans", async () => {
+    const tracer = trace.getTracer("test")
+    tracer.startActiveSpan(
+      "GET /hello/:name",
+      {
+        kind: SpanKind.SERVER,
+        attributes: {
+          [ATTR_HTTP_METHOD]: "GET",
+          [ATTR_HTTP_ROUTE]: "/hello/:name",
+          [ATTR_HTTP_TARGET]: "/hello/world",
         },
       },
       (span) => {
         tracer.startActiveSpan("operation", (span) => {
           span.end()
         })
 
-        span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 200)
+        span.setAttribute(ATTR_HTTP_STATUS_CODE, 200)
         span.end()
       },
     )
@@ -97,8 +134,8 @@ describe("ResponseTimeProcessor", () => {
     expect(attributes).to.deep.equal({
       "sw.is_error": false,
       "sw.transaction": "/hello/:name",
-      [SEMATTRS_HTTP_METHOD]: "GET",
-      [SEMATTRS_HTTP_STATUS_CODE]: 200,
+      [ATTR_HTTP_METHOD]: "GET",
+      [ATTR_HTTP_STATUS_CODE]: 200,
     })
     expect(value).to.be.greaterThan(0)
   })
@@ -109,11 +146,11 @@ describe("ResponseTimeProcessor", () => {
       {
         kind: SpanKind.CLIENT,
         attributes: {
-          [SEMATTRS_HTTP_METHOD]: "GET",
+          [ATTR_HTTP_REQUEST_METHOD]: "GET",
         },
       },
       (span) => {
-        span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 404)
+        span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, 404)
         span.setStatus({ code: SpanStatusCode.ERROR })
         span.end()
       },
diff --git a/packages/solarwinds-apm/test/processing/transaction-name.test.ts b/packages/solarwinds-apm/test/processing/transaction-name.test.ts
diff --git a/packages/solarwinds-apm/test/sampling/sampler.test.ts b/packages/solarwinds-apm/test/sampling/sampler.test.ts
diff --git a/packages/test/package.json b/packages/test/package.json
diff --git a/yarn.lock b/yarn.lock
