From 3deb8c3a204deeefcb4adcfce61a66e610dd430c Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Mon, 10 Aug 2020 19:26:30 -0500
Subject: [PATCH 01/12] feat: add gitignore and redo PR
---
.commitlintrc.yml | 29 ++
.editorconfig | 11 +
.gitignore | 80 +++++
.gitmodules | 3 +
.markdownlint.json | 7 +
.npmignore | 4 +
.nycrc | 18 ++
codecov.yml | 15 +
eslint.config.js | 49 +++
karma.base.js | 31 ++
karma.webpack.js | 43 +++
lerna.json | 22 ++
package.json | 66 +++++
.../.eslintignore | 1 +
.../.eslintrc.js | 9 +
.../.npmignore | 4 +
.../karma.conf.js | 24 ++
.../package.json | 59 ++++
.../src/index.ts | 16 +
.../platform/browser/AwsXrayIdGenerator.ts | 74 +++++
.../src/platform/browser/index.ts | 17 ++
.../src/platform/index.ts | 16 +
.../src/platform/node/AwsXrayIdGenerator.ts | 47 +++
.../src/platform/node/index.ts | 17 ++
.../src/version.ts | 18 ++
.../test/platform/AwsXrayIdGenerator.test.ts | 63 ++++
.../tsconfig.json | 11 +
.../.eslintignore | 1 +
.../.eslintrc.js | 9 +
.../opentelemetry-propagator-aws-xray/LICENSE | 201 +++++++++++++
.../README.md | 38 +++
.../karma.conf.js | 24 ++
.../package.json | 76 +++++
.../src/AWSXRayPropagator.ts | 211 +++++++++++++
.../src/index.ts | 17 ++
.../src/version.ts | 18 ++
.../test/AWSXRayPropagator.test.ts | 280 ++++++++++++++++++
.../test/index-webpack.ts | 20 ++
.../tsconfig.json | 11 +
renovate.json | 27 ++
scripts/version-update.js | 48 +++
tsconfig.base.json | 23 ++
webpack.node-polyfills.js | 52 ++++
43 files changed, 1810 insertions(+)
create mode 100644 .commitlintrc.yml
create mode 100644 .editorconfig
create mode 100644 .gitignore
create mode 100644 .gitmodules
create mode 100644 .markdownlint.json
create mode 100644 .npmignore
create mode 100644 .nycrc
create mode 100644 codecov.yml
create mode 100644 eslint.config.js
create mode 100644 karma.base.js
create mode 100644 karma.webpack.js
create mode 100644 lerna.json
create mode 100644 package.json
create mode 100644 packages/opentelemetry-id-generator-aws-xray/.eslintignore
create mode 100644 packages/opentelemetry-id-generator-aws-xray/.eslintrc.js
create mode 100644 packages/opentelemetry-id-generator-aws-xray/.npmignore
create mode 100644 packages/opentelemetry-id-generator-aws-xray/karma.conf.js
create mode 100644 packages/opentelemetry-id-generator-aws-xray/package.json
create mode 100644 packages/opentelemetry-id-generator-aws-xray/src/index.ts
create mode 100644 packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts
create mode 100644 packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts
create mode 100644 packages/opentelemetry-id-generator-aws-xray/src/platform/index.ts
create mode 100644 packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts
create mode 100644 packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts
create mode 100644 packages/opentelemetry-id-generator-aws-xray/src/version.ts
create mode 100644 packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
create mode 100644 packages/opentelemetry-id-generator-aws-xray/tsconfig.json
create mode 100644 packages/opentelemetry-propagator-aws-xray/.eslintignore
create mode 100644 packages/opentelemetry-propagator-aws-xray/.eslintrc.js
create mode 100644 packages/opentelemetry-propagator-aws-xray/LICENSE
create mode 100644 packages/opentelemetry-propagator-aws-xray/README.md
create mode 100644 packages/opentelemetry-propagator-aws-xray/karma.conf.js
create mode 100644 packages/opentelemetry-propagator-aws-xray/package.json
create mode 100644 packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts
create mode 100644 packages/opentelemetry-propagator-aws-xray/src/index.ts
create mode 100644 packages/opentelemetry-propagator-aws-xray/src/version.ts
create mode 100644 packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts
create mode 100644 packages/opentelemetry-propagator-aws-xray/test/index-webpack.ts
create mode 100644 packages/opentelemetry-propagator-aws-xray/tsconfig.json
create mode 100644 renovate.json
create mode 100644 scripts/version-update.js
create mode 100644 tsconfig.base.json
create mode 100644 webpack.node-polyfills.js
diff --git a/.commitlintrc.yml b/.commitlintrc.yml
new file mode 100644
index 00000000..1a5e5ac7
--- /dev/null
+++ b/.commitlintrc.yml
@@ -0,0 +1,29 @@
+extends:
+ - '@commitlint/config-conventional'
+rules:
+ header-max-length: [1, 'always', 72]
+ type-enum:
+ - 2
+ - always
+ - - ci
+ - feat
+ - fix
+ - docs
+ - style
+ - refactor
+ - perf
+ - test
+ - revert
+ - chore
+help: |
+ **Possible types**:
+ `ci`: Changes to our CI configuration files and scripts (example scopes: Travis, Circle CI, BrowserStack, SauceLabs)
+ `feat`: Adds a new feature.
+ `fix`: Solves a bug.
+ `docs`: Adds or alters documentation. (example scopes: readme, worker, code_of_conduct, contributors)
+ `style`: Improves formatting, white-space.
+ `refactor`: Rewrites code without feature, performance or bug changes.
+ `perf`: Improves performance.
+ `test`: Adds or modifies tests. (example scopes: functionals, unit-tests)
+ `revert`: Changes that reverting other changes
+ `chore`: No production code change. Updating grunt tasks etc;
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..f68e97b0
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..99005428
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,80 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+build/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# next.js build output
+.next
+
+# lock files
+yarn.lock
+package-lock.json
+packages/**/yarn.lock
+packages/**/package-lock.json
+
+# docs files
+docs
+
+.nyc_output
+
+#lerna
+.changelog
+package.json.lerna_backup
+
+# OS generated files
+.DS_Store
+
+# VsCode configs
+.vscode/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..bebf3ea8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "packages/opentelemetry-exporter-collector/src/platform/node/protos"]
+ path = packages/opentelemetry-exporter-collector/src/platform/node/protos
+ url = https://github.com/open-telemetry/opentelemetry-proto.git
diff --git a/.markdownlint.json b/.markdownlint.json
new file mode 100644
index 00000000..6208ac19
--- /dev/null
+++ b/.markdownlint.json
@@ -0,0 +1,7 @@
+{
+ "MD013": false,
+ "MD024": false,
+ "MD033": false,
+ "MD041": false,
+ "MD026": false
+}
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 00000000..9505ba94
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,4 @@
+/bin
+/coverage
+/doc
+/test
diff --git a/.nycrc b/.nycrc
new file mode 100644
index 00000000..47b8c170
--- /dev/null
+++ b/.nycrc
@@ -0,0 +1,18 @@
+{
+ "extension": [
+ ".ts"
+ ],
+ "exclude": [
+ "**/*.d.ts",
+ "build/**/*.*",
+ "src/index.ts",
+ "src/platform/**/index.ts",
+ "src/platform/browser/*.ts",
+ "src/version.ts",
+ "test/**/*.*",
+ ".eslintrc.js",
+ "karma.conf.js",
+ "webpack/*.js"
+ ],
+ "all": true
+}
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 00000000..1beb17b8
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,15 @@
+codecov:
+ notify:
+ require_ci_to_pass: no
+comment:
+ layout: "header, changes, diff, files"
+ behavior: default
+coverage:
+ status:
+ patch:
+ default:
+ target: 80%
+ project:
+ default:
+ target: auto
+ threshold: 1%
diff --git a/eslint.config.js b/eslint.config.js
new file mode 100644
index 00000000..7c1a2ca8
--- /dev/null
+++ b/eslint.config.js
@@ -0,0 +1,49 @@
+module.exports = {
+ plugins: [
+ "@typescript-eslint",
+ "header"
+ ],
+ extends: [
+ "./node_modules/gts",
+ ],
+ parser: "@typescript-eslint/parser",
+ parserOptions: {
+ "project": "./tsconfig.json"
+ },
+ rules: {
+ "@typescript-eslint/no-this-alias": "off",
+ "eqeqeq": "off",
+ "prefer-rest-params": "off",
+ "@typescript-eslint/naming-convention": [
+ "error",
+ {
+ "selector": "memberLike",
+ "modifiers": ["private", "protected"],
+ "format": ["camelCase"],
+ "leadingUnderscore": "require"
+ }
+ ],
+ "@typescript-eslint/no-inferrable-types": ["error", { ignoreProperties: true }],
+ "arrow-parens": ["error", "as-needed"],
+ "prettier/prettier": ["error", { "singleQuote": true, "arrowParens": "avoid" }],
+ "node/no-deprecated-api": ["warn"],
+ "header/header": [2, "block", [{
+ pattern: / \* Copyright The OpenTelemetry Authors[\r\n]+ \*[\r\n]+ \* Licensed under the Apache License, Version 2\.0 \(the \"License\"\);[\r\n]+ \* you may not use this file except in compliance with the License\.[\r\n]+ \* You may obtain a copy of the License at[\r\n]+ \*[\r\n]+ \* https:\/\/www\.apache\.org\/licenses\/LICENSE-2\.0[\r\n]+ \*[\r\n]+ \* Unless required by applicable law or agreed to in writing, software[\r\n]+ \* distributed under the License is distributed on an \"AS IS\" BASIS,[\r\n]+ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.[\r\n]+ \* See the License for the specific language governing permissions and[\r\n]+ \* limitations under the License\./gm,
+ template:
+ `\n * Copyright The OpenTelemetry Authors\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n `
+ }]]
+ },
+ overrides: [
+ {
+ "files": ["test/**/*.ts"],
+ "rules": {
+ "no-empty": "off",
+ "@typescript-eslint/ban-ts-ignore": "off",
+ "@typescript-eslint/no-empty-function": "off",
+ "@typescript-eslint/no-explicit-any": "off",
+ "@typescript-eslint/no-unused-vars": "off",
+ "@typescript-eslint/no-var-requires": "off"
+ }
+ }
+ ]
+};
diff --git a/karma.base.js b/karma.base.js
new file mode 100644
index 00000000..cbae813f
--- /dev/null
+++ b/karma.base.js
@@ -0,0 +1,31 @@
+/*!
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module.exports = {
+ listenAddress: 'localhost',
+ hostname: 'localhost',
+ browsers: ['ChromeHeadless'],
+ frameworks: ['mocha'],
+ coverageIstanbulReporter: {
+ reports: ['html', 'json'],
+ dir: '.nyc_output',
+ fixWebpackSourcePaths: true
+ },
+ reporters: ['spec', 'coverage-istanbul'],
+ files: ['test/index-webpack.ts'],
+ preprocessors: { 'test/index-webpack.ts': ['webpack'] },
+ webpackMiddleware: { noInfo: true }
+};
diff --git a/karma.webpack.js b/karma.webpack.js
new file mode 100644
index 00000000..bc8eb3a7
--- /dev/null
+++ b/karma.webpack.js
@@ -0,0 +1,43 @@
+/*!
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const webpackNodePolyfills = require('./webpack.node-polyfills.js');
+
+// This is the webpack configuration for browser Karma tests with coverage.
+module.exports = {
+ mode: 'development',
+ target: 'web',
+ output: { filename: 'bundle.js' },
+ resolve: { extensions: ['.ts', '.js'] },
+ devtool: 'inline-source-map',
+ module: {
+ rules: [
+ { test: /\.ts$/, use: 'ts-loader' },
+ {
+ enforce: 'post',
+ exclude: /(node_modules|\.test\.[tj]sx?$)/,
+ test: /\.ts$/,
+ use: {
+ loader: 'istanbul-instrumenter-loader',
+ options: { esModules: true }
+ }
+ },
+ // This setting configures Node polyfills for the browser that will be
+ // added to the webpack bundle for Karma tests.
+ { parser: { node: webpackNodePolyfills } }
+ ]
+ }
+};
diff --git a/lerna.json b/lerna.json
new file mode 100644
index 00000000..c609aa15
--- /dev/null
+++ b/lerna.json
@@ -0,0 +1,22 @@
+{
+ "lerna": "3.13.4",
+ "npmClient": "npm",
+ "packages": [
+ "benchmark/*",
+ "metapackages/*",
+ "packages/*"
+ ],
+ "version": "0.10.2",
+ "changelog": {
+ "repo": "open-telemetry/opentelemetry-js",
+ "labels": {
+ "breaking": ":boom: Breaking Change",
+ "enhancement": ":rocket: (Enhancement)",
+ "bug": ":bug: (Bug Fix)",
+ "core": ":wrench: Core",
+ "document": ":books: (Refine Doc)",
+ "feature-request": ":sparkles: (Feature)"
+ },
+ "cacheDir": ".changelog"
+ }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..b6920816
--- /dev/null
+++ b/package.json
@@ -0,0 +1,66 @@
+{
+ "name": "opentelemetry-base",
+ "version": "0.10.2",
+ "description": "OpenTelemetry is a distributed tracing and stats collection framework.",
+ "main": "build/src/index.js",
+ "types": "build/src/index.d.ts",
+ "scripts": {
+ "bench": "node benchmark",
+ "clean": "lerna run clean",
+ "postinstall": "npm run bootstrap",
+ "precompile": "tsc --version",
+ "version:update": "lerna run version:update",
+ "compile": "lerna run compile",
+ "test": "lerna run test",
+ "test:browser": "lerna run test:browser",
+ "bootstrap": "lerna bootstrap",
+ "bump": "lerna publish",
+ "codecov": "lerna run codecov",
+ "codecov:browser": "lerna run codecov:browser",
+ "changelog": "lerna-changelog",
+ "predocs-test": "npm run docs",
+ "docs-test": "lerna run docs-test",
+ "docs": "lerna run docs",
+ "docs-deploy": "gh-pages --dist packages/opentelemetry-api/docs/out",
+ "lint": "lerna run lint",
+ "lint:fix": "lerna run lint:fix",
+ "lint:examples": "eslint ./examples/**/*.js",
+ "lint:examples:fix": "eslint ./examples/**/*.js --fix",
+ "lint:markdown": "./node_modules/.bin/markdownlint $(git ls-files '*.md') -i ./CHANGELOG.md",
+ "lint:markdown:fix": "./node_modules/.bin/markdownlint $(git ls-files '*.md') -i ./CHANGELOG.md --fix"
+ },
+ "repository": "open-telemetry/opentelemetry-js",
+ "keywords": [
+ "opentelemetry",
+ "nodejs",
+ "profiling",
+ "metrics",
+ "stats"
+ ],
+ "author": "OpenTelemetry Authors",
+ "license": "Apache-2.0",
+ "devDependencies": {
+ "@commitlint/cli": "9.1.1",
+ "@commitlint/config-conventional": "9.1.1",
+ "@typescript-eslint/eslint-plugin": "3.7.1",
+ "@typescript-eslint/parser": "3.7.1",
+ "beautify-benchmark": "0.2.4",
+ "benchmark": "2.1.4",
+ "eslint": "7.5.0",
+ "eslint-config-airbnb-base": "14.2.0",
+ "eslint-plugin-header": "3.0.0",
+ "eslint-plugin-import": "2.22.0",
+ "gh-pages": "3.1.0",
+ "gts": "2.0.2",
+ "husky": "4.2.5",
+ "lerna": "3.22.1",
+ "lerna-changelog": "1.0.1",
+ "markdownlint-cli": "0.23.2",
+ "typescript": "3.9.7"
+ },
+ "husky": {
+ "hooks": {
+ "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+ }
+ }
+}
diff --git a/packages/opentelemetry-id-generator-aws-xray/.eslintignore b/packages/opentelemetry-id-generator-aws-xray/.eslintignore
new file mode 100644
index 00000000..378eac25
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/.eslintignore
@@ -0,0 +1 @@
+build
diff --git a/packages/opentelemetry-id-generator-aws-xray/.eslintrc.js b/packages/opentelemetry-id-generator-aws-xray/.eslintrc.js
new file mode 100644
index 00000000..9dfe62f9
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/.eslintrc.js
@@ -0,0 +1,9 @@
+module.exports = {
+ "env": {
+ "mocha": true,
+ "commonjs": true,
+ "node": true,
+ "browser": true
+ },
+ ...require('../../eslint.config.js')
+}
diff --git a/packages/opentelemetry-id-generator-aws-xray/.npmignore b/packages/opentelemetry-id-generator-aws-xray/.npmignore
new file mode 100644
index 00000000..9505ba94
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/.npmignore
@@ -0,0 +1,4 @@
+/bin
+/coverage
+/doc
+/test
diff --git a/packages/opentelemetry-id-generator-aws-xray/karma.conf.js b/packages/opentelemetry-id-generator-aws-xray/karma.conf.js
new file mode 100644
index 00000000..edcd9f05
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/karma.conf.js
@@ -0,0 +1,24 @@
+/*!
+ * Copyright 2020, OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const karmaWebpackConfig = require('../../karma.webpack');
+const karmaBaseConfig = require('../../karma.base');
+
+module.exports = (config) => {
+ config.set(Object.assign({}, karmaBaseConfig, {
+ webpack: karmaWebpackConfig
+ }))
+};
diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
new file mode 100644
index 00000000..5e978e9a
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -0,0 +1,59 @@
+{
+ "name": "@opentelemetry/id-generator-aws-xray",
+ "version": "0.10.1",
+ "description": "AWS X-Ray ID generator for OpenTelemetry",
+ "main": ".eslintrc.js",
+ "directories": {
+ "test": "test"
+ },
+ "scripts": {
+ "lint": "eslint . --ext .ts",
+ "lint:fix": "eslint . --ext .ts --fix",
+ "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
+ "tdd": "npm run test -- --watch-extensions ts --watch",
+ "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
+ "clean": "rimraf build/*",
+ "precompile": "tsc --version",
+ "version:update": "node ../../scripts/version-update.js",
+ "compile": "npm run version:update && tsc -p .",
+ "prepare": "npm run compile"
+ },
+ "keywords": [
+ "opentelemetry",
+ "nodejs",
+ "browser",
+ "tracing",
+ "AWS",
+ "X-Ray"
+ ],
+ "author": "AWS Authors",
+ "license": "ISC",
+ "dependencies": {
+ "@opentelemetry/core": "^0.10.2",
+ "assert": "^2.0.0",
+ "@types/mocha": "7.0.2",
+ "@types/node": "12.12.47",
+ "@types/sinon": "9.0.4",
+ "@types/webpack-env": "1.15.2",
+ "codecov": "3.7.1",
+ "gts": "2.0.2",
+ "istanbul-instrumenter-loader": "3.0.1",
+ "karma": "5.1.0",
+ "karma-chrome-launcher": "3.1.0",
+ "karma-coverage-istanbul-reporter": "3.0.3",
+ "karma-mocha": "2.0.1",
+ "karma-spec-reporter": "0.0.32",
+ "karma-webpack": "4.0.2",
+ "mocha": "6.2.3",
+ "nyc": "15.1.0",
+ "rimraf": "3.0.2",
+ "sinon": "9.0.2",
+ "ts-loader": "8.0.0",
+ "ts-mocha": "7.0.0",
+ "ts-node": "8.10.2",
+ "tslint-consistent-codestyle": "1.16.0",
+ "tslint-microsoft-contrib": "6.2.0",
+ "typescript": "3.9.6",
+ "webpack": "4.43.0"
+ }
+}
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/index.ts b/packages/opentelemetry-id-generator-aws-xray/src/index.ts
new file mode 100644
index 00000000..e76b3a35
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/src/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './platform';
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts
new file mode 100644
index 00000000..425cdf14
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { IdGenerator } from '@opentelemetry/core';
+
+type WindowWithMsCrypto = Window & {
+ msCrypto?: Crypto;
+};
+const cryptoLib = window.crypto || (window as WindowWithMsCrypto).msCrypto;
+const SPAN_ID_BYTES = 8;
+const TRACE_ID_BYTES = 16;
+const TIME_BYTES = 4;
+const randomBytesArray = new Uint8Array(TRACE_ID_BYTES);
+
+/** IdGenerator that generates trace IDs conforming to AWS X-Ray format.
+ * https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids
+ */
+export class AwsXrayIdGenerator implements IdGenerator {
+ /**
+ * Returns a random 16-byte trace ID formatted/encoded as a 32 lowercase hex
+ * characters corresponding to 128 bits. The first 4 bytes correspond to the current
+ * time, in seconds, as per X-Ray trace ID format.
+ */
+ generateTraceId(): string {
+ const nowSec = Math.floor(Date.now() / 1000).toString(16);
+ cryptoLib.getRandomValues(randomBytesArray);
+ return (
+ nowSec +
+ this.toHex(randomBytesArray.slice(0, TRACE_ID_BYTES - TIME_BYTES))
+ );
+ }
+
+ /**
+ * Returns a random 8-byte span ID formatted/encoded as a 16 lowercase hex
+ * characters corresponding to 64 bits.
+ */
+ generateSpanId(): string {
+ cryptoLib.getRandomValues(randomBytesArray);
+ return this.toHex(randomBytesArray.slice(0, SPAN_ID_BYTES));
+ }
+
+ /**
+ * Get the hex string representation of a byte array
+ *
+ * @param byteArray
+ */
+ private toHex(byteArray: Uint8Array) {
+ const chars: number[] = new Array(byteArray.length * 2);
+ const alpha = 'a'.charCodeAt(0) - 10;
+ const digit = '0'.charCodeAt(0);
+
+ let p = 0;
+ for (let i = 0; i < byteArray.length; i++) {
+ let nibble = (byteArray[i] >>> 4) & 0xf;
+ chars[p++] = nibble > 9 ? nibble + alpha : nibble + digit;
+ nibble = byteArray[i] & 0xf;
+ chars[p++] = nibble > 9 ? nibble + alpha : nibble + digit;
+ }
+ return String.fromCharCode.apply(null, chars);
+ }
+}
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts
new file mode 100644
index 00000000..65d5e5b5
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './AwsXrayIdGenerator';
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/index.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/index.ts
new file mode 100644
index 00000000..a12506ff
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './node';
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts
new file mode 100644
index 00000000..84599f34
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as crypto from 'crypto';
+import { IdGenerator } from '@opentelemetry/core';
+
+const SPAN_ID_BYTES = 8;
+const TRACE_ID_BYTES = 16;
+const TIME_BYTES = 4;
+
+/** IdGenerator that generates trace IDs conforming to AWS X-Ray format.
+ * https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids
+ */
+export class AwsXrayIdGenerator implements IdGenerator {
+ /**
+ * Returns a random 16-byte trace ID formatted/encoded as a 32 lowercase hex
+ * characters corresponding to 128 bits. The first 4 bytes correspond to the current
+ * time, in seconds, as per X-Ray trace ID format.
+ */
+ generateTraceId(): string {
+ const nowSec = Math.floor(Date.now() / 1000).toString(16);
+ return (
+ nowSec + crypto.randomBytes(TRACE_ID_BYTES - TIME_BYTES).toString('hex')
+ );
+ }
+
+ /**
+ * Returns a random 8-byte span ID formatted/encoded as a 16 lowercase hex
+ * characters corresponding to 64 bits.
+ */
+ generateSpanId(): string {
+ return crypto.randomBytes(SPAN_ID_BYTES).toString('hex');
+ }
+}
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts
new file mode 100644
index 00000000..65d5e5b5
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './AwsXrayIdGenerator';
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/version.ts b/packages/opentelemetry-id-generator-aws-xray/src/version.ts
new file mode 100644
index 00000000..04e7c6b7
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/src/version.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// this is autogenerated file, see scripts/version-update.js
+export const VERSION = '0.10.1';
diff --git a/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts b/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
new file mode 100644
index 00000000..670b63c4
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as assert from 'assert';
+import { AwsXrayIdGenerator } from '../../src/platform';
+
+const idGenerator = new AwsXrayIdGenerator();
+
+describe('AWSXrayTraceId', () => {
+ let traceId1: string, traceId2: string;
+ let prevTime: number, currTime: number, nextTime: number;
+ beforeEach(() => {
+ prevTime = Math.floor(Date.now() / 1000);
+ traceId1 = idGenerator.generateTraceId();
+ currTime = parseInt(traceId1.substring(0, 8), 16);
+ nextTime = Math.floor(Date.now() / 1000);
+ console.log(traceId1.length);
+ traceId2 = idGenerator.generateTraceId();
+ });
+
+ it('returns 32 character hex strings', () => {
+ assert.ok(traceId1.match(/[a-f0-9]{32}/));
+ assert.ok(!traceId1.match(/^0+$/));
+ });
+
+ it('returns different ids on each call', () => {
+ assert.notDeepStrictEqual(traceId1, traceId2);
+ });
+
+ it('using current time to encode trace id', () => {
+ assert.ok(currTime >= prevTime);
+ assert.ok(currTime <= nextTime);
+ });
+});
+
+describe('AWSXraySpanId', () => {
+ let spanId1: string, spanId2: string;
+ beforeEach(() => {
+ spanId1 = idGenerator.generateSpanId();
+ spanId2 = idGenerator.generateSpanId();
+ });
+
+ it('returns 16 character hex strings', () => {
+ assert.ok(spanId1.match(/[a-f0-9]{16}/));
+ assert.ok(!spanId1.match(/^0+$/));
+ });
+
+ it('returns different ids on each call', () => {
+ assert.notDeepStrictEqual(spanId1, spanId2);
+ });
+});
diff --git a/packages/opentelemetry-id-generator-aws-xray/tsconfig.json b/packages/opentelemetry-id-generator-aws-xray/tsconfig.json
new file mode 100644
index 00000000..4078877c
--- /dev/null
+++ b/packages/opentelemetry-id-generator-aws-xray/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "extends": "../../tsconfig.base",
+ "compilerOptions": {
+ "rootDir": ".",
+ "outDir": "build"
+ },
+ "include": [
+ "src/**/*.ts",
+ "test/**/*.ts"
+ ]
+}
diff --git a/packages/opentelemetry-propagator-aws-xray/.eslintignore b/packages/opentelemetry-propagator-aws-xray/.eslintignore
new file mode 100644
index 00000000..378eac25
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/.eslintignore
@@ -0,0 +1 @@
+build
diff --git a/packages/opentelemetry-propagator-aws-xray/.eslintrc.js b/packages/opentelemetry-propagator-aws-xray/.eslintrc.js
new file mode 100644
index 00000000..01b8d097
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/.eslintrc.js
@@ -0,0 +1,9 @@
+module.exports = {
+ "env": {
+ "mocha": true,
+ "commonjs": true,
+ "browser": true,
+ "jquery": true
+ },
+ ...require('../../eslint.config.js')
+}
diff --git a/packages/opentelemetry-propagator-aws-xray/LICENSE b/packages/opentelemetry-propagator-aws-xray/LICENSE
new file mode 100644
index 00000000..261eeb9e
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/packages/opentelemetry-propagator-aws-xray/README.md b/packages/opentelemetry-propagator-aws-xray/README.md
new file mode 100644
index 00000000..4fdaf468
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/README.md
@@ -0,0 +1,38 @@
+# OpenTelemetry Propagator AWS Xray
+[![Gitter chat][gitter-image]][gitter-url]
+[![Apache License][license-image]][license-image]
+
+OpenTelemetry AWS Xray propagator provides HTTP header propagation for systems that are using AWS Xray HTTP header format.
+
+[Example Tracing Header](https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader):
+
+```X-Amzn-Trace-Id: Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1```
+
+Format:
+X-Amzn-Trace-Id: Root=1-{trace-id-1}-{trace-id-2};Parent={span-id};Sampled={flags}
+
+* {trace-id-1}
+ * 32-bit number in base16 format, encoded from time(second) when created.
+ * Can be referred: [AWS Xray Trace ID](https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids)
+* {trace-id-2}
+ * 96-bit random number in base16 format
+* {span-id}
+ * 64-bit random number in base16 format.
+* {flags}
+ * One byte bitmap, as two hex digits.
+ * Can be referred: [JavaScript TraceFlags](https://github.com/open-telemetry/opentelemetry-js/blob/e9b2cf9aeb1daf5ffbab800681bfe1cafc636576/packages/opentelemetry-api/src/trace/trace_flags.ts)
+
+Example of usage (will be added after published):
+## Useful links
+- For more information on OpenTelemetry, visit:
+- For more about OpenTelemetry JavaScript:
+- For help or feedback on this project, join us on [gitter][gitter-url]
+
+## License
+
+Apache 2.0 - See [LICENSE][license-url] for more information.
+
+[gitter-image]: https://badges.gitter.im/open-telemetry/opentelemetry-js.svg
+[gitter-url]: https://gitter.im/open-telemetry/opentelemetry-node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+[license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/master/LICENSE
+[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
\ No newline at end of file
diff --git a/packages/opentelemetry-propagator-aws-xray/karma.conf.js b/packages/opentelemetry-propagator-aws-xray/karma.conf.js
new file mode 100644
index 00000000..edcd9f05
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/karma.conf.js
@@ -0,0 +1,24 @@
+/*!
+ * Copyright 2020, OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const karmaWebpackConfig = require('../../karma.webpack');
+const karmaBaseConfig = require('../../karma.base');
+
+module.exports = (config) => {
+ config.set(Object.assign({}, karmaBaseConfig, {
+ webpack: karmaWebpackConfig
+ }))
+};
diff --git a/packages/opentelemetry-propagator-aws-xray/package.json b/packages/opentelemetry-propagator-aws-xray/package.json
new file mode 100644
index 00000000..f0ef46e0
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/package.json
@@ -0,0 +1,76 @@
+{
+ "name": "@opentelemetry/propagator-aws-xray",
+ "version": "0.9.0",
+ "description": "OpenTelemetry AWS Xray propagator provides HTTP header propagation for systems that are using AWS Xray HTTP header format.",
+ "main": "build/src/index.js",
+ "types": "build/src/index.d.ts",
+ "repository": "open-telemetry/opentelemetry-js",
+ "scripts": {
+ "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/index-webpack.ts'",
+ "test:browser": "nyc karma start --single-run",
+ "tdd": "npm run tdd:node",
+ "tdd:node": "npm run test -- --watch-extensions ts --watch",
+ "tdd:browser": "karma start",
+ "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
+ "clean": "rimraf build/*",
+ "lint": "eslint . --ext .ts",
+ "lint:fix": "eslint . --ext .ts --fix",
+ "precompile": "tsc --version",
+ "compile": "npm run version:update && tsc -p .",
+ "prepare": "npm run compile",
+ "version:update": "node ../../scripts/version-update.js",
+ "watch": "tsc -w"
+ },
+ "keywords": [
+ "opentelemetry",
+ "nodejs",
+ "tracing",
+ "profiling",
+ "awsxray"
+ ],
+ "author": "OpenTelemetry Authors",
+ "license": "Apache-2.0",
+ "engines": {
+ "node": ">=8.0.0"
+ },
+ "files": [
+ "build/src/**/*.js",
+ "build/src/**/*.d.ts",
+ "doc",
+ "LICENSE",
+ "README.md"
+ ],
+ "publishConfig": {
+ "access": "public"
+ },
+ "devDependencies": {
+ "@types/mocha": "7.0.2",
+ "@types/node": "12.12.47",
+ "@types/sinon": "9.0.4",
+ "@types/webpack-env": "1.15.2",
+ "codecov": "3.7.1",
+ "gts": "2.0.2",
+ "istanbul-instrumenter-loader": "3.0.1",
+ "karma": "5.1.0",
+ "karma-chrome-launcher": "3.1.0",
+ "karma-coverage-istanbul-reporter": "3.0.3",
+ "karma-mocha": "2.0.1",
+ "karma-spec-reporter": "0.0.32",
+ "karma-webpack": "4.0.2",
+ "mocha": "6.2.3",
+ "nyc": "15.1.0",
+ "rimraf": "3.0.2",
+ "sinon": "9.0.2",
+ "ts-loader": "8.0.0",
+ "ts-mocha": "7.0.0",
+ "ts-node": "8.10.2",
+ "tslint-consistent-codestyle": "1.16.0",
+ "tslint-microsoft-contrib": "6.2.0",
+ "typescript": "3.9.6",
+ "webpack": "4.43.0"
+ },
+ "dependencies": {
+ "@opentelemetry/api": "^0.9.0",
+ "@opentelemetry/core": "^0.9.0"
+ }
+}
diff --git a/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts b/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts
new file mode 100644
index 00000000..03ed4d98
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts
@@ -0,0 +1,211 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+ Context,
+ HttpTextPropagator,
+ SpanContext,
+ TraceFlags,
+ SetterFunction,
+ GetterFunction,
+ INVALID_TRACE_ID,
+ INVALID_SPAN_ID,
+} from '@opentelemetry/api';
+import {
+ getParentSpanContext,
+ setExtractedSpanContext,
+ INVALID_SPAN_CONTEXT,
+ isValid,
+} from '@opentelemetry/core';
+
+export const AWSXRAY_TRACE_ID_HEADER = 'X-Amzn-Trace-Id';
+
+const TRACE_HEADER_DELIMITER = ';';
+const KV_DELIMITER = '=';
+
+const TRACE_ID_KEY = 'Root';
+const TRACE_ID_LENGTH = 35;
+const TRACE_ID_VERSION = '1';
+const TRACE_ID_DELIMITER = '-';
+const TRACE_ID_DELIMITER_INDEX_1 = 1;
+const TRACE_ID_DELIMITER_INDEX_2 = 10;
+const TRACE_ID_FIRST_PART_LENGTH = 8;
+
+const PARENT_ID_KEY = 'Parent';
+
+const SAMPLED_FLAG_KEY = 'Sampled';
+const SAMPLED_FLAG_LENGTH = 1;
+const IS_SAMPLED = '1';
+const NOT_SAMPLED = '0';
+
+const VALID_TRACEID_REGEX = /^([0-9a-f]{32})$/i;
+const VALID_SPANID_REGEX = /^[0-9a-f]{16}$/i;
+/**
+ * Implementation of the AWS X-Ray Trace Header propagation protocol. See AWS
+ * Tracing header spec
+ *
+ * An example AWS Xray Tracing Header is shown below:
+ * X-Amzn-Trace-Id: Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1
+ */
+export class AWSXRayPropagator implements HttpTextPropagator {
+ inject(context: Context, carrier: unknown, setter: SetterFunction) {
+ const spanContext = getParentSpanContext(context);
+ if (!spanContext || !isValid(spanContext)) return;
+
+ const otTraceId = spanContext.traceId;
+ const xrayTraceId =
+ TRACE_ID_VERSION +
+ TRACE_ID_DELIMITER +
+ otTraceId.substring(0, TRACE_ID_FIRST_PART_LENGTH) +
+ TRACE_ID_DELIMITER +
+ otTraceId.substring(TRACE_ID_FIRST_PART_LENGTH);
+ const parentId = spanContext.spanId;
+ const samplingFlag = spanContext.traceFlags ? IS_SAMPLED : NOT_SAMPLED;
+ // TODO: Add OT trace state to the X-Ray trace header
+
+ const traceHeader =
+ TRACE_ID_KEY +
+ KV_DELIMITER +
+ xrayTraceId +
+ TRACE_HEADER_DELIMITER +
+ PARENT_ID_KEY +
+ KV_DELIMITER +
+ parentId +
+ TRACE_HEADER_DELIMITER +
+ SAMPLED_FLAG_KEY +
+ KV_DELIMITER +
+ samplingFlag;
+
+ setter(carrier, AWSXRAY_TRACE_ID_HEADER, traceHeader);
+ }
+
+ extract(context: Context, carrier: unknown, getter: GetterFunction): Context {
+ const spanContext = this.getSpanContextFromHeader(carrier, getter);
+ if (!isValid(spanContext)) return context;
+
+ return setExtractedSpanContext(context, spanContext);
+ }
+
+ private getSpanContextFromHeader(
+ carrier: unknown,
+ getter: GetterFunction
+ ): SpanContext {
+ const traceHeader = getter(carrier, AWSXRAY_TRACE_ID_HEADER);
+ // Only if the returned traceHeader is no empty string can be extracted
+ if (!traceHeader || typeof traceHeader !== 'string')
+ return INVALID_SPAN_CONTEXT;
+
+ let pos = 0;
+ let trimmedPart: string;
+ let parsedTraceId = INVALID_TRACE_ID;
+ let parsedSpanId = INVALID_SPAN_ID;
+ let parsedTraceFlags = null;
+ while (pos < traceHeader.length) {
+ const delimiterIndex = traceHeader.indexOf(TRACE_HEADER_DELIMITER, pos);
+ if (delimiterIndex >= 0) {
+ trimmedPart = traceHeader.substring(pos, delimiterIndex).trim();
+ pos = delimiterIndex + 1;
+ } else {
+ //last part
+ trimmedPart = traceHeader.substring(pos).trim();
+ pos = traceHeader.length;
+ }
+ const equalsIndex = trimmedPart.indexOf(KV_DELIMITER);
+
+ const value = trimmedPart.substring(equalsIndex + 1);
+
+ if (trimmedPart.startsWith(TRACE_ID_KEY)) {
+ parsedTraceId = this._parseTraceId(value);
+ }
+ if (trimmedPart.startsWith(PARENT_ID_KEY)) {
+ parsedSpanId = this._parseSpanId(value);
+ }
+ if (trimmedPart.startsWith(SAMPLED_FLAG_KEY)) {
+ parsedTraceFlags = this._parseTraceFlag(value);
+ }
+ }
+ if (parsedTraceFlags === null) {
+ return INVALID_SPAN_CONTEXT;
+ }
+ const resultSpanContext: SpanContext = {
+ traceId: parsedTraceId,
+ spanId: parsedSpanId,
+ traceFlags: parsedTraceFlags,
+ isRemote: true,
+ };
+ if (!isValid(resultSpanContext)) {
+ return INVALID_SPAN_CONTEXT;
+ }
+ return resultSpanContext;
+ }
+
+ private _parseTraceId(xrayTraceId: string): string {
+ // Check length of trace id
+ if (xrayTraceId.length !== TRACE_ID_LENGTH) {
+ return INVALID_TRACE_ID;
+ }
+
+ // Check version trace id version
+ if (!xrayTraceId.startsWith(TRACE_ID_VERSION)) {
+ return INVALID_TRACE_ID;
+ }
+
+ // Check delimiters
+ if (
+ xrayTraceId.charAt(TRACE_ID_DELIMITER_INDEX_1) !== TRACE_ID_DELIMITER ||
+ xrayTraceId.charAt(TRACE_ID_DELIMITER_INDEX_2) !== TRACE_ID_DELIMITER
+ ) {
+ return INVALID_TRACE_ID;
+ }
+
+ const epochPart = xrayTraceId.substring(
+ TRACE_ID_DELIMITER_INDEX_1 + 1,
+ TRACE_ID_DELIMITER_INDEX_2
+ );
+ const uniquePart = xrayTraceId.substring(
+ TRACE_ID_DELIMITER_INDEX_2 + 1,
+ TRACE_ID_LENGTH
+ );
+ const resTraceId = epochPart + uniquePart;
+
+ // Check the content of trace id
+ if (!VALID_TRACEID_REGEX.test(resTraceId)) {
+ return INVALID_TRACE_ID;
+ }
+
+ return resTraceId;
+ }
+
+ private _parseSpanId(xrayParentId: string): string {
+ return VALID_SPANID_REGEX.test(xrayParentId)
+ ? xrayParentId
+ : INVALID_SPAN_ID;
+ }
+
+ private _parseTraceFlag(xraySampledFlag: string): TraceFlags | null {
+ if (
+ xraySampledFlag.length === SAMPLED_FLAG_LENGTH &&
+ xraySampledFlag === NOT_SAMPLED
+ ) {
+ return TraceFlags.NONE;
+ }
+ if (xraySampledFlag === IS_SAMPLED) {
+ return TraceFlags.SAMPLED;
+ }
+ return null;
+ }
+}
diff --git a/packages/opentelemetry-propagator-aws-xray/src/index.ts b/packages/opentelemetry-propagator-aws-xray/src/index.ts
new file mode 100644
index 00000000..dea84766
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/src/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './AWSXRayPropagator';
diff --git a/packages/opentelemetry-propagator-aws-xray/src/version.ts b/packages/opentelemetry-propagator-aws-xray/src/version.ts
new file mode 100644
index 00000000..2c92beb6
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/src/version.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// this is autogenerated file, see scripts/version-update.js
+export const VERSION = '0.9.0';
diff --git a/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts b/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts
new file mode 100644
index 00000000..8cd3b52e
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts
@@ -0,0 +1,280 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+ Context,
+ defaultGetter,
+ defaultSetter,
+ SpanContext,
+ TraceFlags,
+} from '@opentelemetry/api';
+import {
+ getExtractedSpanContext,
+ setExtractedSpanContext,
+ TraceState,
+ INVALID_SPAN_CONTEXT,
+} from '@opentelemetry/core';
+import * as assert from 'assert';
+import {
+ AWSXRayPropagator,
+ AWSXRAY_TRACE_ID_HEADER,
+} from '../src/AWSXRayPropagator';
+
+describe('AWSXRayPropagator', () => {
+ const xrayPropagator = new AWSXRayPropagator();
+ const TRACE_ID = '8a3c60f7d188f8fa79d48a391a778fa6';
+ const SPAN_ID = '53995c3f42cd8ad8';
+ const SAMPLED_TRACE_FLAG = TraceFlags.SAMPLED;
+ const NOT_SAMPLED_TRACE_FLAG = TraceFlags.NONE;
+
+ let carrier: { [key: string]: unknown };
+
+ beforeEach(() => {
+ carrier = {};
+ });
+
+ describe('.inject()', () => {
+ it('should inject sampled context', () => {
+ const spanContext: SpanContext = {
+ traceId: TRACE_ID,
+ spanId: SPAN_ID,
+ traceFlags: SAMPLED_TRACE_FLAG,
+ };
+ xrayPropagator.inject(
+ setExtractedSpanContext(Context.ROOT_CONTEXT, spanContext),
+ carrier,
+ defaultSetter
+ );
+
+ assert.deepStrictEqual(
+ carrier[AWSXRAY_TRACE_ID_HEADER],
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1'
+ );
+ });
+
+ it('should inject not sampled context', () => {
+ const spanContext: SpanContext = {
+ traceId: TRACE_ID,
+ spanId: SPAN_ID,
+ traceFlags: NOT_SAMPLED_TRACE_FLAG,
+ };
+ xrayPropagator.inject(
+ setExtractedSpanContext(Context.ROOT_CONTEXT, spanContext),
+ carrier,
+ defaultSetter
+ );
+
+ assert.deepStrictEqual(
+ carrier[AWSXRAY_TRACE_ID_HEADER],
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=0'
+ );
+ });
+
+ it('should inject with TraceState', () => {
+ const traceState = new TraceState();
+ traceState.set('foo', 'bar');
+ const spanContext: SpanContext = {
+ traceId: TRACE_ID,
+ spanId: SPAN_ID,
+ traceFlags: SAMPLED_TRACE_FLAG,
+ traceState: traceState,
+ };
+ xrayPropagator.inject(
+ setExtractedSpanContext(Context.ROOT_CONTEXT, spanContext),
+ carrier,
+ defaultSetter
+ );
+
+ // TODO: assert trace state when the propagator supports it
+ assert.deepStrictEqual(
+ carrier[AWSXRAY_TRACE_ID_HEADER],
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1'
+ );
+ });
+
+ it('inject without spanContext - should inject nothing', () => {
+ xrayPropagator.inject(Context.ROOT_CONTEXT, carrier, defaultSetter);
+
+ assert.deepStrictEqual(carrier, {});
+ });
+
+ it('inject default invalid spanContext - should inject nothing', () => {
+ const spanContext: SpanContext = INVALID_SPAN_CONTEXT;
+ xrayPropagator.inject(
+ setExtractedSpanContext(Context.ROOT_CONTEXT, spanContext),
+ carrier,
+ defaultSetter
+ );
+
+ assert.deepStrictEqual(carrier, {});
+ });
+ });
+
+ describe('.extract()', () => {
+ it('extract nothing from context', () => {
+ // context remains untouched
+ assert.deepStrictEqual(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter),
+ Context.ROOT_CONTEXT
+ );
+ });
+
+ it('should extract sampled context', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, {
+ traceId: TRACE_ID,
+ spanId: SPAN_ID,
+ isRemote: true,
+ traceFlags: TraceFlags.SAMPLED,
+ });
+ });
+
+ it('should extract sampled context with arbitrary order', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Parent=53995c3f42cd8ad8;Sampled=1;Root=1-8a3c60f7-d188f8fa79d48a391a778fa6';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, {
+ traceId: TRACE_ID,
+ spanId: SPAN_ID,
+ isRemote: true,
+ traceFlags: TraceFlags.SAMPLED,
+ });
+ });
+
+ it('should extract context with additional fields', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1;Foo=Bar';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ // TODO: assert additional fields when the propagator supports it
+ assert.deepStrictEqual(extractedSpanContext, {
+ traceId: TRACE_ID,
+ spanId: SPAN_ID,
+ isRemote: true,
+ traceFlags: TraceFlags.SAMPLED,
+ });
+ });
+
+ it('extract empty header value - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] = '';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+
+ it('extract invalid traceId - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1-abcdefgh-ijklmnopabcdefghijklmnop;Parent=53995c3f42cd8ad8;Sampled=0';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+
+ it('extract invalid traceId size - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa600;Parent=53995c3f42cd8ad8;Sampled=0';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+
+ it('extract invalid traceId delimiter - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1*8a3c60f7+d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1;Foo=Bar';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+
+ it('extract invalid spanId - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=abcdefghijklmnop;Sampled=0';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+
+ it('extract invalid spanId size - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad800;Sampled=0';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+
+ it('extract invalid traceFlags - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+
+ it('extract invalid traceFlags length - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=10220';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+
+ it('extract nonnumeric invalid traceFlags - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=1-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=a';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+
+ it('extract invalid aws xray version - should return undefined', () => {
+ carrier[AWSXRAY_TRACE_ID_HEADER] =
+ 'Root=2-8a3c60f7-d188f8fa79d48a391a778fa6;Parent=53995c3f42cd8ad8;Sampled=1';
+ const extractedSpanContext = getExtractedSpanContext(
+ xrayPropagator.extract(Context.ROOT_CONTEXT, carrier, defaultGetter)
+ );
+
+ assert.deepStrictEqual(extractedSpanContext, undefined);
+ });
+ });
+});
diff --git a/packages/opentelemetry-propagator-aws-xray/test/index-webpack.ts b/packages/opentelemetry-propagator-aws-xray/test/index-webpack.ts
new file mode 100644
index 00000000..061a48cc
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/test/index-webpack.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const testsContext = require.context('.', true, /test$/);
+testsContext.keys().forEach(testsContext);
+
+const srcContext = require.context('.', true, /src$/);
+srcContext.keys().forEach(srcContext);
diff --git a/packages/opentelemetry-propagator-aws-xray/tsconfig.json b/packages/opentelemetry-propagator-aws-xray/tsconfig.json
new file mode 100644
index 00000000..4078877c
--- /dev/null
+++ b/packages/opentelemetry-propagator-aws-xray/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "extends": "../../tsconfig.base",
+ "compilerOptions": {
+ "rootDir": ".",
+ "outDir": "build"
+ },
+ "include": [
+ "src/**/*.ts",
+ "test/**/*.ts"
+ ]
+}
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 00000000..d2b949af
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,27 @@
+{
+ "extends": [
+ "config:base"
+ ],
+ "packageRules": [
+ {
+ "groupName": "all non-major dependencies",
+ "updateTypes": ["patch", "minor"],
+ "groupSlug": "all-minor-patch"
+ }
+ ],
+ "ignoreDeps": [
+ "gcp-metadata",
+ "got",
+ "mocha",
+ "prom-client"
+ ],
+ "assignees": [
+ "@dyladan",
+ "@mayurkale22",
+ "@obecny"
+ ],
+ "schedule": [
+ "before 3am on Friday"
+ ],
+ "labels": ["dependencies"]
+}
diff --git a/scripts/version-update.js b/scripts/version-update.js
new file mode 100644
index 00000000..32b05516
--- /dev/null
+++ b/scripts/version-update.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+const appRoot = process.cwd();
+
+const packageJsonUrl = path.resolve(`${appRoot}/package.json`);
+const pjson = require(packageJsonUrl);
+
+const content = `/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// this is autogenerated file, see scripts/version-update.js
+export const VERSION = '${pjson.version}';
+`;
+
+const fileUrl = path.join(appRoot, "src", "version.ts")
+
+fs.writeFileSync(fileUrl, content.replace(/\n/g, os.EOL));
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 00000000..3d1763d3
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,23 @@
+{
+ "compilerOptions": {
+ "allowUnreachableCode": false,
+ "allowUnusedLabels": false,
+ "declaration": true,
+ "declarationMap": true,
+ "forceConsistentCasingInFileNames": true,
+ "module": "commonjs",
+ "noEmitOnError": true,
+ "noFallthroughCasesInSwitch": true,
+ "noImplicitReturns": true,
+ "noUnusedLocals": true,
+ "pretty": true,
+ "sourceMap": true,
+ "strict": true,
+ "strictNullChecks": true,
+ "target": "es2017",
+ "incremental": true
+ },
+ "exclude": [
+ "node_modules"
+ ]
+}
diff --git a/webpack.node-polyfills.js b/webpack.node-polyfills.js
new file mode 100644
index 00000000..8d50ebd2
--- /dev/null
+++ b/webpack.node-polyfills.js
@@ -0,0 +1,52 @@
+module.exports = {
+ // Enable the assert library polyfill because that is used in tests
+ assert: true,
+ // The assert polyfill from github.com/browserify/commonjs-assert
+ // also requires the `global` polyfill.
+ global: true,
+
+ // Turn off all other Node.js API polyfills for the browser tests to
+ // make sure that we are not attempting to use Node-specific APIs in
+ // the browser code. Instead, we will write browser specific
+ // implementations of platform functionality we need under the
+ // `./src/platform/browser` folder. This allows for writing browser
+ // optimized implementations of the specific needed functionality
+ // rather than bringing in (sometimes large) polyfills for the
+ // corresponding Node APIs.
+ Buffer: false,
+ __dirname: false,
+ __filename: false,
+ buffer: false,
+ child_process: false,
+ cluster: false,
+ console: false,
+ constants: false,
+ crypto: false,
+ dgram: false,
+ dns: false,
+ domain: false,
+ events: false,
+ fs: false,
+ http: false,
+ https: false,
+ module: false,
+ net: false,
+ os: false,
+ path: false,
+ process: false,
+ punycode: false,
+ querystring: false,
+ readline: false,
+ repl: false,
+ setImmediate: false,
+ stream: false,
+ string_decoder: false,
+ sys: false,
+ timers: false,
+ tls: false,
+ tty: false,
+ url: false,
+ util: false,
+ vm: false,
+ zlib: false
+};
From f11899505a0d512e7a6e87666a612239530f214d Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Mon, 10 Aug 2020 19:42:48 -0500
Subject: [PATCH 02/12] chore: modify the info in package
---
package.json | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index b6920816..11c5e955 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
- "name": "opentelemetry-base",
+ "name": "aws-opentelemetry-js",
"version": "0.10.2",
- "description": "OpenTelemetry is a distributed tracing and stats collection framework.",
+ "description": "Host AWS X-Ray vendor-specific components for OTel-JS-SDK auto-instrumentation.",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
"scripts": {
@@ -34,8 +34,10 @@
"opentelemetry",
"nodejs",
"profiling",
- "metrics",
- "stats"
+ "trace",
+ "AWS",
+ "X-Ray",
+ "awsxray"
],
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
From ef88f149537a7279830eeb52d35710e84967291d Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Mon, 10 Aug 2020 20:01:43 -0500
Subject: [PATCH 03/12] chore: modified information in lerna.json
---
lerna.json | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lerna.json b/lerna.json
index c609aa15..e310b1d1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,13 +2,11 @@
"lerna": "3.13.4",
"npmClient": "npm",
"packages": [
- "benchmark/*",
- "metapackages/*",
"packages/*"
],
"version": "0.10.2",
"changelog": {
- "repo": "open-telemetry/opentelemetry-js",
+ "repo": " open-o11y/aws-opentelemetry-js ",
"labels": {
"breaking": ":boom: Breaking Change",
"enhancement": ":rocket: (Enhancement)",
From 02513f802cfea30f3e41218a73527a982dd49979 Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Mon, 10 Aug 2020 20:32:23 -0500
Subject: [PATCH 04/12] chore: modify test code of IdGenerator
---
.../test/platform/AwsXrayIdGenerator.test.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts b/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
index 670b63c4..7564761f 100644
--- a/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
+++ b/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
@@ -26,7 +26,6 @@ describe('AWSXrayTraceId', () => {
traceId1 = idGenerator.generateTraceId();
currTime = parseInt(traceId1.substring(0, 8), 16);
nextTime = Math.floor(Date.now() / 1000);
- console.log(traceId1.length);
traceId2 = idGenerator.generateTraceId();
});
From a84a41440105919b5ad9b51e37799a6161047394 Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Tue, 11 Aug 2020 11:11:54 -0500
Subject: [PATCH 05/12] chore: modified repo name in packages
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 11c5e955..0808e6fa 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"lint:markdown": "./node_modules/.bin/markdownlint $(git ls-files '*.md') -i ./CHANGELOG.md",
"lint:markdown:fix": "./node_modules/.bin/markdownlint $(git ls-files '*.md') -i ./CHANGELOG.md --fix"
},
- "repository": "open-telemetry/opentelemetry-js",
+ "repository": "open-o11y/aws-opentelemetry-js",
"keywords": [
"opentelemetry",
"nodejs",
From 4d423fa799fd7032200d3a23cd123db058baea43 Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Tue, 11 Aug 2020 12:11:54 -0500
Subject: [PATCH 06/12] chore: modify the naming of IdGenerator and Propagator
---
.../src/platform/browser/AwsXrayIdGenerator.ts | 2 +-
.../src/platform/browser/index.ts | 2 +-
.../src/platform/node/AwsXrayIdGenerator.ts | 2 +-
.../src/platform/node/index.ts | 2 +-
.../test/platform/AwsXrayIdGenerator.test.ts | 4 ++--
.../src/AWSXRayPropagator.ts | 2 +-
packages/opentelemetry-propagator-aws-xray/src/index.ts | 2 +-
.../test/AWSXRayPropagator.test.ts | 6 +++---
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts
index 425cdf14..60262606 100644
--- a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts
@@ -28,7 +28,7 @@ const randomBytesArray = new Uint8Array(TRACE_ID_BYTES);
/** IdGenerator that generates trace IDs conforming to AWS X-Ray format.
* https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids
*/
-export class AwsXrayIdGenerator implements IdGenerator {
+export class AwsXRayIdGenerator implements IdGenerator {
/**
* Returns a random 16-byte trace ID formatted/encoded as a 32 lowercase hex
* characters corresponding to 128 bits. The first 4 bytes correspond to the current
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts
index 65d5e5b5..d8a16792 100644
--- a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/index.ts
@@ -14,4 +14,4 @@
* limitations under the License.
*/
-export * from './AwsXrayIdGenerator';
+export * from './AwsXRayIdGenerator';
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts
index 84599f34..d187b446 100644
--- a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts
@@ -24,7 +24,7 @@ const TIME_BYTES = 4;
/** IdGenerator that generates trace IDs conforming to AWS X-Ray format.
* https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids
*/
-export class AwsXrayIdGenerator implements IdGenerator {
+export class AwsXRayIdGenerator implements IdGenerator {
/**
* Returns a random 16-byte trace ID formatted/encoded as a 32 lowercase hex
* characters corresponding to 128 bits. The first 4 bytes correspond to the current
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts
index 65d5e5b5..d8a16792 100644
--- a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/index.ts
@@ -14,4 +14,4 @@
* limitations under the License.
*/
-export * from './AwsXrayIdGenerator';
+export * from './AwsXRayIdGenerator';
diff --git a/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts b/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
index 7564761f..e310dd21 100644
--- a/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
+++ b/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
@@ -14,9 +14,9 @@
* limitations under the License.
*/
import * as assert from 'assert';
-import { AwsXrayIdGenerator } from '../../src/platform';
+import { AwsXRayIdGenerator } from '../../src/platform';
-const idGenerator = new AwsXrayIdGenerator();
+const idGenerator = new AwsXRayIdGenerator();
describe('AWSXrayTraceId', () => {
let traceId1: string, traceId2: string;
diff --git a/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts b/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts
index 03ed4d98..3d698dd5 100644
--- a/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts
+++ b/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts
@@ -61,7 +61,7 @@ const VALID_SPANID_REGEX = /^[0-9a-f]{16}$/i;
* An example AWS Xray Tracing Header is shown below:
* X-Amzn-Trace-Id: Root=1-5759e988-bd862e3fe1be46a994272793;Parent=53995c3f42cd8ad8;Sampled=1
*/
-export class AWSXRayPropagator implements HttpTextPropagator {
+export class AwsXRayPropagator implements HttpTextPropagator {
inject(context: Context, carrier: unknown, setter: SetterFunction) {
const spanContext = getParentSpanContext(context);
if (!spanContext || !isValid(spanContext)) return;
diff --git a/packages/opentelemetry-propagator-aws-xray/src/index.ts b/packages/opentelemetry-propagator-aws-xray/src/index.ts
index dea84766..2402860f 100644
--- a/packages/opentelemetry-propagator-aws-xray/src/index.ts
+++ b/packages/opentelemetry-propagator-aws-xray/src/index.ts
@@ -14,4 +14,4 @@
* limitations under the License.
*/
-export * from './AWSXRayPropagator';
+export * from './AwsXRayPropagator';
diff --git a/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts b/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts
index 8cd3b52e..e4a6283a 100644
--- a/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts
+++ b/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts
@@ -29,12 +29,12 @@ import {
} from '@opentelemetry/core';
import * as assert from 'assert';
import {
- AWSXRayPropagator,
+ AwsXRayPropagator,
AWSXRAY_TRACE_ID_HEADER,
-} from '../src/AWSXRayPropagator';
+} from '../src/AwsXRayPropagator';
describe('AWSXRayPropagator', () => {
- const xrayPropagator = new AWSXRayPropagator();
+ const xrayPropagator = new AwsXRayPropagator();
const TRACE_ID = '8a3c60f7d188f8fa79d48a391a778fa6';
const SPAN_ID = '53995c3f42cd8ad8';
const SAMPLED_TRACE_FLAG = TraceFlags.SAMPLED;
From a54c897fddc9ead6f0a517e62bdf0c9197db14b4 Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Tue, 11 Aug 2020 17:07:37 -0500
Subject: [PATCH 07/12] chore: modified test case naming
---
.../test/platform/AwsXrayIdGenerator.test.ts | 4 ++--
.../test/AWSXRayPropagator.test.ts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts b/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
index e310dd21..1724f05f 100644
--- a/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
+++ b/packages/opentelemetry-id-generator-aws-xray/test/platform/AwsXrayIdGenerator.test.ts
@@ -18,7 +18,7 @@ import { AwsXRayIdGenerator } from '../../src/platform';
const idGenerator = new AwsXRayIdGenerator();
-describe('AWSXrayTraceId', () => {
+describe('AwsXRayTraceId', () => {
let traceId1: string, traceId2: string;
let prevTime: number, currTime: number, nextTime: number;
beforeEach(() => {
@@ -44,7 +44,7 @@ describe('AWSXrayTraceId', () => {
});
});
-describe('AWSXraySpanId', () => {
+describe('AwsXRaySpanId', () => {
let spanId1: string, spanId2: string;
beforeEach(() => {
spanId1 = idGenerator.generateSpanId();
diff --git a/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts b/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts
index e4a6283a..23902c59 100644
--- a/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts
+++ b/packages/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts
@@ -33,7 +33,7 @@ import {
AWSXRAY_TRACE_ID_HEADER,
} from '../src/AwsXRayPropagator';
-describe('AWSXRayPropagator', () => {
+describe('AwsXRayPropagator', () => {
const xrayPropagator = new AwsXRayPropagator();
const TRACE_ID = '8a3c60f7d188f8fa79d48a391a778fa6';
const SPAN_ID = '53995c3f42cd8ad8';
From bb5d2fb70ee41d9b230eda0be4d35f55b86a525b Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Tue, 18 Aug 2020 11:33:46 -0500
Subject: [PATCH 08/12] feat: re-write IdGenerator to be consistent with main
repo
---
.../platform/browser/AwsXrayIdGenerator.ts | 56 +++++++------------
.../src/platform/node/AwsXrayIdGenerator.ts | 35 ++++++++----
2 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts
index 60262606..aedda73f 100644
--- a/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/browser/AwsXrayIdGenerator.ts
@@ -16,14 +16,9 @@
import { IdGenerator } from '@opentelemetry/core';
-type WindowWithMsCrypto = Window & {
- msCrypto?: Crypto;
-};
-const cryptoLib = window.crypto || (window as WindowWithMsCrypto).msCrypto;
const SPAN_ID_BYTES = 8;
const TRACE_ID_BYTES = 16;
const TIME_BYTES = 4;
-const randomBytesArray = new Uint8Array(TRACE_ID_BYTES);
/** IdGenerator that generates trace IDs conforming to AWS X-Ray format.
* https://docs.aws.amazon.com/xray/latest/devguide/xray-api-sendingdata.html#xray-api-traceids
@@ -34,41 +29,32 @@ export class AwsXRayIdGenerator implements IdGenerator {
* characters corresponding to 128 bits. The first 4 bytes correspond to the current
* time, in seconds, as per X-Ray trace ID format.
*/
- generateTraceId(): string {
- const nowSec = Math.floor(Date.now() / 1000).toString(16);
- cryptoLib.getRandomValues(randomBytesArray);
- return (
- nowSec +
- this.toHex(randomBytesArray.slice(0, TRACE_ID_BYTES - TIME_BYTES))
- );
- }
+ generateTraceId = getIdGenerator(true, TRACE_ID_BYTES - TIME_BYTES);
/**
* Returns a random 8-byte span ID formatted/encoded as a 16 lowercase hex
* characters corresponding to 64 bits.
*/
- generateSpanId(): string {
- cryptoLib.getRandomValues(randomBytesArray);
- return this.toHex(randomBytesArray.slice(0, SPAN_ID_BYTES));
- }
-
- /**
- * Get the hex string representation of a byte array
- *
- * @param byteArray
- */
- private toHex(byteArray: Uint8Array) {
- const chars: number[] = new Array(byteArray.length * 2);
- const alpha = 'a'.charCodeAt(0) - 10;
- const digit = '0'.charCodeAt(0);
+ generateSpanId = getIdGenerator(false, SPAN_ID_BYTES);
+}
- let p = 0;
- for (let i = 0; i < byteArray.length; i++) {
- let nibble = (byteArray[i] >>> 4) & 0xf;
- chars[p++] = nibble > 9 ? nibble + alpha : nibble + digit;
- nibble = byteArray[i] & 0xf;
- chars[p++] = nibble > 9 ? nibble + alpha : nibble + digit;
+const SHARED_CHAR_CODES_ARRAY = Array(32);
+function getIdGenerator(timeUsage: boolean, bytes: number): () => string {
+ return function generateId() {
+ for (let i = 0; i < bytes * 2; i++) {
+ SHARED_CHAR_CODES_ARRAY[i] = Math.floor(Math.random() * 16) + 48;
+ // valid hex characters in the range 48-57 and 97-102
+ if (SHARED_CHAR_CODES_ARRAY[i] >= 58) {
+ SHARED_CHAR_CODES_ARRAY[i] += 39;
+ }
}
- return String.fromCharCode.apply(null, chars);
- }
+ const nowSec = timeUsage ? Math.floor(Date.now() / 1000).toString(16) : '';
+ return (
+ nowSec +
+ String.fromCharCode.apply(
+ null,
+ SHARED_CHAR_CODES_ARRAY.slice(0, bytes * 2)
+ )
+ );
+ };
}
diff --git a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts
index d187b446..556bf8aa 100644
--- a/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts
+++ b/packages/opentelemetry-id-generator-aws-xray/src/platform/node/AwsXrayIdGenerator.ts
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import * as crypto from 'crypto';
import { IdGenerator } from '@opentelemetry/core';
const SPAN_ID_BYTES = 8;
@@ -30,18 +29,34 @@ export class AwsXRayIdGenerator implements IdGenerator {
* characters corresponding to 128 bits. The first 4 bytes correspond to the current
* time, in seconds, as per X-Ray trace ID format.
*/
- generateTraceId(): string {
- const nowSec = Math.floor(Date.now() / 1000).toString(16);
- return (
- nowSec + crypto.randomBytes(TRACE_ID_BYTES - TIME_BYTES).toString('hex')
- );
- }
+ generateTraceId = getIdGenerator(true, TRACE_ID_BYTES - TIME_BYTES);
/**
* Returns a random 8-byte span ID formatted/encoded as a 16 lowercase hex
* characters corresponding to 64 bits.
*/
- generateSpanId(): string {
- return crypto.randomBytes(SPAN_ID_BYTES).toString('hex');
- }
+ generateSpanId = getIdGenerator(false, SPAN_ID_BYTES);
+}
+
+const SHARED_BUFFER = Buffer.allocUnsafe(TRACE_ID_BYTES);
+function getIdGenerator(timeUsage: boolean, bytes: number): () => string {
+ return function generateId() {
+ for (let i = 0; i < bytes / 4; i++) {
+ // unsigned right shift drops decimal part of the number
+ // it is required because if a number between 2**32 and 2**32 - 1 is generated, an out of range error is thrown by writeUInt32BE
+ SHARED_BUFFER.writeUInt32BE((Math.random() * 2 ** 32) >>> 0, i * 4);
+ }
+
+ // If buffer is all 0, set the last byte to 1 to guarantee a valid w3c id is generated
+ for (let i = 0; i < bytes; i++) {
+ if (SHARED_BUFFER[i] > 0) {
+ break;
+ } else if (i === bytes - 1) {
+ SHARED_BUFFER[bytes - 1] = 1;
+ }
+ }
+
+ const nowSec = timeUsage ? Math.floor(Date.now() / 1000).toString(16) : '';
+ return nowSec + SHARED_BUFFER.toString('hex', 0, bytes);
+ };
}
From 1023034009f2dbdd47b991bf0158ab979e684744 Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Thu, 20 Aug 2020 18:27:55 -0500
Subject: [PATCH 09/12] feat: added basic example demo
---
examples/basic-xray/client.js | 46 +++
.../basic-xray/docker/collector-config.yaml | 28 ++
.../basic-xray/docker/docker-compose.yaml | 34 ++
examples/basic-xray/helloworld_grpc_pb.js | 64 ++++
examples/basic-xray/helloworld_pb.js | 332 ++++++++++++++++++
examples/basic-xray/package.json | 36 ++
examples/basic-xray/server.js | 38 ++
examples/basic-xray/tracer.js | 43 +++
.../package.json | 7 +-
.../package.json | 2 +-
10 files changed, 625 insertions(+), 5 deletions(-)
create mode 100644 examples/basic-xray/client.js
create mode 100644 examples/basic-xray/docker/collector-config.yaml
create mode 100644 examples/basic-xray/docker/docker-compose.yaml
create mode 100644 examples/basic-xray/helloworld_grpc_pb.js
create mode 100644 examples/basic-xray/helloworld_pb.js
create mode 100644 examples/basic-xray/package.json
create mode 100644 examples/basic-xray/server.js
create mode 100644 examples/basic-xray/tracer.js
diff --git a/examples/basic-xray/client.js b/examples/basic-xray/client.js
new file mode 100644
index 00000000..5541113a
--- /dev/null
+++ b/examples/basic-xray/client.js
@@ -0,0 +1,46 @@
+'use strict';
+
+const tracer = require('./tracer')('example-grpc-client');
+// eslint-disable-next-line import/order
+const grpc = require('grpc');
+const messages = require('./helloworld_pb');
+const services = require('./helloworld_grpc_pb');
+
+const PORT = 50051;
+
+/** A function which makes requests and handles response. */
+function main() {
+ // span corresponds to outgoing requests. Here, we have manually created
+ // the span, which is created to track work that happens outside of the
+ // request lifecycle entirely.
+ const span = tracer.startSpan('client.js:main()');
+ tracer.withSpan(span, () => {
+ console.log('Client traceId ', span.context().traceId);
+ const client = new services.GreeterClient(
+ `localhost:${PORT}`,
+ grpc.credentials.createInsecure(),
+ );
+ const request = new messages.HelloRequest();
+ let user;
+ if (process.argv.length >= 3) {
+ // eslint-disable-next-line prefer-destructuring
+ user = process.argv[2];
+ } else {
+ user = 'world';
+ }
+ request.setName(user);
+ client.sayHello(request, (err, response) => {
+ span.end();
+ if (err) throw err;
+ console.log('Greeting:', response.getMessage());
+ });
+ });
+
+ // The process must live for at least the interval past any traces that
+ // must be exported, or some risk being lost if they are recorded after the
+ // last export.
+ console.log('Sleeping 5 seconds before shutdown to ensure all records are flushed.');
+ setTimeout(() => { console.log('Completed.'); }, 5000);
+}
+
+main();
diff --git a/examples/basic-xray/docker/collector-config.yaml b/examples/basic-xray/docker/collector-config.yaml
new file mode 100644
index 00000000..bec4c8e0
--- /dev/null
+++ b/examples/basic-xray/docker/collector-config.yaml
@@ -0,0 +1,28 @@
+receivers:
+ otlp:
+ protocols:
+ grpc:
+ endpoint: 0.0.0.0:55680
+ http:
+ cors_allowed_origins:
+ -http://*
+ -https://*
+exporters:
+ logging:
+ loglevel: info
+ awsxray:
+ local_mode: true
+ zipkin:
+ endpoint: "http://zipkin-server:9411/api/v2/spans"
+ # jaeger:
+ # endpoint: jaeger-server:14250
+service:
+ pipelines:
+ traces:
+ receivers:
+ - otlp
+ exporters:
+ - logging
+ - awsxray
+ - zipkin
+ # - jaeger
\ No newline at end of file
diff --git a/examples/basic-xray/docker/docker-compose.yaml b/examples/basic-xray/docker/docker-compose.yaml
new file mode 100644
index 00000000..c14bdac5
--- /dev/null
+++ b/examples/basic-xray/docker/docker-compose.yaml
@@ -0,0 +1,34 @@
+version: '3.8'
+services:
+ # jaeger-server:
+ # image: jaegertracing/all-in-one:latest
+ # ports:
+ # - "16686:16686"
+ # - "14268"
+ # - "14250"
+
+ zipkin-server:
+ image: openzipkin/zipkin:latest
+ ports:
+ - "9411:9411"
+
+ collector:
+ #build:
+ # context: ../opentelemetry-collector-contrib
+ # dockerfile: examples/tracing/Dockerfile
+ image: otel/opentelemetry-collector-contrib-dev
+ command: --config /config/collector-config.yaml
+ environment:
+ - AWS_PROFILE=default
+ - AWS_ACCESS_KEY_ID
+ - AWS_SECRET_ACCESS_KEY
+ - AWS_REGION
+ ports:
+ - "55680:55680"
+ - "55681:55681"
+ volumes:
+ - ./collector-config.yaml:/config/collector-config.yaml
+ - ~/.aws:/root/.aws
+ depends_on:
+ - zipkin-server
+ # - jaeger-server
diff --git a/examples/basic-xray/helloworld_grpc_pb.js b/examples/basic-xray/helloworld_grpc_pb.js
new file mode 100644
index 00000000..1e39a0f4
--- /dev/null
+++ b/examples/basic-xray/helloworld_grpc_pb.js
@@ -0,0 +1,64 @@
+// GENERATED CODE -- DO NOT EDIT!
+
+// Original file comments:
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+'use strict';
+
+const grpc = require('grpc');
+const helloworld_pb = require('./helloworld_pb.js');
+
+function serialize_HelloReply(arg) {
+ if (!(arg instanceof helloworld_pb.HelloReply)) {
+ throw new Error('Expected argument of type HelloReply');
+ }
+ return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_HelloReply(buffer_arg) {
+ return helloworld_pb.HelloReply.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
+function serialize_HelloRequest(arg) {
+ if (!(arg instanceof helloworld_pb.HelloRequest)) {
+ throw new Error('Expected argument of type HelloRequest');
+ }
+ return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_HelloRequest(buffer_arg) {
+ return helloworld_pb.HelloRequest.deserializeBinary(
+ new Uint8Array(buffer_arg),
+ );
+}
+
+// The greeting service definition.
+const GreeterService = (exports.GreeterService = {
+ // Sends a greeting
+ sayHello: {
+ path: '/helloworld.Greeter/SayHello',
+ requestStream: false,
+ responseStream: false,
+ requestType: helloworld_pb.HelloRequest,
+ responseType: helloworld_pb.HelloReply,
+ requestSerialize: serialize_HelloRequest,
+ requestDeserialize: deserialize_HelloRequest,
+ responseSerialize: serialize_HelloReply,
+ responseDeserialize: deserialize_HelloReply,
+ },
+});
+
+exports.GreeterClient = grpc.makeGenericClientConstructor(GreeterService);
diff --git a/examples/basic-xray/helloworld_pb.js b/examples/basic-xray/helloworld_pb.js
new file mode 100644
index 00000000..066acd68
--- /dev/null
+++ b/examples/basic-xray/helloworld_pb.js
@@ -0,0 +1,332 @@
+/**
+ * @fileoverview
+ * @enhanceable
+ * @public
+ */
+// GENERATED CODE -- DO NOT EDIT!
+
+const jspb = require('google-protobuf');
+
+const goog = jspb;
+const global = Function('return this')();
+
+goog.exportSymbol('proto.helloworld.HelloReply', null, global);
+goog.exportSymbol('proto.helloworld.HelloRequest', null, global);
+
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.helloworld.HelloRequest = function (opt_data) {
+ jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.helloworld.HelloRequest, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+ proto.helloworld.HelloRequest.displayName = 'proto.helloworld.HelloRequest';
+}
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+ /**
+ * Creates an object representation of this proto suitable for use in Soy templates.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * To access a reserved field use, foo.pb_, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
+ * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
+ * for transitional soy proto support: http://goto/soy-param-migration
+ * @return {!Object}
+ */
+ proto.helloworld.HelloRequest.prototype.toObject = function (
+ opt_includeInstance,
+ ) {
+ return proto.helloworld.HelloRequest.toObject(opt_includeInstance, this);
+ };
+
+ /**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Whether to include the JSPB
+ * instance for transitional soy proto support:
+ * http://goto/soy-param-migration
+ * @param {!proto.helloworld.HelloRequest} msg The msg instance to transform.
+ * @return {!Object}
+ */
+ proto.helloworld.HelloRequest.toObject = function (includeInstance, msg) {
+ let f;
+
+ const obj = {
+ name: msg.getName(),
+ };
+
+ if (includeInstance) {
+ obj.$jspbMessageInstance = msg;
+ }
+ return obj;
+ };
+}
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.helloworld.HelloRequest}
+ */
+proto.helloworld.HelloRequest.deserializeBinary = function (bytes) {
+ const reader = new jspb.BinaryReader(bytes);
+ const msg = new proto.helloworld.HelloRequest();
+ return proto.helloworld.HelloRequest.deserializeBinaryFromReader(msg, reader);
+};
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.helloworld.HelloRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.helloworld.HelloRequest}
+ */
+proto.helloworld.HelloRequest.deserializeBinaryFromReader = function (
+ msg,
+ reader,
+) {
+ while (reader.nextField()) {
+ if (reader.isEndGroup()) {
+ break;
+ }
+ const field = reader.getFieldNumber();
+ switch (field) {
+ case 1:
+ var value = /** @type {string} */ (reader.readString());
+ msg.setName(value);
+ break;
+ default:
+ reader.skipField();
+ break;
+ }
+ }
+ return msg;
+};
+
+/**
+ * Class method variant: serializes the given message to binary data
+ * (in protobuf wire format), writing to the given BinaryWriter.
+ * @param {!proto.helloworld.HelloRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ */
+proto.helloworld.HelloRequest.serializeBinaryToWriter = function (
+ message,
+ writer,
+) {
+ message.serializeBinaryToWriter(writer);
+};
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.helloworld.HelloRequest.prototype.serializeBinary = function () {
+ const writer = new jspb.BinaryWriter();
+ this.serializeBinaryToWriter(writer);
+ return writer.getResultBuffer();
+};
+
+/**
+ * Serializes the message to binary data (in protobuf wire format),
+ * writing to the given BinaryWriter.
+ * @param {!jspb.BinaryWriter} writer
+ */
+proto.helloworld.HelloRequest.prototype.serializeBinaryToWriter = function (
+ writer,
+) {
+ let f;
+ f = this.getName();
+ if (f.length > 0) {
+ writer.writeString(1, f);
+ }
+};
+
+/**
+ * Creates a deep clone of this proto. No data is shared with the original.
+ * @return {!proto.helloworld.HelloRequest} The clone.
+ */
+proto.helloworld.HelloRequest.prototype.cloneMessage = function () {
+ return /** @type {!proto.helloworld.HelloRequest} */ (jspb.Message.cloneMessage(
+ this,
+ ));
+};
+
+/**
+ * optional string name = 1;
+ * @return {string}
+ */
+proto.helloworld.HelloRequest.prototype.getName = function () {
+ return /** @type {string} */ (jspb.Message.getFieldProto3(this, 1, ''));
+};
+
+/** @param {string} value */
+proto.helloworld.HelloRequest.prototype.setName = function (value) {
+ jspb.Message.setField(this, 1, value);
+};
+
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.helloworld.HelloReply = function (opt_data) {
+ jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.helloworld.HelloReply, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+ proto.helloworld.HelloReply.displayName = 'proto.helloworld.HelloReply';
+}
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+ /**
+ * Creates an object representation of this proto suitable for use in Soy templates.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * To access a reserved field use, foo.pb_, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
+ * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
+ * for transitional soy proto support: http://goto/soy-param-migration
+ * @return {!Object}
+ */
+ proto.helloworld.HelloReply.prototype.toObject = function (
+ opt_includeInstance,
+ ) {
+ return proto.helloworld.HelloReply.toObject(opt_includeInstance, this);
+ };
+
+ /**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Whether to include the JSPB
+ * instance for transitional soy proto support:
+ * http://goto/soy-param-migration
+ * @param {!proto.helloworld.HelloReply} msg The msg instance to transform.
+ * @return {!Object}
+ */
+ proto.helloworld.HelloReply.toObject = function (includeInstance, msg) {
+ let f;
+
+ const obj = {
+ message: msg.getMessage(),
+ };
+
+ if (includeInstance) {
+ obj.$jspbMessageInstance = msg;
+ }
+ return obj;
+ };
+}
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.helloworld.HelloReply}
+ */
+proto.helloworld.HelloReply.deserializeBinary = function (bytes) {
+ const reader = new jspb.BinaryReader(bytes);
+ const msg = new proto.helloworld.HelloReply();
+ return proto.helloworld.HelloReply.deserializeBinaryFromReader(msg, reader);
+};
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.helloworld.HelloReply} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.helloworld.HelloReply}
+ */
+proto.helloworld.HelloReply.deserializeBinaryFromReader = function (
+ msg,
+ reader,
+) {
+ while (reader.nextField()) {
+ if (reader.isEndGroup()) {
+ break;
+ }
+ const field = reader.getFieldNumber();
+ switch (field) {
+ case 1:
+ var value = /** @type {string} */ (reader.readString());
+ msg.setMessage(value);
+ break;
+ default:
+ reader.skipField();
+ break;
+ }
+ }
+ return msg;
+};
+
+/**
+ * Class method variant: serializes the given message to binary data
+ * (in protobuf wire format), writing to the given BinaryWriter.
+ * @param {!proto.helloworld.HelloReply} message
+ * @param {!jspb.BinaryWriter} writer
+ */
+proto.helloworld.HelloReply.serializeBinaryToWriter = function (
+ message,
+ writer,
+) {
+ message.serializeBinaryToWriter(writer);
+};
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.helloworld.HelloReply.prototype.serializeBinary = function () {
+ const writer = new jspb.BinaryWriter();
+ this.serializeBinaryToWriter(writer);
+ return writer.getResultBuffer();
+};
+
+/**
+ * Serializes the message to binary data (in protobuf wire format),
+ * writing to the given BinaryWriter.
+ * @param {!jspb.BinaryWriter} writer
+ */
+proto.helloworld.HelloReply.prototype.serializeBinaryToWriter = function (
+ writer,
+) {
+ let f;
+ f = this.getMessage();
+ if (f.length > 0) {
+ writer.writeString(1, f);
+ }
+};
+
+/**
+ * Creates a deep clone of this proto. No data is shared with the original.
+ * @return {!proto.helloworld.HelloReply} The clone.
+ */
+proto.helloworld.HelloReply.prototype.cloneMessage = function () {
+ return /** @type {!proto.helloworld.HelloReply} */ (jspb.Message.cloneMessage(
+ this,
+ ));
+};
+
+/**
+ * optional string message = 1;
+ * @return {string}
+ */
+proto.helloworld.HelloReply.prototype.getMessage = function () {
+ return /** @type {string} */ (jspb.Message.getFieldProto3(this, 1, ''));
+};
+
+/** @param {string} value */
+proto.helloworld.HelloReply.prototype.setMessage = function (value) {
+ jspb.Message.setField(this, 1, value);
+};
+
+goog.object.extend(exports, proto.helloworld);
diff --git a/examples/basic-xray/package.json b/examples/basic-xray/package.json
new file mode 100644
index 00000000..c047367c
--- /dev/null
+++ b/examples/basic-xray/package.json
@@ -0,0 +1,36 @@
+{
+ "name": "basic-xray",
+ "version": "1.0.0",
+ "description": "Basic AWS X-Ray instrumentation using OTel JS SDK",
+ "main": "index.js",
+ "scripts": {
+ "server": "node ./server.js",
+ "client": "node ./client.js",
+ "docker:start": "cd ./docker && docker-compose down && docker-compose up",
+ "docker:startd": "cd ./docker && docker-compose down && docker-compose up -d",
+ "docker:stop": "cd ./docker && docker-compose down"
+ },
+ "keywords": [
+ "opentelemetry",
+ "tracing",
+ "AWS",
+ "X-Ray"
+ ],
+ "engines": {
+ "node": ">=8"
+ },
+ "author": "AWS Authors",
+ "license": "ISC",
+ "dependencies": {
+ "@opentelemetry/api": "^0.10.2",
+ "@opentelemetry/exporter-collector": "^0.10.2",
+ "@opentelemetry/node": "^0.10.2",
+ "@opentelemetry/plugin-grpc": "^0.10.2",
+ "@opentelemetry/resource-detector-aws": "^0.10.3-alpha.28",
+ "@opentelemetry/resources": "^0.10.2",
+ "@opentelemetry/tracing": "^0.10.2",
+ "google-protobuf": "^3.13.0",
+ "grpc": "^1.24.3",
+ "node-pre-gyp": "^0.15.0"
+ }
+}
diff --git a/examples/basic-xray/server.js b/examples/basic-xray/server.js
new file mode 100644
index 00000000..1b9d5331
--- /dev/null
+++ b/examples/basic-xray/server.js
@@ -0,0 +1,38 @@
+'use strict';
+
+const tracer = require('./tracer')(('example-grpc-server'));
+// eslint-disable-next-line import/order
+const grpc = require('grpc');
+
+const messages = require('./helloworld_pb');
+const services = require('./helloworld_grpc_pb');
+
+const PORT = 50051;
+
+/** Starts a gRPC server that receives requests on sample server port. */
+function startServer() {
+ // Creates a server
+ const server = new grpc.Server();
+ server.addService(services.GreeterService, { sayHello });
+ server.bind(`0.0.0.0:${PORT}`, grpc.ServerCredentials.createInsecure());
+ console.log(`binding server on 0.0.0.0:${PORT}`);
+ server.start();
+}
+
+function sayHello(call, callback) {
+ const currentSpan = tracer.getCurrentSpan();
+ // display traceid in the terminal
+ console.log(`traceid: ${currentSpan.context().traceId}`);
+ const span = tracer.startSpan('server.js:sayHello()', {
+ parent: currentSpan,
+ kind: 1, // server
+ attributes: { key: 'value' },
+ });
+ span.addEvent(`invoking sayHello() to ${call.request.getName()}`);
+ const reply = new messages.HelloReply();
+ reply.setMessage(`Hello ${call.request.getName()}`);
+ callback(null, reply);
+ span.end();
+}
+
+startServer();
diff --git a/examples/basic-xray/tracer.js b/examples/basic-xray/tracer.js
new file mode 100644
index 00000000..3c51c8b3
--- /dev/null
+++ b/examples/basic-xray/tracer.js
@@ -0,0 +1,43 @@
+'use strict'
+
+const { BasicTracerProvider, SimpleSpanProcessor, ConsoleSpanExporter } = require("@opentelemetry/tracing");
+const { NodeTracerProvider } = require('@opentelemetry/node');
+const { context, propagation, trace } = require("@opentelemetry/api");
+const { CollectorTraceExporter, CollectorProtocolNode } = require('@opentelemetry/exporter-collector');
+const { detectResources } = require('@opentelemetry/resources');
+const { awsEc2Detector } = require('@opentelemetry/resource-detector-aws');
+const { AwsXRayPropagator } = require('@opentelemetry/propagator-aws-xray');
+const { AwsXRayIdGenerator } = require('@opentelemetry/id-generator-aws-xray');
+
+module.exports = (serviceName) => {
+ // set global propagator
+ propagation.setGlobalPropagator(new AwsXRayPropagator());
+
+ // currently have not been merged, will do it later
+ // // get resource by take use of multiple detectors
+ // const detectorConfig = {
+ // detectors: [awsEcsDetector, awsEc2Detector, awsBeanstalkDetector]
+ // };
+ // const resources = detectResources(detectorConfig);
+
+ // create a provider for activating and tracking with AWS IdGenerator
+ const tracerConfig = {
+ idGenerator: new AwsXRayIdGenerator(),
+ // resources: resources
+ };
+ const tracerProvider = new NodeTracerProvider(tracerConfig);
+
+ // add OTLP exporter
+ const otlpExporter = new CollectorTraceExporter({
+ serviceName: serviceName,
+ protocolNode: CollectorProtocolNode.HTTP_PROTO,
+ });
+ tracerProvider.addSpanProcessor(new SimpleSpanProcessor(otlpExporter));
+ tracerProvider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter()));
+
+ // Register the tracer
+ tracerProvider.register();
+
+ // Get a tracer
+ return trace.getTracer("awsxray-tests");
+}
diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
index 5e978e9a..719ef98b 100644
--- a/packages/opentelemetry-id-generator-aws-xray/package.json
+++ b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -2,10 +2,9 @@
"name": "@opentelemetry/id-generator-aws-xray",
"version": "0.10.1",
"description": "AWS X-Ray ID generator for OpenTelemetry",
- "main": ".eslintrc.js",
- "directories": {
- "test": "test"
- },
+ "main": "build/src/index.js",
+ "types": "build/src/index.d.ts",
+ "repository": "aws-opentelemetry-js/opentelemetry-id-generator-aws-xray",
"scripts": {
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
diff --git a/packages/opentelemetry-propagator-aws-xray/package.json b/packages/opentelemetry-propagator-aws-xray/package.json
index f0ef46e0..c9b54173 100644
--- a/packages/opentelemetry-propagator-aws-xray/package.json
+++ b/packages/opentelemetry-propagator-aws-xray/package.json
@@ -4,7 +4,7 @@
"description": "OpenTelemetry AWS Xray propagator provides HTTP header propagation for systems that are using AWS Xray HTTP header format.",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
- "repository": "open-telemetry/opentelemetry-js",
+ "repository": "aws-opentelemetry-js/opentelemetry-propagator-aws-xray",
"scripts": {
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/index-webpack.ts'",
"test:browser": "nyc karma start --single-run",
From c18970924c4dde7f17efbc9a3777d7d7fc46c94c Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Thu, 20 Aug 2020 18:39:58 -0500
Subject: [PATCH 10/12] style: add final line for collector-config
---
examples/basic-xray/docker/collector-config.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/basic-xray/docker/collector-config.yaml b/examples/basic-xray/docker/collector-config.yaml
index bec4c8e0..21853cff 100644
--- a/examples/basic-xray/docker/collector-config.yaml
+++ b/examples/basic-xray/docker/collector-config.yaml
@@ -25,4 +25,4 @@ service:
- logging
- awsxray
- zipkin
- # - jaeger
\ No newline at end of file
+ # - jaeger
From 286faefb25f1da49b3d1bba01c7368dd6d3858a3 Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Tue, 25 Aug 2020 20:45:05 -0500
Subject: [PATCH 11/12] feat: push example demo for debug purpose
---
examples/basic-xray/client.js | 43 +--
.../basic-xray/docker/collector-config.yaml | 10 +-
.../basic-xray/docker/docker-compose.yaml | 21 +-
examples/basic-xray/helloworld_grpc_pb.js | 64 ----
examples/basic-xray/helloworld_pb.js | 332 ------------------
examples/basic-xray/package.json | 11 +-
examples/basic-xray/server.js | 56 +--
examples/basic-xray/tracer.js | 21 +-
.../package.json | 2 +-
.../package.json | 6 +-
.../src/AWSXRayPropagator.ts | 17 +-
11 files changed, 110 insertions(+), 473 deletions(-)
delete mode 100644 examples/basic-xray/helloworld_grpc_pb.js
delete mode 100644 examples/basic-xray/helloworld_pb.js
diff --git a/examples/basic-xray/client.js b/examples/basic-xray/client.js
index 5541113a..5a88497f 100644
--- a/examples/basic-xray/client.js
+++ b/examples/basic-xray/client.js
@@ -1,38 +1,27 @@
'use strict';
-const tracer = require('./tracer')('example-grpc-client');
+const tracer = require('./tracer')('example-http-client');
// eslint-disable-next-line import/order
-const grpc = require('grpc');
-const messages = require('./helloworld_pb');
-const services = require('./helloworld_grpc_pb');
-
-const PORT = 50051;
+const http = require('http');
/** A function which makes requests and handles response. */
-function main() {
+function makeRequest() {
// span corresponds to outgoing requests. Here, we have manually created
// the span, which is created to track work that happens outside of the
// request lifecycle entirely.
- const span = tracer.startSpan('client.js:main()');
+ const span = tracer.startSpan('makeRequest');
tracer.withSpan(span, () => {
- console.log('Client traceId ', span.context().traceId);
- const client = new services.GreeterClient(
- `localhost:${PORT}`,
- grpc.credentials.createInsecure(),
- );
- const request = new messages.HelloRequest();
- let user;
- if (process.argv.length >= 3) {
- // eslint-disable-next-line prefer-destructuring
- user = process.argv[2];
- } else {
- user = 'world';
- }
- request.setName(user);
- client.sayHello(request, (err, response) => {
- span.end();
- if (err) throw err;
- console.log('Greeting:', response.getMessage());
+ http.get({
+ host: 'localhost',
+ port: 8080,
+ path: '/helloworld',
+ }, (response) => {
+ const body = [];
+ response.on('data', (chunk) => body.push(chunk));
+ response.on('end', () => {
+ console.log(body.toString());
+ span.end();
+ });
});
});
@@ -43,4 +32,4 @@ function main() {
setTimeout(() => { console.log('Completed.'); }, 5000);
}
-main();
+makeRequest();
diff --git a/examples/basic-xray/docker/collector-config.yaml b/examples/basic-xray/docker/collector-config.yaml
index 21853cff..4f9e058f 100644
--- a/examples/basic-xray/docker/collector-config.yaml
+++ b/examples/basic-xray/docker/collector-config.yaml
@@ -9,13 +9,15 @@ receivers:
-https://*
exporters:
logging:
- loglevel: info
+ loglevel: debug
awsxray:
local_mode: true
+ # role_arn: arn:aws:iam::640946111646:user/CongZou
zipkin:
endpoint: "http://zipkin-server:9411/api/v2/spans"
- # jaeger:
- # endpoint: jaeger-server:14250
+ jaeger:
+ endpoint: jaeger-server:14250
+ insecure: true
service:
pipelines:
traces:
@@ -25,4 +27,4 @@ service:
- logging
- awsxray
- zipkin
- # - jaeger
+ - jaeger
diff --git a/examples/basic-xray/docker/docker-compose.yaml b/examples/basic-xray/docker/docker-compose.yaml
index c14bdac5..d5e62177 100644
--- a/examples/basic-xray/docker/docker-compose.yaml
+++ b/examples/basic-xray/docker/docker-compose.yaml
@@ -1,16 +1,22 @@
version: '3.8'
services:
- # jaeger-server:
- # image: jaegertracing/all-in-one:latest
- # ports:
- # - "16686:16686"
- # - "14268"
- # - "14250"
+ jaeger-server:
+ image: jaegertracing/all-in-one:latest
+ ports:
+ - "16686:16686"
+ - "14268"
+ - "14250"
zipkin-server:
image: openzipkin/zipkin:latest
ports:
- "9411:9411"
+
+ imds:
+ image: amazon/amazon-ec2-metadata-mock:v1.5.0
+ command: --hostname 0.0.0.0
+ ports:
+ - "1338:1338"
collector:
#build:
@@ -26,9 +32,10 @@ services:
ports:
- "55680:55680"
- "55681:55681"
+ - "14268"
volumes:
- ./collector-config.yaml:/config/collector-config.yaml
- ~/.aws:/root/.aws
depends_on:
- zipkin-server
- # - jaeger-server
+ - jaeger-server
diff --git a/examples/basic-xray/helloworld_grpc_pb.js b/examples/basic-xray/helloworld_grpc_pb.js
deleted file mode 100644
index 1e39a0f4..00000000
--- a/examples/basic-xray/helloworld_grpc_pb.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// GENERATED CODE -- DO NOT EDIT!
-
-// Original file comments:
-// Copyright 2015 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-'use strict';
-
-const grpc = require('grpc');
-const helloworld_pb = require('./helloworld_pb.js');
-
-function serialize_HelloReply(arg) {
- if (!(arg instanceof helloworld_pb.HelloReply)) {
- throw new Error('Expected argument of type HelloReply');
- }
- return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_HelloReply(buffer_arg) {
- return helloworld_pb.HelloReply.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
-function serialize_HelloRequest(arg) {
- if (!(arg instanceof helloworld_pb.HelloRequest)) {
- throw new Error('Expected argument of type HelloRequest');
- }
- return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_HelloRequest(buffer_arg) {
- return helloworld_pb.HelloRequest.deserializeBinary(
- new Uint8Array(buffer_arg),
- );
-}
-
-// The greeting service definition.
-const GreeterService = (exports.GreeterService = {
- // Sends a greeting
- sayHello: {
- path: '/helloworld.Greeter/SayHello',
- requestStream: false,
- responseStream: false,
- requestType: helloworld_pb.HelloRequest,
- responseType: helloworld_pb.HelloReply,
- requestSerialize: serialize_HelloRequest,
- requestDeserialize: deserialize_HelloRequest,
- responseSerialize: serialize_HelloReply,
- responseDeserialize: deserialize_HelloReply,
- },
-});
-
-exports.GreeterClient = grpc.makeGenericClientConstructor(GreeterService);
diff --git a/examples/basic-xray/helloworld_pb.js b/examples/basic-xray/helloworld_pb.js
deleted file mode 100644
index 066acd68..00000000
--- a/examples/basic-xray/helloworld_pb.js
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
- * @fileoverview
- * @enhanceable
- * @public
- */
-// GENERATED CODE -- DO NOT EDIT!
-
-const jspb = require('google-protobuf');
-
-const goog = jspb;
-const global = Function('return this')();
-
-goog.exportSymbol('proto.helloworld.HelloReply', null, global);
-goog.exportSymbol('proto.helloworld.HelloRequest', null, global);
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.helloworld.HelloRequest = function (opt_data) {
- jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.helloworld.HelloRequest, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
- proto.helloworld.HelloRequest.displayName = 'proto.helloworld.HelloRequest';
-}
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
- /**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_, eg, foo.pb_default.
- * For the list of reserved names please see:
- * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- * for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
- proto.helloworld.HelloRequest.prototype.toObject = function (
- opt_includeInstance,
- ) {
- return proto.helloworld.HelloRequest.toObject(opt_includeInstance, this);
- };
-
- /**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- * instance for transitional soy proto support:
- * http://goto/soy-param-migration
- * @param {!proto.helloworld.HelloRequest} msg The msg instance to transform.
- * @return {!Object}
- */
- proto.helloworld.HelloRequest.toObject = function (includeInstance, msg) {
- let f;
-
- const obj = {
- name: msg.getName(),
- };
-
- if (includeInstance) {
- obj.$jspbMessageInstance = msg;
- }
- return obj;
- };
-}
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.helloworld.HelloRequest}
- */
-proto.helloworld.HelloRequest.deserializeBinary = function (bytes) {
- const reader = new jspb.BinaryReader(bytes);
- const msg = new proto.helloworld.HelloRequest();
- return proto.helloworld.HelloRequest.deserializeBinaryFromReader(msg, reader);
-};
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.helloworld.HelloRequest} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.helloworld.HelloRequest}
- */
-proto.helloworld.HelloRequest.deserializeBinaryFromReader = function (
- msg,
- reader,
-) {
- while (reader.nextField()) {
- if (reader.isEndGroup()) {
- break;
- }
- const field = reader.getFieldNumber();
- switch (field) {
- case 1:
- var value = /** @type {string} */ (reader.readString());
- msg.setName(value);
- break;
- default:
- reader.skipField();
- break;
- }
- }
- return msg;
-};
-
-/**
- * Class method variant: serializes the given message to binary data
- * (in protobuf wire format), writing to the given BinaryWriter.
- * @param {!proto.helloworld.HelloRequest} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.helloworld.HelloRequest.serializeBinaryToWriter = function (
- message,
- writer,
-) {
- message.serializeBinaryToWriter(writer);
-};
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.helloworld.HelloRequest.prototype.serializeBinary = function () {
- const writer = new jspb.BinaryWriter();
- this.serializeBinaryToWriter(writer);
- return writer.getResultBuffer();
-};
-
-/**
- * Serializes the message to binary data (in protobuf wire format),
- * writing to the given BinaryWriter.
- * @param {!jspb.BinaryWriter} writer
- */
-proto.helloworld.HelloRequest.prototype.serializeBinaryToWriter = function (
- writer,
-) {
- let f;
- f = this.getName();
- if (f.length > 0) {
- writer.writeString(1, f);
- }
-};
-
-/**
- * Creates a deep clone of this proto. No data is shared with the original.
- * @return {!proto.helloworld.HelloRequest} The clone.
- */
-proto.helloworld.HelloRequest.prototype.cloneMessage = function () {
- return /** @type {!proto.helloworld.HelloRequest} */ (jspb.Message.cloneMessage(
- this,
- ));
-};
-
-/**
- * optional string name = 1;
- * @return {string}
- */
-proto.helloworld.HelloRequest.prototype.getName = function () {
- return /** @type {string} */ (jspb.Message.getFieldProto3(this, 1, ''));
-};
-
-/** @param {string} value */
-proto.helloworld.HelloRequest.prototype.setName = function (value) {
- jspb.Message.setField(this, 1, value);
-};
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.helloworld.HelloReply = function (opt_data) {
- jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.helloworld.HelloReply, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
- proto.helloworld.HelloReply.displayName = 'proto.helloworld.HelloReply';
-}
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
- /**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_, eg, foo.pb_default.
- * For the list of reserved names please see:
- * com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- * for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
- proto.helloworld.HelloReply.prototype.toObject = function (
- opt_includeInstance,
- ) {
- return proto.helloworld.HelloReply.toObject(opt_includeInstance, this);
- };
-
- /**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- * instance for transitional soy proto support:
- * http://goto/soy-param-migration
- * @param {!proto.helloworld.HelloReply} msg The msg instance to transform.
- * @return {!Object}
- */
- proto.helloworld.HelloReply.toObject = function (includeInstance, msg) {
- let f;
-
- const obj = {
- message: msg.getMessage(),
- };
-
- if (includeInstance) {
- obj.$jspbMessageInstance = msg;
- }
- return obj;
- };
-}
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.helloworld.HelloReply}
- */
-proto.helloworld.HelloReply.deserializeBinary = function (bytes) {
- const reader = new jspb.BinaryReader(bytes);
- const msg = new proto.helloworld.HelloReply();
- return proto.helloworld.HelloReply.deserializeBinaryFromReader(msg, reader);
-};
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.helloworld.HelloReply} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.helloworld.HelloReply}
- */
-proto.helloworld.HelloReply.deserializeBinaryFromReader = function (
- msg,
- reader,
-) {
- while (reader.nextField()) {
- if (reader.isEndGroup()) {
- break;
- }
- const field = reader.getFieldNumber();
- switch (field) {
- case 1:
- var value = /** @type {string} */ (reader.readString());
- msg.setMessage(value);
- break;
- default:
- reader.skipField();
- break;
- }
- }
- return msg;
-};
-
-/**
- * Class method variant: serializes the given message to binary data
- * (in protobuf wire format), writing to the given BinaryWriter.
- * @param {!proto.helloworld.HelloReply} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.helloworld.HelloReply.serializeBinaryToWriter = function (
- message,
- writer,
-) {
- message.serializeBinaryToWriter(writer);
-};
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.helloworld.HelloReply.prototype.serializeBinary = function () {
- const writer = new jspb.BinaryWriter();
- this.serializeBinaryToWriter(writer);
- return writer.getResultBuffer();
-};
-
-/**
- * Serializes the message to binary data (in protobuf wire format),
- * writing to the given BinaryWriter.
- * @param {!jspb.BinaryWriter} writer
- */
-proto.helloworld.HelloReply.prototype.serializeBinaryToWriter = function (
- writer,
-) {
- let f;
- f = this.getMessage();
- if (f.length > 0) {
- writer.writeString(1, f);
- }
-};
-
-/**
- * Creates a deep clone of this proto. No data is shared with the original.
- * @return {!proto.helloworld.HelloReply} The clone.
- */
-proto.helloworld.HelloReply.prototype.cloneMessage = function () {
- return /** @type {!proto.helloworld.HelloReply} */ (jspb.Message.cloneMessage(
- this,
- ));
-};
-
-/**
- * optional string message = 1;
- * @return {string}
- */
-proto.helloworld.HelloReply.prototype.getMessage = function () {
- return /** @type {string} */ (jspb.Message.getFieldProto3(this, 1, ''));
-};
-
-/** @param {string} value */
-proto.helloworld.HelloReply.prototype.setMessage = function (value) {
- jspb.Message.setField(this, 1, value);
-};
-
-goog.object.extend(exports, proto.helloworld);
diff --git a/examples/basic-xray/package.json b/examples/basic-xray/package.json
index c047367c..26ebdbb6 100644
--- a/examples/basic-xray/package.json
+++ b/examples/basic-xray/package.json
@@ -22,15 +22,16 @@
"author": "AWS Authors",
"license": "ISC",
"dependencies": {
+ "@lerna/link": "^3.21.0",
"@opentelemetry/api": "^0.10.2",
+ "@opentelemetry/context-base": "^0.10.2",
+ "@opentelemetry/core": "^0.10.2",
"@opentelemetry/exporter-collector": "^0.10.2",
"@opentelemetry/node": "^0.10.2",
- "@opentelemetry/plugin-grpc": "^0.10.2",
+ "@opentelemetry/plugin-http": "^0.10.2",
+ "@opentelemetry/propagator-jaeger": "^0.9.0",
"@opentelemetry/resource-detector-aws": "^0.10.3-alpha.28",
"@opentelemetry/resources": "^0.10.2",
- "@opentelemetry/tracing": "^0.10.2",
- "google-protobuf": "^3.13.0",
- "grpc": "^1.24.3",
- "node-pre-gyp": "^0.15.0"
+ "@opentelemetry/tracing": "^0.10.2"
}
}
diff --git a/examples/basic-xray/server.js b/examples/basic-xray/server.js
index 1b9d5331..8cefe745 100644
--- a/examples/basic-xray/server.js
+++ b/examples/basic-xray/server.js
@@ -1,38 +1,50 @@
'use strict';
-const tracer = require('./tracer')(('example-grpc-server'));
+const tracer = require('./tracer')('example-http-server');
// eslint-disable-next-line import/order
-const grpc = require('grpc');
+const http = require('http');
-const messages = require('./helloworld_pb');
-const services = require('./helloworld_grpc_pb');
-
-const PORT = 50051;
-
-/** Starts a gRPC server that receives requests on sample server port. */
-function startServer() {
+/** Starts a HTTP server that receives requests on sample server port. */
+function startServer(port) {
// Creates a server
- const server = new grpc.Server();
- server.addService(services.GreeterService, { sayHello });
- server.bind(`0.0.0.0:${PORT}`, grpc.ServerCredentials.createInsecure());
- console.log(`binding server on 0.0.0.0:${PORT}`);
- server.start();
+ const server = http.createServer(handleRequest);
+ // Starts the server
+ server.listen(port, (err) => {
+ if (err) {
+ throw err;
+ }
+ console.log(`Node HTTP listening on ${port}`);
+ });
}
-function sayHello(call, callback) {
+/** A function which handles requests and send response. */
+function handleRequest(request, response) {
const currentSpan = tracer.getCurrentSpan();
// display traceid in the terminal
console.log(`traceid: ${currentSpan.context().traceId}`);
- const span = tracer.startSpan('server.js:sayHello()', {
+ const span = tracer.startSpan('handleRequest', {
parent: currentSpan,
kind: 1, // server
attributes: { key: 'value' },
});
- span.addEvent(`invoking sayHello() to ${call.request.getName()}`);
- const reply = new messages.HelloReply();
- reply.setMessage(`Hello ${call.request.getName()}`);
- callback(null, reply);
- span.end();
+ // Annotate our span to capture metadata about the operation
+ span.addEvent('invoking handleRequest');
+ try {
+ const body = [];
+ console.log(JSON.stringify(request.headers));
+ request.on('error', (err) => console.log(err));
+ request.on('data', (chunk) => body.push(chunk));
+ request.on('end', () => {
+ // deliberately sleeping to mock some action.
+ setTimeout(() => {
+ span.end();
+ response.end('Hello World!');
+ }, 2000);
+ });
+ } catch (err) {
+ console.error(err);
+ span.end();
+ }
}
-startServer();
+startServer(8080);
diff --git a/examples/basic-xray/tracer.js b/examples/basic-xray/tracer.js
index 3c51c8b3..5aed17f3 100644
--- a/examples/basic-xray/tracer.js
+++ b/examples/basic-xray/tracer.js
@@ -5,20 +5,27 @@ const { NodeTracerProvider } = require('@opentelemetry/node');
const { context, propagation, trace } = require("@opentelemetry/api");
const { CollectorTraceExporter, CollectorProtocolNode } = require('@opentelemetry/exporter-collector');
const { detectResources } = require('@opentelemetry/resources');
+// const { HttpTraceContextTemp } = require('httptracecontexttemp');
+const { HttpTraceContext } = require('@opentelemetry/core');
const { awsEc2Detector } = require('@opentelemetry/resource-detector-aws');
-const { AwsXRayPropagator } = require('@opentelemetry/propagator-aws-xray');
-const { AwsXRayIdGenerator } = require('@opentelemetry/id-generator-aws-xray');
+const { AwsXRayPropagator } = require('@aws-observability/propagator-aws-xray');
+const { AwsXRayIdGenerator } = require('@aws-observability/id-generator-aws-xray');
module.exports = (serviceName) => {
// set global propagator
propagation.setGlobalPropagator(new AwsXRayPropagator());
// currently have not been merged, will do it later
- // // get resource by take use of multiple detectors
- // const detectorConfig = {
- // detectors: [awsEcsDetector, awsEc2Detector, awsBeanstalkDetector]
- // };
- // const resources = detectResources(detectorConfig);
+ // get resource by take use of multiple detectors
+ const detectorConfig = {
+ detectors: [
+ // awsEcsDetector,
+ awsEc2Detector,
+ // awsBeanstalkDetector
+ ]
+ };
+ const resources = detectResources(detectorConfig);
+ console.log(JSON.stringify(resources));
// create a provider for activating and tracking with AWS IdGenerator
const tracerConfig = {
diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
index 719ef98b..1575a8f9 100644
--- a/packages/opentelemetry-id-generator-aws-xray/package.json
+++ b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -1,5 +1,5 @@
{
- "name": "@opentelemetry/id-generator-aws-xray",
+ "name": "@aws-observability/id-generator-aws-xray",
"version": "0.10.1",
"description": "AWS X-Ray ID generator for OpenTelemetry",
"main": "build/src/index.js",
diff --git a/packages/opentelemetry-propagator-aws-xray/package.json b/packages/opentelemetry-propagator-aws-xray/package.json
index c9b54173..9d6db7fe 100644
--- a/packages/opentelemetry-propagator-aws-xray/package.json
+++ b/packages/opentelemetry-propagator-aws-xray/package.json
@@ -1,5 +1,5 @@
{
- "name": "@opentelemetry/propagator-aws-xray",
+ "name": "@aws-observability/propagator-aws-xray",
"version": "0.9.0",
"description": "OpenTelemetry AWS Xray propagator provides HTTP header propagation for systems that are using AWS Xray HTTP header format.",
"main": "build/src/index.js",
@@ -70,7 +70,7 @@
"webpack": "4.43.0"
},
"dependencies": {
- "@opentelemetry/api": "^0.9.0",
- "@opentelemetry/core": "^0.9.0"
+ "@opentelemetry/api": "^0.10.2",
+ "@opentelemetry/core": "^0.10.2"
}
}
diff --git a/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts b/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts
index 3d698dd5..f788db46 100644
--- a/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts
+++ b/packages/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts
@@ -63,10 +63,14 @@ const VALID_SPANID_REGEX = /^[0-9a-f]{16}$/i;
*/
export class AwsXRayPropagator implements HttpTextPropagator {
inject(context: Context, carrier: unknown, setter: SetterFunction) {
+ console.log('context(inject): ' + JSON.stringify(context));
const spanContext = getParentSpanContext(context);
+ console.log('spanContext(inject): ' + JSON.stringify(spanContext));
if (!spanContext || !isValid(spanContext)) return;
const otTraceId = spanContext.traceId;
+ console.log('inject traceId: ' + otTraceId);
+
const xrayTraceId =
TRACE_ID_VERSION +
TRACE_ID_DELIMITER +
@@ -89,12 +93,16 @@ export class AwsXRayPropagator implements HttpTextPropagator {
SAMPLED_FLAG_KEY +
KV_DELIMITER +
samplingFlag;
+ console.log('inject traceHeader: ' + traceHeader);
setter(carrier, AWSXRAY_TRACE_ID_HEADER, traceHeader);
+ console.log('carrier(inject): ' + JSON.stringify(carrier));
}
extract(context: Context, carrier: unknown, getter: GetterFunction): Context {
+ console.log('context(extract): ' + JSON.stringify(context));
const spanContext = this.getSpanContextFromHeader(carrier, getter);
+ console.log('spanContext(extract): ' + JSON.stringify(spanContext));
if (!isValid(spanContext)) return context;
return setExtractedSpanContext(context, spanContext);
@@ -104,7 +112,11 @@ export class AwsXRayPropagator implements HttpTextPropagator {
carrier: unknown,
getter: GetterFunction
): SpanContext {
- const traceHeader = getter(carrier, AWSXRAY_TRACE_ID_HEADER);
+ const traceHeader = getter(carrier, AWSXRAY_TRACE_ID_HEADER)
+ ? getter(carrier, AWSXRAY_TRACE_ID_HEADER)
+ : getter(carrier, AWSXRAY_TRACE_ID_HEADER.toLowerCase());
+ console.log('carrier(extract): ' + JSON.stringify(carrier));
+ console.log('traceHeader(extract): ' + traceHeader);
// Only if the returned traceHeader is no empty string can be extracted
if (!traceHeader || typeof traceHeader !== 'string')
return INVALID_SPAN_CONTEXT;
@@ -138,6 +150,9 @@ export class AwsXRayPropagator implements HttpTextPropagator {
parsedTraceFlags = this._parseTraceFlag(value);
}
}
+ console.log('parsedTraceId(extract): ' + parsedTraceId);
+ console.log('parsedSpanId(extract): ' + parsedSpanId);
+ console.log('parsedTraceFlags(extract): ' + parsedTraceFlags);
if (parsedTraceFlags === null) {
return INVALID_SPAN_CONTEXT;
}
From b30c8110d549db445d2745a937bddd3aa94cae2c Mon Sep 17 00:00:00 2001
From: EdZou <1018766866@qq.com>
Date: Thu, 3 Sep 2020 17:45:08 -0500
Subject: [PATCH 12/12] feat: add README docs and template detector components
for demo purpose
---
README.md | 59 ++++
examples/basic-xray/README.md | 265 ++++++++++++++++++
.../basic-xray/docker/collector-config.yaml | 3 +-
.../basic-xray/docker/docker-compose.yaml | 7 +-
examples/basic-xray/images/JaegerResult.png | Bin 0 -> 392004 bytes
examples/basic-xray/images/XRayResult.png | Bin 0 -> 424992 bytes
examples/basic-xray/images/ZipkinResult.png | Bin 0 -> 629106 bytes
examples/basic-xray/package.json | 2 +
examples/basic-xray/server.js | 1 -
examples/basic-xray/tracer.js | 21 +-
.../test/platform/AwsXrayIdGenerator.test.ts | 31 ++
.../package.json | 61 ++++
.../src/detectors/AwsEc2Detector.ts | 164 +++++++++++
.../src/detectors/index.ts | 17 ++
.../src/index.ts | 17 ++
.../src/version.ts | 18 ++
.../tsconfig.json | 8 +
17 files changed, 660 insertions(+), 14 deletions(-)
create mode 100644 examples/basic-xray/README.md
create mode 100644 examples/basic-xray/images/JaegerResult.png
create mode 100644 examples/basic-xray/images/XRayResult.png
create mode 100644 examples/basic-xray/images/ZipkinResult.png
create mode 100644 packages/opentelemetry-resource-detector-aws-demo/package.json
create mode 100644 packages/opentelemetry-resource-detector-aws-demo/src/detectors/AwsEc2Detector.ts
create mode 100644 packages/opentelemetry-resource-detector-aws-demo/src/detectors/index.ts
create mode 100644 packages/opentelemetry-resource-detector-aws-demo/src/index.ts
create mode 100644 packages/opentelemetry-resource-detector-aws-demo/src/version.ts
create mode 100644 packages/opentelemetry-resource-detector-aws-demo/tsconfig.json
diff --git a/README.md b/README.md
index 76c724d9..99a9dbe1 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,61 @@
# aws-opentelemetry-js
AWS extensions to the OpenTelemetry JavaScript API and SDK
+
+You may find OpenTelemetry [Here](https://github.com/open-telemetry)
+
+# Contributing Guide
+
+We'd love your help!
+
+## How to contribute
+
+#### Conventional commit
+
+The Conventional Commits specification is a lightweight convention on top of commit messages. It provides an easy set of rules for creating an explicit commit history; which makes it easier to write automated tools on top of. This convention dovetails with SemVer, by describing the features, fixes, and breaking changes made in commit messages. You can see examples [here](https://www.conventionalcommits.org/en/v1.0.0-beta.4/#examples).
+We use [commitlint](https://github.com/conventional-changelog/commitlint) and [husky](https://github.com/typicode/husky) to prevent bad commit message.
+For example, you want to submit the following commit message `git commit -s -am "my bad commit"`.
+You will receive the following error :
+
+```text
+✖ type must be one of [ci, feat, fix, docs, style, refactor, perf, test, revert, chore] [type-enum]
+```
+
+Here an exemple that will pass the verification: `git commit -s -am "chore(opentelemetry-core): update deps"`
+
+### Fork
+
+In the interest of keeping this repository clean and manageable, you should work from a fork. To create a fork, click the 'Fork' button at the top of the repository, then clone the fork locally using `git clone git@github.com:USERNAME/aws-opentelemetry-js.git`.
+
+You should also add this repository as an "upstream" repo to your local copy, in order to keep it up to date. You can add this as a remote like so:
+
+```sh
+git remote add upstream https://github.com/open-o11y/opentelemetry-js.git
+
+#verify that the upstream exists
+git remote -v
+```
+
+To update your fork, fetch the upstream repo's branches and commits, then merge your master with upstream's master:
+
+```sh
+git fetch upstream
+git checkout master
+git merge upstream/master
+```
+
+Remember to always work in a branch of your local copy, as you might otherwise have to contend with conflicts in master.
+
+### Running the tests (For packages)
+
+The `opentelemetry-js` project is written in TypeScript.
+
+- `npm install` to install dependencies.
+- `npm run compile` compiles the code, checking for type errors.
+- `npm run bootstrap` Bootstrap the packages in the current Lerna repo. Installs all of their dependencies and links any cross-dependencies.
+- `npm test` tests code the same way that our CI will test it.
+- `npm run lint` lint any changes.
+
+
+
+Note that the `opentelemetry-resource-detector-demo` package is only for demo purpose.
+
diff --git a/examples/basic-xray/README.md b/examples/basic-xray/README.md
new file mode 100644
index 00000000..422a19b2
--- /dev/null
+++ b/examples/basic-xray/README.md
@@ -0,0 +1,265 @@
+# Example Usage Guide
+
+In our example demo, we mainly have 3 parts of components:
+
+1. **server.js** and **client.js**: These 2 files simulate a sample application and communicate with each other. Note that in JS SDK, the application is using HTTP protocol, and application integrating OpenTelemetry with HTTP by using `@opentelemetry/plugin-http`. (OpenTelemetry JS team is intending to change the naming of all plugins, so the dependency may also change in the future)
+2. **tracer.js**: In this file, we instrument OpenTelemetry with AWS X-Ray and finally return a instrumented `Tracer` instance for application to use. The detail of instrumentation we will explain in later section
+3. **docker**: In our `docker-compose` file. We mainly take use of follow images:
+ * `jaegertracing/all-in-one:latest`: image to simulate Jaeger backend locally
+ * `openzipkin/zipkin:latest`: image to simulate Zipkin backend locally
+ * `amazon/amazon-ec2-metadata-mock:v1.5.0`: image to simulate EC2 enivironment locally for AWS X-Ray resource detector
+ * `otel/opentelemetry-collector-contrib-dev`: image to use OpenTelemetry Collector
+
+For the details of this pipeline and dataflow, you can refer to [here](https://github.com/open-o11y/docs/blob/master/Integrating-OpenTelemetry-JS-SDK-with-AWS-X-Ray/README.md#reference-documents)
+
+# Get Started
+
+In order to get started with this example demo, please follow the steps below:
+
+## Step 1: Configure and run docker
+
+As illustrated before, we have 4 images running in the same time. The first 3 images including Jaeger, Zipkin and EC2 Metadata can work well in any condition. But for Collector, user need to do some configuration jobs.
+
+In `collector-config.yaml`, you may notice that we use 4 exporters to export our tracingd data to different backends:
+
+1. Jaeger Exporter: export to Jaeger backend, corresponding to local `jaegertracing/all-in-one:latest` image
+2. Zipkin Exporter: export to Zipkin backend, corresponding to local `openzipkin/zipkin:latest` image
+3. Logger Exporter: export the span data to terminal
+4. AWS X-Ray Exporter: export to AWS X-Ray backend, **need** further configuration
+
+If you have not configured aws credentials before, you may find this [guide](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html) useful
+
+If the configuration succeeded, you can run in your terminal:
+
+```
+aws configure list
+```
+
+And it should print something like:
+
+```
+ Name Value Type Location
+ ---- ----- ---- --------
+ profile None None
+access_key ****************47G3 shared-credentials-file
+secret_key ****************zDuB shared-credentials-file
+ region us-east-2 config-file ~/.aws/config
+```
+
+Then under `basic-xray` repo, run this command:
+
+```
+npm run docker:start
+```
+
+to start the docker, if success, terminal should print:
+
+```
+...
+jaeger-server_1 | {"level":"info","ts":1598922793.0212545,"caller":"healthcheck/handler.go:128","msg":"Health Check state change","status":"ready"}
+...
+collector_1 | {"level":"info","ts":1598922793.5785978,"caller":"service/service.go:252","msg":"Everything is ready. Begin running and processing data."}
+...
+zipkin-server_1 | 2020-09-01 01:13:17.650 INFO 1 --- [ main] z.s.ZipkinServer : Started ZipkinServer in 3.51 seconds (JVM running for 4.744)
+```
+
+## Step 2: Tackle Dependency Problem
+
+Till the example demo is built, our `AwsXRayPropagator`, `AwsXRayIdGenerator` and EC2 detectors (for demo purpose) have not been published, so we need to link the local dependency manually.
+
+```
+sudo npm link ../../packages/opentelemetry-id-generator-aws-xray
+sudo npm link ../../packages/opentelemetry-propagator-aws-xray
+sudo npm link ../../packages/opentelemetry-resource-detector-aws-demo
+```
+
+There could be some problems related to this step, I will illustrate them and corresponding solution in the troubleshooting section.
+
+## Step 3: Run application
+
+Run following command in different terminal:
+
+```
+npm run server
+```
+
+and
+
+````
+npm run client
+````
+
+If everything goes well, in the server terminal, we have:
+
+```
+{
+ traceId: '5f4eb3d24e4b94a1d9dfdacdbe5ce453',
+ parentId: '1a3437130f2a2c2e',
+ name: 'POST /v1/trace',
+ id: '3aaaaf5c89574d14',
+ kind: 2,
+ timestamp: 1598993366865133,
+ duration: 30885,
+ attributes: {
+ 'http.url': 'http://localhost:55681/v1/trace',
+ 'http.method': 'POST',
+ 'http.target': '/v1/trace',
+ 'net.peer.name': 'localhost',
+ 'net.peer.ip': '127.0.0.1',
+ 'net.peer.port': 55681,
+ 'http.host': 'localhost:55681',
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.flavor': '1.1',
+ 'net.transport': 'IP.TCP'
+ },
+ status: { code: 0 },
+ events: []
+}
+```
+
+And in client terminal:
+
+```
+{
+ traceId: '5f4eb3d24e4b94a1d9dfdacdbe5ce453',
+ parentId: '1a3437130f2a2c2e',
+ name: 'POST /v1/trace',
+ id: '3aaaaf5c89574d14',
+ kind: 2,
+ timestamp: 1598993366865133,
+ duration: 30885,
+ attributes: {
+ 'http.url': 'http://localhost:55681/v1/trace',
+ 'http.method': 'POST',
+ 'http.target': '/v1/trace',
+ 'net.peer.name': 'localhost',
+ 'net.peer.ip': '127.0.0.1',
+ 'net.peer.port': 55681,
+ 'http.host': 'localhost:55681',
+ 'http.status_code': 200,
+ 'http.status_text': 'OK',
+ 'http.flavor': '1.1',
+ 'net.transport': 'IP.TCP'
+ },
+ status: { code: 0 },
+ events: []
+}
+```
+
+## Step 4: Observe the Results
+
+In Zipkin, search for corresponding endpoint using traceId we have, in this example, we use `5f4eb3d24e4b94a1d9dfdacdbe5ce453` (Note to use the generated trace ID by you example demo!!!) and browse http://localhost:9411/zipkin/traces/5f4eb3d24e4b94a1d9dfdacdbe5ce453, It is supposed to show:
+
+
+
+In Jaeger, access http://localhost:16686/trace/5f4eb3d24e4b94a1d9dfdacdbe5ce453, it is supposed to show:
+
+
+
+Logging into AWS X-Ray console, search for `1-5f4eb3d2-4e4b94a1d9dfdacdbe5ce453` using search bar of X-Ray console
+
+
+
+# TroubleShooting
+
+Here I will list several common blockers when using this demo:
+
+### 1. Failed to load AWS_REGION
+
+Sometimes, OpenTelemetry Collector may not work correctly and cannot load the region information which is a **mandatory** part of AWS credentials. This will cause the breakdown of docker Collector. To solve this, you need to set your environment variable value.
+
+Under Unix:
+
+```
+export AWS_REGION=us-xxxx-x
+```
+
+You can also write this down to your `~/.zrhrc` or `~/bash_profile` to make this more convenient to use
+
+Under Windows OS:
+
+```
+set AWS_REGION=us-xxxx-x
+```
+
+You can add this environment variable in system setting
+
+### 2. Server side and Client side have different trace ID
+
+It is because Propagator is not instrumented correctly. Till now, the released version of OpenTelemetry JS-SDK is `0.10.2`, in this version, JS SDK cannot instrumented with any custom propagator. This bug has been fixed by [this Pull Request](https://github.com/open-telemetry/opentelemetry-js/pull/1387), but still not released yet.
+
+There are 2 recommended ways to solve this:
+
+1. If the time you use this example demo, there is released JS SDK version newer than `0.10.2`. Then you may try to open the `package.json` of `basic-xray` and `opentelemetry-propagator-aws-xray` repository and change the dependency of `@opentelemetry/context-base` to the latest version. Then do `npm install` in the terminal. It should work
+
+2. If the time when you use this example demo, the released JS SDK version is still `0.10.2`. Then unfortunately, you need to first fork the [upstream](https://github.com/open-telemetry/opentelemetry-js), then
+
+ ```
+ git clone git@github.com:USERNAME/opentelemetry-js.git
+
+ git remote add upstream https://github.com/open-telemetry/opentelemetry-js.git
+
+ #verify that the upstream exists
+ git remote -v
+ ```
+
+ also make sure you are the updated repository by doing:
+
+ ```
+ git fetch upstream
+ git checkout master
+ git merge upstream/master
+ ```
+
+ Then do `npm link` to [this package](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-context-base) in the following order:
+
+ 1. Do `sudo npm link ../../../opentelemetry-js/packages/opentelemetry-context-base` under `basic-xray` repository
+ 2. Do `sudo npm link ../../packages/opentelemetry-propagator-aws-xray` still under `basic-xray` repository
+ 3. Finally do `sudo npm link ../../../opentelemetry-js/packages/opentelemetry-context-base` under `opentelemetry-propagator-aws-xray` repository
+
+ Note that the directory should be consistent with practical use.
+
+ To make the dependency has been updated, go to `node_modules/@opentelemetry`. Run
+
+ ```
+ ls -al
+ ```
+
+ It is supposed to print:
+
+ ```
+ lrwxr-xr-x 1 xxxxxx ANT\Domain Users 70 Aug 31 18:56 context-base -> ../../../../../../../.npm/lib/node_modules/@opentelemetry/context-base
+ ```
+
+### 3. "socket hang up" Problem
+
+After run both client and server, the terminal prints
+
+```
+'http.error': 'socket hang up'
+```
+
+It is because you are using `0.8.0` version of Collector image. This bug belongs to AWS X-Ray Exporter and has been fixed by us in the latest `0.9.0` version. So do make sure you have pulled the latest image of Collector. This problem can be solved.
+
+### 4. Everything works well, only nothing on AWS X-Ray console
+
+This is because the error message has not been printed out by OpenTelemetry Collector. If you has successfully transmitted your tracing data to AWS X-Ray console, the response message printed by Collector looks like:
+
+```
+collector_1 | {"level":"debug","ts":1598993367.705899,"caller":"awsxrayexporter/awsxray.go:94","msg":"response: {\n UnprocessedTraceSegments: []\n}","component_kind":"exporter","component_type":"awsxray","component_name":"awsxray"}
+```
+
+Rather than
+
+```
+collector_1 | {"level":"debug","ts":1598993367.705899,"caller":"awsxrayexporter/awsxray.go:94","msg":"response: {\n\n}","component_kind":"exporter","component_type":"awsxray","component_name":"awsxray"}
+```
+
+To get more insight into this problem, you can add a debug line to [this line](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/master/exporter/awsxrayexporter/awsxray.go#L93)
+
+```
+logger.Debug('localErr: ' + localErr.Error())
+```
+
+Normally, it is because the wrong credentials or access rights of IAM roles.
\ No newline at end of file
diff --git a/examples/basic-xray/docker/collector-config.yaml b/examples/basic-xray/docker/collector-config.yaml
index 4f9e058f..5961cbf6 100644
--- a/examples/basic-xray/docker/collector-config.yaml
+++ b/examples/basic-xray/docker/collector-config.yaml
@@ -9,10 +9,11 @@ receivers:
-https://*
exporters:
logging:
- loglevel: debug
+ loglevel: info
awsxray:
local_mode: true
# role_arn: arn:aws:iam::640946111646:user/CongZou
+ region: us-east-2
zipkin:
endpoint: "http://zipkin-server:9411/api/v2/spans"
jaeger:
diff --git a/examples/basic-xray/docker/docker-compose.yaml b/examples/basic-xray/docker/docker-compose.yaml
index d5e62177..9d6f8d9d 100644
--- a/examples/basic-xray/docker/docker-compose.yaml
+++ b/examples/basic-xray/docker/docker-compose.yaml
@@ -19,13 +19,12 @@ services:
- "1338:1338"
collector:
- #build:
- # context: ../opentelemetry-collector-contrib
+ # build:
+ # context: ../../../../opentelemetry-collector-contrib
# dockerfile: examples/tracing/Dockerfile
image: otel/opentelemetry-collector-contrib-dev
- command: --config /config/collector-config.yaml
+ command: --config /config/collector-config.yaml --log-level DEBUG
environment:
- - AWS_PROFILE=default
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- AWS_REGION
diff --git a/examples/basic-xray/images/JaegerResult.png b/examples/basic-xray/images/JaegerResult.png
new file mode 100644
index 0000000000000000000000000000000000000000..b54ddf4245acaba3af630bbcf2ed74f0b4660d62
GIT binary patch
literal 392004
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