Skip to content

Commit

Permalink
Remove sending a metric as part of auto-instrumentation
Browse files Browse the repository at this point in the history
  • Loading branch information
atoulme committed Aug 10, 2023
1 parent 5a6f688 commit bdd2951
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 195 deletions.
11 changes: 4 additions & 7 deletions instrumentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ obj/logger.o: obj src/logger.c src/logger.h
obj/config.o: obj src/config.c src/config.h
gcc -c -Wall -Werror -fpic -o obj/config.o src/config.c

obj/metrics_client.o: obj src/metrics_client.c src/metrics_client.h
gcc -c -Wall -Werror -fpic -o obj/metrics_client.o src/metrics_client.c

obj/splunk.o: obj src/splunk.c src/splunk.h
gcc -c -Wall -Werror -fpic -o obj/splunk.o src/splunk.c

Expand All @@ -36,12 +33,12 @@ obj/args.o: obj src/args.c src/args.h
obj/cmdline_reader.o: obj src/cmdline_reader.c src/cmdline_reader.h
gcc -c -Wall -Werror -fpic -o obj/cmdline_reader.o src/cmdline_reader.c

so/libsplunk.so: obj so obj/logger.o obj/config.o obj/metrics_client.o obj/cmdline_reader.o obj/args.o obj/splunk.o
gcc -shared -o so/libsplunk.so obj/logger.o obj/config.o obj/metrics_client.o obj/cmdline_reader.o obj/args.o obj/splunk.o
so/libsplunk.so: obj so obj/logger.o obj/config.o obj/cmdline_reader.o obj/args.o obj/splunk.o
gcc -shared -o so/libsplunk.so obj/logger.o obj/config.o obj/cmdline_reader.o obj/args.o obj/splunk.o

tests: src/test_main.h src/test_main.c src/test_utils.h src/test_utils.c src/logger.h src/test_logger.c \
src/metrics_client.h src/cmdline_reader.h src/cmdline_reader_test.c obj/config.o obj/metrics_client.o obj/args.o obj/splunk.o
gcc -g -o tests src/test_main.c src/test_utils.c src/test_logger.c src/cmdline_reader_test.c obj/config.o obj/metrics_client.o obj/args.o obj/splunk.o
src/cmdline_reader.h src/cmdline_reader_test.c obj/config.o obj/args.o obj/splunk.o
gcc -g -o tests src/test_main.c src/test_utils.c src/test_logger.c src/cmdline_reader_test.c obj/config.o obj/args.o obj/splunk.o

.PHONY: test
test: tests
Expand Down
133 changes: 0 additions & 133 deletions instrumentation/src/metrics_client.c

This file was deleted.

10 changes: 0 additions & 10 deletions instrumentation/src/metrics_client.h

This file was deleted.

12 changes: 2 additions & 10 deletions instrumentation/src/splunk.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "splunk.h"
#include "config.h"
#include "metrics_client.h"
#include "args.h"

#include <stdlib.h>
Expand Down Expand Up @@ -49,7 +48,7 @@ void __attribute__((constructor)) splunk_instrumentation_enter() {
if (cr == NULL) {
return;
}
auto_instrument(l, has_read_access, program_invocation_short_name, load_config, cr, send_otlp_metric);
auto_instrument(l, has_read_access, program_invocation_short_name, load_config, cr);
cmdline_reader_close(cr);
free_logger(l);
}
Expand All @@ -59,8 +58,7 @@ void auto_instrument(
has_access_func_t has_access,
const char *program_name,
load_config_func_t load_config_func,
cmdline_reader cr,
send_otlp_metric_func_t send_otlp_metric_func
cmdline_reader cr
) {
if (!streq(program_name, "java")) {
return;
Expand Down Expand Up @@ -111,12 +109,6 @@ void auto_instrument(

set_env_var_from_attr(log, "resource_attributes", resource_attributes_var, cfg.resource_attributes);

if (str_to_bool(cfg.disable_telemetry, 0)) {
log_info(log, "disabling telemetry as per config");
} else {
send_otlp_metric_func(log, service_name);
}

free_config(&cfg);
}

Expand Down
4 changes: 1 addition & 3 deletions instrumentation/src/splunk.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "logger.h"
#include "config.h"
#include "cmdline_reader.h"
#include "metrics_client.h"

static char *const disable_env_var = "DISABLE_SPLUNK_AUTOINSTRUMENTATION";
static char *const java_tool_options_var = "JAVA_TOOL_OPTIONS";
Expand All @@ -20,8 +19,7 @@ void auto_instrument(
has_access_func_t has_access,
const char *program_name,
load_config_func_t load_config_func,
cmdline_reader cr,
send_otlp_metric_func_t send_otlp_metric_func
cmdline_reader cr
);

int streq(const char *expected, const char *actual);
Expand Down
Loading

0 comments on commit bdd2951

Please sign in to comment.