Merge branch 'main' into override-idGenerator

.nycrc

@@ -1,4 +1,5 @@
 {
+  "produceSourceMap": false,
   "extension": [
     ".ts"
   ],

CHANGELOG.md

@@ -23,12 +23,14 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 ### :bug: (Bug Fix)
 
 * fix(core): added falsy check to make otel core work with browser where webpack config had process as false or null [#3613](https://github.com/open-telemetry/opentelemetry-js/issues/3613) @ravindra-dyte
+* fix(instrumentation-http): include query params in http.target [#3646](https://github.com/open-telemetry/opentelemetry-js/pull/3646) @kobi-co
 
 ### :books: (Refine Doc)
 
 ### :house: (Internal)
 
-* fix(sdk-metrics): ix flaky LastValueAggregator test by using fake timer [#3587](https://github.com/open-telemetry/opentelemetry-js/pull/3587) @pichlermarc
+* fix(sdk-metrics): fix flaky LastValueAggregator test by using fake timer [#3587](https://github.com/open-telemetry/opentelemetry-js/pull/3587) @pichlermarc
+* fix(test): fix failing tests by preventing source-map generation [#3642](https://github.com/open-telemetry/opentelemetry-js/pull/3642) @pichlermarc
 
 ## 1.9.1
 

api/CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### :bug: (Bug Fix)
 
 * fix(metrics): export `MetricsAPI` type [#3535](https://github.com/open-telemetry/opentelemetry-js/pull/3535)
+* fix(api): rename `LoggerOptions` to `DiagLoggerOptions` [#3641](https://github.com/open-telemetry/opentelemetry-js/pull/3641)
 
 ## 1.4.0
 

api/src/diag/types.ts

@@ -97,7 +97,7 @@ export interface ComponentLoggerOptions {
   namespace: string;
 }
 
-export interface LoggerOptions {
+export interface DiagLoggerOptions {
   /**
    * The {@link DiagLogLevel} used to filter logs sent to the logger.
    *
@@ -117,10 +117,10 @@ export interface DiagLoggerApi {
    * If a global diag logger is already set, this will override it.
    *
    * @param logger - The {@link DiagLogger} instance to set as the default logger.
-   * @param options - A {@link LoggerOptions} object. If not provided, default values will be set.
+   * @param options - A {@link DiagLoggerOptions} object. If not provided, default values will be set.
    * @returns `true` if the logger was successfully registered, else `false`
    */
-  setLogger(logger: DiagLogger, options?: LoggerOptions): boolean;
+  setLogger(logger: DiagLogger, options?: DiagLoggerOptions): boolean;
 
   /**
    *

experimental/packages/opentelemetry-instrumentation-http/src/utils.ts

@@ -484,7 +484,7 @@ export const getIncomingRequestAttributes = (
   }
 
   if (requestUrl) {
-    attributes[SemanticAttributes.HTTP_TARGET] = requestUrl.pathname || '/';
+    attributes[SemanticAttributes.HTTP_TARGET] = requestUrl.path || '/';
   }
 
   if (userAgent !== undefined) {

experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts

@@ -503,6 +503,23 @@ describe('Utility', () => {
       });
       assert.strictEqual(attributes[SemanticAttributes.HTTP_ROUTE], undefined);
     });
+
+    it('should set http.target as path in http span attributes', () => {
+      const request = {
+        url: 'http://hostname/user/?q=val',
+        method: 'GET',
+      } as IncomingMessage;
+      request.headers = {
+        'user-agent': 'chrome',
+      };
+      const attributes = utils.getIncomingRequestAttributes(request, {
+        component: 'http',
+      });
+      assert.strictEqual(
+        attributes[SemanticAttributes.HTTP_TARGET],
+        '/user/?q=val'
+      );
+    });
   });
 
   describe('headers to span attributes capture', () => {