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

pkg/trace/api: add support for Unix Domain Sockets #3556

Merged
merged 2 commits into from
Jul 10, 2019
Merged

pkg/trace/api: add support for Unix Domain Sockets #3556

merged 2 commits into from
Jul 10, 2019

Conversation

gbbr
Copy link
Contributor

@gbbr gbbr commented May 24, 2019

This change adds support for Unix Domain Sockets by means of a
configuration setting. By default, this feature is disabled. To enable
it, simply point the yaml setting to the right socket path, for example:

apm_config:
    receiver_socket: /tmp/trace.sock

This will enable the HTTP server to listen on unix:https:///tmp/trace.sock

@gbbr gbbr added the team/agent-apm trace-agent label May 24, 2019
@gbbr gbbr added this to the 6.12.0 milestone May 24, 2019
@gbbr gbbr requested review from a team as code owners May 24, 2019 14:04
@gbbr gbbr force-pushed the gbbr/uds branch 2 times, most recently from 31a768b to b777357 Compare May 24, 2019 14:54
@gbbr
Copy link
Contributor Author

gbbr commented May 24, 2019

We should consider whether we need to introduce the dogstatsd_so_rcvbuf option too.

gbbr added a commit that referenced this pull request May 27, 2019
This is an APM-only custom build of the agent, containing the latest
Datadog Agent release (6.11.2) and the APM development branch from #3556.

It was created by running:

  git checkout 6.11.2
  git checkout gbbr/uds -- pkg/trace

  # clean up
  rm pkg/trace/writer/payload* pkg/watchdog/net.go
  rm pkg/trace/watchdog/info_nix_test.go
@gbbr gbbr modified the milestones: 6.12.0, 6.13.0 Jun 3, 2019
@gbbr gbbr force-pushed the gbbr/uds branch 5 times, most recently from b6148c6 to 8a679a9 Compare July 9, 2019 18:56
This change adds support for Unix Domain Sockets by means of a
configuration setting. By default, this feature is disabled. To enable
it, simply point the yaml setting to the right socket path, for example:

    apm_config:
        receiver_socket: /tmp/trace.sock

This will enable the HTTP server to listen on unix:https:///tmp/trace.sock

The DD_APM_RECEIVER_SOCKET environment variable is an alias for the
above.
Copy link

@erichgess erichgess left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some questions and minor nitpicks

pkg/trace/api/api.go Outdated Show resolved Hide resolved
pkg/trace/api/api.go Outdated Show resolved Hide resolved
pkg/trace/api/api.go Show resolved Hide resolved
pkg/trace/api/api.go Show resolved Hide resolved
Copy link
Contributor Author

@gbbr gbbr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I addressed the comments and replied to one, with a question.

pkg/trace/api/api.go Show resolved Hide resolved
pkg/trace/api/api.go Outdated Show resolved Hide resolved
pkg/trace/api/api.go Outdated Show resolved Hide resolved
pkg/trace/api/api.go Show resolved Hide resolved
@gbbr gbbr merged commit 669a065 into master Jul 10, 2019
@gbbr gbbr deleted the gbbr/uds branch July 10, 2019 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team/agent-apm trace-agent
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants