Skip to content

Commit 123e334

Browse files
authored
Merge branch 'main' into refactor/opentelemetry-instrumentations-semcov
2 parents 3571a6f + d2d136d commit 123e334

File tree

126 files changed

+1059
-326
lines changed

Some content is hidden

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

126 files changed

+1059
-326
lines changed

.github/workflows/core_contrib_test_0.yml

Lines changed: 679 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/core_contrib_test.yml.j2

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ jobs:
3535
repository: open-telemetry/opentelemetry-python-contrib
3636
ref: ${% raw %}{{ env.CONTRIB_REPO_SHA }}{% endraw %}
3737

38+
- name: Checkout core repo @ SHA - ${% raw %}{{ env.CORE_REPO_SHA }}{% endraw %}
39+
uses: actions/checkout@v4
40+
with:
41+
repository: open-telemetry/opentelemetry-python
42+
ref: ${% raw %}{{ env.CORE_REPO_SHA }}{% endraw %}
43+
path: opentelemetry-python
44+
3845
- name: Set up Python 3.9
3946
uses: actions/setup-python@v5
4047
with:

CHANGELOG.md

Lines changed: 6 additions & 1 deletion

_template/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__ = "0.57b0.dev"
15+
__version__ = "0.58b0.dev"

eachdist.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

1818
[stable]
19-
version=1.36.0.dev
19+
version=1.37.0.dev
2020

2121
packages=
2222
opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
3434
opentelemetry-api
3535

3636
[prerelease]
37-
version=0.57b0.dev
37+
version=0.58b0.dev
3838

3939
packages=
4040
all

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/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__ = "0.57b0.dev"
15+
__version__ = "0.58b0.dev"

exporter/opentelemetry-exporter-richconsole/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
2929
"opentelemetry-sdk ~= 1.12",
30-
"opentelemetry-semantic-conventions == 0.57b0.dev",
30+
"opentelemetry-semantic-conventions == 0.58b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/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__ = "0.57b0.dev"
15+
__version__ = "0.58b0.dev"

instrumentation-genai/opentelemetry-instrumentation-google-genai/examples/zero-code/README.rst

Lines changed: 1 addition & 1 deletion

instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.5",
29-
"opentelemetry-instrumentation == 0.57b0.dev",
29+
"opentelemetry-instrumentation == 0.58b0.dev",
3030
"wrapt >= 1.0.0, < 2.0.0",
3131
]
3232

0 commit comments

Comments
 (0)