Code

merging from upstream master#7

Code

Merged

dmarar merged 5 commits intodmarar:masterdmarar/opentelemetry-python:masterfrom open-telemetry:masteropen-telemetry/opentelemetry-python:masterCopy head branch name to clipboardDec 7, 2020

+382-127

Commits

Commits on Dec 3, 2020

• OTLP exporter use grpc runtime cert if not set (#1430)

  

  alrex

  authored
  00578e3

  Copy full SHA for 00578e3

Commits on Dec 4, 2020

• Add convenience methods to access common config options in Configuration class (#1426)

  srikanthccv

  authored
  268cfbf

  Copy full SHA for 268cfbf

• Use a delegate sampler for each possible case in ParentBased Sampler (#1440)

  lzchen

  authored
  0f8eb6c

  Copy full SHA for 0f8eb6c

• Update set_status docstring (#1434)

  srikanthccv

  authored
  6411755

  Copy full SHA for 6411755

Commits on Dec 7, 2020

• Throw an error when multiple instruments are registered by the same name (#1438)

  srikanthccv

  authored
  8d195e6

  Copy full SHA for 8d195e6