[paymentservice] Adds otel logging support

src/paymentservice/charge.js

@@ -62,7 +62,17 @@ module.exports.charge = async request => {
   span.end();
 
   const { units, nanos, currencyCode } = request.amount;
-  logger.info({transactionId, cardType, lastFourDigits, amount: { units, nanos, currencyCode }}, "Transaction complete.");
+  logger.emit({
+		severityNumber: SeverityNumber.INFO,
+		severityText: "INFO",
+		body: "Transaction complete.",
+		attributes: {
+			transactionId,
+			cardType,
+			lastFourDigits,
+			amount: { units, nanos, currencyCode },
+		},
+  });
   transactionsCounter.add(1, {"app.payment.currency": currencyCode})
   return { transactionId }
 }

src/paymentservice/index.js

@@ -1,59 +1,83 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
-const grpc = require('@grpc/grpc-js')
-const protoLoader = require('@grpc/proto-loader')
-const health = require('grpc-js-health-check')
-const opentelemetry = require('@opentelemetry/api')
+const grpc = require("@grpc/grpc-js");
+const protoLoader = require("@grpc/proto-loader");
+const health = require("grpc-js-health-check");
+const opentelemetry = require("@opentelemetry/api");
+const { SeverityNumber } = require("@opentelemetry/api-logs");
 
-const charge = require('./charge')
-const logger = require('./logger')
+const charge = require("./charge");
+const logger = require("./logger");
 
 async function chargeServiceHandler(call, callback) {
-  const span = opentelemetry.trace.getActiveSpan();
+	const span = opentelemetry.trace.getActiveSpan();
 
-  try {
-    const amount = call.request.amount
-    span.setAttributes({
-      'app.payment.amount': parseFloat(`${amount.units}.${amount.nanos}`)
-    })
-    logger.info({ request: call.request }, "Charge request received.")
+	try {
+		const amount = call.request.amount;
+		span.setAttributes({
+			"app.payment.amount": parseFloat(`${amount.units}.${amount.nanos}`),
+		});
+		logger.emit({
+			severityNumber: SeverityNumber.INFO,
+			severityText: "INFO",
+			body: "Charge request received.",
+			attributes: { request: call.request },
+		});
 
-    const response = await charge.charge(call.request)
-    callback(null, response)
+		const response = await charge.charge(call.request);
+		callback(null, response);
+	} catch (err) {
+		logger.emit({
+			severityNumber: SeverityNumber.WARN,
+			severityText: "ERROR",
+			body: "Charge request failed.",
+			attributes: { request: call.request },
+		});
 
-  } catch (err) {
-    logger.warn({ err })
+		span.recordException(err);
+		span.setStatus({ code: opentelemetry.SpanStatusCode.ERROR });
 
-    span.recordException(err)
-    span.setStatus({ code: opentelemetry.SpanStatusCode.ERROR })
-
-    callback(err)
-  }
+		callback(err);
+	}
 }
 
 async function closeGracefully(signal) {
-  server.forceShutdown()
-  process.kill(process.pid, signal)
+	server.forceShutdown();
+	process.kill(process.pid, signal);
 }
 
-const otelDemoPackage = grpc.loadPackageDefinition(protoLoader.loadSync('demo.proto'))
-const server = new grpc.Server()
+const otelDemoPackage = grpc.loadPackageDefinition(
+	protoLoader.loadSync("demo.proto")
+);
+const server = new grpc.Server();
 
-server.addService(health.service, new health.Implementation({
-  '': health.servingStatus.SERVING
-}))
+server.addService(
+	health.service,
+	new health.Implementation({
+		"": health.servingStatus.SERVING,
+	})
+);
 
-server.addService(otelDemoPackage.oteldemo.PaymentService.service, { charge: chargeServiceHandler })
+server.addService(otelDemoPackage.oteldemo.PaymentService.service, {
+	charge: chargeServiceHandler,
+});
 
-server.bindAsync(`0.0.0.0:${process.env['PAYMENT_SERVICE_PORT']}`, grpc.ServerCredentials.createInsecure(), (err, port) => {
-  if (err) {
-    return logger.error({ err })
-  }
+server.bindAsync(
+	`0.0.0.0:${process.env["PAYMENT_SERVICE_PORT"]}`,
+	grpc.ServerCredentials.createInsecure(),
+	(err, port) => {
+		if (err) {
+			return logger.error({ err });
+		}
 
-  logger.info(`PaymentService gRPC server started on port ${port}`)
-  server.start()
-}
-)
+		logger.emit({
+			severityNumber: SeverityNumber.INFO,
+			severityText: "INFO",
+			body: `PaymentService gRPC server started on port ${port}.`,
+		});
+		server.start();
+	}
+);
 
-process.once('SIGINT', closeGracefully)
-process.once('SIGTERM', closeGracefully)
+process.once('SIGINT', closeGracefully);
+process.once('SIGTERM', closeGracefully);

src/paymentservice/logger.js

@@ -1,6 +1,16 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
+const {
+	LoggerProvider,
+	SimpleLogRecordProcessor,
+	ConsoleLogRecordExporter,
+} = require("@opentelemetry/sdk-logs");
+import { logs } from "@opentelemetry/api-logs";
 
-const pino = require('pino');
+const loggerProvider = new LoggerProvider();
+loggerProvider.addLogRecordProcessor(
+	new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())
+);
+logs.setGlobalLoggerProvider(loggerProvider);
 
-module.exports = pino();
+module.exports = logs.getLogger("paymentservice", "1.0.0");

src/paymentservice/opentelemetry.js

@@ -1,41 +1,52 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-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 { NodeSDK, tracing } = require("@opentelemetry/sdk-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,
-      },
-    })
-  ],
-  metricReader: new PeriodicExportingMetricReader({
-    exporter: new OTLPMetricExporter()
-  }),
-  resourceDetectors: [
-    containerDetector,
-    envDetector,
-    hostDetector,
-    osDetector,
-    processDetector,
-    alibabaCloudEcsDetector,
-    awsEksDetector,
-    awsEc2Detector,
-    gcpDetector
-  ],
-})
+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 NodeSDK({
+	traceExporter: new OTLPTraceExporter(),
+	spanProcessor: new tracing.SimpleSpanProcessor(
+		new tracing.ConsoleSpanExporter()
+	),
+	metricReader: new PeriodicExportingMetricReader({
+		exporter: new OTLPMetricExporter(),
+	}),
+	resourceDetectors: [
+		containerDetector,
+		envDetector,
+		hostDetector,
+		osDetector,
+		processDetector,
+		alibabaCloudEcsDetector,
+		awsEksDetector,
+		awsEc2Detector,
+		gcpDetector,
+	],
+});
 
 sdk.start();