Skip to content

Commit 7c9e5ed

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into value-convert-object
2 parents 5dca13a + 867bb1f commit 7c9e5ed

File tree

105 files changed

+867
-1546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+867
-1546
lines changed

.codecov.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ coverage:
1111
status:
1212
project:
1313
default:
14-
target: 90%
14+
target: 89%
1515
paths:
1616
- "!opencensus-shim/"
1717
- "!opentracing-shim/"

.github/workflows/backport.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ on:
66
description: "The pull request # to backport"
77
required: true
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
backport:
14+
permissions:
15+
contents: write # for git push to PR branch
1116
runs-on: ubuntu-latest
1217
steps:
1318
- run: |

.github/workflows/benchmark-tags.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ name: Benchmark Tags
33
on:
44
workflow_dispatch:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
sdk-benchmark:
11+
permissions:
12+
contents: write # for git push to benchmarks branch
813
name: Benchmark SDK
914
runs-on: self-hosted
1015
timeout-minutes: 10

.github/workflows/benchmark.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ on:
55
branches: [ main ]
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
sdk-benchmark:
13+
permissions:
14+
contents: write # for git push to benchmarks branch
1015
name: Benchmark SDK
1116
runs-on: self-hosted
1217
timeout-minutes: 10

.github/workflows/build-tracecontext-testsuite.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@ on:
99
- main
1010
workflow_dispatch:
1111

12+
permissions:
13+
contents: read
14+
1215
jobs:
1316
publish:
17+
permissions:
18+
contents: read
19+
packages: write
1420
runs-on: ubuntu-latest
1521
steps:
1622
- uses: actions/checkout@v4

.github/workflows/codeql-daily.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.github/workflows/codeql.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: CodeQL
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- release/*
8+
- benchmarks
9+
push:
10+
branches:
11+
- main
12+
- release/*
13+
- benchmarks
14+
schedule:
15+
- cron: "29 13 * * 2" # weekly at 13:29 UTC on Tuesday
16+
17+
permissions:
18+
contents: read
19+
20+
jobs:
21+
analyze:
22+
permissions:
23+
contents: read
24+
actions: read # for github/codeql-action/init to get workflow details
25+
security-events: write # for github/codeql-action/analyze to upload SARIF results
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
29+
30+
- name: Set up Java 17
31+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
32+
with:
33+
distribution: temurin
34+
java-version: 17
35+
36+
- name: Set up gradle
37+
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
38+
39+
- name: Initialize CodeQL
40+
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
41+
with:
42+
languages: java, actions
43+
# using "latest" helps to keep up with the latest Kotlin support
44+
# see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
45+
tools: latest
46+
47+
- name: Assemble
48+
# --no-build-cache is required for codeql to analyze all modules
49+
# --no-daemon is required for codeql to observe the compilation
50+
# (see https://docs.github.com/en/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#specifying-build-commands)
51+
run: ./gradlew assemble --no-build-cache --no-daemon
52+
53+
- name: Perform CodeQL analysis
54+
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8

.github/workflows/docker-test-containers-daily.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ on:
55
- cron: "23 3 * * *"
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
copy-images:
13+
permissions:
14+
contents: read
15+
packages: write
1016
strategy:
1117
matrix:
1218
include:
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
name: Gradle wrapper validation
2+
23
on:
3-
pull_request:
4-
paths:
5-
- '**/gradle/wrapper/**'
64
push:
7-
paths:
8-
- '**/gradle/wrapper/**'
5+
pull_request:
6+
7+
permissions:
8+
contents: read
99

1010
jobs:
11-
validation:
11+
gradle-wrapper-validation:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
- uses: gradle/actions/wrapper-validation@v4.2.2
16+
- uses: gradle/actions/wrapper-validation@v4.3.0

.github/workflows/issue-management-feedback-label.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@ on:
44
issue_comment:
55
types: [created]
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
issue_comment:
12+
permissions:
13+
contents: read
14+
issues: write
915
if: >
1016
contains(github.event.issue.labels.*.name, 'needs author feedback') &&
1117
github.event.comment.user.login == github.event.issue.user.login

0 commit comments

Comments
 (0)