Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 37 additions & 7 deletions .github/workflows/otel-integration-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.23.x
go-version: 1.25.x
- name: Setup cluster
uses: ./.github/actions/setup
with:
Expand Down Expand Up @@ -58,7 +58,37 @@ jobs:
run: |
cd ./otel-integration/k8s-helm/e2e-test/
go clean -testcache
go test -v -run='^TestE2E.*' -skip='^TestE2E_TargetAllocator_ServiceMonitorMetrics$' $(go list ./... | rg -v '/supervisor$')
go test -v -run='^TestE2E.*' -skip='^(TestE2E_TargetAllocator_ServiceMonitorMetrics|TestE2E_InstrumentationWebhookNoCRDs)$' $(go list ./... | rg -v '/supervisor$')
- name: Pods logs
if: failure()
run: |
for pod in $(kubectl get pods -l "app.kubernetes.io/instance=otel-integration-agent-e2e" -o jsonpath='{.items[*].metadata.name}'); do
echo "===== Last 25 log lines for pod: $pod ====="
kubectl logs --tail=25 $pod
echo
done

otel-integration-instrumentation-webhook-test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.25.x
- name: Setup cluster
uses: ./.github/actions/setup
with:
create-kind-cluster: "true"
cluster-name: "otel-integration-agent-e2e"
- name: Run Instrumentation Webhook E2E test
run: |
cd ./otel-integration/k8s-helm/e2e-test/
chmod +x ./run-all.sh
./run-all.sh --test TestE2E_InstrumentationWebhookNoCRDs
- name: Pods logs
if: failure()
run: |
Expand All @@ -78,7 +108,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.23.x
go-version: 1.25.x
- name: Setup cluster
uses: ./.github/actions/setup
with:
Expand Down Expand Up @@ -108,7 +138,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.23.x
go-version: 1.25.x
- name: Setup cluster
uses: ./.github/actions/setup
with:
Expand Down Expand Up @@ -188,7 +218,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.23.x
go-version: 1.25.x
- name: Setup cluster
uses: ./.github/actions/setup
with:
Expand Down Expand Up @@ -250,7 +280,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.23.x
go-version: 1.25.x
- name: Setup cluster
uses: ./.github/actions/setup
with:
Expand Down Expand Up @@ -310,7 +340,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v6
with:
go-version: 1.23.x
go-version: 1.25.x
- name: Setup cluster
uses: ./.github/actions/setup
with:
Expand Down
5 changes: 5 additions & 0 deletions .mdox.validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ validators:
# Ignore links that includes 'assets' because the generated content will resolve them correctly.
- regex: '.+/assets/.+'
type: ignore
# Ignore remote docs pages that reject or drop validator requests.
- regex: '^https:\/\/dev\.mysql\.com\/doc\/refman\/8\.0\/en\/server-logs\.html$'
type: ignore
- regex: '^https:\/\/opentelemetry\.io\/docs\/collector\/configuration\/$'
type: ignore
1 change: 1 addition & 0 deletions otel-integration/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### v0.0.320 / 2026-06-30

- [Chore] Bump chart dependency to opentelemetry-collector 0.134.1
- [Feat] Add optional `opentelemetry-autoinstrumentation` support for Java, Python, and .NET workload auto-instrumentation.

#### Changes from opentelemetry-collector 0.134.1:
- [Fix] Use the ECS Coralogix distribution header for all ECS signals and centralize the header mapping in a shared template helper.
Expand Down
5 changes: 5 additions & 0 deletions otel-integration/k8s-helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ dependencies:
version: "0.134.1"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-agent.enabled
- name: opentelemetry-operator
alias: opentelemetry-autoinstrumentation
version: "0.115.1"
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
condition: opentelemetry-autoinstrumentation.enabled
- name: opentelemetry-collector
alias: opentelemetry-agent-windows
version: "0.134.1"
Expand Down
25 changes: 25 additions & 0 deletions otel-integration/k8s-helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,31 @@ helm upgrade --install otel-coralogix-integration coralogix-charts-virtual/otel-
--render-subchart-notes -f values-crd-override.yaml --set global.clusterName=<cluster_name> --set global.domain=<domain>
```

### OpenTelemetry AutoInstrumentation without Instrumentation CRDs

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.

Enable it with:

```yaml
opentelemetry-autoinstrumentation:
enabled: true
```

Supported annotations:

```yaml
instrumentation.opentelemetry.io/inject-java: "true"
instrumentation.opentelemetry.io/inject-python: "true"
instrumentation.opentelemetry.io/inject-dotnet: "true"
```

Java and .NET use OTLP/gRPC to `http://$(OTEL_NODE_IP):4317`. Python uses OTLP HTTP/protobuf to `http://$(OTEL_NODE_IP):4318`.

> [!IMPORTANT]
>
> Do not enable `opentelemetry-autoinstrumentation` in a cluster that already has another OpenTelemetry Operator webhook installed, unless the webhook names and selectors are configured to avoid collisions.

### Troubleshooting

During installation, you may encounter warning messages about missing namespace rules (`get`, `list`, `watch`). This is a known issue in OpenTelemetry (see [issue #2685](https://github.com/open-telemetry/opentelemetry-operator/issues/2685)) and does not impact the successful installation of the chart.
Expand Down
Loading
Loading