Skip to content

Commit 2343707

Browse files
nagkumar91nagkumar91
authored
Merge branch 'main' into feature/genai-genai-spec-updates
2 parents fadcf7d + f9b8d5a commit 2343707

File tree

130 files changed

+416
-317
lines changed

Some content is hidden

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

130 files changed

+416
-317
lines changed

‎.github/workflows/package-prepare-patch-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-openai-agents-v2
1213
- opentelemetry-instrumentation-vertexai
1314
- opentelemetry-instrumentation-google-genai
1415
- opentelemetry-util-genai

‎.github/workflows/package-prepare-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-openai-agents-v2
1213
- opentelemetry-instrumentation-vertexai
1314
- opentelemetry-instrumentation-google-genai
1415
- opentelemetry-util-genai

‎.github/workflows/package-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- opentelemetry-resource-detector-azure
1010
- opentelemetry-sdk-extension-aws
1111
- opentelemetry-instrumentation-openai-v2
12+
- opentelemetry-instrumentation-openai-agents-v2
1213
- opentelemetry-instrumentation-vertexai
1314
- opentelemetry-instrumentation-google-genai
1415
- opentelemetry-util-genai

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions

‎RELEASING.md‎

Lines changed: 2 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.59b0.dev"
15+
__version__ = "0.60b0.dev"

‎eachdist.ini‎

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

1818
[stable]
19-
version=1.38.0.dev
19+
version=1.39.0.dev
2020

2121
packages=
2222
opentelemetry-sdk
@@ -35,7 +35,7 @@ packages=
3535
opentelemetry-exporter-credential-provider-gcp
3636

3737
[prerelease]
38-
version=0.59b0.dev
38+
version=0.60b0.dev
3939

4040
packages=
4141
all
@@ -54,6 +54,7 @@ packages=
5454
opentelemetry-instrumentation-google-genai
5555
opentelemetry-instrumentation-vertexai
5656
opentelemetry-instrumentation-openai-v2
57+
opentelemetry-instrumentation-openai-agents-v2
5758
opentelemetry-instrumentation-test
5859
opentelemetry-instrumentation-langchain
5960
opentelemetry-instrumentation-weaviate

‎exporter/opentelemetry-exporter-credential-provider-gcp/src/opentelemetry/gcp_credential_provider/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.59b0.dev"
15+
__version__ = "0.60b0.dev"

‎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.59b0.dev"
15+
__version__ = "0.60b0.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.59b0.dev",
30+
"opentelemetry-semantic-conventions == 0.60b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

0 commit comments

Comments
 (0)