Skip to content

Add process tags to remote config #7840

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −3
Open

Add process tags to remote config #7840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion tracer/src/Datadog.Trace/RemoteConfigurationManagement/Protocol/RcmClientTracer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ namespace Datadog.Trace.RemoteConfigurationManagement.Protocol
{
internal class RcmClientTracer
{
public RcmClientTracer(string runtimeId, string tracerVersion, string service, string env, string? appVersion, List<string> tags)
public RcmClientTracer(string runtimeId, string tracerVersion, string service, string env, string? appVersion, List<string> tags, string? processTags)
{
RuntimeId = runtimeId;
Language = TracerConstants.Language;
TracerVersion = tracerVersion;
Service = service;
ProcessTags = processTags;
Env = env;
AppVersion = appVersion;
Tags = tags;
Expand All @@ -35,6 +36,9 @@ public RcmClientTracer(string runtimeId, string tracerVersion, string service, s
[JsonProperty("service")]
public string Service { get; }

[JsonProperty("process_tags")]
public string? ProcessTags { get; }

[JsonProperty("extra_services")]
public string[]? ExtraServices { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace/RemoteConfigurationManagement/RemoteConfigurationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static RemoteConfigurationManager Create(
return new RemoteConfigurationManager(
discoveryService,
remoteConfigurationApi,
rcmTracer: new RcmClientTracer(settings.RuntimeId, settings.TracerVersion, serviceName, TraceUtil.NormalizeTag(tracerSettings.Environment), tracerSettings.ServiceVersion, tags),
new RcmClientTracer(settings.RuntimeId, settings.TracerVersion, serviceName, TraceUtil.NormalizeTag(tracerSettings.Environment), tracerSettings.ServiceVersion, tags, tracerSettings.PropagateProcessTags ? ProcessTags.SerializedTags : null),
pollInterval: settings.PollInterval,
gitMetadataTagsProvider,
subscriptionManager);
Expand Down
3 changes: 2 additions & 1 deletion tracer/test/Datadog.Trace.Tests/RemoteConfigurationManagement/RemoteConfigurationApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ private static GetRcmRequest GetRequest(string backendClientStage = null)
service: nameof(RemoteConfigurationApiTests),
env: "RCM Test",
appVersion: "1.0.0",
tags: []);
tags: [],
processTags: "a.b:c,x.y:z");

var state = new RcmClientState(
rootVersion: 1,
Expand Down
Loading