chore: update e2e test to use upstreamed resource detector (#840)

Author: aabmass

e2e-test-server/package.json

@@ -36,12 +36,12 @@
   "dependencies": {
     "@google-cloud/functions-framework": "^3.1.3",
     "@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
-    "@google-cloud/opentelemetry-resource-util": "^3.0.0",
     "@google-cloud/pubsub": "^4.0.0",
     "@grpc/grpc-js": "^1.3.2",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/context-async-hooks": "^2.0.0",
     "@opentelemetry/core": "^2.0.0",
+    "@opentelemetry/resource-detector-gcp": "^0.44.0",
     "@opentelemetry/resources": "^2.0.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "express": "^4.21.0",

e2e-test-server/src/scenarios.ts

@@ -28,7 +28,7 @@ import {
   TraceExporter,
   TraceExporterOptions,
 } from '@google-cloud/opentelemetry-cloud-trace-exporter';
-import {GcpDetectorSync} from '@google-cloud/opentelemetry-resource-util';
+import {gcpDetector} from '@opentelemetry/resource-detector-gcp';
 import * as constants from './constants';
 import {context, SpanKind, Tracer} from '@opentelemetry/api';
 import {AsyncHooksContextManager} from '@opentelemetry/context-async-hooks';
@@ -117,8 +117,8 @@ async function complexTrace(request: Request): Promise<Response> {
 }
 
 async function detectResource(request: Request): Promise<Response> {
-  const resource = await detectResources({
-    detectors: [new GcpDetectorSync(), envDetector],
+  const resource = detectResources({
+    detectors: [gcpDetector, envDetector],
   });
 
   return withTracer(