Merge pull request #567 from solarwinds/NH-102104

Detect k8s metadata on EKS and GCP

.yarn/versions/39bf73da.yml

@@ -0,0 +1,3 @@
+releases:
+  "@solarwinds-apm/instrumentations": minor
+  solarwinds-apm: minor

packages/instrumentations/COMPATIBILITY.md

@@ -4,7 +4,7 @@
 | --------------------------- | ------------------ | ------------------------------------------------- |
 | `@aws-sdk/middleware-stack` | `>=3.1.0 <4.0.0`   | `@opentelemetry/instrumentation-aws-sdk`          |
 | `@aws-sdk/smithy-client`    | `>=3.1.0 <4.0.0`   | `@opentelemetry/instrumentation-aws-sdk`          |
-| `@cucumber/cucumber`        | `>=8.0.0 <11.0.0`  | `@opentelemetry/instrumentation-cucumber`         |
+| `@cucumber/cucumber`        | `>=8.0.0 <12.0.0`  | `@opentelemetry/instrumentation-cucumber`         |
 | `@grpc/grpc-js`             | `>=1.0.0 <2.0.0`   | `@opentelemetry/instrumentation-grpc`             |
 | `@hapi/hapi`                | `>=17.0.0 <22.0.0` | `@opentelemetry/instrumentation-hapi`             |
 | `@nestjs/core`              | `>=4.0.0 <11.0.0`  | `@opentelemetry/instrumentation-nestjs-core`      |

packages/instrumentations/package.json

@@ -84,6 +84,7 @@
     "@opentelemetry/resource-detector-aws": "^1.3.1",
     "@opentelemetry/resource-detector-azure": "^0.6.0",
     "@opentelemetry/resource-detector-container": "^0.6.0",
+    "@opentelemetry/resource-detector-gcp": "^0.33.0",
     "@opentelemetry/resources": "~1.30.0",
     "@opentelemetry/semantic-conventions": "~1.30.0",
     "@opentelemetry/winston-transport": "^0.10.0",

packages/instrumentations/src/index.ts

@@ -162,11 +162,22 @@ const CORE_RESOURCE_DETECTORS = {
     "processDetectorSync",
     "serviceInstanceIdDetectorSync",
   ],
+  "@opentelemetry/resource-detector-aws": ["awsLambdaDetectorSync"],
 } as const
 const RESOURCE_DETECTORS = {
-  "@opentelemetry/resource-detector-aws": ["awsEc2Detector"],
-  "@opentelemetry/resource-detector-azure": ["azureAppServiceDetector"],
   "@opentelemetry/resource-detector-container": ["containerDetector"],
+  "@opentelemetry/resource-detector-aws": [
+    "awsBeanstalkDetectorSync",
+    "awsEc2DetectorSync",
+    "awsEcsDetectorSync",
+    "awsEksDetectorSync",
+  ],
+  "@opentelemetry/resource-detector-azure": [
+    "azureAppServiceDetector",
+    "azureFunctionsDetector",
+    "azureVmDetector",
+  ],
+  "@opentelemetry/resource-detector-gcp": ["gcpDetector"],
   "./resource-detector-uams": ["uamsDetector"],
 } as const