bundle autoinstrumentation package with webpack

Author: ezhang6811

aws-distro-opentelemetry-node-autoinstrumentation/package.json

@@ -22,7 +22,9 @@
   "repository": "aws-observability/aws-otel-js-instrumentation",
   "scripts": {
     "clean": "rimraf build/*",
-    "compile": "tsc -p .",
+    "compile:tsc": "tsc -p .",
+    "compile:webpack": "webpack",
+    "compile": "npm run compile:webpack",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
     "create-version": "node -p \"'export const LIB_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
@@ -88,8 +90,11 @@
     "nyc": "15.1.0",
     "rimraf": "5.0.5",
     "sinon": "15.2.0",
+    "ts-loader": "^9.5.2",
     "ts-mocha": "10.0.0",
-    "typescript": "4.4.4"
+    "typescript": "4.4.4",
+    "webpack": "^5.98.0",
+    "webpack-cli": "^6.0.1"
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
@@ -105,7 +110,7 @@
     "@opentelemetry/instrumentation-aws-sdk": "0.44.0",
     "@opentelemetry/otlp-transformer": "0.53.0",
     "@opentelemetry/propagator-aws-xray": "1.26.0",
-    "@opentelemetry/resource-detector-aws": "1.6.1",
+    "@opentelemetry/resource-detector-aws": "1.12.0",
     "@opentelemetry/resources": "1.26.0",
     "@opentelemetry/sdk-metrics": "1.26.0",
     "@opentelemetry/sdk-node": "0.53.0",
@@ -114,8 +119,8 @@
   },
   "files": [
     "build/src/**/*.js",
-    "build/src/**/*.js.map",
     "build/src/**/*.d.ts",
-    "build/src/**/*.json"
+    "build/src/**/*.d.ts.map",
+    "build/workspace/node_modules/**"
   ]
 }

aws-distro-opentelemetry-node-autoinstrumentation/test/patches/instrumentation-patch.test.ts

@@ -24,7 +24,7 @@ import { AWSXRAY_TRACE_ID_HEADER, AWSXRayPropagator } from '@opentelemetry/propa
 import { Context } from 'aws-lambda';
 import { SinonStub } from 'sinon';
 import { S3 } from '@aws-sdk/client-s3';
-import nock = require('nock');
+import * as nock from 'nock';
 import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import { getTestSpans, registerInstrumentationTesting } from '@opentelemetry/contrib-test-utils';
 import { AwsSdkInstrumentationExtended } from '../../src/patches/extended-instrumentations/aws-sdk-instrumentation-extended';

aws-distro-opentelemetry-node-autoinstrumentation/tsconfig.webpack.json

@@ -0,0 +1,11 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+      "module": "es2020",
+      "target": "es2020",
+      "moduleResolution": "node",
+    },
+    "exclude": [
+      "node_modules",
+    ]
+  }

aws-distro-opentelemetry-node-autoinstrumentation/webpack.config.js

@@ -0,0 +1,46 @@
+const path = require('path');
+
+module.exports = {
+  entry: './src/register.ts',
+  target: 'node',
+  mode: 'production',
+  externalsPresets: { node: true },
+  externals: [
+    'import-in-the-middle',
+  ],
+  output: {
+    path: path.resolve('./build/src'),
+    filename: 'register.js',
+    library: {
+        type: 'commonjs2',
+    }
+  },
+  resolve: {
+    extensions: ['.ts', '.js'],
+    modules: [
+        path.resolve('./src'),
+        'node_modules',
+    ],
+  },
+  module: {
+    rules: [
+      {
+        test: /\.ts$/,
+        use: [
+          {
+            loader: 'ts-loader',
+            options: {
+              configFile: 'tsconfig.webpack.json'
+            },
+          }
+        ],
+        exclude: /node_modules/,
+      },
+    ],
+  },
+  optimization: {
+    minimize: true,
+    providedExports: true,
+    usedExports: true,
+  },
+};