Cleanup

Author: anuraaga

plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/bedrock-runtime.ts

@@ -57,6 +57,7 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
   private operationDuration!: Histogram;
 
   updateMetricInstruments(meter: Meter) {
+    // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclienttokenusage
     this.tokenUsage = meter.createHistogram('gen_ai.client.token.usage', {
       unit: '{token}',
       description: 'Measures number of input and output tokens used',
@@ -68,6 +69,8 @@ export class BedrockRuntimeServiceExtension implements ServiceExtension {
         ],
       },
     });
+
+    // https://opentelemetry.io/docs/specs/semconv/gen-ai/gen-ai-metrics/#metric-gen_aiclientoperationduration
     this.operationDuration = meter.createHistogram(
       'gen_ai.client.operation.duration',
       {

plugins/node/opentelemetry-instrumentation-aws-sdk/test/lambda.test.ts

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { getTestSpans } from '@opentelemetry/contrib-test-utils';
 import './load-instrumentation';
 
+import { getTestSpans } from '@opentelemetry/contrib-test-utils';
 import {
   SEMATTRS_FAAS_EXECUTION,
   SEMATTRS_FAAS_INVOKED_NAME,

plugins/node/opentelemetry-instrumentation-aws-sdk/test/load-instrumentation.ts

@@ -13,6 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ * Because all tests in this folder are run in the same process, if instantiating
+ * instrumentation within tests with different configurations such as metrics support,
+ * it can be difficult to ensure the correct instrumentation is applied during the
+ * specific test. We instead instantiate a single instrumentation instance here to
+ * use within all tests.
+ */
 import {
   initMeterProvider,
   registerInstrumentationTesting,
@@ -21,5 +29,4 @@ import { AwsInstrumentation } from '../src';
 
 export const instrumentation = new AwsInstrumentation();
 export const metricReader = initMeterProvider(instrumentation);
-instrumentation._updateMetricInstruments();
 registerInstrumentationTesting(instrumentation);