added buttercup payment to payment

Author: hagen-p

.gitignore

@@ -63,3 +63,5 @@ src/payment/charge.js.original
 src/payment/logger.js.not sure
 src/payment/logger.js.original
 src/payment.zip
+src/payment-old
+src/payment/*.bak

kubernetes/opentelemetry-demo.yaml

@@ -1877,6 +1877,14 @@ spec:
                   fieldPath: status.hostIP
             - name: OTEL_COLLECTOR_NAME
               value: $(NODE_IP)
+            - name: OTEL_TRACES_EXPORTER
+              value: otlp
+            - name: OTEL_METRICS_EXPORTER
+              value: otlp
+            - name: OTEL_LOGS_EXPORTER
+              value: otlp
+            - name: SPLUNK_OTEL_LOG_CORRELATION_ENABLED
+              value: "true"
             - name: OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
               value: cumulative
             - name: PAYMENT_PORT

src/payment/.dockerignore

@@ -1,6 +1,4 @@
 node_modules/
 .dockerignore
-Dockerfile
-package.json
-package-lock.json
+Dockerfiledok
 README.md

src/payment/Dockerfile

@@ -2,30 +2,40 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
-FROM docker.io/library/node:22-slim AS builder
+FROM docker.io/library/node:22 AS builder
 
 WORKDIR /usr/src/app/
 
 COPY ./src/payment/package.json package.json
 COPY ./src/payment/package-lock.json package-lock.json
 
-RUN npm ci --omit=dev
+RUN npm ci --omit=dev && chmod -R go+r node_modules/@splunk/otel
 
 # -----------------------------------------------------------------------------
 
-FROM gcr.io/distroless/nodejs22-debian12:nonroot
+FROM docker.io/library/node:22
 
 WORKDIR /usr/src/app/
 
+# Create non-root user for security
+RUN groupadd -r appuser && useradd -r -g appuser appuser
+
 COPY --from=builder /usr/src/app/node_modules/ node_modules/
 
 COPY ./pb/demo.proto demo.proto
 
 COPY ./src/payment/charge.js charge.js
 COPY ./src/payment/index.js index.js
 COPY ./src/payment/logger.js logger.js
-#COPY ./src/payment/opentelemetry.js opentelemetry.js
+COPY ./src/payment/opentelemetry.js opentelemetry.js
+
+# Set ownership for non-root user
+RUN chown -R appuser:appuser /usr/src/app
 
 EXPOSE ${PAYMENT_PORT}
 
-CMD ["-r", "@splunk/otel/instrument", "index.js"]
+# Switch to non-root user
+USER appuser
+
+#CMD ["node", "-r @splunk/otel/instrument index.js"]
+CMD ["--require=./opentelemetry.js", "index.js"]

src/payment/build-payment.sh

@@ -1,11 +1,12 @@
 #!/bin/bash -e
 
 # Usage:
-#   ./build.sh <version> [-cc] 
+#   ./build-payment.sh <version> [-cc]
 
 if [ -z "$1" ]; then
   echo "❌ Error: No version provided."
-  echo "Usage: $0 <version> [-cc] "
+  echo "Usage: $0 <version> [-cc]"
+  exit 1
 fi
 
 VERSION="$1"
@@ -14,28 +15,47 @@ CACHE_OPTION=""
 # Check if the second arg is -cc
 if [[ "$2" == "-cc" ]]; then
   CACHE_OPTION="--no-cache"
-  # Shift all remaining args so $2 becomes RUM_TOKEN
-  shift
 fi
-URL_PREFIX="$6"
 
-
-# Move two directories up from src/recomndation
+# Move two directories up from src/payment
 cd "$(dirname "$0")/../.."
 
-# Build command
+echo "Building payment service version: $VERSION"
+echo "Build options: ${CACHE_OPTION:-default caching enabled}"
+
+# Build without push first
 DOCKER_CMD=(
   docker buildx build
   --platform=linux/amd64,linux/arm64
   $CACHE_OPTION
   --build-arg VERSION="$VERSION"
   -t ghcr.io/splunk/opentelemetry-demo/otel-payment:"$VERSION"
-  --push
+  --load
   -f src/payment/Dockerfile
+  .
 )
 
-# Add build context
-DOCKER_CMD+=( . )
+echo "Executing build command..."
+if ! "${DOCKER_CMD[@]}"; then
+  echo "❌ Error: Docker build failed"
+  exit 1
+fi
+
+echo "✅ Build successful"
+
+# Verify image exists locally
+if ! docker image inspect ghcr.io/splunk/opentelemetry-demo/otel-payment:"$VERSION" > /dev/null 2>&1; then
+  echo "❌ Error: Built image not found locally"
+  exit 1
+fi
+
+echo "✅ Image verified locally"
+
+# Push the image
+echo "Pushing image to registry..."
+if ! docker push ghcr.io/splunk/opentelemetry-demo/otel-payment:"$VERSION"; then
+  echo "❌ Error: Push failed. Check your registry authentication."
+  exit 1
+fi
 
-# Execute the build
-"${DOCKER_CMD[@]}"
+echo "✅ Successfully pushed ghcr.io/splunk/opentelemetry-demo/otel-payment:$VERSION"

src/payment/charge.js

@@ -1,6 +1,5 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
-///Update Tghis !!!
 const { context, propagation, trace, metrics, SpanKind, SpanStatusCode } = require('@opentelemetry/api');
 const cardValidator = require('simple-card-validator');
 const { v4: uuidv4 } = require('uuid');
@@ -295,7 +294,7 @@ module.exports.charge = async request => {
       'http.status_code': finalCode,
     });
 
-    // set explicit error status on the root span so it doesn’t show as “unknown”
+    // set explicit error status on the root span so it doesn't show as "unknown"
     span.setStatus({ code: SpanStatusCode.ERROR, message: String(finalCode) });
 
     // keep baggage handling as you have it

src/payment/index.js

@@ -44,12 +44,24 @@ server.addService(health.service, new health.Implementation({
 
 server.addService(otelDemoPackage.oteldemo.PaymentService.service, { charge: chargeServiceHandler })
 
-server.bindAsync(`0.0.0.0:${process.env['PAYMENT_PORT']}`, grpc.ServerCredentials.createInsecure(), (err, port) => {
+
+let ip = "0.0.0.0";
+
+const ipv6_enabled = process.env.IPV6_ENABLED;
+
+if (ipv6_enabled == "true") {
+  ip = "[::]";
+  logger.info(`Overwriting Localhost IP: ${ip}`)
+}
+
+const address = ip + `:${process.env['PAYMENT_PORT']}`;
+
+server.bindAsync(address, grpc.ServerCredentials.createInsecure(), (err, port) => {
   if (err) {
     return logger.error({ err })
   }
 
-  logger.info(`payment gRPC server started on port ${port}`)
+  logger.info(`payment gRPC server started on ${address}`)
 })
 
 process.once('SIGINT', closeGracefully)

src/payment/logger.js

@@ -1,34 +1,38 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-const pino = require('pino');
-const { context, trace } = require('@opentelemetry/api');
+const pino = require('pino')
 
-const logger = pino({
-  // Match desired base fields
-  base: { name: 'paymentservice' },        // shows up as "name"
-  pid: process.pid,
-  hostname: require('os').hostname(),
-  messageKey: 'message',                   // your examples use "message"
-  timestamp: pino.stdTimeFunctions.unixTime, // Unix seconds in "time"
-  // Map level -> { severity: "<level>" }
-  formatters: {
-    level: (label) => ({ severity: label }),
-  },
-  // Inject OTEL fields when a span is active
-  mixin() {
-    const span = trace.getSpan(context.active());
-    const svc = process.env.OTEL_SERVICE_NAME || 'paymentservice';
-    const base = { 'service.name': svc };
-    if (span && typeof span.spanContext === 'function') {
-      const sc = span.spanContext();
-      if (sc) {
-        // slice low 64-bits of 128-bit trace id to match your example format
-        base.trace_id = (sc.traceId || '').slice(-16);
-        base.span_id = sc.spanId;
+const transport = pino.transport({
+  target: 'pino-opentelemetry-transport',
+  options: {
+    logRecordProcessorOptions: [
+      {
+        recordProcessorType: 'batch',
+        exporterOptions: {
+          protocol: 'grpc',
+        }
+      },
+      {
+        recordProcessorType: 'simple',
+        exporterOptions: { protocol: 'console' }
       }
+    ],
+    loggerName: 'payment-logger',
+    serviceVersion: '1.0.0'
+  }
+})
+
+const logger = pino(transport, {
+  mixin() {
+    return {
+      'service.name': process.env['OTEL_SERVICE_NAME'],
     }
-    return base;
+  },
+  formatters: {
+    level: (label) => {
+      return { 'level': label };
+    },
   },
 });
 

src/payment/opentelemetry.js

@@ -0,0 +1,76 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+// const { start } = require('@splunk/otel');
+
+// start({
+//    serviceName: 'my-node-service',
+//    endpoint: 'http://localhost:4317'
+// });
+// 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 {RuntimeNodeInstrumentation} = require('@opentelemetry/instrumentation-runtime-node')
+
+// const sdk = new opentelemetry.NodeSDK({
+//   traceExporter: new OTLPTraceExporter(),
+//   instrumentations: [
+//     getNodeAutoInstrumentations({
+//       // only instrument fs if it is part of another trace
+//       '@opentelemetry/instrumentation-fs': {
+//         requireParentSpan: true,
+//       },
+//     }),
+//     new RuntimeNodeInstrumentation({
+//       monitoringPrecision: 5000,
+//     })
+//   ],
+//   metricReader: new PeriodicExportingMetricReader({
+//     exporter: new OTLPMetricExporter()
+//   }),
+//   resourceDetectors: [
+//     containerDetector,
+//     envDetector,
+//     hostDetector,
+//     osDetector,
+//     processDetector,
+//     alibabaCloudEcsDetector,
+//     awsEksDetector,
+//     awsEc2Detector,
+//     gcpDetector
+//   ],
+// })
+
+// sdk.start();
+const { start } = require('@splunk/otel');
+// Print relevant OTEL/Splunk environment variables
+console.log('=== OpenTelemetry Environment Variables ===');
+[
+  'OTEL_SERVICE_NAME',
+  'OTEL_EXPORTER_OTLP_ENDPOINT',
+  'OTEL_EXPORTER_OTLP_TRACES_ENDPOINT',
+  //'OTEL_EXPORTER_OTLP_METRICS_ENDPOINT',
+  'OTEL_RESOURCE_ATTRIBUTES',
+  'SPLUNK_PROFILER_ENABLED',
+  'SPLUNK_PROFILER_MEMORY_ENABLED',
+  'SPLUNK_PROFILER_CALL_STACK_INTERVAL',
+  'OTEL_PROFILER_LOGS_ENDPOINT',
+  'OTEL_LOG_LEVEL'
+].forEach((key) => {
+  if (process.env[key]) {
+    console.log(`${key}: ${process.env[key]}`);
+  } else {
+    console.log(`${key}: (not set)`);
+  }
+});
+
+console.log('===========================================');
+
+start();