Skip to content

Commit e60c227

Browse files
committed
Remove crates from upstream opentelemetry-rust repo.
* We will only keep the contrib repos. * Had to temporarily point to main since there are some existing breaking changes. * Adjust CI to work on only the contribs. * Update the homepage and repository links
1 parent 23aa7e2 commit e60c227

File tree

381 files changed

+112
-57491
lines changed

Some content is hidden

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

381 files changed

+112
-57491
lines changed

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Bug Report
22
description: File a bug report
33
title: "[Bug]: "
44
labels: ["bug", "triage:todo"]
5-
projects: ["open-telemetry/opentelemetry-rust"]
5+
projects: ["open-telemetry/opentelemetry-rust-contrib"]
66
body:
77
- type: markdown
88
attributes:
@@ -34,14 +34,19 @@ body:
3434
validations:
3535
required: true
3636
- type: dropdown
37-
id: browsers
37+
id: components
3838
attributes:
39-
label: What Exporters are you seeing the problem on?
39+
label: What component are you working with?
4040
multiple: true
4141
options:
42-
- OTLP
43-
- Zipkin
44-
- Jaeger (Deprecated)
42+
- opentelemetry-aws
43+
- opentelemetry-contrib
44+
- opentelemetry-datadog
45+
- opentelemetry-dynatrace
46+
- opentelemetry-stackdriver
47+
- opentelemetry-user-events-logs
48+
- opentelemetry-user-events-metrics
49+
- opentelemetry-zpages
4550
- N/A
4651
- type: textarea
4752
id: logs

.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "Feature Request"
33
description: Request a feature for the OpenTelemetry Rust implementation.
44
title: "[Feature]: "
55
labels: ["enhancement", "triage:todo"]
6-
projects: ["open-telemetry/opentelemetry-rust"]
6+
projects: ["open-telemetry/opentelemetry-rust-contrib"]
77
body:
88
- type: markdown
99
attributes:
@@ -22,6 +22,21 @@ body:
2222
placeholder: Include the Issue ID from this or other repos.
2323
validations:
2424
required: false
25+
- type: dropdown
26+
id: components
27+
attributes:
28+
label: What component are you working with?
29+
multiple: true
30+
options:
31+
- opentelemetry-aws
32+
- opentelemetry-contrib
33+
- opentelemetry-datadog
34+
- opentelemetry-dynatrace
35+
- opentelemetry-stackdriver
36+
- opentelemetry-user-events-logs
37+
- opentelemetry-user-events-metrics
38+
- opentelemetry-zpages
39+
- N/A
2540
- type: textarea
2641
id: solution
2742
attributes:

.github/ISSUE_TEMPLATE/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
contact_links:
22
- name: GitHub Discussions
3-
url: https://github.com/open-telemetry/opentelemetry-rust/discussions/new/choose
3+
url: https://github.com/open-telemetry/opentelemetry-rust-contrib/discussions/new/choose
44
about: Please ask questions here.
55
- name: Slack
66
url: https://cloud-native.slack.com/archives/C03GDP0H023
77
about: Or the `#otel-rust` channel in the CNCF Slack instance. (Not terribly responsive.)
88
- name: "⚠️ Report a security vulnerability"
9-
url: "https://github.com/open-telemetry/opentelemetry-rust/security/advisories/new"
9+
url: "https://github.com/open-telemetry/opentelemetry-rust-contrib/security/advisories/new"
1010
about: "Report a security vulnerability."
1111

.github/workflows/ci.yml

+19-54
Original file line numberDiff line numberDiff line change
@@ -50,60 +50,25 @@ jobs:
5050
args: --all -- --check
5151
- name: Lint
5252
run: ./scripts/lint.sh
53-
external-types:
54-
strategy:
55-
matrix:
56-
example: [opentelemetry, opentelemetry-sdk]
57-
runs-on: ubuntu-latest
58-
steps:
59-
- uses: actions/checkout@v2
60-
- uses: actions-rs/toolchain@v1
61-
with:
62-
toolchain: nightly
63-
components: rustfmt
64-
override: true
65-
- name: external-type-check
66-
run: |
67-
cargo install cargo-check-external-types
68-
cd ${{ matrix.example }}
69-
cargo check-external-types --config allowed-external-types.toml
70-
non-default-examples:
71-
strategy:
72-
matrix:
73-
example: [opentelemetry-otlp/examples/external-otlp-grpcio-async-std, opentelemetry-otlp/examples/basic-otlp]
74-
runs-on: ubuntu-latest
75-
steps:
76-
- uses: actions/checkout@v1
77-
with:
78-
submodules: true
79-
- uses: actions-rs/toolchain@v1
80-
with:
81-
toolchain: stable
82-
components: rustfmt
83-
profile: minimal
84-
- uses: arduino/setup-protoc@v1
85-
- name: Build
86-
run: |
87-
cd ${{ matrix.example }}
88-
cargo build --verbose
89-
msrv:
90-
runs-on: ubuntu-latest
91-
steps:
92-
- uses: actions/checkout@v1
93-
with:
94-
submodules: true
95-
- uses: actions-rs/toolchain@v1
96-
with:
97-
profile: minimal
98-
toolchain: 1.65.0
99-
override: true
100-
- name: Patch dependencies versions # some dependencies bump MSRV without major version bump
101-
run: ./scripts/patch_dependencies.sh
102-
- name: Run tests
103-
run: cargo --version &&
104-
cargo test --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,testing &&
105-
cargo test --manifest-path=opentelemetry-jaeger/Cargo.toml --features rt-tokio &&
106-
cargo test --manifest-path=opentelemetry-zipkin/Cargo.toml
53+
# TODO: re-add this test
54+
# msrv:
55+
# runs-on: ubuntu-latest
56+
# steps:
57+
# - uses: actions/checkout@v1
58+
# with:
59+
# submodules: true
60+
# - uses: actions-rs/toolchain@v1
61+
# with:
62+
# profile: minimal
63+
# toolchain: 1.65.0
64+
# override: true
65+
# - name: Patch dependencies versions # some dependencies bump MSRV without major version bump
66+
# run: ./scripts/patch_dependencies.sh
67+
# - name: Run tests
68+
# run: cargo --version &&
69+
# cargo test --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,testing &&
70+
# cargo test --manifest-path=opentelemetry-jaeger/Cargo.toml --features rt-tokio &&
71+
# cargo test --manifest-path=opentelemetry-zipkin/Cargo.toml
10772
cargo-deny:
10873
runs-on: ubuntu-latest
10974
continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci

.github/workflows/integration_tests.yml

-17
This file was deleted.

.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[submodule "opentelemetry-proto/src/proto/opentelemetry-proto"]
2-
path = opentelemetry-proto/src/proto/opentelemetry-proto
3-
url = https://github.com/open-telemetry/opentelemetry-proto
4-
branch = tags/v1.0.0

Cargo.toml

+6-26
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,16 @@
11
[workspace]
22
members = [
3-
"opentelemetry",
43
"opentelemetry-aws",
54
"opentelemetry-contrib",
6-
"opentelemetry-datadog",
7-
"opentelemetry-http",
8-
"opentelemetry-jaeger",
9-
"opentelemetry-jaeger/examples/actix-udp",
10-
"opentelemetry-jaeger/examples/remote-sampler",
11-
"opentelemetry-appender-log",
12-
"opentelemetry-appender-tracing",
13-
"opentelemetry-otlp",
14-
"opentelemetry-prometheus",
15-
"opentelemetry-proto",
16-
"opentelemetry-sdk",
17-
"opentelemetry-semantic-conventions",
18-
"opentelemetry-stackdriver",
19-
"opentelemetry-stdout",
5+
# TODO: Add back in once this relies on a published version
6+
# "opentelemetry-datadog",
7+
# TODO: Add back in once this relies on a published version
8+
# "opentelemetry-stackdriver",
209
"opentelemetry-user-events-logs",
2110
"opentelemetry-user-events-metrics",
22-
"opentelemetry-zipkin",
23-
"opentelemetry-zpages",
24-
"opentelemetry-otlp/examples/basic-otlp",
25-
"opentelemetry-otlp/examples/basic-otlp-http",
26-
"opentelemetry-otlp/examples/external-otlp-grpcio-async-std",
27-
"examples/metrics-basic",
28-
"examples/metrics-advanced",
29-
"examples/logs-basic",
11+
# TODO: Add back in once this relies on a published version
12+
# "opentelemetry-zpages",
3013
"examples/traceresponse",
31-
"examples/tracing-grpc",
32-
"examples/tracing-jaeger",
33-
"stress",
3414
]
3515
resolver = "2"
3616

examples/logs-basic/Cargo.toml

-14
This file was deleted.

examples/logs-basic/README.md

-16
This file was deleted.

examples/logs-basic/src/main.rs

-32
This file was deleted.

examples/metrics-advanced/Cargo.toml

-13
This file was deleted.

examples/metrics-advanced/README.md

-17
This file was deleted.

0 commit comments

Comments
 (0)