open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cache encoded property names for the zipkin json. (#1699) 

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
This commit is contained in:
Mikel Blanchard 2021-01-14 12:02:31 -08:00 committed by GitHub
parent b17278f691
commit a16c14ce6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 80 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinEndpoint.cs
View File

@ -117,22 +117,22 @@ namespace OpenTelemetry.Exporter.Zipkin.Implementation
if (this.ServiceName != null)
{
writer.WriteString("serviceName", this.ServiceName);
writer.WriteString(ZipkinSpanJsonHelper.ServiceNamePropertyName, this.ServiceName);
}
if (this.Ipv4 != null)
{
writer.WriteString("ipv4", this.Ipv4);
writer.WriteString(ZipkinSpanJsonHelper.Ipv4PropertyName, this.Ipv4);
}
if (this.Ipv6 != null)
{
writer.WriteString("ipv6", this.Ipv6);
writer.WriteString(ZipkinSpanJsonHelper.Ipv6PropertyName, this.Ipv6);
}
if (this.Port.HasValue)
{
writer.WriteNumber("port", this.Port.Value);
writer.WriteNumber(ZipkinSpanJsonHelper.PortPropertyName, this.Port.Value);
}
writer.WriteEndObject();

30
src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinSpan.cs
View File

@ -227,69 +227,69 @@ namespace OpenTelemetry.Exporter.Zipkin.Implementation
{
writer.WriteStartObject();
writer.WriteString("traceId", this.TraceId);
writer.WriteString(ZipkinSpanJsonHelper.TraceIdPropertyName, this.TraceId);
if (this.Name != null)
{
writer.WriteString("name", this.Name);
writer.WriteString(ZipkinSpanJsonHelper.NamePropertyName, this.Name);
}
if (this.ParentId != null)
{
writer.WriteString("parentId", this.ParentId);
writer.WriteString(ZipkinSpanJsonHelper.ParentIdPropertyName, this.ParentId);
}
writer.WriteString("id", this.Id);
writer.WriteString(ZipkinSpanJsonHelper.IdPropertyName, this.Id);
if (this.Kind != null)
{
writer.WriteString("kind", this.Kind);
writer.WriteString(ZipkinSpanJsonHelper.KindPropertyName, this.Kind);
}
if (this.Timestamp.HasValue)
{
writer.WriteNumber("timestamp", this.Timestamp.Value);
writer.WriteNumber(ZipkinSpanJsonHelper.TimestampPropertyName, this.Timestamp.Value);
}
if (this.Duration.HasValue)
{
writer.WriteNumber("duration", this.Duration.Value);
writer.WriteNumber(ZipkinSpanJsonHelper.DurationPropertyName, this.Duration.Value);
}
if (this.Debug.HasValue)
{
writer.WriteBoolean("debug", this.Debug.Value);
writer.WriteBoolean(ZipkinSpanJsonHelper.DebugPropertyName, this.Debug.Value);
}
if (this.Shared.HasValue)
{
writer.WriteBoolean("shared", this.Shared.Value);
writer.WriteBoolean(ZipkinSpanJsonHelper.SharedPropertyName, this.Shared.Value);
}
if (this.LocalEndpoint != null)
{
writer.WritePropertyName("localEndpoint");
writer.WritePropertyName(ZipkinSpanJsonHelper.LocalEndpointPropertyName);
this.LocalEndpoint.Write(writer);
}
if (this.RemoteEndpoint != null)
{
writer.WritePropertyName("remoteEndpoint");
writer.WritePropertyName(ZipkinSpanJsonHelper.RemoteEndpointPropertyName);
this.RemoteEndpoint.Write(writer);
}
if (!this.Annotations.IsEmpty)
{
writer.WritePropertyName("annotations");
writer.WritePropertyName(ZipkinSpanJsonHelper.AnnotationsPropertyName);
writer.WriteStartArray();
foreach (var annotation in this.Annotations)
{
writer.WriteStartObject();
writer.WriteNumber("timestamp", annotation.Timestamp);
writer.WriteNumber(ZipkinSpanJsonHelper.TimestampPropertyName, annotation.Timestamp);
writer.WriteString("value", annotation.Value);
writer.WriteString(ZipkinSpanJsonHelper.ValuePropertyName, annotation.Value);
writer.WriteEndObject();
}
@ -299,7 +299,7 @@ namespace OpenTelemetry.Exporter.Zipkin.Implementation
if (!this.Tags.IsEmpty || this.LocalEndpoint.Tags != null)
{
writer.WritePropertyName("tags");
writer.WritePropertyName(ZipkinSpanJsonHelper.TagsPropertyName);
writer.WriteStartObject();
// this will be used when we convert int, double, int[], double[] to string

61
src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinSpanJsonHelper.cs Normal file
View File

@ -0,0 +1,61 @@
// <copyright file="ZipkinSpanJsonHelper.cs" company="OpenTelemetry Authors">
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
#if !NET452
using System.Text.Json;
namespace OpenTelemetry.Exporter.Zipkin.Implementation
{
internal static class ZipkinSpanJsonHelper
{
public static readonly JsonEncodedText TraceIdPropertyName = JsonEncodedText.Encode("traceId");
public static readonly JsonEncodedText NamePropertyName = JsonEncodedText.Encode("name");
public static readonly JsonEncodedText ParentIdPropertyName = JsonEncodedText.Encode("parentId");
public static readonly JsonEncodedText IdPropertyName = JsonEncodedText.Encode("id");
public static readonly JsonEncodedText KindPropertyName = JsonEncodedText.Encode("kind");
public static readonly JsonEncodedText TimestampPropertyName = JsonEncodedText.Encode("timestamp");
public static readonly JsonEncodedText DurationPropertyName = JsonEncodedText.Encode("duration");
public static readonly JsonEncodedText DebugPropertyName = JsonEncodedText.Encode("debug");
public static readonly JsonEncodedText SharedPropertyName = JsonEncodedText.Encode("shared");
public static readonly JsonEncodedText LocalEndpointPropertyName = JsonEncodedText.Encode("localEndpoint");
public static readonly JsonEncodedText RemoteEndpointPropertyName = JsonEncodedText.Encode("remoteEndpoint");
public static readonly JsonEncodedText AnnotationsPropertyName = JsonEncodedText.Encode("annotations");
public static readonly JsonEncodedText ValuePropertyName = JsonEncodedText.Encode("value");
public static readonly JsonEncodedText TagsPropertyName = JsonEncodedText.Encode("tags");
public static readonly JsonEncodedText ServiceNamePropertyName = JsonEncodedText.Encode("serviceName");
public static readonly JsonEncodedText Ipv4PropertyName = JsonEncodedText.Encode("ipv4");
public static readonly JsonEncodedText Ipv6PropertyName = JsonEncodedText.Encode("ipv6");
public static readonly JsonEncodedText PortPropertyName = JsonEncodedText.Encode("port");
}
}
#endif