Merge branch 'main' into website-docs-update-0821

open-telemetry · Aug 9, 2021 · 9169984 · 9169984
2 parents 842da63 + 9790070
commit 9169984
Show file tree

Hide file tree

Showing 53 changed files with 115 additions and 2,614 deletions.
diff --git a/package.json b/package.json
@@ -45,8 +45,8 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@commitlint/cli": "12.1.4",
-    "@commitlint/config-conventional": "12.1.4",
+    "@commitlint/cli": "13.1.0",
+    "@commitlint/config-conventional": "13.1.0",
     "@typescript-eslint/eslint-plugin": "4.29.0",
     "@typescript-eslint/parser": "4.29.0",
     "beautify-benchmark": "0.2.4",

diff --git a/packages/opentelemetry-exporter-collector-grpc/tsconfig.json b/packages/opentelemetry-exporter-collector-grpc/tsconfig.json
@@ -19,10 +19,10 @@
       "path": "../opentelemetry-exporter-collector"
     },
     {
-      "path": "../opentelemetry-sdk-metrics-base"
+      "path": "../opentelemetry-resources"
     },
     {
-      "path": "../opentelemetry-resources"
+      "path": "../opentelemetry-sdk-metrics-base"
     },
     {
       "path": "../opentelemetry-sdk-trace-base"

diff --git a/packages/opentelemetry-exporter-collector-proto/tsconfig.json b/packages/opentelemetry-exporter-collector-proto/tsconfig.json
@@ -19,10 +19,10 @@
       "path": "../opentelemetry-exporter-collector"
     },
     {
-      "path": "../opentelemetry-sdk-metrics-base"
+      "path": "../opentelemetry-resources"
     },
     {
-      "path": "../opentelemetry-resources"
+      "path": "../opentelemetry-sdk-metrics-base"
     },
     {
       "path": "../opentelemetry-sdk-trace-base"

diff --git a/packages/opentelemetry-exporter-collector/tsconfig.json b/packages/opentelemetry-exporter-collector/tsconfig.json
@@ -16,10 +16,10 @@
       "path": "../opentelemetry-core"
     },
     {
-      "path": "../opentelemetry-sdk-metrics-base"
+      "path": "../opentelemetry-resources"
     },
     {
-      "path": "../opentelemetry-resources"
+      "path": "../opentelemetry-sdk-metrics-base"
     },
     {
       "path": "../opentelemetry-sdk-trace-base"

diff --git a/packages/opentelemetry-exporter-jaeger/tsconfig.json b/packages/opentelemetry-exporter-jaeger/tsconfig.json
@@ -16,10 +16,10 @@
       "path": "../opentelemetry-resources"
     },
     {
-      "path": "../opentelemetry-semantic-conventions"
+      "path": "../opentelemetry-sdk-trace-base"
     },
     {
-      "path": "../opentelemetry-sdk-trace-base"
+      "path": "../opentelemetry-semantic-conventions"
     }
   ]
 }
diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.json b/packages/opentelemetry-exporter-zipkin/tsconfig.json
@@ -16,10 +16,10 @@
       "path": "../opentelemetry-resources"
     },
     {
-      "path": "../opentelemetry-semantic-conventions"
+      "path": "../opentelemetry-sdk-trace-base"
     },
     {
-      "path": "../opentelemetry-sdk-trace-base"
+      "path": "../opentelemetry-semantic-conventions"
     }
   ]
 }
diff --git a/packages/opentelemetry-instrumentation-fetch/tsconfig.json b/packages/opentelemetry-instrumentation-fetch/tsconfig.json
@@ -22,14 +22,14 @@
     {
       "path": "../opentelemetry-propagator-b3"
     },
-    {
-      "path": "../opentelemetry-semantic-conventions"
-    },
     {
       "path": "../opentelemetry-sdk-trace-base"
     },
     {
       "path": "../opentelemetry-sdk-trace-web"
+    },
+    {
+      "path": "../opentelemetry-semantic-conventions"
     }
   ]
 }
diff --git a/packages/opentelemetry-instrumentation-grpc/tsconfig.json b/packages/opentelemetry-instrumentation-grpc/tsconfig.json
@@ -22,13 +22,13 @@
       "path": "../opentelemetry-instrumentation"
     },
     {
-      "path": "../opentelemetry-sdk-trace-node"
+      "path": "../opentelemetry-sdk-trace-base"
     },
     {
-      "path": "../opentelemetry-semantic-conventions"
+      "path": "../opentelemetry-sdk-trace-node"
     },
     {
-      "path": "../opentelemetry-sdk-trace-base"
+      "path": "../opentelemetry-semantic-conventions"
     }
   ]
 }
diff --git a/packages/opentelemetry-instrumentation-http/tsconfig.json b/packages/opentelemetry-instrumentation-http/tsconfig.json
@@ -19,13 +19,13 @@
       "path": "../opentelemetry-instrumentation"
     },
     {
-      "path": "../opentelemetry-sdk-trace-node"
+      "path": "../opentelemetry-sdk-trace-base"
     },
     {
-      "path": "../opentelemetry-semantic-conventions"
+      "path": "../opentelemetry-sdk-trace-node"
     },
     {
-      "path": "../opentelemetry-sdk-trace-base"
+      "path": "../opentelemetry-semantic-conventions"
     }
   ]
 }
diff --git a/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json b/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json
@@ -22,14 +22,14 @@
     {
       "path": "../opentelemetry-propagator-b3"
     },
-    {
-      "path": "../opentelemetry-semantic-conventions"
-    },
     {
       "path": "../opentelemetry-sdk-trace-base"
     },
     {
       "path": "../opentelemetry-sdk-trace-web"
+    },
+    {
+      "path": "../opentelemetry-semantic-conventions"
     }
   ]
 }
diff --git a/packages/opentelemetry-resource-detector-aws/.eslintignore b/packages/opentelemetry-resource-detector-aws/.eslintignore
diff --git a/packages/opentelemetry-resource-detector-aws/.eslintrc.js b/packages/opentelemetry-resource-detector-aws/.eslintrc.js
diff --git a/packages/opentelemetry-resource-detector-aws/.npmignore b/packages/opentelemetry-resource-detector-aws/.npmignore
diff --git a/packages/opentelemetry-resource-detector-aws/LICENSE b/packages/opentelemetry-resource-detector-aws/LICENSE