Skip to content

Commit 96a9b82

Browse files
committed
Address comments from code review
Signed-off-by: Israel Blancas <iblancasa@gmail.com>
1 parent 214da0b commit 96a9b82

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

.mdox.validate.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@ validators:
1313
# Ignore links that includes 'assets' because the generated content will resolve them correctly.
1414
- regex: '.+/assets/.+'
1515
type: ignore
16+
# Ignore remote docs pages that reject or drop validator requests.
17+
- regex: '^https:\/\/dev\.mysql\.com\/doc\/refman\/8\.0\/en\/server-logs\.html$'
18+
type: ignore
19+
- regex: '^https:\/\/opentelemetry\.io\/docs\/collector\/configuration\/$'
20+
type: ignore

otel-integration/k8s-helm/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ helm upgrade --install otel-coralogix-integration coralogix-charts-virtual/otel-
188188
--render-subchart-notes -f values-crd-override.yaml --set global.clusterName=<cluster_name> --set global.domain=<domain>
189189
```
190190

191-
### Auto-instrumentation webhook without Instrumentation CRDs
191+
### OpenTelemetry AutoInstrumentation without Instrumentation CRDs
192192

193-
The chart can deploy an instrumentation webhook that injects OpenTelemetry auto-instrumentation into annotated application pods without requiring `Instrumentation` CRDs. This mode uses one static instrumentation configuration from Helm values and sends traces to the `opentelemetry-agent` DaemonSet on the same node as the application pod.
193+
The chart can deploy an OpenTelemetry Operator webhook that injects OpenTelemetry auto-instrumentation into annotated application pods without requiring `Instrumentation` CRDs. This mode uses one static instrumentation configuration from Helm values and sends traces to the `opentelemetry-agent` DaemonSet on the same node as the application pod.
194194

195195
Enable it with:
196196

otel-integration/k8s-helm/e2e-test/instrumentation_webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func waitForInstrumentationWebhookManager(k8sClient *xk8stest.K8sClient) error {
175175
deployments := schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "deployments"}
176176
return eventually(5*time.Minute, 2*time.Second, func() (bool, error) {
177177
list, err := k8sClient.DynamicClient.Resource(deployments).Namespace("default").List(context.Background(), metav1.ListOptions{
178-
LabelSelector: "app.kubernetes.io/name=instrumentation-webhook,app.kubernetes.io/component=controller-manager",
178+
LabelSelector: "app.kubernetes.io/name=otel-autoinstrumentation,app.kubernetes.io/component=controller-manager",
179179
})
180180
if err != nil {
181181
return false, err

otel-integration/k8s-helm/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ distribution: ""
2323
# instrumentation.opentelemetry.io/inject-java, inject-python, or inject-dotnet annotations.
2424
opentelemetry-autoinstrumentation:
2525
enabled: false
26-
# Use a stable short name so webhook resources do not collide with a full operator installation.
27-
nameOverride: instrumentation-webhook
26+
# Use a stable name so webhook resources do not collide with a full operator installation.
27+
nameOverride: otel-autoinstrumentation
2828
# Keep CRDs disabled. This mode uses the static manager.config.instrumentations object below.
2929
crds:
3030
create: false

0 commit comments

Comments
 (0)