-
Notifications
You must be signed in to change notification settings - Fork 2
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
Add OTLP/HTTP collector #13
Merged
codefromthecrypt
merged 14 commits into
openzipkin-contrib:main
from
making:otlp-collector
Sep 16, 2024
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
7b23b75
Add OTLP/HTTP collector
making b5015c0
Remove unused opentelemetry-sdk-common
making 6f2bec2
Update collector-http/src/main/java/zipkin2/collector/otel/http/OpenT…
making 88b3977
Update collector-http/src/main/java/zipkin2/collector/otel/http/OpenT…
making 88a5f95
Update collector-http/src/main/java/zipkin2/collector/otel/http/OpenT…
making 9ac6f61
Fix import
making e94d942
Fix test
making ce708bc
Use long to set trace/span id and remove OtelEncodingUtils
making b162311
Unwrap UncheckedIOException
making 420507b
Use comma separator instead of json to encode attributes
making 3dbd79a
Makes no sense to set an id with zeros, as this will throw an Illegal…
making 9f67806
Remove unused INVALID_TRACE
making c869d69
Increment spanDropped if the received span is invalid
making 5195c30
Handling invalid span exceptions outside the Translator
making File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
# zipkin-collector-otel-http | ||
# collector-http | ||
|
||
This component implements | ||
the [OTLP/HTTP protocol](https://opentelemetry.io/docs/specs/otlp/#otlphttp) | ||
with [Armeria](https://armeria.dev/). | ||
This component implements the [OTLP/HTTP protocol](https://opentelemetry.io/docs/specs/otlp/#otlphttp) with [Armeria](https://armeria.dev/). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
collector-http/src/main/java/zipkin2/collector/otel/http/ProtoUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
* Copyright The OpenZipkin Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
package zipkin2.collector.otel.http; | ||
|
||
import java.util.List; | ||
|
||
import com.google.protobuf.TextFormat; | ||
import io.opentelemetry.proto.common.v1.AnyValue; | ||
import io.opentelemetry.proto.common.v1.KeyValue; | ||
|
||
import static java.util.stream.Collectors.joining; | ||
|
||
final class ProtoUtils { | ||
static String kvListToJson(List<KeyValue> attributes) { | ||
return attributes.stream() | ||
.map(entry -> "\"" + entry.getKey() + "\":" + valueToJson(entry.getValue())) | ||
.collect(joining(",", "{", "}")); | ||
} | ||
|
||
static String valueToString(AnyValue value) { | ||
if (value.hasStringValue()) { | ||
return value.getStringValue(); | ||
} | ||
if (value.hasArrayValue()) { | ||
// While https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/README.md#attribute says | ||
// that an array should be encoded as a json, | ||
// the Otel Zipkin Exporter doesn't implement like that https://github.com/open-telemetry/opentelemetry-java/blob/main/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/OtelToZipkinSpanTransformerTest.java#L382-L385 | ||
// Also Brave doesn't use the json encoding. | ||
// So follow the comma separator here. | ||
return value.getArrayValue().getValuesList().stream() | ||
.map(ProtoUtils::valueToString) | ||
.collect(joining(",")); | ||
} | ||
return valueToJson(value); | ||
} | ||
|
||
static String valueToJson(AnyValue value) { | ||
if (value.hasStringValue()) { | ||
return "\"" + value.getStringValue() + "\""; | ||
} | ||
if (value.hasArrayValue()) { | ||
return value.getArrayValue().getValuesList().stream() | ||
.map(ProtoUtils::valueToJson) | ||
.collect(joining(",", "[", "]")); | ||
} | ||
if (value.hasKvlistValue()) { | ||
return kvListToJson(value.getKvlistValue().getValuesList()); | ||
} | ||
if (value.hasBoolValue()) { | ||
return String.valueOf(value.getBoolValue()); | ||
} | ||
if (value.hasDoubleValue()) { | ||
return String.valueOf(value.getDoubleValue()); | ||
} | ||
if (value.hasIntValue()) { | ||
return String.valueOf(value.getIntValue()); | ||
} | ||
if (value.hasBytesValue()) { | ||
// TODO | ||
return TextFormat.escapeBytes(value.getBytesValue()); | ||
} | ||
return value.toString(); | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we want to name this similar to the sender?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you elaborate this?