Fix Lockfile, Dependencies and tests

Author: jonathanrainer

federation-integration-testsuite-js/src/snapshotSerializers/readableSpanArraySerializer.ts

@@ -1,5 +1,5 @@
 import { Plugin } from 'pretty-format';
-import { ReadableSpan } from '@opentelemetry/tracing'
+import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 
 export default {
     test(value: any) {

gateway-js/package.json

@@ -36,15 +36,13 @@
     "@apollo/utils.keyvaluecache": "^2.1.0",
     "@apollo/utils.logger": "^2.0.0",
     "@josephg/resolvable": "^1.0.1",
-    "@opentelemetry/api": "^1.0.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "^0.203.0",
-    "@opentelemetry/node": "^0.24.0",
-    "@opentelemetry/resources": "^2.0.1",
-    "@opentelemetry/resource-detector-alibaba-cloud": "^0.31.3",
-    "@opentelemetry/resource-detector-aws": "^2.3.0",
-    "@opentelemetry/resource-detector-azure": "^0.10.0",
-    "@opentelemetry/resource-detector-gcp": "^0.37.0",
-    "@opentelemetry/sdk-metrics": "^2.0.1",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.57.2",
+    "@opentelemetry/resources": "^1.30.1",
+    "@opentelemetry/resource-detector-alibaba-cloud": "0.30.1",
+    "@opentelemetry/resource-detector-aws": "1.12.0",
+    "@opentelemetry/resource-detector-azure": "0.6.1",
+    "@opentelemetry/resource-detector-gcp": "0.33.1",
     "@types/node-fetch": "^2.6.2",
     "async-retry": "^1.3.3",
     "loglevel": "^1.6.1",

gateway-js/src/__tests__/gateway/opentelemetry.test.ts

@@ -4,12 +4,9 @@ import {
   fixtures,
   spanSerializer,
 } from 'apollo-federation-integration-testsuite';
-import {
-  InMemorySpanExporter,
-  SimpleSpanProcessor,
-} from '@opentelemetry/tracing';
-import { NodeTracerProvider } from '@opentelemetry/node';
 import { buildSubgraphSchema } from '@apollo/subgraph';
+import { InMemorySpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
+import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
 
 expect.addSnapshotSerializer(spanSerializer);
 

gateway-js/src/utilities/opentelemetry.ts

@@ -7,10 +7,6 @@ import {
   MeterProvider,
   PeriodicExportingMetricReader,
 } from '@opentelemetry/sdk-metrics';
-import {
-  detectResources,
-  resourceFromAttributes,
-} from '@opentelemetry/resources';
 import { alibabaCloudEcsDetector } from '@opentelemetry/resource-detector-alibaba-cloud';
 import {
   awsBeanstalkDetector,
@@ -25,6 +21,7 @@ import {
   azureFunctionsDetector,
   azureVmDetector,
 } from '@opentelemetry/resource-detector-azure';
+import { detectResourcesSync, Resource } from '@opentelemetry/resources';
 
 export type OpenTelemetryConfig = {
   /**
@@ -144,14 +141,14 @@ export function recordExceptions(
 }
 
 export function configureOpenTelemetry(): MeterProvider {
-  const resource = detectResources({
+  const resource = detectResourcesSync({
     detectors: [alibabaCloudEcsDetector, awsEc2Detector, awsBeanstalkDetector, awsEcsDetector, awsEksDetector, awsLambdaDetector, gcpDetector, azureVmDetector, azureFunctionsDetector, azureAppServiceDetector],
   })
 
   const metricExporter = new OTLPMetricExporter();
   return new MeterProvider({
     resource: resource.merge(
-      resourceFromAttributes({
+      new Resource ({
         // Replace with any string to identify this service in your system
         'service.name': 'gateway',
       }),