Merge branch 'main' into fix/web-example-deps

Author: pichlermarc

examples/redis/src/server.ts

@@ -7,6 +7,7 @@ const tracer = setupTracing('example-redis-server');
 import * as express from 'express';
 import axios from 'axios';
 import * as tracerHandlers from './express-tracer-handlers';
+import { randomBytes } from 'crypto';
 const redisPromise = require('./setup-redis').redis;
 
 // Setup express
@@ -20,12 +21,7 @@ async function setupRoutes() {
   const redis = await redisPromise;
 
   app.get('/run_test', async (req: express.Request, res: express.Response) => {
-    const uuid = Math.random()
-      .toString(36)
-      .substring(2, 15)
-      + Math.random()
-        .toString(36)
-        .substring(2, 15);
+    const uuid = randomBytes(16).toString('hex');
     await axios.get(`http://localhost:${PORT}/set?args=uuid,${uuid}`);
     const body = await axios.get(`http://localhost:${PORT}/get?args=uuid`);
 

package-lock.json

@@ -90,7 +90,10 @@ export class AwsLambdaInstrumentation extends InstrumentationBase<AwsLambdaInstr
     }
 
     const handler = path.basename(handlerDef);
-    const moduleRoot = handlerDef.substr(0, handlerDef.length - handler.length);
+    const moduleRoot = handlerDef.substring(
+      0,
+      handlerDef.length - handler.length
+    );
 
     const [module, functionName] = handler.split('.', 2);
 

plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts

@@ -93,7 +93,7 @@ export class SnsServiceExtension implements ServiceExtension {
     if (topicArn || targetArn) {
       const arn = topicArn ?? targetArn;
       try {
-        return arn.substr(arn.lastIndexOf(':') + 1);
+        return arn.substring(arn.lastIndexOf(':') + 1);
       } catch (err) {
         return arn;
       }

plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/sns.ts

@@ -45,7 +45,7 @@
     "@opentelemetry/api": "^1.3.0"
   },
   "devDependencies": {
-    "@koa/router": "12.0.1",
+    "@koa/router": "13.1.0",
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/context-async-hooks": "^1.8.0",
     "@opentelemetry/contrib-test-utils": "^0.43.0",