Skip to content

Add ActivityExporter for Zipkin #738

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.

Sign up for GitHub

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

Merged
cijothomas merged 13 commits into from
Jun 19, 2020
Merged

Add ActivityExporter for Zipkin #738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f0fe011
Adding Zipkin activity exporter
rajkumar-rangaraj Jun 17, 2020
6003a1b
Added activitysource to tags
rajkumar-rangaraj Jun 17, 2020
895492a
Revert ZipkinTraceExporterOptions name change
rajkumar-rangaraj Jun 17, 2020
475bdea
Refactored ProcessTags
rajkumar-rangaraj Jun 17, 2020
07cdafa
Removing sample files
rajkumar-rangaraj Jun 17, 2020
942b3aa
Merge branch 'master' into master
rajkumar-rangaraj Jun 17, 2020
97b8a1e
Merge branch 'master' into master
rajkumar-rangaraj Jun 18, 2020
2afb1e0
Modified UseZipkinActivityExporter to use AddProcessorPipeline
rajkumar-rangaraj Jun 18, 2020
37e6084
Refactored based on Reiley's comments
rajkumar-rangaraj Jun 18, 2020
aaa1941
Merge branch 'master' into master
cijothomas Jun 19, 2020
2bfb0f5
Added UseShortTraceIds to test
rajkumar-rangaraj Jun 19, 2020
fced635
Merge branch 'master' of https://github.com/rajkumar-rangaraj/opentel…
rajkumar-rangaraj Jun 19, 2020
2b51443
Added useShortTraceIds to test
rajkumar-rangaraj Jun 19, 2020
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
Prev Previous commit
Next Next commit
Added UseShortTraceIds to test
  • Loading branch information
@rajkumar-rangaraj
rajkumar-rangaraj committed Jun 19, 2020
commit 2bfb0f53c85c19aa63ce0065716b2205958e8749
2 changes: 1 addition & 1 deletion src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinActivityConversionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private static bool ProcessActivityEvents(ref PooledList<ZipkinAnnotation> annot
private static bool ProcessTags(ref AttributeEnumerationState state, KeyValuePair<string, string> attribute)
{
string key = attribute.Key;
string strVal = attribute.Value?.ToString();
string strVal = attribute.Value;

if (strVal != null)
{
Expand Down
5 changes: 3 additions & 2 deletions test/OpenTelemetry.Exporter.Zipkin.Tests/Implementation/ZipkinActivityConversionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace OpenTelemetry.Exporter.Zipkin.Tests.Implementation
{
public class ZipkinActivityConversionTest
{
private const string ZipkinSpanName = "Name";
private static readonly ZipkinEndpoint DefaultZipkinEndpoint = new ZipkinEndpoint("TestService");

[Fact]
Expand All @@ -34,7 +35,7 @@ public void ZipkinActivityConversion_ToZipkinSpan_AllPropertiesSet()
// Act & Assert
var zipkinSpan = activity.ToZipkinSpan(DefaultZipkinEndpoint);

Assert.Equal("Name", zipkinSpan.Name);
Assert.Equal(ZipkinSpanName, zipkinSpan.Name);

Assert.Equal(activity.TraceId.ToHexString(), zipkinSpan.TraceId);
Assert.Equal(activity.SpanId.ToHexString(), zipkinSpan.Id);
Expand Down Expand Up @@ -67,7 +68,7 @@ public void ZipkinActivityConversion_ToZipkinSpan_NoEvents()
// Act & Assert
var zipkinSpan = activity.ToZipkinSpan(DefaultZipkinEndpoint);

Assert.Equal("Name", zipkinSpan.Name);
Assert.Equal(ZipkinSpanName, zipkinSpan.Name);
Assert.Empty(zipkinSpan.Annotations.Value);
Assert.Equal(activity.TraceId.ToHexString(), zipkinSpan.TraceId);
Assert.Equal(activity.SpanId.ToHexString(), zipkinSpan.Id);
Expand Down
3 changes: 2 additions & 1 deletion test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinActivityExporterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public async Task ZipkinActivityExporterIntegrationTest()
new ZipkinTraceExporterOptions
{
Endpoint = new Uri($"http://{this.testServerHost}:{this.testServerPort}/api/v2/spans?requestId={requestId}"),
UseShortTraceIds = true,
});

await exporter.ExportAsync(batchActivity, CancellationToken.None).ConfigureAwait(false);
Expand All @@ -117,7 +118,7 @@ public async Task ZipkinActivityExporterIntegrationTest()
}

Assert.Equal(
$@"[{{""traceId"":""e8ea7e9ac72de94e91fabc613f9686b2"",""name"":""Name"",""parentId"":""{ZipkinConversionExtensions.EncodeSpanId(activity.ParentSpanId)}"",""id"":""{ZipkinActivityConversionExtensions.EncodeSpanId(context.SpanId)}"",""kind"":""CLIENT"",""timestamp"":{timestamp},""duration"":60000000,""localEndpoint"":{{""serviceName"":""Open Telemetry Exporter""{ipInformation}}},""annotations"":[{{""timestamp"":{eventTimestamp},""value"":""Event1""}},{{""timestamp"":{eventTimestamp},""value"":""Event2""}}],""tags"":{{""stringKey"":""value"",""longKey"":""1"",""longKey2"":""1"",""doubleKey"":""1"",""doubleKey2"":""1"",""boolKey"":""True"",""library.name"":""CreateTestActivity""}}}}]",
$@"[{{""traceId"":""91fabc613f9686b2"",""name"":""Name"",""parentId"":""{ZipkinConversionExtensions.EncodeSpanId(activity.ParentSpanId)}"",""id"":""{ZipkinActivityConversionExtensions.EncodeSpanId(context.SpanId)}"",""kind"":""CLIENT"",""timestamp"":{timestamp},""duration"":60000000,""localEndpoint"":{{""serviceName"":""Open Telemetry Exporter""{ipInformation}}},""annotations"":[{{""timestamp"":{eventTimestamp},""value"":""Event1""}},{{""timestamp"":{eventTimestamp},""value"":""Event2""}}],""tags"":{{""stringKey"":""value"",""longKey"":""1"",""longKey2"":""1"",""doubleKey"":""1"",""doubleKey2"":""1"",""boolKey"":""True"",""library.name"":""CreateTestActivity""}}}}]",
Responses[requestId]);
}

Expand Down