Skip to content

Commit 26d1685

Browse files
Merge remote-tracking branch 'origin/main' into opentelemetrybot/spec-integration-v1.46.0-dev
2 parents 4f80dab + e8f9483 commit 26d1685

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Here is a list of community roles with current and previous members:
6464
- [Austin Parker](https://github.com/austinlparker), Honeycomb
6565
- [Fabrizio Ferri-Benedetti](https://github.com/theletterf), Elastic
6666
- [Patrice Chalin](https://github.com/chalin), CNCF
67-
- [Phillip Carter](https://github.com/cartermp), Honeycomb
67+
- [Phillip Carter](https://github.com/cartermp), Salesforce
6868
- [Severin Neumann](https://github.com/svrnm)
6969
- [Tiffany Hrabusa](https://github.com/tiffany76), Grafana Labs
7070

content/en/docs/languages/java/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cascade:
99
instrumentation: 2.16.0
1010
otel: 1.51.0
1111
contrib: 1.46.0
12-
semconv: 1.32.0
12+
semconv: 1.34.0
1313
weight: 18
1414
---
1515

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
"ajv-formats": "^3.0.1",
124124
"autoprefixer": "^10.4.21",
125125
"cspell": "^9.0.2",
126-
"gulp": "^5.0.0",
126+
"gulp": "^5.0.1",
127127
"hugo-extended": "0.147.6",
128128
"js-yaml": "^4.1.0",
129129
"markdown-it": "^14.1.0",
@@ -132,9 +132,9 @@
132132
"markdownlint-cli2": "^0.18.1",
133133
"postcss-cli": "^11.0.1",
134134
"prettier": "3.5.3",
135-
"puppeteer": "^24.9.0",
135+
"puppeteer": "^24.10.0",
136136
"require-dir": "^1.2.0",
137-
"textlint": "^14.7.2",
137+
"textlint": "^14.8.0",
138138
"textlint-filter-rule-allowlist": "^4.0.0",
139139
"textlint-filter-rule-comments": "^1.2.2",
140140
"textlint-rule-terminology": "^5.2.12",
@@ -147,7 +147,7 @@
147147
"@opentelemetry/context-zone": "^2.0.1",
148148
"@opentelemetry/core": "^2.0.1",
149149
"@opentelemetry/exporter-trace-otlp-http": "^0.202.0",
150-
"@opentelemetry/instrumentation": "^0.201.1",
150+
"@opentelemetry/instrumentation": "^0.202.0",
151151
"@opentelemetry/resources": "^2.0.1",
152152
"@opentelemetry/sdk-trace-base": "^2.0.1",
153153
"@opentelemetry/sdk-trace-web": "^2.0.1",

0 commit comments

Comments
 (0)