Skip to content

Commit 200c274

Browse files
author
NN
committed
Merge remote-tracking branch 'base/main' into feature/json-file-http-exporter
2 parents 48a87c6 + 742171e commit 200c274

File tree

134 files changed

+3995
-1336
lines changed

Some content is hidden

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

134 files changed

+3995
-1336
lines changed

‎.github/workflows/contrib.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
- 'release/*'
77
pull_request:
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
contrib_0:
1115
uses: open-telemetry/opentelemetry-python-contrib/.github/workflows/core_contrib_test_0.yml@main

‎.github/workflows/fossa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

17-
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
17+
- uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
1818
with:
1919
api-key: ${{secrets.FOSSA_API_KEY}}
2020
team: OpenTelemetry

‎.github/workflows/lint_0.yml‎

Lines changed: 61 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
- 'release/*'
1010
pull_request:
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
14+
cancel-in-progress: true
15+
1216
env:
1317
CORE_REPO_SHA: main
1418
CONTRIB_REPO_SHA: main
@@ -19,14 +23,15 @@ jobs:
1923
lint-opentelemetry-api:
2024
name: opentelemetry-api
2125
runs-on: ubuntu-latest
26+
timeout-minutes: 30
2227
steps:
2328
- name: Checkout repo @ SHA - ${{ github.sha }}
2429
uses: actions/checkout@v4
2530

26-
- name: Set up Python 3.12
31+
- name: Set up Python 3.13
2732
uses: actions/setup-python@v5
2833
with:
29-
python-version: "3.12"
34+
python-version: "3.13"
3035

3136
- name: Install tox
3237
run: pip install tox
@@ -37,14 +42,15 @@ jobs:
3742
lint-opentelemetry-proto-protobuf5:
3843
name: opentelemetry-proto-protobuf5
3944
runs-on: ubuntu-latest
45+
timeout-minutes: 30
4046
steps:
4147
- name: Checkout repo @ SHA - ${{ github.sha }}
4248
uses: actions/checkout@v4
4349

44-
- name: Set up Python 3.12
50+
- name: Set up Python 3.13
4551
uses: actions/setup-python@v5
4652
with:
47-
python-version: "3.12"
53+
python-version: "3.13"
4854

4955
- name: Install tox
5056
run: pip install tox
@@ -55,14 +61,15 @@ jobs:
5561
lint-opentelemetry-sdk:
5662
name: opentelemetry-sdk
5763
runs-on: ubuntu-latest
64+
timeout-minutes: 30
5865
steps:
5966
- name: Checkout repo @ SHA - ${{ github.sha }}
6067
uses: actions/checkout@v4
6168

62-
- name: Set up Python 3.12
69+
- name: Set up Python 3.13
6370
uses: actions/setup-python@v5
6471
with:
65-
python-version: "3.12"
72+
python-version: "3.13"
6673

6774
- name: Install tox
6875
run: pip install tox
@@ -73,14 +80,15 @@ jobs:
7380
lint-opentelemetry-semantic-conventions:
7481
name: opentelemetry-semantic-conventions
7582
runs-on: ubuntu-latest
83+
timeout-minutes: 30
7684
steps:
7785
- name: Checkout repo @ SHA - ${{ github.sha }}
7886
uses: actions/checkout@v4
7987

80-
- name: Set up Python 3.12
88+
- name: Set up Python 3.13
8189
uses: actions/setup-python@v5
8290
with:
83-
python-version: "3.12"
91+
python-version: "3.13"
8492

8593
- name: Install tox
8694
run: pip install tox
@@ -91,14 +99,15 @@ jobs:
9199
lint-opentelemetry-getting-started:
92100
name: opentelemetry-getting-started
93101
runs-on: ubuntu-latest
102+
timeout-minutes: 30
94103
steps:
95104
- name: Checkout repo @ SHA - ${{ github.sha }}
96105
uses: actions/checkout@v4
97106

98-
- name: Set up Python 3.12
107+
- name: Set up Python 3.13
99108
uses: actions/setup-python@v5
100109
with:
101-
python-version: "3.12"
110+
python-version: "3.13"
102111

103112
- name: Install tox
104113
run: pip install tox
@@ -109,14 +118,15 @@ jobs:
109118
lint-opentelemetry-opentracing-shim:
110119
name: opentelemetry-opentracing-shim
111120
runs-on: ubuntu-latest
121+
timeout-minutes: 30
112122
steps:
113123
- name: Checkout repo @ SHA - ${{ github.sha }}
114124
uses: actions/checkout@v4
115125

116-
- name: Set up Python 3.12
126+
- name: Set up Python 3.13
117127
uses: actions/setup-python@v5
118128
with:
119-
python-version: "3.12"
129+
python-version: "3.13"
120130

121131
- name: Install tox
122132
run: pip install tox
@@ -127,14 +137,15 @@ jobs:
127137
lint-opentelemetry-opencensus-shim:
128138
name: opentelemetry-opencensus-shim
129139
runs-on: ubuntu-latest
140+
timeout-minutes: 30
130141
steps:
131142
- name: Checkout repo @ SHA - ${{ github.sha }}
132143
uses: actions/checkout@v4
133144

134-
- name: Set up Python 3.12
145+
- name: Set up Python 3.13
135146
uses: actions/setup-python@v5
136147
with:
137-
python-version: "3.12"
148+
python-version: "3.13"
138149

139150
- name: Install tox
140151
run: pip install tox
@@ -145,14 +156,15 @@ jobs:
145156
lint-opentelemetry-exporter-opencensus:
146157
name: opentelemetry-exporter-opencensus
147158
runs-on: ubuntu-latest
159+
timeout-minutes: 30
148160
steps:
149161
- name: Checkout repo @ SHA - ${{ github.sha }}
150162
uses: actions/checkout@v4
151163

152-
- name: Set up Python 3.12
164+
- name: Set up Python 3.13
153165
uses: actions/setup-python@v5
154166
with:
155-
python-version: "3.12"
167+
python-version: "3.13"
156168

157169
- name: Install tox
158170
run: pip install tox
@@ -163,14 +175,15 @@ jobs:
163175
lint-opentelemetry-exporter-otlp-proto-common:
164176
name: opentelemetry-exporter-otlp-proto-common
165177
runs-on: ubuntu-latest
178+
timeout-minutes: 30
166179
steps:
167180
- name: Checkout repo @ SHA - ${{ github.sha }}
168181
uses: actions/checkout@v4
169182

170-
- name: Set up Python 3.12
183+
- name: Set up Python 3.13
171184
uses: actions/setup-python@v5
172185
with:
173-
python-version: "3.12"
186+
python-version: "3.13"
174187

175188
- name: Install tox
176189
run: pip install tox
@@ -199,14 +212,15 @@ jobs:
199212
lint-opentelemetry-exporter-otlp-combined:
200213
name: opentelemetry-exporter-otlp-combined
201214
runs-on: ubuntu-latest
215+
timeout-minutes: 30
202216
steps:
203217
- name: Checkout repo @ SHA - ${{ github.sha }}
204218
uses: actions/checkout@v4
205219

206-
- name: Set up Python 3.12
220+
- name: Set up Python 3.13
207221
uses: actions/setup-python@v5
208222
with:
209-
python-version: "3.12"
223+
python-version: "3.13"
210224

211225
- name: Install tox
212226
run: pip install tox
@@ -217,14 +231,15 @@ jobs:
217231
lint-opentelemetry-exporter-otlp-proto-grpc:
218232
name: opentelemetry-exporter-otlp-proto-grpc
219233
runs-on: ubuntu-latest
234+
timeout-minutes: 30
220235
steps:
221236
- name: Checkout repo @ SHA - ${{ github.sha }}
222237
uses: actions/checkout@v4
223238

224-
- name: Set up Python 3.12
239+
- name: Set up Python 3.13
225240
uses: actions/setup-python@v5
226241
with:
227-
python-version: "3.12"
242+
python-version: "3.13"
228243

229244
- name: Install tox
230245
run: pip install tox
@@ -235,14 +250,15 @@ jobs:
235250
lint-opentelemetry-exporter-otlp-proto-http:
236251
name: opentelemetry-exporter-otlp-proto-http
237252
runs-on: ubuntu-latest
253+
timeout-minutes: 30
238254
steps:
239255
- name: Checkout repo @ SHA - ${{ github.sha }}
240256
uses: actions/checkout@v4
241257

242-
- name: Set up Python 3.12
258+
- name: Set up Python 3.13
243259
uses: actions/setup-python@v5
244260
with:
245-
python-version: "3.12"
261+
python-version: "3.13"
246262

247263
- name: Install tox
248264
run: pip install tox
@@ -271,14 +287,15 @@ jobs:
271287
lint-opentelemetry-exporter-prometheus:
272288
name: opentelemetry-exporter-prometheus
273289
runs-on: ubuntu-latest
290+
timeout-minutes: 30
274291
steps:
275292
- name: Checkout repo @ SHA - ${{ github.sha }}
276293
uses: actions/checkout@v4
277294

278-
- name: Set up Python 3.12
295+
- name: Set up Python 3.13
279296
uses: actions/setup-python@v5
280297
with:
281-
python-version: "3.12"
298+
python-version: "3.13"
282299

283300
- name: Install tox
284301
run: pip install tox
@@ -289,14 +306,15 @@ jobs:
289306
lint-opentelemetry-exporter-zipkin-combined:
290307
name: opentelemetry-exporter-zipkin-combined
291308
runs-on: ubuntu-latest
309+
timeout-minutes: 30
292310
steps:
293311
- name: Checkout repo @ SHA - ${{ github.sha }}
294312
uses: actions/checkout@v4
295313

296-
- name: Set up Python 3.12
314+
- name: Set up Python 3.13
297315
uses: actions/setup-python@v5
298316
with:
299-
python-version: "3.12"
317+
python-version: "3.13"
300318

301319
- name: Install tox
302320
run: pip install tox
@@ -307,14 +325,15 @@ jobs:
307325
lint-opentelemetry-exporter-zipkin-proto-http:
308326
name: opentelemetry-exporter-zipkin-proto-http
309327
runs-on: ubuntu-latest
328+
timeout-minutes: 30
310329
steps:
311330
- name: Checkout repo @ SHA - ${{ github.sha }}
312331
uses: actions/checkout@v4
313332

314-
- name: Set up Python 3.12
333+
- name: Set up Python 3.13
315334
uses: actions/setup-python@v5
316335
with:
317-
python-version: "3.12"
336+
python-version: "3.13"
318337

319338
- name: Install tox
320339
run: pip install tox
@@ -325,14 +344,15 @@ jobs:
325344
lint-opentelemetry-exporter-zipkin-json:
326345
name: opentelemetry-exporter-zipkin-json
327346
runs-on: ubuntu-latest
347+
timeout-minutes: 30
328348
steps:
329349
- name: Checkout repo @ SHA - ${{ github.sha }}
330350
uses: actions/checkout@v4
331351

332-
- name: Set up Python 3.12
352+
- name: Set up Python 3.13
333353
uses: actions/setup-python@v5
334354
with:
335-
python-version: "3.12"
355+
python-version: "3.13"
336356

337357
- name: Install tox
338358
run: pip install tox
@@ -343,14 +363,15 @@ jobs:
343363
lint-opentelemetry-propagator-b3:
344364
name: opentelemetry-propagator-b3
345365
runs-on: ubuntu-latest
366+
timeout-minutes: 30
346367
steps:
347368
- name: Checkout repo @ SHA - ${{ github.sha }}
348369
uses: actions/checkout@v4
349370

350-
- name: Set up Python 3.12
371+
- name: Set up Python 3.13
351372
uses: actions/setup-python@v5
352373
with:
353-
python-version: "3.12"
374+
python-version: "3.13"
354375

355376
- name: Install tox
356377
run: pip install tox
@@ -361,14 +382,15 @@ jobs:
361382
lint-opentelemetry-propagator-jaeger:
362383
name: opentelemetry-propagator-jaeger
363384
runs-on: ubuntu-latest
385+
timeout-minutes: 30
364386
steps:
365387
- name: Checkout repo @ SHA - ${{ github.sha }}
366388
uses: actions/checkout@v4
367389

368-
- name: Set up Python 3.12
390+
- name: Set up Python 3.13
369391
uses: actions/setup-python@v5
370392
with:
371-
python-version: "3.12"
393+
python-version: "3.13"
372394

373395
- name: Install tox
374396
run: pip install tox
@@ -379,14 +401,15 @@ jobs:
379401
lint-opentelemetry-test-utils:
380402
name: opentelemetry-test-utils
381403
runs-on: ubuntu-latest
404+
timeout-minutes: 30
382405
steps:
383406
- name: Checkout repo @ SHA - ${{ github.sha }}
384407
uses: actions/checkout@v4
385408

386-
- name: Set up Python 3.12
409+
- name: Set up Python 3.13
387410
uses: actions/setup-python@v5
388411
with:
389-
python-version: "3.12"
412+
python-version: "3.13"
390413

391414
- name: Install tox
392415
run: pip install tox

0 commit comments

Comments
 (0)