From b432929f4b5682e7879c50682547cea25790c588 Mon Sep 17 00:00:00 2001
From: Jamie Danielson <jamiedanielson@honeycomb.io>
Date: Tue, 14 May 2024 16:15:16 -0400
Subject: [PATCH] fix(aws-lambda): update semconv package and readme (#2181)

---
 package-lock.json                             | 19 +++++++++++++++++--
 .../README.md                                 | 12 ++++++++++++
 .../package.json                              |  2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae274779d6..368cd33f93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37474,7 +37474,7 @@
         "@opentelemetry/instrumentation": "^0.51.0",
         "@opentelemetry/propagator-aws-xray": "^1.3.1",
         "@opentelemetry/resources": "^1.8.0",
-        "@opentelemetry/semantic-conventions": "^1.0.0",
+        "@opentelemetry/semantic-conventions": "^1.22.0",
         "@types/aws-lambda": "8.10.122"
       },
       "devDependencies": {
@@ -37498,6 +37498,14 @@
         "@opentelemetry/api": "^1.3.0"
       }
     },
+    "plugins/node/opentelemetry-instrumentation-aws-lambda/node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.24.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.1.tgz",
+      "integrity": "sha512-VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw==",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "plugins/node/opentelemetry-instrumentation-aws-sdk": {
       "name": "@opentelemetry/instrumentation-aws-sdk",
       "version": "0.41.0",
@@ -46238,7 +46246,7 @@
         "@opentelemetry/sdk-metrics": "^1.8.0",
         "@opentelemetry/sdk-trace-base": "^1.8.0",
         "@opentelemetry/sdk-trace-node": "^1.8.0",
-        "@opentelemetry/semantic-conventions": "^1.0.0",
+        "@opentelemetry/semantic-conventions": "^1.22.0",
         "@types/aws-lambda": "8.10.122",
         "@types/mocha": "7.0.2",
         "@types/node": "18.6.5",
@@ -46247,6 +46255,13 @@
         "rimraf": "5.0.5",
         "ts-mocha": "10.0.0",
         "typescript": "4.4.4"
+      },
+      "dependencies": {
+        "@opentelemetry/semantic-conventions": {
+          "version": "1.24.1",
+          "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.1.tgz",
+          "integrity": "sha512-VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw=="
+        }
       }
     },
     "@opentelemetry/instrumentation-aws-sdk": {
diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md b/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md
index 8a3c533c5c..59543ddb2d 100644
--- a/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md
+++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/README.md
@@ -82,6 +82,18 @@ The `lambdaHandler` should be specified as a string in the format `<file>.<handl
 
 One way to determine if the `lambdaHandler` option should be used is to check the handler defined on your Lambda. This can be done by determining the value of the `_HANDLER` environment variable or by viewing the **Runtime Settings** of your Lambda in AWS Console. If the handler is what you expect, then the instrumentation should work without the `lambdaHandler` option. If the handler points to something else, then the `lambdaHandler` option should be used to explicitly specify the handler that should be instrumented.
 
+## Semantic Conventions
+
+This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which implements Semantic Convention [Version 1.7.0](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.7.0/semantic_conventions/README.md)
+
+Attributes collected:
+
+| Attribute          | Short Description                                                         |
+| ------------------ | ------------------------------------------------------------------------- |
+| `cloud.account.id` | The cloud account ID the resource is assigned to.                         |
+| `faas.execution`   | The execution ID of the current function execution.                       |
+| `faas.id`          | The unique ID of the single function that this runtime instance executes. |
+
 ## Useful links
 
 - For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
index 368ffcd5ef..888d47d99d 100644
--- a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
+++ b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
@@ -59,7 +59,7 @@
     "@opentelemetry/instrumentation": "^0.51.0",
     "@opentelemetry/propagator-aws-xray": "^1.3.1",
     "@opentelemetry/resources": "^1.8.0",
-    "@opentelemetry/semantic-conventions": "^1.0.0",
+    "@opentelemetry/semantic-conventions": "^1.22.0",
     "@types/aws-lambda": "8.10.122"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-aws-lambda#readme"