Merge branch 'main' into root-span-sampler

README.md

@@ -224,6 +224,14 @@ To request automatic tracing support for a module not on this list, please [file
 
 ## Upgrade guidelines
 
+### 0.19.x to x
+
+- `HttpBaggage` renamed to `HttpBaggagePropagator`
+
+- `HttpTraceContext` renamed to `HttpTraceContextPropagator`
+
+- `JaegerHttpTracePropagator` renamed to `JaegerPropagator`
+
 ### 0.18.x to 0.19.0
 
 - API is now a peer dependency. This means that users will need to include `@opentelemetry/api` as a dependency of their project in order to use the SDK. NPM version 7+ (Node 15+) should do this automatically.

benchmark/README.md

@@ -59,7 +59,7 @@ Beginning B3Propagator Benchmark...
   #Inject  x 2,018,725 ops/sec ±3.49% (100 runs sampled)
   #Extract x 2,040,891 ops/sec ±1.75% (100 runs sampled)
 
-Beginning HttpTraceContext Benchmark...
+Beginning HttpTraceContextPropagator Benchmark...
   2 tests completed.
 
   #Inject  x 3,987,007 ops/sec ±1.87% (100 runs sampled)
@@ -112,7 +112,7 @@ Beginning B3Propagator Benchmark...
   #Inject  x 5,086,366 ops/sec ±3.18% (100 runs sampled)
   #Extract x 4,859,557 ops/sec ±3.80% (100 runs sampled)
 
-Beginning HttpTraceContext Benchmark...
+Beginning HttpTraceContextPropagator Benchmark...
   2 tests completed.
 
   #Inject  x 13,660,710 ops/sec ±1.84% (100 runs sampled)

benchmark/propagator.js

@@ -17,8 +17,8 @@ const setups = [
     }
   },
   {
-    name: 'HttpTraceContext',
-    propagator: new opentelemetry.HttpTraceContext(),
+    name: 'HttpTraceContextPropagator',
+    propagator: new opentelemetry.HttpTraceContextPropagator(),
     injectCarrier: {},
     extractCarrier: {
       traceparent: '00-d4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-00'

examples/collector-exporter-node/docker/collector-config.yaml

@@ -15,15 +15,14 @@ exporters:
 
 processors:
   batch:
-  queued_retry:
 
 service:
   pipelines:
     traces:
       receivers: [otlp]
       exporters: [zipkin]
-      processors: [batch, queued_retry]
+      processors: [batch]
     metrics:
       receivers: [otlp]
       exporters: [prometheus]
-      processors: [batch, queued_retry]
+      processors: [batch]

examples/collector-exporter-node/docker/docker-compose.yaml

@@ -2,7 +2,7 @@ version: "3"
 services:
   # Collector
   collector:
-    image: otel/opentelemetry-collector:0.16.0
+    image: otel/opentelemetry-collector:0.25.0
 #    image: otel/opentelemetry-collector:latest
     command: ["--config=/conf/collector-config.yaml", "--log-level=DEBUG"]
     volumes:

examples/http/server.js

@@ -29,21 +29,17 @@ function handleRequest(request, response) {
   });
   // Annotate our span to capture metadata about the operation
   span.addEvent('invoking handleRequest');
-  try {
-    const body = [];
-    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();
-  }
+
+  const body = [];
+  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);
+  });
 }
 
 startServer(8080);

examples/https/server.js

@@ -34,21 +34,17 @@ function handleRequest(request, response) {
   });
   // Annotate our span to capture metadata about the operation
   span.addEvent('invoking handleRequest');
-  try {
-    const body = [];
-    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.log(err);
-    span.end();
-  }
+
+  const body = [];
+  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);
+  });
 }
 
 startServer(443);

integration-tests/propagation-validation-server/validation-server.js

@@ -1,5 +1,5 @@
 const axios = require("axios");
-const { HttpTraceContext } = require("@opentelemetry/core");
+const { HttpTraceContextPropagator } = require("@opentelemetry/core");
 const { BasicTracerProvider } = require("@opentelemetry/tracing");
 const { context, propagation, setSpan, trace, ROOT_CONTEXT } = require("@opentelemetry/api");
 const {
@@ -8,7 +8,7 @@ const {
 const bodyParser = require("body-parser");
 
 // set global propagator
-propagation.setGlobalPropagator(new HttpTraceContext());
+propagation.setGlobalPropagator(new HttpTraceContextPropagator());
 
 // set global context manager
 context.setGlobalContextManager(new AsyncHooksContextManager());

packages/opentelemetry-core/README.md

@@ -12,7 +12,7 @@ This package provides default implementations of the OpenTelemetry API for trace
 - [OpenTelemetry Core](#opentelemetry-core)
   - [Built-in Implementations](#built-in-implementations)
     - [Built-in Propagators](#built-in-propagators)
-      - [HttpTraceContext Propagator](#httptracecontext-propagator)
+      - [HttpTraceContextPropagator Propagator](#httptracecontext-propagator)
       - [Composite Propagator](#composite-propagator)
       - [Baggage Propagator](#baggage-propagator)
     - [Built-in Sampler](#built-in-sampler)
@@ -25,16 +25,16 @@ This package provides default implementations of the OpenTelemetry API for trace
 
 ### Built-in Propagators
 
-#### HttpTraceContext Propagator
+#### HttpTraceContextPropagator Propagator
 
 OpenTelemetry provides a text-based approach to propagate context to remote services using the [W3C Trace Context](https://www.w3.org/TR/trace-context/) HTTP headers.
 
 ```js
 const api = require("@opentelemetry/api");
-const { HttpTraceContext } = require("@opentelemetry/core");
+const { HttpTraceContextPropagator } = require("@opentelemetry/core");
 
 /* Set Global Propagator */
-api.propagation.setGlobalPropagator(new HttpTraceContext());
+api.propagation.setGlobalPropagator(new HttpTraceContextPropagator());
 ```
 
 #### Composite Propagator
@@ -57,10 +57,10 @@ Provides a text-based approach to propagate [baggage](https://w3c.github.io/bagg
 
 ```js
 const api = require("@opentelemetry/api");
-const { HttpBaggage } = require("@opentelemetry/core");
+const { HttpBaggagePropagator } = require("@opentelemetry/core");
 
 /* Set Global Propagator */
-api.propagation.setGlobalPropagator(new HttpBaggage());
+api.propagation.setGlobalPropagator(new HttpBaggagePropagator());
 ```
 
 ### Built-in Sampler

packages/opentelemetry-core/package.json

@@ -85,6 +85,7 @@
     "@opentelemetry/api": "^1.0.0-rc.0"
   },
   "dependencies": {
-    "semver": "^7.1.3"
+    "semver": "^7.1.3",
+    "@opentelemetry/semantic-conventions": "0.19.0"
   }
 }

packages/opentelemetry-core/src/baggage/constants.ts

@@ -0,0 +1,28 @@
+/*
+ * 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 const BAGGAGE_KEY_PAIR_SEPARATOR = '=';
+export const BAGGAGE_PROPERTIES_SEPARATOR = ';';
+export const BAGGAGE_ITEMS_SEPARATOR = ',';
+
+// Name of the http header used to propagate the baggage
+export const BAGGAGE_HEADER = 'baggage';
+// Maximum number of name-value pairs allowed by w3c spec
+export const BAGGAGE_MAX_NAME_VALUE_PAIRS = 180;
+// Maximum number of bytes per a single name-value pair allowed by w3c spec
+export const BAGGAGE_MAX_PER_NAME_VALUE_PAIRS = 4096;
+// Maximum total length of all name-value pairs allowed by w3c spec
+export const BAGGAGE_MAX_TOTAL_LENGTH = 8192;