remove unused deps/vars, update package-lock

Author: jj22ee

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

@@ -40,12 +40,13 @@
     "version:update": "node ../../scripts/version-update.js",
     "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
   },
+  "peerDependencies": {
+    "@opentelemetry/api": "^1.9.0"
+  },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^1.26.0",
     "@opentelemetry/resources": "^1.10.0",
-    "@opentelemetry/sdk-trace-base": "^1.26.0",
-    "@opentelemetry/semantic-conventions": "^1.27.0"
+    "@opentelemetry/sdk-trace-base": "^1.26.0"
   },
   "devDependencies": {
     "@opentelemetry/sdk-trace-node": "^1.26.0",

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

@@ -89,7 +89,6 @@ export class _AWSXRayRemoteSampler implements Sampler {
   private awsProxyEndpoint: string;
   private samplerDiag: DiagLogger;
   private rulePoller: NodeJS.Timeout | undefined;
-  private clientId: string;
   private rulePollingJitterMillis: number;
   private samplingClient: AWSXRaySamplingClient;
 
@@ -114,7 +113,6 @@ export class _AWSXRayRemoteSampler implements Sampler {
     this.awsProxyEndpoint = samplerConfig.endpoint
       ? samplerConfig.endpoint
       : DEFAULT_AWS_PROXY_ENDPOINT;
-    this.clientId = _AWSXRayRemoteSampler.generateClientId();
 
     this.samplingClient = new AWSXRaySamplingClient(
       this.awsProxyEndpoint,
@@ -187,30 +185,4 @@ export class _AWSXRayRemoteSampler implements Sampler {
       );
     }
   }
-
-  private static generateClientId(): string {
-    const hexChars: string[] = [
-      '0',
-      '1',
-      '2',
-      '3',
-      '4',
-      '5',
-      '6',
-      '7',
-      '8',
-      '9',
-      'a',
-      'b',
-      'c',
-      'd',
-      'e',
-      'f',
-    ];
-    const clientIdArray: string[] = [];
-    for (let _ = 0; _ < 24; _ += 1) {
-      clientIdArray.push(hexChars[Math.floor(Math.random() * hexChars.length)]);
-    }
-    return clientIdArray.join('');
-  }
 }

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

@@ -46,7 +46,6 @@ describe('AWSXRayRemoteSampler', () => {
       300 * 1000
     );
     expect((sampler as any)._root._root.samplingClient).not.toBeFalsy();
-    expect((sampler as any)._root._root.clientId).toMatch(/[a-f0-9]{24}/);
   });
 
   it('testCreateRemoteSamplerWithPopulatedResource', () => {
@@ -61,7 +60,6 @@ describe('AWSXRayRemoteSampler', () => {
       300 * 1000
     );
     expect((sampler as any)._root._root.samplingClient).not.toBeFalsy();
-    expect((sampler as any)._root._root.clientId).toMatch(/[a-f0-9]{24}/);
   });
 
   it('testCreateRemoteSamplerWithAllFieldsPopulated', () => {
@@ -83,7 +81,6 @@ describe('AWSXRayRemoteSampler', () => {
     expect((sampler as any)._root._root.awsProxyEndpoint).toEqual(
       'http://abc.com'
     );
-    expect((sampler as any)._root._root.clientId).toMatch(/[a-f0-9]{24}/);
   });
 
   it('toString()', () => {
@@ -132,10 +129,4 @@ describe('_AWSXRayRemoteSampler', () => {
 
     sinon.assert.calledThrice(xrayClientSpy);
   });
-
-  it('generates valid ClientId', () => {
-    const clientId: string = _AWSXRayRemoteSampler['generateClientId']();
-    const match: RegExpMatchArray | null = clientId.match(/[0-9a-z]{24}/g);
-    expect(match).not.toBeNull();
-  });
 });