Merge branch 'main' into issue-2394-respect-sampled

open-telemetry · Aug 7, 2021 · 0b1748f · 0b1748f
2 parents d8df4db + f180870
commit 0b1748f
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 50 deletions.
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-resources/README.md b/packages/opentelemetry-resources/README.md
@@ -25,11 +25,11 @@ const resource = new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: 'api-service',
 });
 
-const another_resource = new Resource({
-    'service.version': 2.0.0,
+const anotherResource = new Resource({
+    'service.version': '2.0.0',
     'service.group': 'instrumentation-group'
 });
-const merged_resource = resource.merge(another_resource);
+const mergedResource = resource.merge(anotherResource);
 ```
 
 ## Useful links

diff --git a/packages/opentelemetry-sdk-node/tsconfig.json b/packages/opentelemetry-sdk-node/tsconfig.json
@@ -21,12 +21,6 @@
     {
       "path": "../opentelemetry-instrumentation"
     },
-    {
-      "path": "../opentelemetry-sdk-metrics-base"
-    },
-    {
-      "path": "../opentelemetry-sdk-trace-node"
-    },
     {
       "path": "../opentelemetry-resource-detector-aws"
     },
@@ -36,8 +30,14 @@
     {
       "path": "../opentelemetry-resources"
     },
+    {
+      "path": "../opentelemetry-sdk-metrics-base"
+    },
     {
       "path": "../opentelemetry-sdk-trace-base"
+    },
+    {
+      "path": "../opentelemetry-sdk-trace-node"
     }
   ]
 }
diff --git a/packages/opentelemetry-sdk-trace-node/tsconfig.json b/packages/opentelemetry-sdk-trace-node/tsconfig.json
@@ -25,10 +25,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-sdk-trace-web/tsconfig.json b/packages/opentelemetry-sdk-trace-web/tsconfig.json
@@ -23,10 +23,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-semantic-conventions/README.md b/packages/opentelemetry-semantic-conventions/README.md
@@ -16,11 +16,11 @@ npm install --save @opentelemetry/semantic-conventions
 ## Usage
 
 ```ts
-import { GeneralAttribute } from '@opentelemetry/semantic-conventions';
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 
 const span = tracer.startSpan().startSpan(spanName, spanOptions)
   .setAttributes({
-    [GeneralAttribute.NET_PEER_HOSTNAME]: 'localhost',
+    [SemanticAttributes.NET_PEER_NAME]: 'localhost',
   });
 ```
 

diff --git a/packages/opentelemetry-shim-opentracing/tsconfig.json b/packages/opentelemetry-shim-opentracing/tsconfig.json
@@ -19,10 +19,10 @@
       "path": "../opentelemetry-propagator-jaeger"
     },
     {
-      "path": "../opentelemetry-semantic-conventions"
+      "path": "../opentelemetry-sdk-trace-base"
     },
     {
-      "path": "../opentelemetry-sdk-trace-base"
+      "path": "../opentelemetry-semantic-conventions"
     }
   ]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -100,12 +100,6 @@
     {
       "path": "packages/opentelemetry-instrumentation"
     },
-    {
-      "path": "packages/opentelemetry-sdk-metrics-base"
-    },
-    {
-      "path": "packages/opentelemetry-sdk-trace-node"
-    },
     {
       "path": "packages/opentelemetry-propagator-b3"
     },
@@ -122,25 +116,31 @@
       "path": "packages/opentelemetry-resources"
     },
     {
-      "path": "packages/opentelemetry-sdk-node"
+      "path": "packages/opentelemetry-sdk-metrics-base"
     },
     {
-      "path": "packages/opentelemetry-semantic-conventions"
+      "path": "packages/opentelemetry-sdk-node"
     },
     {
-      "path": "packages/opentelemetry-shim-opentracing"
+      "path": "packages/opentelemetry-sdk-trace-base"
     },
     {
-      "path": "packages/opentelemetry-sdk-trace-base"
+      "path": "packages/opentelemetry-sdk-trace-node"
     },
     {
       "path": "packages/opentelemetry-sdk-trace-web"
     },
+    {
+      "path": "packages/opentelemetry-semantic-conventions"
+    },
+    {
+      "path": "packages/opentelemetry-shim-opentracing"
+    },
     {
       "path": "packages/template"
     },
     {
       "path": "integration-tests/propagation-validation-server"
     }
   ]
-}
+}