Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-31465 Update system to use the most recent open telemetry libraries #18419

Merged
merged 1 commit into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions system/jlib/jtrace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

#include "opentelemetry/trace/semantic_conventions.h" //known span defines
#include "opentelemetry/context/propagation/global_propagator.h" // context::propagation::GlobalTextMapPropagator::GetGlobalPropagator
#include "opentelemetry/sdk/trace/batch_span_processor_options.h" //opentelemetry::sdk::trace::TracerProviderFactory::Create(context)
#include "opentelemetry/sdk/trace/tracer_provider_factory.h" //opentelemetry::sdk::trace::TracerProviderFactory::Create(context)
#include "opentelemetry/sdk/trace/tracer_context.h" //opentelemetry::sdk::trace::TracerContextFactory::Create(std::move(processors));
#include "opentelemetry/sdk/trace/tracer_context_factory.h" //opentelemetry::sdk::trace::TracerContextFactory::Create(std::move(processors));
#include "opentelemetry/sdk/trace/simple_processor_factory.h"
#include "opentelemetry/sdk/trace/batch_span_processor_factory.h"
Expand Down Expand Up @@ -48,6 +50,9 @@
#include "lnuid.h"
#include <variant>

//This seems to be defined in some window builds - avoid conflicts with the functions below
#undef max

namespace context = opentelemetry::context;
namespace nostd = opentelemetry::nostd;
namespace opentel_trace = opentelemetry::trace;
Expand Down Expand Up @@ -1321,10 +1326,10 @@ void CTraceManager::initTracerProviderAndGlobalInternals(const IPropertyTree * t
auto jtraceResource = opentelemetry::sdk::resource::Resource::Create(resourceAtts);

// Default is an always-on sampler.
std::shared_ptr<opentelemetry::sdk::trace::TracerContext> context =
std::unique_ptr<opentelemetry::sdk::trace::TracerContext> context =
opentelemetry::sdk::trace::TracerContextFactory::Create(std::move(processors), jtraceResource);
std::shared_ptr<opentelemetry::trace::TracerProvider> provider =
opentelemetry::sdk::trace::TracerProviderFactory::Create(context);
opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(context));

// Set the global trace provider
opentelemetry::trace::Provider::SetTracerProvider(provider);
Expand Down
15 changes: 0 additions & 15 deletions vcpkg_overlays/opentelemetry-cpp/add-missing-dependencies.patch

This file was deleted.

13 changes: 0 additions & 13 deletions vcpkg_overlays/opentelemetry-cpp/add-missing-find-dependency.patch

This file was deleted.

56 changes: 0 additions & 56 deletions vcpkg_overlays/opentelemetry-cpp/hpcc-remove-unsafe-onfork.patch

This file was deleted.

75 changes: 0 additions & 75 deletions vcpkg_overlays/opentelemetry-cpp/portfile.cmake

This file was deleted.

26 changes: 0 additions & 26 deletions vcpkg_overlays/opentelemetry-cpp/use-default-cxx-version.patch

This file was deleted.

87 changes: 0 additions & 87 deletions vcpkg_overlays/opentelemetry-cpp/vcpkg.json

This file was deleted.

Loading