@opentelemetry/instrumentation-http 0.219.0 → 0.221.0

package/build/src/utils.js

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.headerCapture = exports.getIncomingStableRequestMetricAttributesOnResponse = exports.getIncomingRequestMetricAttributesOnResponse = exports.getIncomingRequestAttributesOnResponse = exports.getIncomingRequestMetricAttributes = exports.getIncomingRequestAttributes = exports.getRemoteClientAddress = exports.getOutgoingStableRequestMetricAttributesOnResponse = exports.getOutgoingRequestMetricAttributesOnResponse = exports.getOutgoingRequestAttributesOnResponse = exports.setAttributesFromHttpKind = exports.getOutgoingRequestMetricAttributes = exports.getOutgoingRequestAttributes = exports.extractHostnameAndPort = exports.isValidOptionsType = exports.getRequestInfo = exports.isCompressed = exports.setResponseContentLengthAttribute = exports.setRequestContentLengthAttribute = exports.setSpanWithError = exports.satisfiesPattern = exports.parseResponseStatus = exports.getAbsoluteUrl = void 0;
+exports.headerCapture = exports.getIncomingStableRequestMetricAttributesOnResponse = exports.getIncomingRequestAttributesOnResponse = exports.getIncomingRequestAttributes = exports.getRemoteClientAddress = exports.getOutgoingStableRequestMetricAttributesOnResponse = exports.getOutgoingRequestAttributesOnResponse = exports.getOutgoingRequestAttributes = exports.extractHostnameAndPort = exports.isValidOptionsType = exports.getRequestInfo = exports.isCompressed = exports.setSpanWithError = exports.satisfiesPattern = exports.parseResponseStatus = exports.getAbsoluteUrl = void 0;
 const api_1 = require("@opentelemetry/api");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const semconv_1 = require("./semconv");
 const core_1 = require("@opentelemetry/core");
-const instrumentation_1 = require("@opentelemetry/instrumentation");
 const url = require("url");
-const AttributeNames_1 = require("./enums/AttributeNames");
 const internal_types_1 = require("./internal-types");
 const internal_types_2 = require("./internal-types");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -87,66 +85,14 @@ exports.satisfiesPattern = satisfiesPattern;
  * Sets the span with the error passed in params
  * @param {Span} span the span that need to be set
  * @param {Error} error error that will be set to span
- * @param {SemconvStability} semconvStability determines which semconv version to use
  */
-const setSpanWithError = (span, error, semconvStability) => {
+const setSpanWithError = (span, error) => {
     const message = error.message;
-    if (semconvStability & instrumentation_1.SemconvStability.OLD) {
-        span.setAttribute(AttributeNames_1.AttributeNames.HTTP_ERROR_NAME, error.name);
-        span.setAttribute(AttributeNames_1.AttributeNames.HTTP_ERROR_MESSAGE, message);
-    }
-    if (semconvStability & instrumentation_1.SemconvStability.STABLE) {
-        span.setAttribute(semantic_conventions_1.ATTR_ERROR_TYPE, error.name);
-    }
+    span.setAttribute(semantic_conventions_1.ATTR_ERROR_TYPE, error.name);
     span.setStatus({ code: api_1.SpanStatusCode.ERROR, message });
     span.recordException(error);
 };
 exports.setSpanWithError = setSpanWithError;
-/**
- * Adds attributes for request content-length and content-encoding HTTP headers
- * @param { IncomingMessage } Request object whose headers will be analyzed
- * @param { Attributes } Attributes object to be modified
- */
-const setRequestContentLengthAttribute = (request, attributes) => {
-    const length = getContentLength(request.headers);
-    if (length === null)
-        return;
-    if ((0, exports.isCompressed)(request.headers)) {
-        attributes[semconv_1.ATTR_HTTP_REQUEST_CONTENT_LENGTH] = length;
-    }
-    else {
-        attributes[semconv_1.ATTR_HTTP_REQUEST_CONTENT_LENGTH_UNCOMPRESSED] = length;
-    }
-};
-exports.setRequestContentLengthAttribute = setRequestContentLengthAttribute;
-/**
- * Adds attributes for response content-length and content-encoding HTTP headers
- * @param { IncomingMessage } Response object whose headers will be analyzed
- * @param { Attributes } Attributes object to be modified
- *
- * @deprecated this is for an older version of semconv. It is retained for compatibility using OTEL_SEMCONV_STABILITY_OPT_IN
- */
-const setResponseContentLengthAttribute = (response, attributes) => {
-    const length = getContentLength(response.headers);
-    if (length === null)
-        return;
-    if ((0, exports.isCompressed)(response.headers)) {
-        attributes[semconv_1.ATTR_HTTP_RESPONSE_CONTENT_LENGTH] = length;
-    }
-    else {
-        attributes[semconv_1.ATTR_HTTP_RESPONSE_CONTENT_LENGTH_UNCOMPRESSED] = length;
-    }
-};
-exports.setResponseContentLengthAttribute = setResponseContentLengthAttribute;
-function getContentLength(headers) {
-    const contentLengthHeader = headers['content-length'];
-    if (contentLengthHeader === undefined)
-        return null;
-    const contentLength = parseInt(contentLengthHeader, 10);
-    if (isNaN(contentLength))
-        return null;
-    return contentLength;
-}
 const isCompressed = (headers) => {
     const encoding = headers['content-encoding'];
     return !!encoding && encoding !== 'identity';
@@ -298,9 +244,8 @@ exports.extractHostnameAndPort = extractHostnameAndPort;
  * Returns outgoing request attributes scoped to the options passed to the request
  * @param {ParsedRequestOptions} requestOptions the same options used to make the request
  * @param {{ component: string, hostname: string, hookAttributes?: Attributes }} options used to pass data needed to create attributes
- * @param {SemconvStability} semconvStability determines which semconv version to use
  */
-const getOutgoingRequestAttributes = (requestOptions, options, semconvStability, enableSyntheticSourceDetection) => {
+const getOutgoingRequestAttributes = (requestOptions, options, enableSyntheticSourceDetection) => {
     const hostname = options.hostname;
     const port = options.port;
     const method = requestOptions.method ?? 'GET';
@@ -308,14 +253,7 @@ const getOutgoingRequestAttributes = (requestOptions, options, semconvStability,
     const headers = (requestOptions.headers || {});
     const userAgent = headers['user-agent'];
     const urlFull = (0, exports.getAbsoluteUrl)(requestOptions, headers, `${options.component}:`, options.redactedQueryParams);
-    const oldAttributes = {
-        [semconv_1.ATTR_HTTP_URL]: urlFull,
-        [semconv_1.ATTR_HTTP_METHOD]: method,
-        [semconv_1.ATTR_HTTP_TARGET]: requestOptions.path || '/',
-        [semconv_1.ATTR_NET_PEER_NAME]: hostname,
-        [semconv_1.ATTR_HTTP_HOST]: headers.host ?? `${hostname}:${port}`,
-    };
-    const newAttributes = {
+    const attributes = {
         // Required attributes
         [semantic_conventions_1.ATTR_HTTP_REQUEST_METHOD]: normalizedMethod,
         [semantic_conventions_1.ATTR_SERVER_ADDRESS]: hostname,
@@ -329,51 +267,14 @@ const getOutgoingRequestAttributes = (requestOptions, options, semconvStability,
     };
     // conditionally required if request method required case normalization
     if (method !== normalizedMethod) {
-        newAttributes[semantic_conventions_1.ATTR_HTTP_REQUEST_METHOD_ORIGINAL] = method;
+        attributes[semantic_conventions_1.ATTR_HTTP_REQUEST_METHOD_ORIGINAL] = method;
     }
     if (enableSyntheticSourceDetection && userAgent) {
-        newAttributes[semconv_1.ATTR_USER_AGENT_SYNTHETIC_TYPE] = getSyntheticType(userAgent);
-    }
-    if (userAgent !== undefined) {
-        oldAttributes[semconv_1.ATTR_HTTP_USER_AGENT] = userAgent;
-    }
-    switch (semconvStability) {
-        case instrumentation_1.SemconvStability.STABLE:
-            return Object.assign(newAttributes, options.hookAttributes);
-        case instrumentation_1.SemconvStability.OLD:
-            return Object.assign(oldAttributes, options.hookAttributes);
+        attributes[semconv_1.ATTR_USER_AGENT_SYNTHETIC_TYPE] = getSyntheticType(userAgent);
     }
-    return Object.assign(oldAttributes, newAttributes, options.hookAttributes);
+    return Object.assign(attributes, options.hookAttributes);
 };
 exports.getOutgoingRequestAttributes = getOutgoingRequestAttributes;
-/**
- * Returns outgoing request Metric attributes scoped to the request data
- * @param {Attributes} spanAttributes the span attributes
- */
-const getOutgoingRequestMetricAttributes = (spanAttributes) => {
-    const metricAttributes = {};
-    metricAttributes[semconv_1.ATTR_HTTP_METHOD] = spanAttributes[semconv_1.ATTR_HTTP_METHOD];
-    metricAttributes[semconv_1.ATTR_NET_PEER_NAME] = spanAttributes[semconv_1.ATTR_NET_PEER_NAME];
-    //TODO: http.url attribute, it should substitute any parameters to avoid high cardinality.
-    return metricAttributes;
-};
-exports.getOutgoingRequestMetricAttributes = getOutgoingRequestMetricAttributes;
-/**
- * Returns attributes related to the kind of HTTP protocol used
- * @param {string} [kind] Kind of HTTP protocol used: "1.0", "1.1", "2", "SPDY" or "QUIC".
- */
-const setAttributesFromHttpKind = (kind, attributes) => {
-    if (kind) {
-        attributes[semconv_1.ATTR_HTTP_FLAVOR] = kind;
-        if (kind.toUpperCase() !== 'QUIC') {
-            attributes[semconv_1.ATTR_NET_TRANSPORT] = semconv_1.NET_TRANSPORT_VALUE_IP_TCP;
-        }
-        else {
-            attributes[semconv_1.ATTR_NET_TRANSPORT] = semconv_1.NET_TRANSPORT_VALUE_IP_UDP;
-        }
-    }
-};
-exports.setAttributesFromHttpKind = setAttributesFromHttpKind;
 /**
  * Returns the type of synthetic source based on the user agent
  * @param {OutgoingHttpHeader} userAgent the user agent string
@@ -395,61 +296,41 @@ const getSyntheticType = (userAgent) => {
 /**
  * Returns outgoing request attributes scoped to the response data
  * @param {IncomingMessage} response the response object
- * @param {SemconvStability} semconvStability determines which semconv version to use
  */
-const getOutgoingRequestAttributesOnResponse = (response, semconvStability) => {
-    const { statusCode, statusMessage, httpVersion, socket } = response;
-    const oldAttributes = {};
-    const stableAttributes = {};
+const getOutgoingRequestAttributesOnResponse = (response) => {
+    const { statusCode, socket } = response;
+    const attributes = {};
     if (statusCode != null) {
-        stableAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE] = statusCode;
+        attributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE] = statusCode;
     }
     if (socket) {
         const { remoteAddress, remotePort } = socket;
-        oldAttributes[semconv_1.ATTR_NET_PEER_IP] = remoteAddress;
-        oldAttributes[semconv_1.ATTR_NET_PEER_PORT] = remotePort;
         // Recommended
-        stableAttributes[semantic_conventions_1.ATTR_NETWORK_PEER_ADDRESS] = remoteAddress;
-        stableAttributes[semantic_conventions_1.ATTR_NETWORK_PEER_PORT] = remotePort;
-        stableAttributes[semantic_conventions_1.ATTR_NETWORK_PROTOCOL_VERSION] = response.httpVersion;
+        attributes[semantic_conventions_1.ATTR_NETWORK_PEER_ADDRESS] = remoteAddress;
+        attributes[semantic_conventions_1.ATTR_NETWORK_PEER_PORT] = remotePort;
+        attributes[semantic_conventions_1.ATTR_NETWORK_PROTOCOL_VERSION] = response.httpVersion;
     }
-    (0, exports.setResponseContentLengthAttribute)(response, oldAttributes);
-    if (statusCode) {
-        oldAttributes[semconv_1.ATTR_HTTP_STATUS_CODE] = statusCode;
-        oldAttributes[AttributeNames_1.AttributeNames.HTTP_STATUS_TEXT] = (statusMessage || '').toUpperCase();
-    }
-    (0, exports.setAttributesFromHttpKind)(httpVersion, oldAttributes);
-    switch (semconvStability) {
-        case instrumentation_1.SemconvStability.STABLE:
-            return stableAttributes;
-        case instrumentation_1.SemconvStability.OLD:
-            return oldAttributes;
-    }
-    return Object.assign(oldAttributes, stableAttributes);
+    return attributes;
 };
 exports.getOutgoingRequestAttributesOnResponse = getOutgoingRequestAttributesOnResponse;
 /**
  * Returns outgoing request Metric attributes scoped to the response data
  * @param {Attributes} spanAttributes the span attributes
  */
-const getOutgoingRequestMetricAttributesOnResponse = (spanAttributes) => {
-    const metricAttributes = {};
-    metricAttributes[semconv_1.ATTR_NET_PEER_PORT] = spanAttributes[semconv_1.ATTR_NET_PEER_PORT];
-    metricAttributes[semconv_1.ATTR_HTTP_STATUS_CODE] =
-        spanAttributes[semconv_1.ATTR_HTTP_STATUS_CODE];
-    metricAttributes[semconv_1.ATTR_HTTP_FLAVOR] = spanAttributes[semconv_1.ATTR_HTTP_FLAVOR];
-    return metricAttributes;
-};
-exports.getOutgoingRequestMetricAttributesOnResponse = getOutgoingRequestMetricAttributesOnResponse;
 const getOutgoingStableRequestMetricAttributesOnResponse = (spanAttributes) => {
     const metricAttributes = {};
     if (spanAttributes[semantic_conventions_1.ATTR_NETWORK_PROTOCOL_VERSION]) {
         metricAttributes[semantic_conventions_1.ATTR_NETWORK_PROTOCOL_VERSION] =
             spanAttributes[semantic_conventions_1.ATTR_NETWORK_PROTOCOL_VERSION];
     }
-    if (spanAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE]) {
-        metricAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE] =
-            spanAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE];
+    const statusCode = spanAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE];
+    if (statusCode) {
+        metricAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE] = statusCode;
+        if (typeof statusCode === 'number' &&
+            statusCode >= 400 &&
+            statusCode < 600) {
+            metricAttributes[semantic_conventions_1.ATTR_ERROR_TYPE] ??= String(statusCode);
+        }
     }
     return metricAttributes;
 };
@@ -618,154 +499,65 @@ function getInfoFromIncomingMessage(component, request, logger) {
 /**
  * Returns incoming request attributes scoped to the request data
  * @param {IncomingMessage} request the request object
- * @param {{ component: string, serverName?: string, hookAttributes?: Attributes }} options used to pass data needed to create attributes
- * @param {SemconvStability} semconvStability determines which semconv version to use
+ * @param {{ component: string, hookAttributes?: Attributes, enableSyntheticSourceDetection: boolean }} options used to pass data needed to create attributes
  */
 const getIncomingRequestAttributes = (request, options, logger) => {
-    const { component, enableSyntheticSourceDetection, hookAttributes, semconvStability, serverName, } = options;
-    const { headers, httpVersion, method } = request;
-    const { host, 'user-agent': userAgent, 'x-forwarded-for': ips } = headers;
+    const { component, enableSyntheticSourceDetection, hookAttributes } = options;
+    const { headers, method } = request;
+    const { 'user-agent': userAgent } = headers;
     const parsedUrl = getInfoFromIncomingMessage(component, request, logger);
-    let newAttributes;
-    let oldAttributes;
-    if (semconvStability !== instrumentation_1.SemconvStability.OLD) {
-        // Stable attributes are used.
-        const normalizedMethod = normalizeMethod(method);
-        const serverAddress = getServerAddress(request, component);
-        const remoteClientAddress = getRemoteClientAddress(request);
-        newAttributes = {
-            [semantic_conventions_1.ATTR_HTTP_REQUEST_METHOD]: normalizedMethod,
-            [semantic_conventions_1.ATTR_URL_SCHEME]: component,
-            [semantic_conventions_1.ATTR_SERVER_ADDRESS]: serverAddress?.host,
-            [semantic_conventions_1.ATTR_NETWORK_PEER_ADDRESS]: request.socket.remoteAddress,
-            [semantic_conventions_1.ATTR_NETWORK_PEER_PORT]: request.socket.remotePort,
-            [semantic_conventions_1.ATTR_NETWORK_PROTOCOL_VERSION]: request.httpVersion,
-            [semantic_conventions_1.ATTR_USER_AGENT_ORIGINAL]: userAgent,
-        };
-        if (parsedUrl.pathname != null) {
-            newAttributes[semantic_conventions_1.ATTR_URL_PATH] = parsedUrl.pathname;
-        }
-        if (parsedUrl.search) {
-            // Remove leading '?' from URL search (https://developer.mozilla.org/en-US/docs/Web/API/URL/search).
-            newAttributes[semantic_conventions_1.ATTR_URL_QUERY] = parsedUrl.search.slice(1);
-        }
-        if (remoteClientAddress != null) {
-            newAttributes[semantic_conventions_1.ATTR_CLIENT_ADDRESS] = remoteClientAddress;
-        }
-        if (serverAddress?.port != null) {
-            newAttributes[semantic_conventions_1.ATTR_SERVER_PORT] = Number(serverAddress.port);
-        }
-        // Conditionally required if request method required case normalization.
-        if (method !== normalizedMethod) {
-            newAttributes[semantic_conventions_1.ATTR_HTTP_REQUEST_METHOD_ORIGINAL] = method;
-        }
-        if (enableSyntheticSourceDetection && userAgent) {
-            newAttributes[semconv_1.ATTR_USER_AGENT_SYNTHETIC_TYPE] =
-                getSyntheticType(userAgent);
-        }
+    // Stable attributes are used.
+    const normalizedMethod = normalizeMethod(method);
+    const serverAddress = getServerAddress(request, component);
+    const remoteClientAddress = getRemoteClientAddress(request);
+    const attributes = {
+        [semantic_conventions_1.ATTR_HTTP_REQUEST_METHOD]: normalizedMethod,
+        [semantic_conventions_1.ATTR_URL_SCHEME]: component,
+        [semantic_conventions_1.ATTR_SERVER_ADDRESS]: serverAddress?.host,
+        [semantic_conventions_1.ATTR_NETWORK_PEER_ADDRESS]: request.socket.remoteAddress,
+        [semantic_conventions_1.ATTR_NETWORK_PEER_PORT]: request.socket.remotePort,
+        [semantic_conventions_1.ATTR_NETWORK_PROTOCOL_VERSION]: request.httpVersion,
+        [semantic_conventions_1.ATTR_USER_AGENT_ORIGINAL]: userAgent,
+    };
+    if (parsedUrl.pathname != null) {
+        attributes[semantic_conventions_1.ATTR_URL_PATH] = parsedUrl.pathname;
     }
-    if (semconvStability !== instrumentation_1.SemconvStability.STABLE) {
-        // Old attributes are used.
-        const hostname = host?.replace(/^(.*)(:[0-9]{1,5})/, '$1') || 'localhost';
-        oldAttributes = {
-            [semconv_1.ATTR_HTTP_URL]: parsedUrl.toString(),
-            [semconv_1.ATTR_HTTP_HOST]: host,
-            [semconv_1.ATTR_NET_HOST_NAME]: hostname,
-            [semconv_1.ATTR_HTTP_METHOD]: method,
-            [semconv_1.ATTR_HTTP_SCHEME]: component,
-        };
-        if (typeof ips === 'string') {
-            oldAttributes[semconv_1.ATTR_HTTP_CLIENT_IP] = ips.split(',')[0];
-        }
-        if (typeof serverName === 'string') {
-            oldAttributes[semconv_1.ATTR_HTTP_SERVER_NAME] = serverName;
-        }
-        if (parsedUrl.pathname) {
-            oldAttributes[semconv_1.ATTR_HTTP_TARGET] =
-                parsedUrl.pathname + parsedUrl.search || '/';
-        }
-        if (userAgent !== undefined) {
-            oldAttributes[semconv_1.ATTR_HTTP_USER_AGENT] = userAgent;
-        }
-        (0, exports.setRequestContentLengthAttribute)(request, oldAttributes);
-        (0, exports.setAttributesFromHttpKind)(httpVersion, oldAttributes);
+    if (parsedUrl.search) {
+        // Remove leading '?' from URL search (https://developer.mozilla.org/en-US/docs/Web/API/URL/search).
+        attributes[semantic_conventions_1.ATTR_URL_QUERY] = parsedUrl.search.slice(1);
+    }
+    if (remoteClientAddress != null) {
+        attributes[semantic_conventions_1.ATTR_CLIENT_ADDRESS] = remoteClientAddress;
+    }
+    if (serverAddress?.port != null) {
+        attributes[semantic_conventions_1.ATTR_SERVER_PORT] = Number(serverAddress.port);
     }
-    switch (semconvStability) {
-        case instrumentation_1.SemconvStability.STABLE:
-            return Object.assign(newAttributes, hookAttributes);
-        case instrumentation_1.SemconvStability.OLD:
-            return Object.assign(oldAttributes, hookAttributes);
-        default:
-            return Object.assign(oldAttributes, newAttributes, hookAttributes);
+    // Conditionally required if request method required case normalization.
+    if (method !== normalizedMethod) {
+        attributes[semantic_conventions_1.ATTR_HTTP_REQUEST_METHOD_ORIGINAL] = method;
+    }
+    if (enableSyntheticSourceDetection && userAgent) {
+        attributes[semconv_1.ATTR_USER_AGENT_SYNTHETIC_TYPE] = getSyntheticType(userAgent);
     }
+    return Object.assign(attributes, hookAttributes);
 };
 exports.getIncomingRequestAttributes = getIncomingRequestAttributes;
-/**
- * Returns incoming request Metric attributes scoped to the request data
- * @param {Attributes} spanAttributes the span attributes
- * @param {{ component: string }} options used to pass data needed to create attributes
- */
-const getIncomingRequestMetricAttributes = (spanAttributes) => {
-    const metricAttributes = {};
-    metricAttributes[semconv_1.ATTR_HTTP_SCHEME] = spanAttributes[semconv_1.ATTR_HTTP_SCHEME];
-    metricAttributes[semconv_1.ATTR_HTTP_METHOD] = spanAttributes[semconv_1.ATTR_HTTP_METHOD];
-    metricAttributes[semconv_1.ATTR_NET_HOST_NAME] = spanAttributes[semconv_1.ATTR_NET_HOST_NAME];
-    metricAttributes[semconv_1.ATTR_HTTP_FLAVOR] = spanAttributes[semconv_1.ATTR_HTTP_FLAVOR];
-    //TODO: http.target attribute, it should substitute any parameters to avoid high cardinality.
-    return metricAttributes;
-};
-exports.getIncomingRequestMetricAttributes = getIncomingRequestMetricAttributes;
 /**
  * Returns incoming request attributes scoped to the response data
  * @param {(ServerResponse & { socket: Socket; })} response the response object
  */
-const getIncomingRequestAttributesOnResponse = (request, response, semconvStability) => {
-    // take socket from the request,
-    // since it may be detached from the response object in keep-alive mode
-    const { socket } = request;
-    const { statusCode, statusMessage } = response;
-    const newAttributes = {
+const getIncomingRequestAttributesOnResponse = (response) => {
+    const { statusCode } = response;
+    const attributes = {
         [semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE]: statusCode,
     };
     const rpcMetadata = (0, core_1.getRPCMetadata)(api_1.context.active());
-    const oldAttributes = {};
-    if (socket) {
-        const { localAddress, localPort, remoteAddress, remotePort } = socket;
-        oldAttributes[semconv_1.ATTR_NET_HOST_IP] = localAddress;
-        oldAttributes[semconv_1.ATTR_NET_HOST_PORT] = localPort;
-        oldAttributes[semconv_1.ATTR_NET_PEER_IP] = remoteAddress;
-        oldAttributes[semconv_1.ATTR_NET_PEER_PORT] = remotePort;
-    }
-    oldAttributes[semconv_1.ATTR_HTTP_STATUS_CODE] = statusCode;
-    oldAttributes[AttributeNames_1.AttributeNames.HTTP_STATUS_TEXT] = (statusMessage || '').toUpperCase();
     if (rpcMetadata?.type === core_1.RPCType.HTTP && rpcMetadata.route !== undefined) {
-        oldAttributes[semantic_conventions_1.ATTR_HTTP_ROUTE] = rpcMetadata.route;
-        newAttributes[semantic_conventions_1.ATTR_HTTP_ROUTE] = rpcMetadata.route;
+        attributes[semantic_conventions_1.ATTR_HTTP_ROUTE] = rpcMetadata.route;
     }
-    switch (semconvStability) {
-        case instrumentation_1.SemconvStability.STABLE:
-            return newAttributes;
-        case instrumentation_1.SemconvStability.OLD:
-            return oldAttributes;
-    }
-    return Object.assign(oldAttributes, newAttributes);
+    return attributes;
 };
 exports.getIncomingRequestAttributesOnResponse = getIncomingRequestAttributesOnResponse;
-/**
- * Returns incoming request Metric attributes scoped to the request data
- * @param {Attributes} spanAttributes the span attributes
- */
-const getIncomingRequestMetricAttributesOnResponse = (spanAttributes) => {
-    const metricAttributes = {};
-    metricAttributes[semconv_1.ATTR_HTTP_STATUS_CODE] =
-        spanAttributes[semconv_1.ATTR_HTTP_STATUS_CODE];
-    metricAttributes[semconv_1.ATTR_NET_HOST_PORT] = spanAttributes[semconv_1.ATTR_NET_HOST_PORT];
-    if (spanAttributes[semantic_conventions_1.ATTR_HTTP_ROUTE] !== undefined) {
-        metricAttributes[semantic_conventions_1.ATTR_HTTP_ROUTE] = spanAttributes[semantic_conventions_1.ATTR_HTTP_ROUTE];
-    }
-    return metricAttributes;
-};
-exports.getIncomingRequestMetricAttributesOnResponse = getIncomingRequestMetricAttributesOnResponse;
 /**
  * Returns incoming stable request Metric attributes scoped to the request data
  * @param {Attributes} spanAttributes the span attributes
@@ -776,25 +568,23 @@ const getIncomingStableRequestMetricAttributesOnResponse = (spanAttributes) => {
         metricAttributes[semantic_conventions_1.ATTR_HTTP_ROUTE] = spanAttributes[semantic_conventions_1.ATTR_HTTP_ROUTE];
     }
     // required if and only if one was sent, same as span requirement
-    if (spanAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE]) {
-        metricAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE] =
-            spanAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE];
+    const statusCode = spanAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE];
+    if (statusCode) {
+        metricAttributes[semantic_conventions_1.ATTR_HTTP_RESPONSE_STATUS_CODE] = statusCode;
+        if (typeof statusCode === 'number' &&
+            statusCode >= 500 &&
+            statusCode < 600) {
+            metricAttributes[semantic_conventions_1.ATTR_ERROR_TYPE] ??= String(statusCode);
+        }
     }
     return metricAttributes;
 };
 exports.getIncomingStableRequestMetricAttributesOnResponse = getIncomingStableRequestMetricAttributesOnResponse;
-function headerCapture(type, headers, semconvStability) {
+function headerCapture(type, headers) {
     const normalizedHeaders = new Map();
     for (let i = 0, len = headers.length; i < len; i++) {
         const capturedHeader = headers[i].toLowerCase();
-        if (semconvStability & instrumentation_1.SemconvStability.STABLE) {
-            normalizedHeaders.set(capturedHeader, capturedHeader);
-        }
-        else {
-            // In old semconv, the header name converted hypen to underscore, e.g.:
-            // `http.request.header.content_length`.
-            normalizedHeaders.set(capturedHeader, capturedHeader.replaceAll('-', '_'));
-        }
+        normalizedHeaders.set(capturedHeader, capturedHeader);
     }
     return (getHeader) => {
         const attributes = {};