demo(cnl): edit payment service

kubeshop · Sep 13, 2023 · b288376 · b288376
1 parent 908f112
commit b288376
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 82 deletions.
diff --git a/src/paymentservice/charge.js b/src/paymentservice/charge.js
@@ -32,7 +32,7 @@ module.exports.charge = request => {
   /**
    * 3. Demo: Create a new active span without the need to pass a parent span
    */
-  // const span = tracer.startSpan('charge')
+  const span = tracer.startSpan('charge')
 
   const {
     creditCardNumber: number,
@@ -50,10 +50,10 @@ module.exports.charge = request => {
   /**
    * 1. Demo: Add span attributes and events for custom test specs
    */
-  // span.setAttributes({
-  //   'app.payment.card_type': cardType,
-  //   'app.payment.card_valid': valid
-  // })
+  span.setAttributes({
+    'app.payment.card_type': cardType,
+    'app.payment.card_valid': valid
+  })
 
   if (!valid) {
     throw new Error('Credit card info is invalid.')
@@ -79,7 +79,7 @@ module.exports.charge = request => {
    * 1. Demo: Use the active span from context.
    * End the span.
    */
-  // span.end()
+  span.end()
 
   const { units, nanos, currencyCode } = request.amount
   logger.info({transactionId, cardType, lastFourDigits, amount: { units, nanos, currencyCode }}, "Transaction complete.")

diff --git a/src/paymentservice/index.js b/src/paymentservice/index.js
@@ -30,49 +30,49 @@ function chargeServiceHandler(call, callback) {
   /**
    * 3. Demo: Create a new active span without the need to pass a parent span
    */
-  // return tracer.startActiveSpan('chargeServiceHandler', span => {...})
-
-  try {
-    const amount = call.request.amount
-
-    /**
-     * 1. Demo: Add span attributes and events for custom test specs
-     */
-    // span.setAttributes({
-    //   'app.payment.amount': parseFloat(`${amount.units}.${amount.nanos}`)
-    // })
-    // span.addEvent('Charge request received.', {
-    //   'log.severity': 'info',
-    //   'log.message': 'Charge request received.',
-    //   'request': call.request,
-    // })
-
-    const response = charge.charge(call.request)
-
-    /**
-     * 1. Demo: Add span attributes and events for custom test specs
-     */
-    // span.setStatus({ code: SpanStatusCode.OK })
-    // span.end()
-
-    callback(null, response)
-
-  } catch (err) {
-
-    /**
-     * 1. Demo: Add span attributes and events for custom test specs
-     */
-    // span.addEvent('Charge request error.', {
-    //   'log.severity': 'warn',
-    //   'log.message': 'Charge request error.',
-    //   'error': err,
-    // })
-    // span.recordException(err)
-    // span.setStatus({ code: SpanStatusCode.ERROR })
-    // span.end()
-
-    callback(err)
-  }
+  return tracer.startActiveSpan('chargeServiceHandler', span => {
+    try {
+      const amount = call.request.amount
+
+      /**
+       * 1. Demo: Add span attributes and events for custom test specs
+       */
+      span.setAttributes({
+        'app.payment.amount': parseFloat(`${amount.units}.${amount.nanos}`)
+      })
+      span.addEvent('Charge request received.', {
+        'log.severity': 'info',
+        'log.message': 'Charge request received.',
+        'request': call.request,
+      })
+
+      const response = charge.charge(call.request)
+
+      /**
+       * 1. Demo: Add span attributes and events for custom test specs
+       */
+      span.setStatus({ code: SpanStatusCode.OK })
+      span.end()
+
+      callback(null, response)
+
+    } catch (err) {
+
+      /**
+       * 1. Demo: Add span attributes and events for custom test specs
+       */
+      span.addEvent('Charge request error.', {
+        'log.severity': 'warn',
+        'log.message': 'Charge request error.',
+        'error': err,
+      })
+      span.recordException(err)
+      span.setStatus({ code: SpanStatusCode.ERROR })
+      span.end()
+
+      callback(err)
+    }
+  })
 }
 
 async function closeGracefully(signal) {

diff --git a/src/paymentservice/opentelemetry.js b/src/paymentservice/opentelemetry.js
@@ -2,38 +2,38 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // Auto Start
-// const opentelemetry = require("@opentelemetry/sdk-node")
-// const {getNodeAutoInstrumentations} = require("@opentelemetry/auto-instrumentations-node")
-// const {OTLPTraceExporter} = require('@opentelemetry/exporter-trace-otlp-grpc')
-// const {OTLPMetricExporter} = require('@opentelemetry/exporter-metrics-otlp-grpc')
-// const {PeriodicExportingMetricReader} = require('@opentelemetry/sdk-metrics')
-// const {alibabaCloudEcsDetector} = require('@opentelemetry/resource-detector-alibaba-cloud')
-// const {awsEc2Detector, awsEksDetector} = require('@opentelemetry/resource-detector-aws')
-// const {containerDetector} = require('@opentelemetry/resource-detector-container')
-// const {gcpDetector} = require('@opentelemetry/resource-detector-gcp')
-// const {envDetector, hostDetector, osDetector, processDetector} = require('@opentelemetry/resources')
+const opentelemetry = require("@opentelemetry/sdk-node")
+const {getNodeAutoInstrumentations} = require("@opentelemetry/auto-instrumentations-node")
+const {OTLPTraceExporter} = require('@opentelemetry/exporter-trace-otlp-grpc')
+const {OTLPMetricExporter} = require('@opentelemetry/exporter-metrics-otlp-grpc')
+const {PeriodicExportingMetricReader} = require('@opentelemetry/sdk-metrics')
+const {alibabaCloudEcsDetector} = require('@opentelemetry/resource-detector-alibaba-cloud')
+const {awsEc2Detector, awsEksDetector} = require('@opentelemetry/resource-detector-aws')
+const {containerDetector} = require('@opentelemetry/resource-detector-container')
+const {gcpDetector} = require('@opentelemetry/resource-detector-gcp')
+const {envDetector, hostDetector, osDetector, processDetector} = require('@opentelemetry/resources')
 
-// const sdk = new opentelemetry.NodeSDK({
-//   traceExporter: new OTLPTraceExporter(),
-//   instrumentations: [
-//     getNodeAutoInstrumentations()
-//   ],
-//   metricReader: new PeriodicExportingMetricReader({
-//     exporter: new OTLPMetricExporter(),
-//   }),
-//   resourceDetectors: [
-//     containerDetector,
-//     envDetector,
-//     hostDetector,
-//     osDetector,
-//     processDetector,
-//     alibabaCloudEcsDetector,
-//     awsEksDetector,
-//     awsEc2Detector,
-//     gcpDetector
-//   ],
-// })
-// sdk.start()
+const sdk = new opentelemetry.NodeSDK({
+  traceExporter: new OTLPTraceExporter(),
+  instrumentations: [
+    getNodeAutoInstrumentations()
+  ],
+  metricReader: new PeriodicExportingMetricReader({
+    exporter: new OTLPMetricExporter(),
+  }),
+  resourceDetectors: [
+    containerDetector,
+    envDetector,
+    hostDetector,
+    osDetector,
+    processDetector,
+    alibabaCloudEcsDetector,
+    awsEksDetector,
+    awsEc2Detector,
+    gcpDetector
+  ],
+})
+sdk.start()
 // Auto End
 
 // Manual Start

diff --git a/test/tracetesting/payment-service/cnl-demo/exploratory-test-valid-credit-card.yaml b/test/tracetesting/payment-service/cnl-demo/exploratory-test-valid-credit-card.yaml
@@ -9,8 +9,8 @@ spec:
   trigger:
     type: grpc
     grpc:
-      protobufFile: ../../../pb/demo.proto
-      address: paymentservice:50051 # ${env:PAYMENT_SERVICE_ADDR}
+      protobufFile: ../../../../pb/demo.proto
+      address: paymentservice:50051
       method: oteldemo.PaymentService.Charge
       request: |-
         {

diff --git a/test/tracetesting/payment-service/valid-credit-card.yaml b/test/tracetesting/payment-service/valid-credit-card.yaml
@@ -37,3 +37,7 @@ spec:
       selector: span[tracetest.span.type="general" name="Tracetest trigger"]
       assertions:
         - attr:tracetest.response.body | json_path '$.transactionId' != ""
+    - name: It should return a valid credit card
+      selector: span[tracetest.span.type="general" name="charge"]
+      assertions: 
+        - attr:app.payment.card_valid = "true"