@uoa/lambda-tracing 2.0.1 → 2.0.2

package/dist/tracing.d.ts

@@ -1,3 +1,5 @@
+import { Tracer } from "@opentelemetry/api";
 export declare function initializeTracing(serviceName: string): void;
+export declare function getTracer(): Tracer;
 export declare function getTraceInfoHeader(): string;
 export declare function setTraceInfoHeader(info: string): void;

package/dist/tracing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setTraceInfoHeader = exports.getTraceInfoHeader = exports.initializeTracing = void 0;
+exports.setTraceInfoHeader = exports.getTraceInfoHeader = exports.getTracer = exports.initializeTracing = void 0;
 const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
 const instrumentation_aws_lambda_1 = require("@opentelemetry/instrumentation-aws-lambda");
 const instrumentation_1 = require("@opentelemetry/instrumentation");
@@ -10,6 +10,8 @@ const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
 const zipkin_1 = require("./zipkin/zipkin");
 const provider = new sdk_trace_node_1.NodeTracerProvider({ sampler: new sdk_trace_base_1.AlwaysOnSampler() });
 let infoHeader;
+let tracer;
+let name;
 function initializeTracing(serviceName) {
     const options = {
         url: process.env.zipkinUrl ? process.env.zipkinUrl : 'http://internal-zipkin-uoa-its-nonprod-internal-1407434909.ap-southeast-2.elb.amazonaws.com:443/api/v2/spans',
@@ -36,8 +38,19 @@ function initializeTracing(serviceName) {
             })
         ]
     });
+    name = serviceName;
+    tracer = api_1.trace.getTracer(serviceName);
 }
 exports.initializeTracing = initializeTracing;
+function getTracer() {
+    if (tracer) {
+        return tracer;
+    }
+    else {
+        return api_1.trace.getTracer(name);
+    }
+}
+exports.getTracer = getTracer;
 function getTraceInfoHeader() {
     if (infoHeader) {
         return infoHeader;

package/dist/uoaHttps.js

@@ -34,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const https = __importStar(require("https"));
 const api_1 = require("@opentelemetry/api");
+const tracing_1 = require("./tracing");
 function request(...args) {
     if (args[2]) {
         api_1.propagation.inject(api_1.context.active(), args[1].headers);
@@ -62,7 +63,12 @@ function doGetRequest(hostname, path, headers, port = 443) {
                 });
                 response.on("end", function () {
                     let body = Buffer.concat(chunks);
-                    body = JSON.parse(body.toString());
+                    if (options.headers['Content-Type'] === 'application/json') {
+                        body = JSON.parse(body.toString());
+                    }
+                    else {
+                        body = body.toString();
+                    }
                     resolve(body);
                 });
                 response.on("error", function (e) {
@@ -73,6 +79,15 @@ function doGetRequest(hostname, path, headers, port = 443) {
         });
     });
 }
+function doGetRequestExternal(hostname, path, headers, port = 443) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (0, tracing_1.getTracer)().startActiveSpan(hostname + path, (span) => __awaiter(this, void 0, void 0, function* () {
+            const result = yield doGetRequest(hostname, path, headers, port);
+            span.end();
+            return result;
+        }));
+    });
+}
 function doPostRequest(hostname, path, headers, data, port = 443) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise(function (resolve, reject) {
@@ -123,6 +138,15 @@ function doPostRequest(hostname, path, headers, data, port = 443) {
         });
     });
 }
+function doPostRequestExternal(hostname, path, headers, data, port = 443) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (0, tracing_1.getTracer)().startActiveSpan(hostname + path, (span) => __awaiter(this, void 0, void 0, function* () {
+            const result = yield doPostRequest(hostname, path, headers, port);
+            span.end();
+            return result;
+        }));
+    });
+}
 function doPutRequest(hostname, path, headers, data, port = 443) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise(function (resolve, reject) {
@@ -173,6 +197,15 @@ function doPutRequest(hostname, path, headers, data, port = 443) {
         });
     });
 }
+function doPutRequestExternal(hostname, path, headers, data, port = 443) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (0, tracing_1.getTracer)().startActiveSpan(hostname + path, (span) => __awaiter(this, void 0, void 0, function* () {
+            const result = yield doPutRequest(hostname, path, headers, port);
+            span.end();
+            return result;
+        }));
+    });
+}
 function doDeleteRequest(hostname, path, headers, port = 443) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise(function (resolve, reject) {
@@ -213,10 +246,23 @@ function doDeleteRequest(hostname, path, headers, port = 443) {
         });
     });
 }
+function doDeleteRequestExternal(hostname, path, headers, data, port = 443) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (0, tracing_1.getTracer)().startActiveSpan(hostname + path, (span) => __awaiter(this, void 0, void 0, function* () {
+            const result = yield doDeleteRequest(hostname, path, headers, port);
+            span.end();
+            return result;
+        }));
+    });
+}
 module.exports = {
     request,
     doGetRequest,
     doPostRequest,
     doPutRequest,
-    doDeleteRequest
+    doDeleteRequest,
+    doGetRequestExternal,
+    doPostRequestExternal,
+    doPutRequestExternal,
+    doDeleteRequestExternal
 };

package/package.json

@@ -1,43 +1,43 @@
-{
-  "name": "@uoa/lambda-tracing",
-  "version": "2.0.1",
-  "description": "Library for logging & distributed tracing in UoA Lambda projects",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@bitbucket.org/uoa/lambda-tracing.git"
-  },
-  "author": "Mitchell Faulconbridge <mitchell.faulconbridge@auckland.ac.nz>",
-  "license": "MIT",
-  "homepage": "https://bitbucket.org/uoa/lambda-tracing#readme",
-  "keywords": [
-    "uoa",
-    "lambda",
-    "logging",
-    "distributed-tracing"
-  ],
-  "main": "dist/tracing.js",
-  "types": "dist/tracing.d.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "prepare": "tsc"
-  },
-  "exports": {
-    ".": "./dist/tracing.js",
-    "./tracing": "./dist/tracing.js",
-    "./uoaHttps": "./dist/uoaHttps.js",
-    "./logging": "./dist/logging.js"
-  },
-  "dependencies": {
-    "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/core": "^1.8.0",
-    "@opentelemetry/instrumentation": "^0.28.0",
-    "@opentelemetry/instrumentation-aws-lambda": "^0.31.0",
-    "@opentelemetry/sdk-trace-node": "^1.8.0",
-    "moment": "^2.29.3",
-    "winston": "^3.7.2"
-  },
-  "devDependencies": {
-    "@types/node": "^17.0.35",
-    "typescript": "^4.7.2"
-  }
-}
+{
+  "name": "@uoa/lambda-tracing",
+  "version": "2.0.2",
+  "description": "Library for logging & distributed tracing in UoA Lambda projects",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@bitbucket.org/uoa/lambda-tracing.git"
+  },
+  "author": "Mitchell Faulconbridge <mitchell.faulconbridge@auckland.ac.nz>",
+  "license": "MIT",
+  "homepage": "https://bitbucket.org/uoa/lambda-tracing#readme",
+  "keywords": [
+    "uoa",
+    "lambda",
+    "logging",
+    "distributed-tracing"
+  ],
+  "main": "dist/tracing.js",
+  "types": "dist/tracing.d.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "prepare": "tsc"
+  },
+  "exports": {
+    ".": "./dist/tracing.js",
+    "./tracing": "./dist/tracing.js",
+    "./uoaHttps": "./dist/uoaHttps.js",
+    "./logging": "./dist/logging.js"
+  },
+  "dependencies": {
+    "@opentelemetry/api": "^1.1.0",
+    "@opentelemetry/core": "^1.8.0",
+    "@opentelemetry/instrumentation": "^0.28.0",
+    "@opentelemetry/instrumentation-aws-lambda": "^0.31.0",
+    "@opentelemetry/sdk-trace-node": "^1.8.0",
+    "moment": "^2.29.3",
+    "winston": "^3.7.2"
+  },
+  "devDependencies": {
+    "@types/node": "^17.0.35",
+    "typescript": "^4.7.2"
+  }
+}

package/tracing.ts

@@ -2,12 +2,14 @@ import {NodeTracerProvider, BatchSpanProcessor} from '@opentelemetry/sdk-trace-n
 import {AwsLambdaInstrumentation} from '@opentelemetry/instrumentation-aws-lambda';
 import {registerInstrumentations} from '@opentelemetry/instrumentation';
 import {B3_INFO_KEY, UoaB3Propagator} from "./UoaB3Propagator";
-import {context} from "@opentelemetry/api";
+import {context, trace, Tracer} from "@opentelemetry/api";
 import {AlwaysOnSampler} from "@opentelemetry/sdk-trace-base";
 import {ZipkinExporter} from "./zipkin/zipkin";
 
 const provider = new NodeTracerProvider({sampler: new AlwaysOnSampler()});
 let infoHeader: string | undefined;
+let tracer: Tracer | undefined;
+let name : string;
 
 export function initializeTracing(serviceName: string) {
     const options = {
@@ -35,7 +37,16 @@ export function initializeTracing(serviceName: string) {
             })
         ]
     })
+    name = serviceName;
+    tracer = trace.getTracer(serviceName);
+}
 
+export function getTracer(): Tracer  {
+    if (tracer) {
+        return tracer;
+    } else {
+        return trace.getTracer(name);
+    }
 }
 
 export function getTraceInfoHeader(): string {
@@ -49,3 +60,4 @@ export function getTraceInfoHeader(): string {
 export function setTraceInfoHeader(info: string) {
     infoHeader = info;
 }
+

package/uoaHttps.ts

@@ -1,8 +1,9 @@
 import * as https from "https";
 import * as http from "http";
 import { URL } from "url";
-import {context, propagation} from "@opentelemetry/api";
+import {context, propagation, trace} from "@opentelemetry/api";
 import {RequestOptions} from "https";
+import {getTracer} from "./tracing";
 
 function request(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
 function request(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
@@ -35,8 +36,12 @@ async function doGetRequest(hostname: string, path: string, headers: any, port:
             });
 
             response.on("end", function () {
-                let body = Buffer.concat(chunks);
-                body = JSON.parse(body.toString());
+                let body: any = Buffer.concat(chunks);
+                if (options.headers['Content-Type'] === 'application/json') {
+                    body = JSON.parse(body.toString());
+                } else {
+                    body = body.toString();
+                }
                 resolve(body);
             });
 
@@ -46,6 +51,15 @@ async function doGetRequest(hostname: string, path: string, headers: any, port:
         });
 
         req.end();
+
+    });
+}
+
+async function doGetRequestExternal(hostname: string, path: string, headers: any, port: number | string = 443) {
+    return getTracer().startActiveSpan(hostname+path, async (span) => {
+        const result = await doGetRequest(hostname, path, headers, port);
+        span.end();
+        return result;
     });
 }
 
@@ -100,6 +114,14 @@ async function doPostRequest(hostname: string, path: string, headers: any, data:
     });
 }
 
+async function doPostRequestExternal(hostname: string, path: string, headers: any, data: any, port: number | string = 443) {
+    return getTracer().startActiveSpan(hostname+path, async(span) => {
+        const result = await doPostRequest(hostname, path, headers, port);
+        span.end();
+        return result;
+    });
+}
+
 async function doPutRequest(hostname: string, path: string, headers: any, data: any, port: number | string = 443) {
     return new Promise(function (resolve, reject) {
         const options = {
@@ -151,6 +173,14 @@ async function doPutRequest(hostname: string, path: string, headers: any, data:
     });
 }
 
+async function doPutRequestExternal(hostname: string, path: string, headers: any, data: any, port: number | string = 443) {
+    return getTracer().startActiveSpan(hostname+path, async(span) => {
+        const result = await doPutRequest(hostname, path, headers, port);
+        span.end();
+        return result;
+    });
+}
+
 async function doDeleteRequest(hostname: string, path: string, headers: any, port: number | string = 443) {
     return new Promise(function (resolve, reject) {
         const options = {
@@ -193,10 +223,23 @@ async function doDeleteRequest(hostname: string, path: string, headers: any, por
     });
 }
 
+async function doDeleteRequestExternal(hostname: string, path: string, headers: any, data: any, port: number | string = 443) {
+    return getTracer().startActiveSpan(hostname+path, async (span) => {
+        const result = await doDeleteRequest(hostname, path, headers, port);
+        span.end();
+        return result;
+    });
+}
+
 module.exports = {
     request,
     doGetRequest,
     doPostRequest,
     doPutRequest,
-    doDeleteRequest
+    doDeleteRequest,
+    doGetRequestExternal,
+    doPostRequestExternal,
+    doPutRequestExternal,
+    doDeleteRequestExternal
 }
+