Skip to content

Commit a4e2d2e

Browse files
tongosstongoss
authored
Merge branch 'main' into bugfix/otlp-exporter-logs-env
2 parents 2d57f4c + 0c49ece commit a4e2d2e

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ jobs:
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3
33+
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3
3434
with:
3535
languages: go
3636

3737
- name: Autobuild
38-
uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3
38+
uses: github/codeql-action/autobuild@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3
3939

4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3
41+
uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3
4242

‎.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ jobs:
5858
# Upload the results to GitHub's code scanning dashboard (optional).
5959
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
6060
- name: "Upload to code-scanning"
61-
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3
61+
uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3
6262
with:
6363
sarif_file: results.sarif

‎CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@ should be canceled.
643643

644644
### Triagers
645645

646+
- [Alex Kats](https://github.com/akats7), Capital One
646647
- [Cheng-Zhen Yang](https://github.com/scorpionknifes), Independent
647648

648649
### Approvers

‎exporters/README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@ This package contains exporters for this purpose.
88
The following exporter packages are provided with the following OpenTelemetry signal support.
99

1010
| Exporter Package | Logs | Metrics | Traces |
11-
|:-----------------------------------------------------------------------------------------------------:|:----:|:-------:|:------:|
12-
| [go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp](./otlp/otlplog/otlploghttp) | ✓ | | |
11+
|:------------------------------------------------------------------------------------------------------|:----:|:-------:|:------:|
12+
| [go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc](./otlp/otlplog/otlploggrpc) | ✓ | | |
13+
| [go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp](./otlp/otlplog/otlploghttp) | ✓ | | |
1314
| [go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc](./otlp/otlpmetric/otlpmetricgrpc) | | ✓ | |
1415
| [go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp](./otlp/otlpmetric/otlpmetrichttp) | | ✓ | |
15-
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](./otlp/otlptrace/otlptracegrpc) | | | ✓ |
16-
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](./otlp/otlptrace/otlptracehttp) | | | ✓ |
17-
| [go.opentelemetry.io/otel/exporters/prometheus](./prometheus) | | ✓ | |
18-
| [go.opentelemetry.io/otel/exporters/stdout/stdoutlog](./stdout/stdoutlog) | ✓ | | |
19-
| [go.opentelemetry.io/otel/exporters/stdout/stdoutmetric](./stdout/stdoutmetric) | | ✓ | |
20-
| [go.opentelemetry.io/otel/exporters/stdout/stdouttrace](./stdout/stdouttrace) | | | ✓ |
21-
| [go.opentelemetry.io/otel/exporters/zipkin](./zipkin) | | | ✓ |
16+
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](./otlp/otlptrace/otlptracegrpc) | | | ✓ |
17+
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](./otlp/otlptrace/otlptracehttp) | | | ✓ |
18+
| [go.opentelemetry.io/otel/exporters/prometheus](./prometheus) | | ✓ | |
19+
| [go.opentelemetry.io/otel/exporters/stdout/stdoutlog](./stdout/stdoutlog) | ✓ | | |
20+
| [go.opentelemetry.io/otel/exporters/stdout/stdoutmetric](./stdout/stdoutmetric) | | ✓ | |
21+
| [go.opentelemetry.io/otel/exporters/stdout/stdouttrace](./stdout/stdouttrace) | | | ✓ |
22+
| [go.opentelemetry.io/otel/exporters/zipkin](./zipkin) | | | ✓ |
2223

2324
See the [OpenTelemetry registry] for 3rd-party exporters compatible with this project.
2425

‎internal/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ require (
8585
github.com/gobwas/glob v0.2.3 // indirect
8686
github.com/gofrs/flock v0.12.1 // indirect
8787
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
88-
github.com/golangci/dupl v0.0.0-20250303184901-44c6a0ba7e6c // indirect
88+
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
8989
github.com/golangci/go-printf-func-name v0.1.0 // indirect
9090
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
9191
github.com/golangci/misspell v0.6.0 // indirect

‎internal/tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
169169
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
170170
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
171171
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
172-
github.com/golangci/dupl v0.0.0-20250303184901-44c6a0ba7e6c h1:BhAyQ4fBxnBDr0LwgEPVETkquPQW4BW6DiNBQq6CO5E=
173-
github.com/golangci/dupl v0.0.0-20250303184901-44c6a0ba7e6c/go.mod h1:NUw9Zr2Sy7+HxzdjIULge71wI6yEg1lWQr7Evcu8K0E=
172+
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM=
173+
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk=
174174
github.com/golangci/go-printf-func-name v0.1.0 h1:dVokQP+NMTO7jwO4bwsRwLWeudOVUPPyAKJuzv8pEJU=
175175
github.com/golangci/go-printf-func-name v0.1.0/go.mod h1:wqhWFH5mUdJQhweRnldEywnR5021wTdZSNgwYceV14s=
176176
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d h1:viFft9sS/dxoYY0aiOTsLKO2aZQAPT4nlQCsimGcSGE=

0 commit comments

Comments
 (0)