Skip to content

Commit a0577fc

Browse files
committed
2 parents 2b86723 + 29e3d49 commit a0577fc

File tree

26 files changed

+192
-74
lines changed

26 files changed

+192
-74
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99

1010
jobs:
1111
test:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-22.04
1313
strategy:
1414
matrix:
1515
py:
@@ -19,6 +19,7 @@ jobs:
1919
- { version: "3.10", tox: "310" }
2020
- { version: "3.11", tox: "311" }
2121
- { version: "3.12", tox: "312" }
22+
- { version: "3.13", tox: "313" }
2223
env:
2324
run-matrix-combo: ${{ matrix.py.version }}
2425

@@ -44,7 +45,7 @@ jobs:
4445
-f py${{ matrix.py.tox }}-ci
4546
4647
lint:
47-
runs-on: ubuntu-latest
48+
runs-on: ubuntu-22.04
4849
strategy:
4950
matrix:
5051
target: [lint-ci, docs-ci, mypy-ci]

e2e-test-server/e2e_test_server/scenarios.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from opentelemetry.sdk.trace.export import BatchSpanProcessor
3030
from opentelemetry.sdk.trace.sampling import ALWAYS_ON
3131
from opentelemetry.trace import SpanKind, Tracer, format_trace_id
32+
from opentelemetry.sdk.resources import get_aggregated_resources
3233
from pydantic import BaseModel
3334

3435
from .constants import INSTRUMENTING_MODULE_NAME, PROJECT_ID, TEST_ID, TRACE_ID
@@ -59,9 +60,7 @@ def _tracer_setup(
5960
spans created during the test after.
6061
"""
6162

62-
tracer_provider = TracerProvider(
63-
sampler=ALWAYS_ON, **tracer_provider_config
64-
)
63+
tracer_provider = TracerProvider(sampler=ALWAYS_ON, **tracer_provider_config)
6564
tracer_provider.add_span_processor(
6665
BatchSpanProcessor(
6766
CloudTraceSpanExporter(project_id=PROJECT_ID, **exporter_config)
@@ -139,9 +138,9 @@ def detect_resource(request: Request) -> Response:
139138
"""Create a trace with GCP resource detector"""
140139
with _tracer_setup(
141140
tracer_provider_config={
142-
"resource": GoogleCloudResourceDetector(
143-
raise_on_error=True
144-
).detect()
141+
"resource": get_aggregated_resources(
142+
[GoogleCloudResourceDetector(raise_on_error=True)]
143+
)
145144
},
146145
exporter_config={"resource_regex": r".*"},
147146
) as tracer:

opentelemetry-exporter-gcp-monitoring/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
## Version 1.8.0a0
6+
7+
Released 2025-01-08
8+
59
## Version 1.7.0a0
610

711
Released 2024-08-27

opentelemetry-exporter-gcp-monitoring/setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ classifiers =
2020
Programming Language :: Python :: 3.10
2121
Programming Language :: Python :: 3.11
2222
Programming Language :: Python :: 3.12
23+
Programming Language :: Python :: 3.13
2324

2425
[options]
2526
python_requires = >=3.7

opentelemetry-exporter-gcp-monitoring/src/opentelemetry/exporter/cloud_monitoring/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.8.0.dev0"
15+
__version__ = "1.9.0.dev0"

opentelemetry-exporter-gcp-trace/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
## Version 1.8.0
6+
7+
Released 2025-01-08
8+
59
## Version 1.7.0
610

711
Released 2024-08-27

opentelemetry-exporter-gcp-trace/setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ classifiers =
2020
Programming Language :: Python :: 3.10
2121
Programming Language :: Python :: 3.11
2222
Programming Language :: Python :: 3.12
23+
Programming Language :: Python :: 3.13
2324

2425
[options]
2526
python_requires = >=3.7

opentelemetry-exporter-gcp-trace/src/opentelemetry/exporter/cloud_trace/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.8.0.dev0"
15+
__version__ = "1.9.0.dev0"

opentelemetry-propagator-gcp/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
## Version 1.8.0
6+
7+
Released 2025-01-08
8+
59
## Version 1.7.0
610

711
Released 2024-08-27

opentelemetry-propagator-gcp/setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ classifiers =
2020
Programming Language :: Python :: 3.10
2121
Programming Language :: Python :: 3.11
2222
Programming Language :: Python :: 3.12
23+
Programming Language :: Python :: 3.13
2324

2425
[options]
2526
python_requires = >=3.7

0 commit comments

Comments
 (0)