Merge pull request #191 from getanteon/develop

K3s support
getanteon · Sep 14, 2024 · 6039f7e · 6039f7e
2 parents acc5040 + aeb63bf
commit 6039f7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cri/cri.go b/cri/cri.go
@@ -21,7 +21,7 @@ import (
 )
 
 // https://kubernetes.io/docs/setup/production-environment/container-runtimes/#cri-versions
-var defaultRuntimeEndpoints = []string{"unix:///proc/1/root/run/containerd/containerd.sock", "unix:///proc/1/root/var/run/containerd/containerd.sock",
+var defaultRuntimeEndpoints = []string{"unix:///proc/1/root/run/k3s/containerd/containerd.sock", "unix:///proc/1/root/run/containerd/containerd.sock", "unix:///proc/1/root/var/run/containerd/containerd.sock",
 	"unix:///proc/1/root/var/run/crio/crio.sock", "unix:///proc/1/root/run/crio/crio.sock",
 	"unix:///proc/1/root/run/cri-dockerd.sock", "unix:///proc/1/root/var/run/cri-dockerd.sock"}
 

diff --git a/main.go b/main.go
@@ -71,7 +71,12 @@ func main() {
 
 	tracingEnabled, err := strconv.ParseBool(os.Getenv("TRACING_ENABLED"))
 	metricsEnabled, _ := strconv.ParseBool(os.Getenv("METRICS_ENABLED"))
-	logsEnabled, _ := strconv.ParseBool(os.Getenv("LOGS_ENABLED"))
+	// logsEnabled, _ := strconv.ParseBool(os.Getenv("LOGS_ENABLED"))
+
+	// Temporarily closed until otlp export's cpu performance problem is resolved
+	// https://github.com/getanteon/alaz/tree/feat/logs-in-otlp
+	// https://github.com/open-telemetry/opentelemetry-go/issues/5196
+	logsEnabled := false
 
 	// datastore backend
 	dsBackend := datastore.NewBackendDS(ctx, config.BackendDSConfig{