Merge branch 'main' into aws-lambda-configurator

Author: mxiamxia

Dockerfile

@@ -1,20 +1,20 @@
-# # Stage 1: Install ADOT nodejs instrumentation in the /operator-build folder
+# Stage 1: Install ADOT nodejs instrumentation in the /operator-build folder
 FROM node:20 AS build
 
-# In the future, when ADOT JS is uploaded to NPM, the source code can be obtained from there
-# and this Dockerfile will not need to copy the source code anymore as a workaround.
-# Copy Source Code without original package.json
-WORKDIR /
-COPY tsconfig.base.json ./tsconfig.base.json
+# Build the ADOT JS SDK Tarball: aws-aws-distro-opentelemetry-node-autoinstrumentation-x.y.z.tgz
+WORKDIR /adot-js-build
+COPY . .
+RUN npm install
+WORKDIR /adot-js-build/aws-distro-opentelemetry-node-autoinstrumentation
+RUN npm run compile
+RUN npm pack
+
+# Install Tarball build from previous step so that autoinstrumentation.ts can "require" the ADOT JS SDK
 WORKDIR /operator-build
-COPY aws-distro-opentelemetry-node-autoinstrumentation/src ./src/
+COPY docker-utils/ .
 COPY aws-distro-opentelemetry-node-autoinstrumentation/tsconfig.json ./tsconfig.json
-COPY aws-distro-opentelemetry-node-autoinstrumentation/LICENSE ./LICENSE
-# ... but also add the required autoinstrumentation.ts and package.json to be consistent with upstream
-# https://github.com/open-telemetry/opentelemetry-operator/tree/main/autoinstrumentation/nodejs
-COPY docker-utils/autoinstrumentation.ts ./src/autoinstrumentation.ts
-COPY docker-utils/package.json ./package.json
-
+RUN cp /adot-js-build/aws-distro-opentelemetry-node-autoinstrumentation/aws-aws-distro-opentelemetry-node-autoinstrumentation-*.tgz ./
+RUN npm install aws-aws-distro-opentelemetry-node-autoinstrumentation-$(node -p -e "require('/adot-js-build/aws-distro-opentelemetry-node-autoinstrumentation/package.json').version").tgz
 RUN npm install
 
 # Stage 2: Build the cp-utility binary

aws-distro-opentelemetry-node-autoinstrumentation/src/aws-opentelemetry-configurator.ts

@@ -478,7 +478,7 @@ export class AwsSpanProcessorProvider {
     }
   }
 
-  protected static _registeredExporters = new Map<string, () => SpanExporter>([
+  protected static _registeredExporters: Map<string, () => SpanExporter> = new Map<string, () => SpanExporter>([
     ['otlp', () => this.configureOtlp()],
     ['zipkin', () => new ZipkinExporter()],
     ['jaeger', () => this.configureJaeger()],

aws-distro-opentelemetry-node-autoinstrumentation/src/aws-span-processing-util.ts

@@ -36,7 +36,7 @@ export class AwsSpanProcessingUtil {
   // The current longest command word is DATETIME_INTERVAL_PRECISION at 27 characters.
   // If we add a longer keyword to the sql dialect keyword list, need to update the constant below.
   static MAX_KEYWORD_LENGTH: number = 27;
-  static SQL_DIALECT_PATTERN = '^(?:' + AwsSpanProcessingUtil.getDialectKeywords().join('|') + ')\\b';
+  static SQL_DIALECT_PATTERN: string = '^(?:' + AwsSpanProcessingUtil.getDialectKeywords().join('|') + ')\\b';
 
   static getDialectKeywords(): string[] {
     return SQL_DIALECT_KEYWORDS_JSON.keywords;

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

@@ -1,13 +1,35 @@
 {
-  "extends": "../tsconfig.base",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build",
+
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "declaration": true,
+    "declarationMap": true,
+    "forceConsistentCasingInFileNames": true,
+    "inlineSources": true,
+    "module": "commonjs",
+    "noEmitOnError": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "pretty": true,
+    "sourceMap": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "target": "es2017",
+    "incremental": true,
+    "newLine": "LF",
     // This command allows TypeScript to import `sql_dialect_keywords.json`
     "resolveJsonModule": true
   },
   "include": [
     "src/**/*.ts",
     "test/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
   ]
 }

docker-utils/package.json

@@ -5,87 +5,14 @@
   "scripts": {
     "clean": "rimraf build/*",
     "prepare": "npm run compile",
-    "create-version": "node -p \"'export const LIB_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
-    "precompile": "npm run create-version",
     "compile": "tsc -p .",
-    "postcompile": "copyfiles -f 'build/src/*.js' build/workspace/ && copyfiles -f 'build/src/configuration/*.json' build/workspace/configuration/ && copyfiles -f 'build/src/patches/*.js' build/workspace/patches/ && copyfiles -f 'build/src/sampler/*.js' build/workspace/sampler/ && copyfiles -f 'build/src/patches/aws/services/*.js' build/workspace/patches/aws/services/ && copyfiles -f 'build/src/third-party/otel/aws/services/*.js' build/workspace/third-party/otel/aws/services/ && copyfiles -f 'build/src/configuration/*.json' build/workspace/configuration/ && copyfiles 'node_modules/**' package.json build/workspace/ && npm -C build/workspace prune --omit=dev --no-package-lock"
+    "postcompile": "copyfiles -f 'aws-aws-distro-opentelemetry-node-autoinstrumentation-*.tgz' build/workspace/ && copyfiles -f 'build/src/**' build/workspace/ && copyfiles 'node_modules/**' package.json build/workspace/ && npm -C build/workspace prune --omit=dev --no-package-lock"
   },
   "devDependencies": {
     "@types/mocha": "7.0.2",
     "@types/node": "18.6.5",
     "copyfiles": "^2.4.1",
     "rimraf": "5.0.5",
     "typescript": "4.4.4"
-  },
-  "dependencies": {
-    "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/auto-instrumentations-node": "0.48.0",
-    "@opentelemetry/auto-configuration-propagators": "0.2.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.52.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.52.1",
-    "@opentelemetry/instrumentation": "0.52.1",
-    "@opentelemetry/id-generator-aws-xray": "1.2.2",
-    "@opentelemetry/propagator-aws-xray": "1.25.1",
-    "@opentelemetry/core": "1.25.1",
-    "@opentelemetry/sdk-trace-base": "1.25.1",
-    "@opentelemetry/semantic-conventions": "1.25.1",
-    "@opentelemetry/resources": "1.25.1",
-    "@opentelemetry/resource-detector-aws": "1.5.2",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.52.1",
-    "@opentelemetry/exporter-zipkin": "1.25.1",
-    "@opentelemetry/sdk-metrics": "1.25.1",
-    "@opentelemetry/sdk-node": "0.52.1",
-    "@opentelemetry/instrumentation-aws-sdk": "0.43.1"
-  },
-  "overrides": {
-    "@opentelemetry/auto-instrumentations-node": {
-      "@opentelemetry/instrumentation": "0.52.1",
-      "@opentelemetry/instrumentation-amqplib": "0.40.0",
-      "@opentelemetry/instrumentation-aws-lambda": "0.43.0",
-      "@opentelemetry/instrumentation-aws-sdk": "0.43.1",
-      "@opentelemetry/instrumentation-bunyan": "0.40.0",
-      "@opentelemetry/instrumentation-cassandra-driver": "0.40.0",
-      "@opentelemetry/instrumentation-connect": "0.38.0",
-      "@opentelemetry/instrumentation-cucumber": "0.8.0",
-      "@opentelemetry/instrumentation-dataloader": "0.11.0",
-      "@opentelemetry/instrumentation-dns": "0.38.0",
-      "@opentelemetry/instrumentation-express": "0.41.1",
-      "@opentelemetry/instrumentation-fastify": "0.38.0",
-      "@opentelemetry/instrumentation-fs": "0.14.0",
-      "@opentelemetry/instrumentation-generic-pool": "0.38.0",
-      "@opentelemetry/instrumentation-graphql": "0.42.0",
-      "@opentelemetry/instrumentation-grpc": "0.52.1",
-      "@opentelemetry/instrumentation-hapi": "0.40.0",
-      "@opentelemetry/instrumentation-http": "0.52.1",
-      "@opentelemetry/instrumentation-ioredis": "0.42.0",
-      "@opentelemetry/instrumentation-kafkajs": "0.2.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-mysql": "0.40.0",
-      "@opentelemetry/instrumentation-mysql2": "0.40.0",
-      "@opentelemetry/instrumentation-nestjs-core": "0.39.0",
-      "@opentelemetry/instrumentation-net": "0.38.0",
-      "@opentelemetry/instrumentation-pg": "0.43.0",
-      "@opentelemetry/instrumentation-pino": "0.41.0",
-      "@opentelemetry/instrumentation-redis": "0.41.0",
-      "@opentelemetry/instrumentation-redis-4": "0.41.0",
-      "@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-undici": "0.4.0",
-      "@opentelemetry/instrumentation-winston": "0.39.0",
-      "@opentelemetry/resource-detector-alibaba-cloud": "0.28.10",
-      "@opentelemetry/resource-detector-aws": "1.5.2",
-      "@opentelemetry/resource-detector-azure": "0.2.9",
-      "@opentelemetry/resource-detector-container": "0.3.11",
-      "@opentelemetry/resource-detector-gcp": "0.29.10",
-      "@opentelemetry/resources": "1.25.1",
-      "@opentelemetry/sdk-node": "0.52.1"
-    }
   }
 }

docker-utils/autoinstrumentation.ts renamed to docker-utils/src/autoinstrumentation.ts

@@ -1,4 +1,4 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-require('./register');
+require('@aws/aws-distro-opentelemetry-node-autoinstrumentation/register');

eslint.config.js

@@ -41,8 +41,12 @@ module.exports = {
         ],
         "@typescript-eslint/no-var-requires": "off",
         "@typescript-eslint/no-inferrable-types": 0,
-        "@typescript-eslint/typedef": ["warn", {
-          "variableDeclaration": true
+        "@typescript-eslint/typedef": ["error", {
+          "variableDeclaration": false,
+          "parameter": true,
+          "propertyDeclaration": true,
+          "memberVariableDeclaration": true,
+          "variableDeclarationIgnoreFunction": true
         }],
         "@typescript-eslint/no-empty-function": ["off"],
         "@typescript-eslint/ban-types": ["warn", {