Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OTL-1409 Add support for Operator based Java auto-instrumentation #701

Merged
merged 18 commits into from
Apr 17, 2023
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
1 change: 1 addition & 0 deletions .github/workflows/functional_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ jobs:

- name: Deploy sck otel collector
run: |
make repo-update dep-build
export CI_SPLUNK_HOST=$(kubectl get pod splunk --template={{.status.podIP}})
ci_scripts/deploy_collector.sh

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ jobs:
with:
version: v3.7.1

- name: Set up chart dependencies
run: make repo-update dep-build

- name: Run chart-testing (list-changed)
id: list-changed
run: |
helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
changed=$(ct list-changed --config=ct.yaml)
if [[ -n "$changed" ]]; then
echo "::set-output name=changed::true"
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.idea
*.iml

# Helm
**/charts/*.tgz
jvoravong marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 4 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
hooks:
- id: render
name: Create the rendered Kubernetes manifest resources for the project examples
entry: make render
entry: make repo-update dep-build render
language: system
pass_filenames: false
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand All @@ -17,5 +17,7 @@ repos:
exclude: "^examples|^test"
- id: check-yaml
# Can't check source yaml since it has go templates in it.
exclude: "^helm-charts|^test"
# Can't check the OptenTelemetry Operator subchart because it does not
# adhere to our standards.
exclude: "^helm-charts|^test|.*operator.*"
- id: check-added-large-files
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### Added

- Add support for Operator based Java auto-instrumentation [#701](https://github.com/signalfx/splunk-otel-collector-chart/pull/701)
- Add experimental support for deploying OpenTelemetry Operator as a subchart [#691](https://github.com/signalfx/splunk-otel-collector-chart/pull/691)
- Improve documentation about providing tokens as Kubernetes secrets [#707](https://github.com/signalfx/splunk-otel-collector-chart/pull/691)
- Expose idle_conn_timeout on the splunk HEC exporters [#728](https://github.com/signalfx/splunk-otel-collector-chart/pull/728)
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
.PHONY: render
render:
bash ./examples/render-examples.sh

.PHONY: repo-update
repo-update:
helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
helm repo add jetstack https://charts.jetstack.io
helm repo update

.PHONY: dep-build
dep-build:
helm dependencies build ./helm-charts/splunk-otel-collector
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ helm delete my-splunk-otel-collector
To fully configure the Helm chart, see the [advanced
configuration](docs/advanced-configuration.md).

## Auto-instrumentation

For setting up auto-instrumentation, see the [auto-instrumentation-introduction.md](docs/auto-instrumentation-introduction.md).

## Contributing

We welcome feedback and contributions from the community! Please see our ([contribution guidelines](CONTRIBUTING.md)) for more information on how to get involved.
Expand Down
20 changes: 10 additions & 10 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ of `version` field.
### Release Procedure

To make a new release of the helm chart:
1. Bump the `version` in [Chart.yaml](helm-charts/splunk-otel-collector/Chart.yaml)
2. Check for Helm Subchart version updates.
- Look for a new version at https://github.com/open-telemetry/opentelemetry-operator/releases.
- If needed, in the [Chart.yaml](helm-charts/splunk-otel-collector/Chart.yaml)
update the operator version and run `helm dependency build`.
3. Run `make render` to render all the examples with the latest changes.
4. Create PR and request review from the team.
5. When the PR gets merged, the release will automatically be made and the helm repo updated.
6. Release notes are not populated automatically. So make sure to update them manually using the notes from
[CHANGELOG](./CHANGELOG.md).
1. Bump the chart `version` in [Chart.yaml](helm-charts/splunk-otel-collector/Chart.yaml)
1. Bump dependencies versions as needed
- Look for new releases
- https://cert-manager.io/docs/installation/supported-releases/
- https://github.com/open-telemetry/opentelemetry-operator/releases
- Increment versions under `dependencies` in [Chart.yaml](helm-charts/splunk-otel-collector/Chart.yaml#)
1. Run `make repo-update dep-build render` to update Helm dependencies and render all the examples with the latest changes.
1. Create PR and request review from the team.
1. When the PR gets merged, the release will automatically be made and the helm repo updated.
1. Release notes are not populated automatically. So make sure to update them manually using the notes from [CHANGELOG](./CHANGELOG.md).
Loading