Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing GRPC #3

Merged
merged 1 commit into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
!build-bin/maven/maven_unjar

# Allow on-demand "mvn package". <modules> referenced in pom.xml must be added even if not built
!collector-grpc/src/main/**
!collector-http/src/main/**
!module/src/main/**
!**/pom.xml
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ persists them to a configured collector component.

| Collector | Description |
|------------------------------------|-----------------------------------------------------------------------------------------|
| [collector-grpc](./collector-grpc) | Implements the [OTLP/gRPC protocol](https://opentelemetry.io/docs/specs/otlp/#otlpgrpc) |
| [collector-http](./collector-http) | Implements the [OTLP/HTTP protocol](https://opentelemetry.io/docs/specs/otlp/#otlphttp) |

## Server integration
Expand Down
5 changes: 0 additions & 5 deletions benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-collector-otel-grpc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-collector-otel-http</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions collector-grpc/README.md

This file was deleted.

70 changes: 0 additions & 70 deletions collector-grpc/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 1 addition & 2 deletions module/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

This is a module that can be added to
a [Zipkin Server](https://github.com/openzipkin/zipkin/tree/master/zipkin-server)
deployment to receive Spans to OpenTelemetry's OLTP/GRPC and OLTP/HTTP protocols.
deployment to receive Spans to OpenTelemetry's OLTP/HTTP protocols.

## Experimental

Expand Down Expand Up @@ -49,7 +49,6 @@ for users that prefer a file based approach.

| Property | Environment Variable | Description |
|--------------------------------------|-------------------------------|----------------------------------------------------------|
| `zipkin.collector.otel.grpc.enabled` | `COLLECTOR_GRPC_OTEL_ENABLED` | `false` disables the GRPC collector. Defaults to `true`. |
| `zipkin.collector.otel.http.enabled` | `COLLECTOR_HTTP_OTEL_ENABLED` | `false` disables the HTTP collector. Defaults to `true`. |

### Running
Expand Down
11 changes: 0 additions & 11 deletions module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-collector-otel-grpc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zipkin-collector-otel-http</artifactId>
Expand Down Expand Up @@ -68,12 +63,6 @@
<version>${armeria.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${armeria.groupId}</groupId>
<artifactId>armeria-grpc</artifactId>
<version>${armeria.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading