Skip to content

Commit 5278351

Browse files
committed
Merge branch 'main' into otelcol-ebpf-profiler
2 parents 7da8a63 + ce52e4f commit 5278351

File tree

7 files changed

+62
-3
lines changed

7 files changed

+62
-3
lines changed

.chloggen/config-reload.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: service
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add service reload signal to systemd unit
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [887]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [user]

.github/workflows/base-ci-goreleaser.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ on:
2222
type: string
2323
default: default-config.yaml
2424
docker_run_options:
25-
required: false
25+
required: false
2626
type: string
2727
otelcol_run_options:
28-
required: false
28+
required: false
2929
type: string
3030

3131
env:

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
45+
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
4646
with:
4747
sarif_file: results.sarif

.github/workflows/stale.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "Close stale issues and pull requests"
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "12 5 * * *" # arbitrary time not to DDOS GitHub
6+
7+
jobs:
8+
stale:
9+
runs-on: ubuntu-24.04
10+
env:
11+
GH_TOKEN: ${{ github.token }}
12+
steps:
13+
- name: Check rate_limit before
14+
run: gh api /rate_limit
15+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
16+
with:
17+
repo-token: ${{ secrets.GITHUB_TOKEN }}
18+
stale-pr-message: 'This PR was marked stale due to lack of activity. It will be closed in 14 days.'
19+
close-pr-message: 'Closed as inactive. Feel free to reopen if this PR is still being worked on.'
20+
close-issue-message: 'This issue has been closed as inactive because it has been stale for 120 days with no activity.'
21+
close-issue-label: 'closed as inactive'
22+
days-before-pr-stale: 14
23+
days-before-issue-stale: 60
24+
days-before-pr-close: 14
25+
days-before-issue-close: 60
26+
exempt-issue-labels: 'never stale,renovatebot'
27+
ascending: true
28+
operations-per-run: 6000
29+
exempt-pr-labels: 'never stale,renovatebot'
30+
- name: Check rate_limit after
31+
run: gh api /rate_limit

distributions/otelcol-contrib/otelcol-contrib.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ After=network.target
55
[Service]
66
EnvironmentFile=/etc/otelcol-contrib/otelcol-contrib.conf
77
ExecStart=/usr/bin/otelcol-contrib $OTELCOL_OPTIONS
8+
ExecReload=/bin/kill -HUP $MAINPID
89
KillMode=mixed
910
Restart=on-failure
1011
Type=simple

distributions/otelcol-otlp/otelcol-otlp.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ After=network.target
55
[Service]
66
EnvironmentFile=/etc/otelcol-otlp/otelcol-otlp.conf
77
ExecStart=/usr/bin/otelcol-otlp $OTELCOL_OPTIONS
8+
ExecReload=/bin/kill -HUP $MAINPID
89
KillMode=mixed
910
Restart=on-failure
1011
Type=simple

distributions/otelcol/otelcol.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ After=network.target
55
[Service]
66
EnvironmentFile=/etc/otelcol/otelcol.conf
77
ExecStart=/usr/bin/otelcol $OTELCOL_OPTIONS
8+
ExecReload=/bin/kill -HUP $MAINPID
89
KillMode=mixed
910
Restart=on-failure
1011
Type=simple

0 commit comments

Comments
 (0)