Merge 340483a into 0e8b359

open-telemetry · Oct 11, 2021 · ab1a6f9 · ab1a6f9
2 parents 0e8b359 + 340483a
commit ab1a6f9
Show file tree

Hide file tree

Showing 44 changed files with 188 additions and 193 deletions.
diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -63,7 +63,7 @@
     "@opentelemetry/api": "^1.0.2"
   },
   "dependencies": {
-    "@opentelemetry/resources": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0"
+    "@opentelemetry/resources": "^1.0.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0"
   }
 }
diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -62,8 +62,8 @@
     "@opentelemetry/api": "^1.0.2"
   },
   "dependencies": {
-    "@opentelemetry/core": "^0.25.0",
-    "@opentelemetry/resources": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0"
+    "@opentelemetry/core": "^1.0.0",
+    "@opentelemetry/resources": "^1.0.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0"
   }
 }
diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@opentelemetry/api": "1.0.2",
     "@opentelemetry/contrib-test-utils": "^0.25.0",
-    "@opentelemetry/core": "0.25.0",
+    "@opentelemetry/core": "1.0.0",
     "@types/mocha": "8.2.3",
     "@types/node": "14.17.9",
     "@types/semver": "7.3.8",
@@ -62,8 +62,8 @@
     "@opentelemetry/api": "^1.0.2"
   },
   "dependencies": {
-    "@opentelemetry/resources": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0",
+    "@opentelemetry/resources": "^1.0.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0",
     "gcp-metadata": "^4.1.4",
     "semver": "7.3.5"
   }

diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -61,6 +61,6 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/resources": "^0.25.0"
+    "@opentelemetry/resources": "^1.0.0"
   }
 }
diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -45,12 +45,12 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.25.0",
+    "@opentelemetry/instrumentation": "^0.26.0",
     "@opentelemetry/instrumentation-dns": "^0.25.0",
     "@opentelemetry/instrumentation-express": "^0.25.0",
     "@opentelemetry/instrumentation-graphql": "^0.25.0",
-    "@opentelemetry/instrumentation-grpc": "^0.25.0",
-    "@opentelemetry/instrumentation-http": "^0.25.0",
+    "@opentelemetry/instrumentation-grpc": "^0.26.0",
+    "@opentelemetry/instrumentation-http": "^0.26.0",
     "@opentelemetry/instrumentation-ioredis": "^0.25.0",
     "@opentelemetry/instrumentation-koa": "^0.25.0",
     "@opentelemetry/instrumentation-mongodb": "^0.25.0",

diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -60,10 +60,10 @@
     "webpack-merge": "5.8.0"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.25.0",
+    "@opentelemetry/instrumentation": "^0.26.0",
     "@opentelemetry/instrumentation-document-load": "^0.25.0",
-    "@opentelemetry/instrumentation-fetch": "^0.25.0",
+    "@opentelemetry/instrumentation-fetch": "^0.26.0",
     "@opentelemetry/instrumentation-user-interaction": "^0.25.0",
-    "@opentelemetry/instrumentation-xml-http-request": "^0.25.0"
+    "@opentelemetry/instrumentation-xml-http-request": "^0.26.0"
   }
 }
diff --git a/packages/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json
@@ -66,18 +66,18 @@
     "@material-ui/core": "4.12.3",
     "@material-ui/icons": "4.11.2",
     "@material-ui/lab": "4.0.0-alpha.60",
-    "@opentelemetry/context-zone": "0.25.0",
-    "@opentelemetry/core": "0.25.0",
-    "@opentelemetry/exporter-collector": "0.25.0",
-    "@opentelemetry/exporter-zipkin": "0.25.0",
-    "@opentelemetry/instrumentation": "0.25.0",
+    "@opentelemetry/context-zone": "1.0.0",
+    "@opentelemetry/core": "1.0.0",
+    "@opentelemetry/exporter-otlp-http": "0.26.0",
+    "@opentelemetry/exporter-zipkin": "1.0.0",
+    "@opentelemetry/instrumentation": "0.26.0",
     "@opentelemetry/instrumentation-document-load": "^0.25.0",
-    "@opentelemetry/instrumentation-fetch": "0.25.0",
-    "@opentelemetry/instrumentation-xml-http-request": "0.25.0",
-    "@opentelemetry/resources": "0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/sdk-trace-web": "0.25.0",
-    "@opentelemetry/semantic-conventions": "0.25.0",
+    "@opentelemetry/instrumentation-fetch": "0.26.0",
+    "@opentelemetry/instrumentation-xml-http-request": "0.26.0",
+    "@opentelemetry/resources": "1.0.0",
+    "@opentelemetry/sdk-trace-base": "1.0.0",
+    "@opentelemetry/sdk-trace-web": "1.0.0",
+    "@opentelemetry/semantic-conventions": "1.0.0",
     "change-case": "4.1.2",
     "json5": "2.2.0",
     "react": "17.0.2",

diff --git a/...s/opentelemetry-browser-extension-autoinjection/src/instrumentation/WebInstrumentation.ts b/...s/opentelemetry-browser-extension-autoinjection/src/instrumentation/WebInstrumentation.ts
@@ -20,7 +20,7 @@ import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xm
 import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';
 import { ZoneContextManager } from '@opentelemetry/context-zone';
 import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
-import { CollectorTraceExporter } from '@opentelemetry/exporter-collector';
+import { OTLPTraceExporter } from '@opentelemetry/exporter-otlp-http';
 import {
   BatchSpanProcessor,
   ConsoleSpanExporter,
@@ -72,7 +72,7 @@ export class WebInstrumentation {
     if (this.exporters[ExporterType.COLLECTOR_TRACE].enabled) {
       this.provider.addSpanProcessor(
         new BatchSpanProcessor(
-          new CollectorTraceExporter({
+          new OTLPTraceExporter({
             url: this.exporters[ExporterType.COLLECTOR_TRACE].url,
           })
         )

diff --git a/packages/opentelemetry-browser-extension-autoinjection/src/ui/App.tsx b/packages/opentelemetry-browser-extension-autoinjection/src/ui/App.tsx
@@ -249,7 +249,7 @@ export class App extends React.Component<AppProps, AppState> {
                 onToggle={this.toggleExporter}
                 onValueChange={this.handleUrlChange}
                 placeholderValue={PlaceholderValues.COLLECTOR_TRACE_URL}
-                exporterPackageUrl="https://www.npmjs.com/package/@opentelemetry/exporter-collector"
+                exporterPackageUrl="https://www.npmjs.com/package/@opentelemetry/exporter-otlp-http"
                 value={exporters[ExporterType.COLLECTOR_TRACE].url}
               />
             </Grid>

diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -61,9 +61,9 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "^0.25.0",
-    "@opentelemetry/core": "^0.25.0",
-    "@opentelemetry/sdk-metrics-base": "^0.25.0",
+    "@opentelemetry/api-metrics": "^0.26.0",
+    "@opentelemetry/core": "^1.0.0",
+    "@opentelemetry/sdk-metrics-base": "^0.26.0",
     "systeminformation": "^5.0.0"
   }
 }
diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -80,6 +80,6 @@
     "webpack": "4.46.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^0.25.0"
+    "@opentelemetry/core": "^1.0.0"
   }
 }
diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json
@@ -44,12 +44,12 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/core": "0.25.0",
-    "@opentelemetry/exporter-jaeger": "0.25.0",
-    "@opentelemetry/instrumentation": "0.25.0",
-    "@opentelemetry/sdk-trace-node": "0.25.0",
-    "@opentelemetry/resources": "0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/semantic-conventions": "0.25.0"
+    "@opentelemetry/core": "1.0.0",
+    "@opentelemetry/exporter-jaeger": "1.0.0",
+    "@opentelemetry/instrumentation": "0.26.0",
+    "@opentelemetry/sdk-trace-node": "1.0.0",
+    "@opentelemetry/resources": "1.0.0",
+    "@opentelemetry/sdk-trace-base": "1.0.0",
+    "@opentelemetry/semantic-conventions": "1.0.0"
   }
 }
diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
@@ -47,9 +47,9 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.0.2",
-    "@opentelemetry/core": "0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/sdk-trace-node": "0.25.0",
+    "@opentelemetry/core": "1.0.0",
+    "@opentelemetry/sdk-trace-base": "1.0.0",
+    "@opentelemetry/sdk-trace-node": "1.0.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.9",
     "codecov": "3.8.3",
@@ -61,10 +61,10 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.25.0",
+    "@opentelemetry/instrumentation": "^0.26.0",
     "@opentelemetry/propagator-aws-xray": "^0.24.0",
-    "@opentelemetry/resources": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.24.0",
+    "@opentelemetry/resources": "^1.0.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0",
     "@types/aws-lambda": "8.10.81"
   }
 }
diff --git a/...ns/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts b/...ns/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts
@@ -47,7 +47,7 @@ import {
   TextMapPropagator,
 } from '@opentelemetry/api';
 import { AWSXRayPropagator } from '@opentelemetry/propagator-aws-xray';
-import { HttpTraceContextPropagator } from '@opentelemetry/core';
+import { W3CTraceContextPropagator } from '@opentelemetry/core';
 
 const memoryExporter = new InMemorySpanExporter();
 const provider = new NodeTracerProvider();
@@ -143,7 +143,7 @@ describe('lambda handler', () => {
   };
   const sampledHttpHeader = serializeSpanContext(
     sampledHttpSpanContext,
-    new HttpTraceContextPropagator()
+    new W3CTraceContextPropagator()
   );
 
   const unsampledAwsSpanContext: SpanContext = {
@@ -165,7 +165,7 @@ describe('lambda handler', () => {
   };
   const unsampledHttpHeader = serializeSpanContext(
     unsampledHttpSpanContext,
-    new HttpTraceContextPropagator()
+    new W3CTraceContextPropagator()
   );
 
   const sampledGenericSpanContext: SpanContext = {
@@ -176,7 +176,7 @@ describe('lambda handler', () => {
   };
   const sampledGenericSpan = serializeSpanContext(
     sampledGenericSpanContext,
-    new HttpTraceContextPropagator()
+    new W3CTraceContextPropagator()
   );
 
   beforeEach(() => {

diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json
@@ -48,9 +48,9 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.0.2",
-    "@opentelemetry/context-async-hooks": "0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/sdk-trace-node": "0.25.0",
+    "@opentelemetry/context-async-hooks": "1.0.0",
+    "@opentelemetry/sdk-trace-base": "1.0.0",
+    "@opentelemetry/sdk-trace-node": "1.0.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.9",
     "@types/sinon": "10.0.2",
@@ -65,7 +65,7 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.25.0",
+    "@opentelemetry/instrumentation": "^0.26.0",
     "@types/bunyan": "1.8.7"
   }
 }
diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json
@@ -48,10 +48,10 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.0.2",
-    "@opentelemetry/context-async-hooks": "0.25.0",
+    "@opentelemetry/context-async-hooks": "1.0.0",
     "@opentelemetry/contrib-test-utils": "^0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/sdk-trace-node": "0.25.0",
+    "@opentelemetry/sdk-trace-base": "1.0.0",
+    "@opentelemetry/sdk-trace-node": "1.0.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.9",
     "@types/semver": "7.3.8",
@@ -67,7 +67,7 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0"
+    "@opentelemetry/instrumentation": "^0.26.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0"
   }
 }
diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json
@@ -46,9 +46,9 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.0.2",
-    "@opentelemetry/context-async-hooks": "0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/sdk-trace-node": "0.25.0",
+    "@opentelemetry/context-async-hooks": "1.0.0",
+    "@opentelemetry/sdk-trace-base": "1.0.0",
+    "@opentelemetry/sdk-trace-node": "1.0.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.4",
     "codecov": "3.8.2",
@@ -61,9 +61,9 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/core": "^0.25.0",
-    "@opentelemetry/instrumentation": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0",
+    "@opentelemetry/core": "^1.0.0",
+    "@opentelemetry/instrumentation": "^0.26.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0",
     "@types/connect": "3.4.35"
   }
 }
diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json
@@ -47,9 +47,9 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.0.2",
-    "@opentelemetry/core": "0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/sdk-trace-node": "0.25.0",
+    "@opentelemetry/core": "1.0.0",
+    "@opentelemetry/sdk-trace-base": "1.0.0",
+    "@opentelemetry/sdk-trace-node": "1.0.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.9",
     "@types/semver": "7.3.8",
@@ -65,8 +65,8 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0",
+    "@opentelemetry/instrumentation": "^0.26.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0",
     "semver": "^7.3.2"
   }
 }
diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json
@@ -48,9 +48,9 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.0.2",
-    "@opentelemetry/context-async-hooks": "0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/sdk-trace-node": "0.25.0",
+    "@opentelemetry/context-async-hooks": "1.0.0",
+    "@opentelemetry/sdk-trace-base": "1.0.0",
+    "@opentelemetry/sdk-trace-node": "1.0.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.9",
     "codecov": "3.8.3",
@@ -63,9 +63,9 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/core": "^0.25.0",
-    "@opentelemetry/instrumentation": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0",
+    "@opentelemetry/core": "^1.0.0",
+    "@opentelemetry/instrumentation": "^0.26.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0",
     "@types/express": "4.17.13"
   }
 }
diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json
@@ -47,9 +47,9 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "1.0.2",
-    "@opentelemetry/context-async-hooks": "0.25.0",
-    "@opentelemetry/sdk-trace-base": "0.25.0",
-    "@opentelemetry/sdk-trace-node": "0.25.0",
+    "@opentelemetry/context-async-hooks": "1.0.0",
+    "@opentelemetry/sdk-trace-base": "1.0.0",
+    "@opentelemetry/sdk-trace-node": "1.0.0",
     "@types/mocha": "7.0.2",
     "@types/node": "14.17.9",
     "@types/semver": "7.3.8",
@@ -64,8 +64,8 @@
     "typescript": "4.3.5"
   },
   "dependencies": {
-    "@opentelemetry/instrumentation": "^0.25.0",
-    "@opentelemetry/semantic-conventions": "^0.25.0",
+    "@opentelemetry/instrumentation": "^0.26.0",
+    "@opentelemetry/semantic-conventions": "^1.0.0",
     "@types/generic-pool": "^3.1.9"
   }
 }