Merge v1.9.0

* commit '7887d32da60f54984a597abccbb0c883f3a51649': (82 commits)
  [RELEASE] Release version 1.9.0 (open-telemetry#2091)
  Use sdk_start_ts for MetricData start_ts for instruments having cumulative aggregation temporality. (open-telemetry#2086)
  [SEMANTIC CONVENTIONS] Upgrade to version 1.20.0 (open-telemetry#2088)
  [EXPORTER] Add OTLP HTTP SSL support (open-telemetry#1793)
  Make Windows build environment parallel (open-telemetry#2080)
  make some hints (open-telemetry#2078)
  Make some targets parallel in CI pipeline (open-telemetry#2076)
  [Metrics SDK] Implement Forceflush for Periodic Metric Reader (open-telemetry#2064)
  Upgraded semantic conventions to 1.19.0 (open-telemetry#2017)
  Bump actions/stale from 7 to 8 (open-telemetry#2070)
  Include directory path added for Zipkin exporter example (open-telemetry#2069)
  Ignore more warning of generated protobuf files than not included in `-Wall` and `-Wextra` (open-telemetry#2067)
  Add `ForceFlush` for all `LogRecordExporter`s and `SpanExporter`s. (open-telemetry#2000)
  Remove unused 'alerting' section from prometheus.yml in examples (open-telemetry#2055)
  Clean warnings in ETW exporters (open-telemetry#2063)
  Fix default value of `OPENTELEMETRY_INSTALL_default`. (open-telemetry#2062)
  [EXPORTER] GRPC endpoint scheme should take precedence over OTEL_EXPORTER_OTLP_TRACES_INSECURE (open-telemetry#2060)
  Fix view names in Prometheus example (open-telemetry#2034)
  Fix some docs typo (open-telemetry#2057)
  Checking indices before dereference (open-telemetry#2040)
  ...

# Conflicts:
#	exporters/ostream/CMakeLists.txt
#	sdk/src/metrics/state/metric_collector.cc
#	sdk/src/metrics/state/temporal_metric_storage.cc

.bazelrc

@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 # bazel configurations for running tests under sanitizers.
 # Based on https:/bazelment/trunk/blob/master/tools/bazel.rc
 

.clang-format

@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 # See Clang docs: http://clang.llvm.org/docs/ClangFormatStyleOptions.html
 BasedOnStyle: Chromium
 

.cmake-format.py

@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 # If comment markup is enabled, don't reflow the first comment block in
 # eachlistfile. Use this to preserve formatting of your
 # copyright/licensestatements.

.copyright-ignore

@@ -0,0 +1,52 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+# Ignore the following directories
+
+./.git/*
+./.github/*
+./third_party/benchmark/*
+./third_party/boost/*
+./third_party/googletest/*
+./third_party/ms-gsl/*
+./third_party/nlohmann-json/*
+./third_party/opentelemetry-proto/*
+./third_party/prometheus-cpp/*
+./tools/vcpkg/*
+./tools/ports/*
+
+# Third party code
+
+./api/include/opentelemetry/nostd/internal/absl/*
+./exporters/jaeger/thrift-gen/*
+./exporters/etw/include/opentelemetry/exporters/etw/TraceLoggingDynamic.h
+
+# Doc
+
+./docs/*
+
+## Ignore the following files patterns
+
+*.md
+*.rst
+*.png
+*.log
+*.patch
+*.json
+*.nuspec
+*.pem
+
+# Packaging
+*/CONTROL
+
+# LICENSE files
+*/LICENSE
+
+# Ignore the following misc files
+
+./.bazelignore
+./.bazelversion
+./docker/.gitignore
+.markdownlintignore
+./ci/toc.yml
+./ci/valgrind-suppressions

.github/workflows/ci.yml

@@ -29,8 +29,8 @@ jobs:
  sudo -E ./ci/setup_thrift.sh
  ./ci/do_ci.sh cmake.test
 
- cmake_gcc_maintainer_test:
- name: CMake gcc 12 (maintainer mode)
+ cmake_gcc_maintainer_sync_test:
+ name: CMake gcc 12 (maintainer mode, sync)
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v3
@@ -41,19 +41,64 @@ jobs:
  CC: /usr/bin/gcc-12
  CXX: /usr/bin/g++-12
  GOOGLETEST_VERSION: 1.12.1
+ PROTOBUF_VERSION: 21.12
  run: |
  sudo -E ./ci/setup_cmake.sh
  sudo -E ./ci/setup_ci_environment.sh
- - name: run cmake gcc (maintainer mode)
+ sudo -E ./ci/install_protobuf.sh
+ - name: run cmake gcc (maintainer mode, sync)
  env:
  CC: /usr/bin/gcc-12
  CXX: /usr/bin/g++-12
  run: |
  sudo -E ./ci/setup_thrift.sh
- ./ci/do_ci.sh cmake.maintainer.test
+ ./ci/do_ci.sh cmake.maintainer.sync.test
+ - name: generate test cert
+ env:
+ CFSSL_VERSION: 1.6.3
+ run: |
+ sudo -E ./tools/setup-cfssl.sh
+ (cd ./functional/cert; ./generate_cert.sh)
+ - name: run func test
+ run: |
+ (cd ./functional/otlp; ./run_test.sh)
+
+ cmake_gcc_maintainer_async_test:
+ name: CMake gcc 12 (maintainer mode, async)
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: 'recursive'
+ - name: setup
+ env:
+ CC: /usr/bin/gcc-12
+ CXX: /usr/bin/g++-12
+ GOOGLETEST_VERSION: 1.12.1
+ PROTOBUF_VERSION: 21.12
+ run: |
+ sudo -E ./ci/setup_cmake.sh
+ sudo -E ./ci/setup_ci_environment.sh
+ sudo -E ./ci/install_protobuf.sh
+ - name: run cmake gcc (maintainer mode, async)
+ env:
+ CC: /usr/bin/gcc-12
+ CXX: /usr/bin/g++-12
+ run: |
+ sudo -E ./ci/setup_thrift.sh
+ ./ci/do_ci.sh cmake.maintainer.async.test
+ - name: generate test cert
+ env:
+ CFSSL_VERSION: 1.6.3
+ run: |
+ sudo -E ./tools/setup-cfssl.sh
+ (cd ./functional/cert; ./generate_cert.sh)
+ - name: run func test
+ run: |
+ (cd ./functional/otlp; ./run_test.sh)
 
- cmake_clang_maintainer_test:
- name: CMake clang 14 (maintainer mode)
+ cmake_clang_maintainer_sync_test:
+ name: CMake clang 14 (maintainer mode, sync)
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v3
@@ -64,16 +109,61 @@ jobs:
  CC: /usr/bin/clang-14
  CXX: /usr/bin/clang++-14
  GOOGLETEST_VERSION: 1.12.1
+ PROTOBUF_VERSION: 21.12
  run: |
  sudo -E ./ci/setup_cmake.sh
  sudo -E ./ci/setup_ci_environment.sh
- - name: run cmake clang (maintainer mode)
+ sudo -E ./ci/install_protobuf.sh
+ - name: run cmake clang (maintainer mode, sync)
  env:
  CC: /usr/bin/clang-14
  CXX: /usr/bin/clang++-14
  run: |
  sudo -E ./ci/setup_thrift.sh
- ./ci/do_ci.sh cmake.maintainer.test
+ ./ci/do_ci.sh cmake.maintainer.sync.test
+ - name: generate test cert
+ env:
+ CFSSL_VERSION: 1.6.3
+ run: |
+ sudo -E ./tools/setup-cfssl.sh
+ (cd ./functional/cert; ./generate_cert.sh)
+ - name: run func test
+ run: |
+ (cd ./functional/otlp; ./run_test.sh)
+
+ cmake_clang_maintainer_async_test:
+ name: CMake clang 14 (maintainer mode, async)
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: 'recursive'
+ - name: setup
+ env:
+ CC: /usr/bin/clang-14
+ CXX: /usr/bin/clang++-14
+ GOOGLETEST_VERSION: 1.12.1
+ PROTOBUF_VERSION: 21.12
+ run: |
+ sudo -E ./ci/setup_cmake.sh
+ sudo -E ./ci/setup_ci_environment.sh
+ sudo -E ./ci/install_protobuf.sh
+ - name: run cmake clang (maintainer mode, async)
+ env:
+ CC: /usr/bin/clang-14
+ CXX: /usr/bin/clang++-14
+ run: |
+ sudo -E ./ci/setup_thrift.sh
+ ./ci/do_ci.sh cmake.maintainer.async.test
+ - name: generate test cert
+ env:
+ CFSSL_VERSION: 1.6.3
+ run: |
+ sudo -E ./tools/setup-cfssl.sh
+ (cd ./functional/cert; ./generate_cert.sh)
+ - name: run func test
+ run: |
+ (cd ./functional/otlp; ./run_test.sh)
 
  cmake_msvc_maintainer_test:
  name: CMake msvc (maintainer mode)
@@ -127,13 +217,31 @@ jobs:
  sudo ./ci/install_abseil.sh
  ./ci/do_ci.sh cmake.abseil.test
 
+ cmake_opentracing_shim_test:
+ name: CMake test (with opentracing-shim)
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: 'recursive'
+ - name: setup
+ run: |
+ sudo ./ci/setup_cmake.sh
+ sudo ./ci/setup_ci_environment.sh
+ - name: run cmake tests (enable opentracing-shim)
+ run: ./ci/do_ci.sh cmake.opentracing_shim.test
+
  cmake_gcc_48_test:
  name: CMake gcc 4.8 (without otlp exporter)
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
  steps:
  - uses: actions/checkout@v3
  with:
  submodules: 'recursive'
+ - name: Add Ubuntu Xenial package sources
+ run: |
+ sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main'
+ sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial universe'
  - name: setup
  run: |
  sudo ./ci/setup_ci_environment.sh
@@ -152,11 +260,15 @@ jobs:
 
  cmake_gcc_48_otlp_exporter_test:
  name: CMake gcc 4.8 (with otlp exporter)
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
  steps:
  - uses: actions/checkout@v3
  with:
  submodules: 'recursive'
+ - name: Add Ubuntu Xenial package sources
+ run: |
+ sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial main'
+ sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ xenial universe'
  - name: setup
  run: |
  sudo ./ci/setup_ci_environment.sh
@@ -238,6 +350,22 @@ jobs:
  sudo ./ci/setup_grpc.sh
  ./ci/do_ci.sh cmake.exporter.otprotocol.test
 
+ cmake_do_not_install_test:
+ name: CMake do not install test (with otlp-exporter)
+ runs-on: ubuntu-20.04
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: 'recursive'
+ - name: setup
+ run: |
+ sudo ./ci/setup_cmake.sh
+ sudo ./ci/setup_ci_environment.sh
+ - name: run otlp exporter tests
+ run: |
+ sudo ./ci/setup_grpc.sh
+ ./ci/do_ci.sh cmake.do_not_install.test
+
  plugin_test:
  name: Plugin -> CMake
  runs-on: ubuntu-latest
@@ -489,6 +617,13 @@ jobs:
  - name: run tests
  run: ./ci/do_ci.sh format
 
+ copyright:
+ name: Copyright
+ runs-on: ubuntu-20.04
+ steps:
+ - uses: actions/checkout@v3
+ - name: check copyright
+ run: ./tools/check_copyright.sh
 
  windows:
  name: CMake -> exporter proto
@@ -507,6 +642,23 @@ jobs:
  - name: run otprotocol test
  run: ./ci/do_ci.ps1 cmake.exporter.otprotocol.test
 
+ windows-build-dll:
+ name: CMake -> exporter proto (Build as DLL)
+ runs-on: windows-2019
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: 'recursive'
+ - name: setup
+ run: |
+ ./ci/setup_windows_cmake.ps1
+ ./ci/setup_windows_ci_environment.ps1
+ ./ci/install_windows_protobuf.ps1
+ - name: run cmake test (DLL build)
+ run: ./ci/do_ci.ps1 cmake.dll.test
+ - name: run otprotocol test (DLL build)
+ run: ./ci/do_ci.ps1 cmake.exporter.otprotocol.dll.test
+
  windows_with_async_export:
  name: CMake (With async export) -> exporter proto
  runs-on: windows-2019

.github/workflows/dependencies_image.yml

@@ -21,7 +21,7 @@ jobs:
  uses: docker/setup-buildx-action@v2
  -
  name: Build Image
- uses: docker/build-push-action@v3
+ uses: docker/build-push-action@v4
  with:
  builder: ${{ steps.buildx.outputs.name }}
  context: ci/

.github/workflows/stale.yml

@@ -7,7 +7,7 @@ jobs:
  stale:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/stale@v7
+ - uses: actions/stale@v8
  with:
  stale-issue-message: "This issue was marked as stale due to lack of activity."
  days-before-issue-stale: 60

.gitignore

@@ -1,3 +1,6 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 # Ref. https:/github/gitignore/blob/master/C%2B%2B.gitignore
 # Prerequisites
 *.d
@@ -16,6 +19,7 @@
 *.so
 *.dylib
 *.dll
+*.pdb
 
 # Fortran module files
 *.mod
@@ -51,3 +55,27 @@
 
 tags
 .cache/clangd/*
+
+# Temporary dir used when generating semconv
+./buildscripts/semantic-convention/opentelemetry-specification
+
+# Generated cert keys in functional tests
+functional/cert/ca.csr
+functional/cert/ca.pem
+functional/cert/ca-key.pem
+functional/cert/client_cert.csr
+functional/cert/client_cert.pem
+functional/cert/client_cert-key.pem
+functional/cert/server_cert.csr
+functional/cert/server_cert.pem
+functional/cert/server_cert-key.pem
+functional/cert/ca_b.csr
+functional/cert/ca_b.pem
+functional/cert/ca_b-key.pem
+functional/cert/client_cert_b.csr
+functional/cert/client_cert_b.pem
+functional/cert/client_cert_b-key.pem
+functional/cert/server_cert_b.csr
+functional/cert/server_cert_b.pem
+functional/cert/server_cert_b-key.pem
+functional/cert/unreadable.pem

.gitmodules

@@ -32,3 +32,8 @@ branch = main
 path = third_party/nlohmann-json
 url = https:/nlohmann/json
 branch = master
+
+[submodule "third_party/opentracing-cpp"]
+path = third_party/opentracing-cpp
+url = https:/opentracing/opentracing-cpp.git
+branch = master