Merge branch 'main' into feat/remove-unused-serializer-exports

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,7 +7,7 @@ Before creating a pull request, please make sure:
 - You have read the guide for contributing
   - See https://github.com/open-telemetry/opentelemetry-js/blob/main/CONTRIBUTING.md
 - You signed all your commits (otherwise we won't be able to merge the PR)
-  - See https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#sign-the-cla
+  - See https://github.com/open-telemetry/community/blob/main/guides/contributor#sign-the-cla
 - You added unit tests for the new functionality
 - You mention in the PR description which issue it is addressing, e.g. "Fixes #xxx". This will auto-close
   the issue that your PR fixes (if such)

CONTRIBUTING.md

@@ -79,7 +79,7 @@ Reporting bugs is an important contribution. Please make sure to include:
 ### Before you start
 
 Please read project contribution
-[guide](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md)
+[guide](https://github.com/open-telemetry/community/blob/main/guides/contributor)
 for general practices for OpenTelemetry project.
 
 #### Conventional commit
@@ -145,7 +145,7 @@ git merge upstream/main
 
 Remember to always work in a branch of your local copy, as you might otherwise have to contend with conflicts in main.
 
-Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#github-workflow) section of general project contributing guide.
+Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/main/guides/contributor/processes.md#github-workflow) section of general project contributing guide.
 
 ## Development
 

experimental/CHANGELOG.md

@@ -79,6 +79,7 @@ All notable changes to experimental packages in this project will be documented
 * feat(otlp-exporter-base): internally accept a http header provider function only [#5179](https://github.com/open-telemetry/opentelemetry-js/pull/5179) @pichlermarc
 * refactor(otlp-exporter-base): don't create blob before sending xhr [#5193](https://github.com/open-telemetry/opentelemetry-js/pull/5193) @pichlermarc
   * improves compatibility with some unsupported runtimes
+* feat(otlp-exporter-base): add http response body to exporter error [#5204](https://github.com/open-telemetry/opentelemetry-js/pull/5204) @pichlermarc
 
 ### :bug: (Bug Fix)
 

experimental/packages/opentelemetry-instrumentation-grpc/package.json

@@ -46,7 +46,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@bufbuild/buf": "1.21.0-1",
+    "@bufbuild/buf": "1.47.2",
     "@grpc/grpc-js": "^1.7.1",
     "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.9.0",

experimental/packages/opentelemetry-instrumentation-http/package.json

@@ -59,7 +59,7 @@
     "@types/semver": "7.5.8",
     "@types/sinon": "17.0.3",
     "@types/superagent": "8.1.9",
-    "axios": "1.7.4",
+    "axios": "1.7.8",
     "cross-var": "1.1.0",
     "lerna": "6.6.2",
     "mocha": "10.8.2",

experimental/packages/otlp-exporter-base/src/index.ts

@@ -37,9 +37,5 @@ export {
   CompressionAlgorithm,
 } from './configuration/legacy-node-configuration';
 export { OTLPExporterConfigBase } from './configuration/legacy-base-configuration';
-export {
-  createOtlpExportDelegate,
-  IOtlpExportDelegate,
-} from './otlp-export-delegate';
-export { createBoundedQueueExportPromiseHandler } from './bounded-queue-export-promise-handler';
+export { IOtlpExportDelegate } from './otlp-export-delegate';
 export { createOtlpNetworkExportDelegate } from './otlp-network-export-delegate';

experimental/packages/otlp-exporter-base/src/transport/http-transport-utils.ts

@@ -72,7 +72,11 @@ export function sendWithHttp(
           retryInMillis: parseRetryAfterToMills(res.headers['retry-after']),
         });
       } else {
-        const error = new OTLPExporterError(res.statusMessage, res.statusCode);
+        const error = new OTLPExporterError(
+          res.statusMessage,
+          res.statusCode,
+          Buffer.concat(responseData).toString()
+        );
         onDone({
           status: 'failure',
           error,

experimental/packages/otlp-exporter-base/test/common/bounded-queue-export-promise-handler.test.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createBoundedQueueExportPromiseHandler } from '../../src';
+import { createBoundedQueueExportPromiseHandler } from '../../src/bounded-queue-export-promise-handler';
 import * as assert from 'assert';
 
 describe('BoundedQueueExportPromiseHandler', function () {

experimental/packages/otlp-exporter-base/test/common/otlp-export-delegate.test.ts

@@ -18,7 +18,7 @@ import * as sinon from 'sinon';
 import * as assert from 'assert';
 import { IExporterTransport } from '../../src';
 import { ExportResultCode } from '@opentelemetry/core';
-import { createOtlpExportDelegate } from '../../src';
+import { createOtlpExportDelegate } from '../../src/otlp-export-delegate';
 import { ExportResponse } from '../../src';
 import { ISerializer } from '@opentelemetry/otlp-transformer';
 import { IExportPromiseHandler } from '../../src/bounded-queue-export-promise-handler';

experimental/packages/otlp-exporter-base/test/node/http-exporter-transport.test.ts

@@ -22,6 +22,7 @@ import {
   ExportResponseRetryable,
   ExportResponseFailure,
   ExportResponseSuccess,
+  OTLPExporterError,
 } from '../../src';
 import * as zlib from 'zlib';
 
@@ -123,7 +124,7 @@ describe('HttpExporterTransport', function () {
       // arrange
       server = http.createServer((_, res) => {
         res.statusCode = 404;
-        res.end();
+        res.end('response-body');
       });
       server.listen(8080);
 
@@ -143,6 +144,14 @@ describe('HttpExporterTransport', function () {
         (result as ExportResponseFailure).error.message,
         'Not Found'
       );
+      assert.strictEqual(
+        ((result as ExportResponseFailure).error as OTLPExporterError).data,
+        'response-body'
+      );
+      assert.strictEqual(
+        ((result as ExportResponseFailure).error as OTLPExporterError).code,
+        404
+      );
     });
 
     it('returns failure when request times out', function (done) {

integration-tests/propagation-validation-server/package.json

@@ -15,7 +15,7 @@
     "@opentelemetry/context-async-hooks": "1.28.0",
     "@opentelemetry/core": "1.28.0",
     "@opentelemetry/sdk-trace-base": "1.28.0",
-    "axios": "1.7.4",
+    "axios": "1.7.8",
     "body-parser": "1.20.3",
     "express": "4.20.0"
   },