Skip to content

Commit 90ba901

Browse files
committed
upgrade to latest c-ares
1 parent 8469b16 commit 90ba901

File tree

3 files changed

+36
-41
lines changed

3 files changed

+36
-41
lines changed

MODULE.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ bazel_dep(name = "rules_multitool", version = "1.0.0")
4141
bazel_dep(name = "c-ares", version = "1.16.1")
4242
archive_override(
4343
module_name = "c-ares",
44-
urls=["https://github.com/malkia/c-ares/archive/5ff026975caa04eb25e02b21976be5aace7da3c8.zip"],
45-
integrity = "sha256-nlYybA2PLmf6hzcaFxCoVQ0+QWOyw0NOii3pUr+AsbQ=",
46-
strip_prefix="c-ares-5ff026975caa04eb25e02b21976be5aace7da3c8"
44+
urls=["https://github.com/malkia/c-ares/archive/92a22155da5494d03d1304d9e0a504b9abef3fd8.zip"],
45+
integrity = "sha256-MwmcYlqIty1yerC76fvX2uW3xiZ2no85PMiZxtU/JaA=",
46+
strip_prefix="c-ares-92a22155da5494d03d1304d9e0a504b9abef3fd8"
4747
)
4848

4949
# ERROR: Q:/b/u/c56xnmzt/external/protobuf+/src/google/protobuf/BUILD.bazel:462:11: Compiling src/google/protobuf/any_lite.cc [for tool] failed: undeclared inclusion(s) in rule '@@protobuf+//src/google/protobuf:protobuf_lite':
@@ -60,7 +60,7 @@ archive_override(
6060
"bazel/opentelemetry-proto.patch",
6161
],
6262
strip_prefix = "opentelemetry-proto-1.4.0",
63-
urls = "https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.4.0.tar.gz",
63+
urls = ["https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.4.0.tar.gz"]
6464
)
6565

6666
bazel_dep(name = "prometheus-cpp", version = "1.3.0")

x/MODULE.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ archive_override(
6464
"bazel/opentelemetry-proto.patch",
6565
],
6666
strip_prefix = "opentelemetry-proto-1.4.0",
67-
urls = "https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.4.0.tar.gz",
67+
urls = [
68+
"https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.4.0.tar.gz",
69+
]
6870
)
6971

7072
bazel_dep(name = "prometheus-cpp", version = "1.3.0")

x/x.cpp

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,6 @@ void CleanupLogger()
275275
opentelemetry::logs::Provider::SetLoggerProvider(noop);
276276
}
277277

278-
static void init_metrics()
279-
{
280-
using namespace opentelemetry;
281-
}
282-
283-
284278
void InitMetrics(const std::string &name)
285279
{
286280
#if 0
@@ -453,44 +447,43 @@ int main1()
453447
// }
454448
//proxy_thread pA(last, opentelemetry::exporter::otlp::GetOtlpDefaultGrpcEndpoint());
455449
// proxy_thread pA(last,"127.0.0.1:4317");
456-
// pA.proxy->SetActive( false );
450+
//pA.proxy->SetActive( false );
457451

458452
printf("starting...\n");
459-
proxy_thread proxy("127.0.0.1:4317", opentelemetry::exporter::otlp::GetOtlpDefaultGrpcEndpoint());
453+
proxy_thread proxy("127.0.0.1:43170", opentelemetry::exporter::otlp::GetOtlpDefaultGrpcEndpoint());
454+
proxy.proxy->SetActive(false);
460455
printf("started...\n");
461-
// {
462-
// using namespace opentelemetry::sdk::common;
463-
// setenv( "OTEL_EXPORTER_OTLP_ENDPOINT", "http://127.0.0.1:4317", 1 /* override */ );
464-
// }
465456

466-
// std::string metrics_name{"malkia_metrics_test"};
467-
// InitTracer();
468-
// InitLogger();
469-
// InitMetrics(metrics_name);
470-
471-
// init_metrics();
472-
// logs_foo_library();
473-
// traces_foo_library();
474-
// std::thread counter_example{&metrics_counter_example, metrics_name};
475-
// std::thread observable_counter_example{&metrics_observable_counter_example, metrics_name};
476-
// std::thread histogram_example{&metrics_histogram_example, metrics_name};
477-
// counter_example.join();
478-
// observable_counter_example.join();
479-
// histogram_example.join();
480-
// CleanupMetrics();
481-
// CleanupLogger();
482-
// CleanupTracer();
483-
484-
printf("Press Ctrl+C to break\n");
485-
try {
486-
printf("waiting...\n");
487-
std::this_thread::sleep_for(std::chrono::seconds(3600*10));
457+
{
458+
using namespace opentelemetry::sdk::common;
459+
setenv( "OTEL_EXPORTER_OTLP_ENDPOINT", "http://127.0.0.1:43170", 1 /* override */ );
488460
}
489-
catch( ... )
461+
462+
std::string metrics_name{"malkia_metrics_test"};
463+
464+
InitTracer();
465+
InitLogger();
466+
InitMetrics(metrics_name);
467+
468+
for(int i=0; i<10000; i++)
490469
{
491-
printf("Caught something?\n");
470+
logs_foo_library();
471+
traces_foo_library();
472+
if( i % 100 == 0 )
473+
{
474+
std::thread counter_example{&metrics_counter_example, metrics_name};
475+
std::thread observable_counter_example{&metrics_observable_counter_example, metrics_name};
476+
std::thread histogram_example{&metrics_histogram_example, metrics_name};
477+
counter_example.join();
478+
observable_counter_example.join();
479+
histogram_example.join();
480+
}
492481
}
493482

483+
CleanupMetrics();
484+
CleanupLogger();
485+
CleanupTracer();
486+
494487
return 0;
495488
}
496489

0 commit comments

Comments
 (0)