upgrade to otel sdk v2, cleanup

Author: jj22ee

incubator/opentelemetry-sampler-aws-xray/package.json

@@ -44,13 +44,14 @@
     "@opentelemetry/api": "^1.9.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.26.0",
-    "@opentelemetry/resources": "^1.10.0",
-    "@opentelemetry/sdk-trace-base": "^1.26.0"
+    "@opentelemetry/core": "^2.0.0",
+    "@opentelemetry/resources": "^2.0.0",
+    "@opentelemetry/sdk-trace-base": "^2.0.0",
+    "@opentelemetry/semantic-conventions": "^1.27.0"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/sdk-trace-node": "^1.26.0",
+    "@opentelemetry/sdk-trace-node": "^2.0.0",
     "@types/mocha": "10.0.10",
     "@types/node": "18.18.14",
     "@types/sinon": "17.0.4",

incubator/opentelemetry-sampler-aws-xray/test/remote-sampler.test.ts

@@ -18,7 +18,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { Resource } from '@opentelemetry/resources';
+import { resourceFromAttributes, emptyResource } from '@opentelemetry/resources';
 import {
   SEMRESATTRS_CLOUD_PLATFORM,
   ATTR_SERVICE_NAME,
@@ -42,7 +42,7 @@ describe('AWSXRayRemoteSampler', () => {
 
   it('testCreateRemoteSamplerWithEmptyResource', () => {
     sampler = new AWSXRayRemoteSampler({
-      resource: Resource.EMPTY,
+      resource: emptyResource(),
     });
 
     expect((sampler as any)._root._root.rulePoller).not.toBeFalsy();
@@ -53,7 +53,7 @@ describe('AWSXRayRemoteSampler', () => {
   });
 
   it('testCreateRemoteSamplerWithPopulatedResource', () => {
-    const resource = new Resource({
+    const resource = resourceFromAttributes({
       [ATTR_SERVICE_NAME]: 'test-service-name',
       [SEMRESATTRS_CLOUD_PLATFORM]: 'test-cloud-platform',
     });
@@ -67,7 +67,7 @@ describe('AWSXRayRemoteSampler', () => {
   });
 
   it('testCreateRemoteSamplerWithAllFieldsPopulated', () => {
-    const resource = new Resource({
+    const resource = resourceFromAttributes({
       [ATTR_SERVICE_NAME]: 'test-service-name',
       [SEMRESATTRS_CLOUD_PLATFORM]: 'test-cloud-platform',
     });
@@ -89,7 +89,7 @@ describe('AWSXRayRemoteSampler', () => {
 
   it('toString()', () => {
     expect(
-      new AWSXRayRemoteSampler({ resource: Resource.EMPTY }).toString()
+      new AWSXRayRemoteSampler({ resource: emptyResource() }).toString()
     ).toEqual(
       'AWSXRayRemoteSampler{root=ParentBased{root=_AWSXRayRemoteSampler{awsProxyEndpoint=http://localhost:2000, rulePollingIntervalMillis=300000}, remoteParentSampled=AlwaysOnSampler, remoteParentNotSampled=AlwaysOffSampler, localParentSampled=AlwaysOnSampler, localParentNotSampled=AlwaysOffSampler}'
     );
@@ -117,15 +117,15 @@ describe('_AWSXRayRemoteSampler', () => {
 
   it('should make a POST request to the /GetSamplingRules endpoint upon initialization', async () => {
     sampler = new _AWSXRayRemoteSampler({
-      resource: Resource.EMPTY,
+      resource: emptyResource(),
       pollingInterval: pollingInterval,
     });
     sinon.assert.calledOnce(xrayClientSpy);
   });
 
   it('should make 3 POST requests to the /GetSamplingRules endpoint after 3 intervals have passed', async () => {
     sampler = new _AWSXRayRemoteSampler({
-      resource: Resource.EMPTY,
+      resource: emptyResource(),
       pollingInterval: pollingInterval,
     });
     clock.tick(pollingInterval * 1000 + 5000);