Merge branch 'main' into metrics

Author: lzchen

.flake8

@@ -18,7 +18,7 @@ exclude =
   __pycache__
   exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/
   exporter/opentelemetry-exporter-jaeger/build/*
-  exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/gen
+  exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/encoder/v2/protobuf/gen/
   docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
   docs/examples/opentelemetry-example-app/build/*
   opentelemetry-proto/build/*

.github/workflows/test.yml

@@ -10,7 +10,7 @@ env:
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
-  CONTRIB_REPO_SHA: b404de2f393aaaeca73694c37fe58fecf423a707
+  CONTRIB_REPO_SHA: 6e328246c895ff433b14430c9edddfead072287c
 
 jobs:
   build:

CHANGELOG.md

@@ -4,11 +4,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v0.17b0...HEAD)
+## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v0.18b0...HEAD)
+
+## [0.18b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.18b0) - 2021-02-16
+
+### Added
+- Add urllib to opentelemetry-bootstrap target list
+  ([#1584])(https://github.com/open-telemetry/opentelemetry-python/pull/1584)
+
+## [1.0.0rc1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.0.0rc1) - 2021-02-12
 
 ### Changed
-- Tracer and Meter provider environment variables are now consistent with the rest
+- Tracer provider environment variables are now consistent with the rest
   ([#1571](https://github.com/open-telemetry/opentelemetry-python/pull/1571)])
+- Rename `TRACE_` to `TRACES_` for environment variables
+  ([#1595](https://github.com/open-telemetry/opentelemetry-python/pull/1595)])
+- Limits for Span attributes, events and links have been updated to 128
+  ([1597](https://github.com/open-telemetry/opentelemetry-python/pull/1597)])
+- Read-only Span attributes have been moved to ReadableSpan class
+  ([#1560](https://github.com/open-telemetry/opentelemetry-python/pull/1560))
+- `BatchExportSpanProcessor` flushes export queue when it reaches `max_export_batch_size`
+  ([#1521])(https://github.com/open-telemetry/opentelemetry-python/pull/1521)
 
 ### Added
 - Added `end_on_exit` argument to `start_as_current_span`

CONTRIBUTING.md

@@ -23,6 +23,10 @@ Please take a look at this list first, your contributions may belong in one of t
    programmatic instrumentations that are now in the `ext` directory in the main OpenTelemetry repo. Please ask in the Gitter
    channel (see below) for guidance if you want to contribute with these instrumentations.
 
+# Find the right branch
+
+The default branch for this repo is `main`. Changes that pertain to `metrics` go into the `metrics` branch. Any changes that pertain to components marked as `stable` in the [specifications](https://github.com/open-telemetry/opentelemetry-specification) or anything that is not `metrics` related go into this branch.
+
 ## Find a Buddy and get Started Quickly!
 
 If you are looking for someone to help you find a starting point and be a resource for your first contribution, join our

README.md

@@ -5,7 +5,7 @@
       •  
     <a href="https://opentelemetry-python.readthedocs.io/">API Documentation<a/>
     &nbsp;&nbsp;&bull;&nbsp;&nbsp;
-    <a href="https://gitter.im/open-telemetry/opentelemetry-python">Getting In Touch (Gitter)<a/>
+    <a href="https://github.com/open-telemetry/opentelemetry-python/discussions">Getting In Touch (GitHub Discussions)<a/>
   </strong>
 </p>
 
@@ -119,7 +119,7 @@ We meet weekly on Thursdays at 9AM PST. The meeting is subject to change dependi
 
 Meetings take place via [Zoom video conference](https://zoom.us/j/6729396170). The passcode is _77777_.
 
-Meeting notes are available as a public [Google doc](https://docs.google.com/document/d/1CIMGoIOZ-c3-igzbd6_Pnxx1SjAkjwqoYSUWxPY8XIs/edit). For edit access, get in touch on [Gitter](https://gitter.im/open-telemetry/opentelemetry-python).
+Meeting notes are available as a public [Google doc](https://docs.google.com/document/d/1CIMGoIOZ-c3-igzbd6_Pnxx1SjAkjwqoYSUWxPY8XIs/edit). For edit access, get in touch on [GitHub Discussions](https://github.com/open-telemetry/opentelemetry-python/discussions).
 
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 

docs/examples/auto-instrumentation/server_instrumented.py

@@ -14,8 +14,9 @@
 
 from flask import Flask, request
 
-from opentelemetry import propagators, trace
+from opentelemetry import trace
 from opentelemetry.instrumentation.wsgi import collect_request_attributes
+from opentelemetry.propagate import extract
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,
@@ -37,7 +38,7 @@
 def server_request():
     with tracer.start_as_current_span(
         "server_request",
-        context=propagators.extract(DictGetter(), request.headers),
+        context=extract(DictGetter(), request.headers),
         kind=trace.SpanKind.SERVER,
         attributes=collect_request_attributes(request.environ),
     ):

docs/examples/datadog_exporter/client.py

@@ -16,11 +16,12 @@
 
 from requests import get
 
-from opentelemetry import propagators, trace
+from opentelemetry import trace
 from opentelemetry.exporter.datadog import (
     DatadogExportSpanProcessor,
     DatadogSpanExporter,
 )
+from opentelemetry.propagate import inject
 from opentelemetry.sdk import resources
 from opentelemetry.sdk.trace import TracerProvider
 
@@ -46,7 +47,7 @@
 
     with tracer.start_as_current_span("client-server"):
         headers = {}
-        propagators.inject(dict.__setitem__, headers)
+        inject(dict.__setitem__, headers)
         requested = get(
             "http://localhost:8082/server_request",
             params={"param": argv[1]},

docs/examples/datadog_exporter/server.py

@@ -14,12 +14,14 @@
 
 from flask import Flask, request
 
-from opentelemetry import propagators, trace
+from opentelemetry import trace
 from opentelemetry.exporter.datadog import (
     DatadogExportSpanProcessor,
     DatadogSpanExporter,
 )
 from opentelemetry.exporter.datadog.propagator import DatadogFormat
+from opentelemetry.propagate import get_global_textmap, set_global_textmap
+from opentelemetry.propagators.composite import CompositeHTTPPropagator
 from opentelemetry.sdk.trace import TracerProvider
 
 app = Flask(__name__)
@@ -35,19 +37,17 @@
 )
 
 # append Datadog format for propagation to and from Datadog instrumented services
-global_textmap = propagators.get_global_textmap()
-if isinstance(
-    global_textmap, propagators.composite.CompositeHTTPPropagator
-) and not any(
+global_textmap = get_global_textmap()
+if isinstance(global_textmap, CompositeHTTPPropagator) and not any(
     isinstance(p, DatadogFormat) for p in global_textmap._propagators
 ):
-    propagators.set_global_textmap(
-        propagators.composite.CompositeHTTPPropagator(
+    set_global_textmap(
+        CompositeHTTPPropagator(
             global_textmap._propagators + [DatadogFormat()]
         )
     )
 else:
-    propagators.set_global_textmap(DatadogFormat())
+    set_global_textmap(DatadogFormat())
 
 tracer = trace.get_tracer(__name__)
 

docs/examples/django/client.py

@@ -16,7 +16,8 @@
 
 from requests import get
 
-from opentelemetry import propagators, trace
+from opentelemetry import trace
+from opentelemetry.propagate import inject
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,
@@ -35,7 +36,7 @@
 
     with tracer.start_as_current_span("client-server"):
         headers = {}
-        propagators.inject(dict.__setitem__, headers)
+        inject(dict.__setitem__, headers)
         requested = get(
             "http://localhost:8000",
             params={"param": argv[1]},

docs/examples/error_hander/error_handler_0/setup.cfg

@@ -37,7 +37,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-sdk == 0.18.dev0
+    opentelemetry-sdk == 1.0.0.dev0
 
 [options.packages.find]
 where = src