github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8970 from cpuguy83/otel_off_by_default

Browse Source 
Configure otel from env instead of config.toml
This commit is contained in:
Akihiro Suda
2024-02-22 04:57:50 +00:00
committed by GitHub
parent fde15badb0 4fbc9842d5
commit fcdfd923cb
6 changed files with 167 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
integration/client/testdata/default-1.6.toml vendored
View File

@@ -168,9 +168,10 @@ version = 2
[plugins."io.containerd.internal.v1.restart"]
interval = "10s"
[plugins."io.containerd.internal.v1.tracing"]
sampling_ratio = 1.0
service_name = "containerd"
# Removed in latest
#[plugins."io.containerd.internal.v1.tracing"]
# sampling_ratio = 1.0
# service_name = "containerd"
[plugins."io.containerd.metadata.v1.bolt"]
content_sharing_policy = "shared"
@@ -225,10 +226,11 @@ version = 2
#[plugins."io.containerd.snapshotter.v1.zfs"]
# root_path = ""
[plugins."io.containerd.tracing.processor.v1.otlp"]
endpoint = ""
insecure = false
protocol = ""
# Removed in latest
#[plugins."io.containerd.tracing.processor.v1.otlp"]
# endpoint = ""
# insecure = false
# protocol = ""
[proxy_plugins]

16
integration/client/testdata/default-1.7.toml vendored
View File

@@ -185,9 +185,10 @@ version = 2
[plugins."io.containerd.internal.v1.restart"]
interval = "10s"
[plugins."io.containerd.internal.v1.tracing"]
sampling_ratio = 1.0
service_name = "containerd"
# Removed in latest
#[plugins."io.containerd.internal.v1.tracing"]
# sampling_ratio = 1.0
# service_name = "containerd"
[plugins."io.containerd.metadata.v1.bolt"]
content_sharing_policy = "shared"
@@ -260,10 +261,11 @@ version = 2
#[plugins."io.containerd.snapshotter.v1.zfs"]
# root_path = ""
[plugins."io.containerd.tracing.processor.v1.otlp"]
endpoint = ""
insecure = false
protocol = ""
# Removed in latest
#[plugins."io.containerd.tracing.processor.v1.otlp"]
# endpoint = ""
# insecure = false
# protocol = ""
[plugins."io.containerd.transfer.v1.local"]
config_path = ""