From e72f68b8e458a70709ed2ebd1e623309a84c7b88 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Mon, 24 Oct 2022 12:34:01 +0200 Subject: [PATCH] feat: add java attacher support for macOS (#9413) * feat: add java attacher support for macOS bump go-sysinfo library to add support for macos without depending on cgo * lint: update notice file * changelog: add changelog entry --- NOTICE.txt | 4 ++-- changelogs/head.asciidoc | 1 + go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 6f29b64f7ce..fb99dc036d1 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1159,11 +1159,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-sysinfo -Version: v1.8.1 +Version: v1.8.2-0.20221020073039-53d6396b5c22 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-sysinfo@v1.8.1/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-sysinfo@v1.8.2-0.20221020073039-53d6396b5c22/LICENSE.txt: Apache License diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index c486dfc0118..265a04ac299 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -26,3 +26,4 @@ Set error.id for OpenTelemetry exception span events {pull}9372[9372] - Service metrics now support global labels {pull}9248[9248] - OpenTelemetry GRPC Spans from the Javascript API/SDK/Instrumentations are now correctly transformed into transactions with type=`request` - Improve Elasticsearch output performance, particularly when compression is enabled (default) {pull}9318[9318] +- Java attacher support for macOS {pull}9413[9413] diff --git a/go.mod b/go.mod index 5b4a979760c..3b08e110091 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/elastic/gmux v0.2.0 github.com/elastic/go-elasticsearch/v8 v8.4.0 github.com/elastic/go-hdrhistogram v0.1.0 - github.com/elastic/go-sysinfo v1.8.1 + github.com/elastic/go-sysinfo v1.8.2-0.20221020073039-53d6396b5c22 github.com/elastic/go-ucfg v0.8.6 github.com/go-sourcemap/sourcemap v2.1.3+incompatible github.com/gofrs/flock v0.8.1 diff --git a/go.sum b/go.sum index ad7cc2adc93..f378326bd36 100644 --- a/go.sum +++ b/go.sum @@ -336,8 +336,8 @@ github.com/elastic/go-seccomp-bpf v1.2.0 h1:K5fToUAMzm0pmdlYORmw0FP0DloRa1SfqRYk github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= github.com/elastic/go-sysinfo v1.7.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= -github.com/elastic/go-sysinfo v1.8.1 h1:4Yhj+HdV6WjbCRgGdZpPJ8lZQlXZLKDAeIkmQ/VRvi4= -github.com/elastic/go-sysinfo v1.8.1/go.mod h1:JfllUnzoQV/JRYymbH3dO1yggI3mV2oTKSXsDHM+uIM= +github.com/elastic/go-sysinfo v1.8.2-0.20221020073039-53d6396b5c22 h1:8btPMMwiCNyXFB2lBrmRrBxweQPy1w6wcbiPhRQYnes= +github.com/elastic/go-sysinfo v1.8.2-0.20221020073039-53d6396b5c22/go.mod h1:BKIB/sRPQTrksWazk1LChlhv1KfTTn6hYYdctLBFvOQ= github.com/elastic/go-ucfg v0.8.6 h1:stUeyh2goTgGX+/wb9gzKvTv0YB0231LTpKUgCKj4U0= github.com/elastic/go-ucfg v0.8.6/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA= github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=