Merge branch 'main' into update_user_events_deps

ThomsonTan · web-flow · commit 87572531894f · 2025-03-11T13:40:57.000-07:00
diff --git a/.github/workflows/boost_log.yml b/.github/workflows/boost_log.yml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.15.0"
+          ref: "v1.19.0"
           path: "opentelemetry-cpp"
           submodules: "recursive"
       - name: setup dependencies
diff --git a/.github/workflows/fluentd.yml b/.github/workflows/fluentd.yml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.15.0"
+          ref: "v1.19.0"
           path: "opentelemetry-cpp"
           submodules: "recursive"
       - name: setup dependencies
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry
diff --git a/.github/workflows/glog.yml b/.github/workflows/glog.yml
@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.15.0"
+          ref: "v1.19.0"
           path: "opentelemetry-cpp"
           submodules: "recursive"
       - name: setup dependencies
diff --git a/.github/workflows/log4cxx.yml b/.github/workflows/log4cxx.yml
@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.15.0"
+          ref: "v1.19.0"
           path: "opentelemetry-cpp"
           submodules: "recursive"
       - name: setup dependencies
diff --git a/.github/workflows/prometheus.yml b/.github/workflows/prometheus.yml
@@ -65,7 +65,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.15.0"
+          ref: "v1.19.0"
           path: "otel_cpp"
           submodules: "recursive"
       - name: run tests
@@ -103,7 +103,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.15.0"
+          ref: "v1.19.0"
           path: "otel_cpp"
           submodules: "recursive"
       - name: setup
diff --git a/.github/workflows/spdlog.yml b/.github/workflows/spdlog.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.15.0"
+          ref: "v1.19.0"
           path: "opentelemetry-cpp"
           submodules: "recursive"
       - name: setup dependencies
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,27 +1,28 @@
 # Contributing to opentelemetry-cpp-contrib
 
-The OpenTelemetry C/C++ special interest group (SIG) meets regularly. See the
-OpenTelemetry [community](https://github.com/open-telemetry/community#cc-sdk)
-repo for information on this and other language SIGs.
+## Introduction
 
-See the [public meeting notes](https://docs.google.com/document/d/1i1E4-_y4uJ083lCutKGDhkpi3n4_e774SBLi9hPLocw/edit)
-for a summary description of past meetings. To request edit access, join the
-meeting or get in touch on [Gitter](https://gitter.im/open-telemetry/opentelemetry-cpp).
+Welcome to the opentelemetry-cpp-contrib repository! This project is an integral part of the broader OpenTelemetry ecosystem, providing additional instrumentation and tools to enhance C/C++ observability.
 
-## Development
+We greatly appreciate any contributions, no matter the size or scope. Please feel free to reach out to the OpenTelemetry C/C++ community on [slack](https://cloud-native.slack.com/archives/C01N3AT62SJ) with questions or for assistance.
 
-TBD
+## Prerequisites
 
-### Build and Run Code Examples
+[C++14](https://github.com/open-telemetry/opentelemetry-cpp/?tab=readme-ov-file#supported-c-versions) or higher
 
-TBD
+CMake 3.18 or higher
+
+Git
 
-## Pull Requests
+## Workflow
 
-### How to Send Pull Requests
+-Use forked repo when contributing
 
-Everyone is welcome to contribute code to `opentelemetry-cpp-contrib` via GitHub pull
-requests (PRs).
+-Follow the OpenTelemetry C++ SDK contributing guidelines
+
+-Write clear, concise commit messages
+
+## Local Run/Build
 
 To create a new PR, fork the project in GitHub and clone the upstream repo:
 
@@ -46,16 +47,49 @@ git push fork feature
 
 Open a pull request against the main `opentelemetry-cpp-contrib` repo.
 
-### How to Receive Comments
+### Build and Run Code Examples
+
+TBD
+
+## Testing
+
+TBD
+
+## Contributing Rules
+
+Follow the OpenTelemetry [C++ SDK coding standards](https://github.com/open-telemetry/opentelemetry-cpp?tab=readme-ov-file#supported-c-versions)
+
+Include tests for new features or bug fixes
+
+
+## How to Receive Comments
 
 * If the PR is not ready for review, please put `[WIP]` in the title, tag it
   as `work-in-progress`, or mark it as [`draft`](https://github.blog/2019-02-14-introducing-draft-pull-requests/).
 * Make sure [CLA](https://identity.linuxfoundation.org/projects/cncf) is
   signed and CI is clear.
+  
+## How to Get PRs Merged
+
+Address any reviewer 
+
+Ensure all tests pass
+
+The maintainers will squash and merge your commit when approved
+
+
+
+## Further Help
+
+The OpenTelemetry C/C++ special interest group (SIG) meets regularly. 
+
+See the public meeting notes via the [README](https://github.com/open-telemetry/opentelemetry-cpp?tab=readme-ov-file#contributing) by following the link to the google doc.
+
+Link to join SIG meets also available in the README
+
+For more info and help, join the meeting or get in touch on the [CNCF Slack channel for opentelemetry-cpp](https://cloud-native.slack.com/archives/C01N3AT62SJ).  
 
-### How to Get PRs Merged
 
-This section needs to be written.
 
 ## Useful Resources
 
diff --git a/README.md b/README.md
@@ -1,5 +1,8 @@
 # OpenTelemetry C++ Contrib
 
+[![FOSSA License Status](https://app.fossa.com/api/projects/custom%2B162%2Fgithub.com%2Fopen-telemetry%2Fopentelemetry-cpp-contrib.svg?type=shield&issueType=license)](https://app.fossa.com/projects/custom%2B162%2Fgithub.com%2Fopen-telemetry%2Fopentelemetry-cpp-contrib?ref=badge_shield&issueType=license)
+[![FOSSA Security Status](https://app.fossa.com/api/projects/custom%2B162%2Fgithub.com%2Fopen-telemetry%2Fopentelemetry-cpp-contrib.svg?type=shield&issueType=security)](https://app.fossa.com/projects/custom%2B162%2Fgithub.com%2Fopen-telemetry%2Fopentelemetry-cpp-contrib?ref=badge_shield&issueType=security)
+
 This repository contains set of components extending functionality of the
 OpenTelemetry SDK. Instrumentation libraries, exporters, and other components
 can find their home here.
diff --git a/exporters/fluentd/CMakeLists.txt b/exporters/fluentd/CMakeLists.txt
@@ -133,16 +133,22 @@ if(OPENTELEMETRY_INSTALL)
 endif()
 
 if(BUILD_TESTING)
-  include(GoogleTest)
+  if(MAIN_PROJECT)
+    find_package(GTest CONFIG REQUIRED)
+  else()
+    if (NOT DEFINED GTEST_BOTH_LIBRARIES)
+      message(STATUS_FATAL, "Test is not enable.")
+    endif()
+  endif()
+  # include(GoogleTest)
   # build trace exporter tests
   add_executable(
     fluentd_recordable_trace_test test/trace/fluentd_recordable_test.cc
                                   test/trace/fluentd_baseline_test.cc)
 
   target_link_libraries(
     fluentd_recordable_trace_test
-    gtest
-    gtest_main
+    ${GTEST_BOTH_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
     opentelemetry_common
     opentelemetry_trace
@@ -164,8 +170,7 @@ if(BUILD_TESTING)
 
   target_link_libraries(
     fluentd_recordable_logs_test
-    gtest
-    gtest_main
+    ${GTEST_BOTH_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
     opentelemetry_common
     opentelemetry_logs
diff --git a/exporters/fluentd/include/opentelemetry/exporters/fluentd/log/fluentd_exporter.h b/exporters/fluentd/include/opentelemetry/exporters/fluentd/log/fluentd_exporter.h
@@ -50,6 +50,12 @@ class FluentdExporter final : public logs_sdk::LogRecordExporter {
   Export(const nostd::span<std::unique_ptr<logs_sdk::Recordable>>
              &logs) noexcept override;
 
+  bool ForceFlush(
+      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
+  {
+        return true;
+  }
+
   /**
    * Shut down the exporter.
    * @param timeout an optional timeout, default to max.
diff --git a/exporters/fluentd/include/opentelemetry/exporters/fluentd/trace/fluentd_exporter.h b/exporters/fluentd/include/opentelemetry/exporters/fluentd/trace/fluentd_exporter.h
@@ -55,6 +55,12 @@ class FluentdExporter final : public trace_sdk::SpanExporter {
   Export(const nostd::span<std::unique_ptr<trace_sdk::Recordable>>
              &spans) noexcept override;
 
+  bool ForceFlush(
+      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
+  {
+        return true;
+  }
+
   /**
    * Shut down the exporter.
    * @param timeout an optional timeout, default to max.
diff --git a/exporters/geneva-trace/third_party/opentelemetry-cpp b/exporters/geneva-trace/third_party/opentelemetry-cpp
@@ -1 +1 @@
-Subproject commit 3efd3ce8f4d9b2753751208c717da47c652ea27e
+Subproject commit 021eb994cfaddbdf371601840e14e288323e19fc
diff --git a/exporters/geneva/src/exporter.cc b/exporters/geneva/src/exporter.cc
@@ -22,18 +22,19 @@ Exporter::Exporter(const ExporterOptions &options)
     : options_(options), connection_string_parser_(options_.connection_string),
       data_transport_{nullptr} {
   if (connection_string_parser_.IsValid()) {
+#ifdef _WIN32
+    if (connection_string_parser_.transport_protocol_ ==
+             TransportProtocol::kETW) {
+      data_transport_ = std::unique_ptr<DataTransport>(
+          new ETWDataTransport(kBinaryHeaderSize));
+    }
+#else
     if (connection_string_parser_.transport_protocol_ ==
         TransportProtocol::kUNIX) {
       data_transport_ =
           std::unique_ptr<DataTransport>(new UnixDomainSocketDataTransport(
               connection_string_parser_.connection_string_));
     }
-#ifdef _WIN32
-    else if (connection_string_parser_.transport_protocol_ ==
-             TransportProtocol::kETW) {
-      data_transport_ = std::unique_ptr<DataTransport>(
-          new ETWDataTransport(kBinaryHeaderSize));
-    }
 #endif
   }
   // Connect transport at initialization
diff --git a/exporters/geneva/src/unix_domain_socket_data_transport.cc b/exporters/geneva/src/unix_domain_socket_data_transport.cc
@@ -45,17 +45,17 @@ bool UnixDomainSocketDataTransport::Send(MetricsEventType event_type,
   if (error_code != 0) {
     LOG_ERROR("Geneva Exporter: UDS::Send failed - not connected");
     connected_ = false;
+    return false;
   }
 
   // try to write
   size_t sent_size = socket_.writeall(data, length);
-  if (length == sent_size) {
-    // Disconnect();
-    return true;
-  } else {
+  if (length != sent_size) {
+    Disconnect();
     LOG_ERROR("Geneva Exporter: UDS::Send failed");
+    return false;
   }
-  return false;
+  return true;
 }
 
 bool UnixDomainSocketDataTransport::Disconnect() noexcept {
diff --git a/exporters/prometheus/CMakeLists.txt b/exporters/prometheus/CMakeLists.txt
@@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(
   opentelemetry-cpp-contrib
-  VERSION "1.11.0" # opentelemetry-cpp-contrib 1.11.0
+  VERSION "1.19.0" # opentelemetry-cpp-contrib 1.19.0
   HOMEPAGE_URL "https://github.com/open-telemetry/opentelemetry-cpp-contrib"
   LANGUAGES CXX)
 
diff --git a/exporters/prometheus/MODULE.bazel b/exporters/prometheus/MODULE.bazel
@@ -0,0 +1,15 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+module(
+    name = "opentelemetry-cpp-contrib-prometheus",
+    version = "1.19.0",
+    compatibility_level = 0,
+    repo_name = "io_opentelemetry_cpp_contrib",
+)
+
+bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_absl")
+bazel_dep(name = "opentelemetry-cpp", version = "1.19.0", repo_name = "io_opentelemetry_cpp")
+bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")
+
+bazel_dep(name = "googletest", version = "1.14.0.bcr.1", dev_dependency = True, repo_name = "com_google_googletest")
diff --git a/instrumentation/nginx/README.md b/instrumentation/nginx/README.md
@@ -136,7 +136,7 @@ Chooses the traces sampler. (default: `parentbased_always_on`).
 - **syntax**: `opentelemetry_traces_sampler always_on|always_off|traceidratio|parentbased_always_on|parentbased_always_off|parentbased_traceidratio`
 - **block**: `http`
 
-### `opentelemetry_traces_sampler`
+### `opentelemetry_traces_sampler_ratio`
 
 Chooses the trace sampling ratio between `0.0` and `1.0` when a ratio based sampler is active. (default: `1.0`).
 
diff --git a/instrumentation/otel-webserver-module/Dockerfile b/instrumentation/otel-webserver-module/Dockerfile
@@ -108,7 +108,7 @@ RUN git clone https://github.com/grpc/grpc \
 RUN mkdir -p dependencies
 
 # install boost version 
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_FILENAME}_rc1.tar.gz \
+RUN wget https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_FILENAME}_rc1.tar.gz \
     && tar -xvf ${BOOST_FILENAME}_rc1.tar.gz \
     && cd ${BOOST_FILENAME} \
     && ./bootstrap.sh --with-libraries=filesystem,system --prefix=/dependencies/boost/${BOOST_VERSION}/ \
diff --git a/instrumentation/otel-webserver-module/codeql-env.sh b/instrumentation/otel-webserver-module/codeql-env.sh
@@ -157,7 +157,7 @@ apt-get install apache2 -y && a2enmod proxy && a2enmod proxy_http \
     && a2enmod proxy_balancer && a2enmod dav
 
 #Build and install boost
-wget https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_FILENAME}.tar.gz \
+wget https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_FILENAME}.tar.gz \
     && tar -xvf ${BOOST_FILENAME}.tar.gz \
     && cd ${BOOST_FILENAME} \
     && ./bootstrap.sh --with-libraries=filesystem,system --prefix=/dependencies/boost/${BOOST_VERSION}/ \
diff --git a/instrumentation/otel-webserver-module/docker/almalinux8/Dockerfile b/instrumentation/otel-webserver-module/docker/almalinux8/Dockerfile
@@ -89,7 +89,7 @@ RUN git clone https://github.com/grpc/grpc \
 RUN mkdir -p dependencies
 
 # install boost version 1.75.0
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_FILENAME}_rc1.tar.gz \
+RUN wget https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_FILENAME}_rc1.tar.gz \
     && tar -xvf ${BOOST_FILENAME}_rc1.tar.gz \
     && cd ${BOOST_FILENAME} \
     && ./bootstrap.sh --with-libraries=filesystem,system --prefix=/dependencies/boost/${BOOST_VERSION}/ \
diff --git a/instrumentation/otel-webserver-module/docker/centos7/Dockerfile b/instrumentation/otel-webserver-module/docker/centos7/Dockerfile
@@ -116,7 +116,7 @@ RUN git clone https://github.com/grpc/grpc \
 RUN mkdir -p dependencies
 
 # install boost version 1.75.0
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_FILENAME}_rc1.tar.gz \
+RUN wget https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_FILENAME}_rc1.tar.gz \
     && tar -xvf ${BOOST_FILENAME}_rc1.tar.gz \
     && cd ${BOOST_FILENAME} \
     && ./bootstrap.sh --with-libraries=filesystem,system --prefix=/dependencies/boost/${BOOST_VERSION}/ \
diff --git a/instrumentation/otel-webserver-module/docker/ubuntu20.04/Dockerfile b/instrumentation/otel-webserver-module/docker/ubuntu20.04/Dockerfile
@@ -159,7 +159,7 @@ RUN apt-get install apache2 -y && a2enmod proxy && a2enmod proxy_http \
     && a2enmod proxy_balancer && a2enmod dav
 
 #Build and install boost
-RUN wget https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_FILENAME}.tar.gz \
+RUN wget https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_FILENAME}.tar.gz \
     && tar -xvf ${BOOST_FILENAME}.tar.gz \
     && cd ${BOOST_FILENAME} \
     && ./bootstrap.sh --with-libraries=filesystem,system --prefix=/dependencies/boost/${BOOST_VERSION}/ \
