Skip to content

Commit 8fa7905

Browse files
authored
Merge branch 'main' into fix-1781-alt
2 parents ca9e744 + afb7f54 commit 8fa7905

File tree

208 files changed

+398
-396
lines changed

Some content is hidden

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

208 files changed

+398
-396
lines changed

.github/component_owners.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,13 @@ components:
4545

4646
instrumentation/opentelemetry-instrumentation-urllib:
4747
- shalevr
48-
- ocelotl
4948

5049
instrumentation/opentelemetry-instrumentation-urllib3:
5150
- shalevr
52-
- ocelotl
5351

5452
instrumentation/opentelemetry-instrumentation-sqlalchemy:
5553
- shalevr
5654

57-
instrumentation/opentelemetry-instrumentation-flask:
58-
- ocelotl
59-
60-
instrumentation/opentelemetry-instrumentation-jinja2:
61-
- ocelotl
62-
63-
instrumentation/opentelemetry-instrumentation-logging:
64-
- ocelotl
65-
66-
instrumentation/opentelemetry-instrumentation-requests:
67-
- ocelotl
68-
6955
instrumentation/opentelemetry-instrumentation-cassandra:
7056
- mattcontinisio
7157

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
{%- if job_data == "generate-workflows" %}
2424
if: |
2525
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
26-
&& github.actor != 'opentelemetrybot'
26+
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
2727
{%- endif %}
2828
{%- if job_data == "public-symbols-check" %}
2929
if: |

.github/workflows/misc_0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
runs-on: ubuntu-latest
9797
if: |
9898
!contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
99-
&& github.actor != 'opentelemetrybot'
99+
&& github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
100100
steps:
101101
- name: Checkout repo @ SHA - ${{ github.sha }}
102102
uses: actions/checkout@v4

CHANGELOG.md

Lines changed: 4 additions & 0 deletions

_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.48b0.dev"
15+
__version__ = "0.49b0.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.27.0.dev
19+
version=1.28.0.dev
2020

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

3636
[prerelease]
37-
version=0.48b0.dev
37+
version=0.49b0.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.48b0.dev"
15+
__version__ = "0.49b0.dev"

exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
certifi==2024.7.4
33
charset-normalizer==3.3.2
44
# We can drop this after bumping baseline to pypy-39

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.48b0.dev",
30+
"opentelemetry-semantic-conventions == 0.49b0.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.48b0.dev"
15+
__version__ = "0.49b0.dev"

0 commit comments

Comments
 (0)