diff --git a/docs/release.md b/docs/release.md index 38aae6b372e..cbbfb3a95ee 100644 --- a/docs/release.md +++ b/docs/release.md @@ -39,11 +39,12 @@ ../internal/buildscripts/packaging/smart-agent-release.txt) for the latest applicable [Smart Agent release]( https://github.com/signalfx/signalfx-agent/releases). -1. If the Smart Agent from the previous step was updated, update the +1. If the Smart Agent from the previous step was updated, or if there are + desired native Go monitor updates, the `github.com/signalfx/signalfx-agent` and `github.com/signalfx/signalfx-agent/pkg/apm` dependencies in [go.mod]( - ../go.mod) to the commit hash for the Smart Agent release tag, and run - `make tidy`. + ../go.mod) should be updated to the commit hash for the Smart Agent release tag or feature commit + via `go get github.com/signalfx/signalfx-agent@ github.com/signalfx/signalfx-agent/pkg/apm@` and running `make tidy`. 1. If necessary, update [java-agent-release.txt]( ../instrumentation/packaging/java-agent-release.txt) for the latest applicable [Java Agent release]( diff --git a/go.mod b/go.mod index 4bc02245f14..cd7a67bf0c9 100644 --- a/go.mod +++ b/go.mod @@ -73,7 +73,7 @@ require ( github.com/openzipkin/zipkin-go v0.4.0 github.com/signalfx/defaults v1.2.2-0.20180531161417-70562fe60657 github.com/signalfx/golib/v3 v3.3.45 - github.com/signalfx/signalfx-agent v1.0.1-0.20220810191306-a41fb5c94d53 + github.com/signalfx/signalfx-agent v1.0.1-0.20220901141412-c14862a155e5 github.com/signalfx/splunk-otel-collector/tests v0.0.0-00010101000000-000000000000 github.com/sirupsen/logrus v1.9.0 github.com/spf13/cast v1.5.0 @@ -130,7 +130,7 @@ require ( github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/armon/go-metrics v0.3.10 // indirect github.com/armon/go-radix v1.0.0 // indirect - github.com/aws/aws-sdk-go v1.44.87 // indirect + github.com/aws/aws-sdk-go v1.44.89 // indirect github.com/aws/aws-sdk-go-v2 v1.16.11 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.12.14 // indirect @@ -363,7 +363,7 @@ require ( github.com/signalfx/golib v2.5.1+incompatible // indirect github.com/signalfx/ingest-protocols v0.1.13 // indirect github.com/signalfx/sapm-proto v0.11.0 // indirect - github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20220810191306-a41fb5c94d53 // indirect + github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20220901141412-c14862a155e5 // indirect github.com/signalfx/signalfx-go v1.23.0 // indirect github.com/sijms/go-ora/v2 v2.5.3 // indirect github.com/snowflakedb/gosnowflake v1.6.13 // indirect diff --git a/go.sum b/go.sum index 1c6bb504dbe..d6bfb7d0493 100644 --- a/go.sum +++ b/go.sum @@ -264,8 +264,8 @@ github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.87 h1:u/1sm8MNUSQHt8MGLEQHAj4r3lns3w0B1IXelPKbpn4= -github.com/aws/aws-sdk-go v1.44.87/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.89 h1:Xf5Pp9GsNSMRinAuWNiQd0vusXXb3IgYbNlxldhWS2Q= +github.com/aws/aws-sdk-go v1.44.89/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.11.0/go.mod h1:SQfA+m2ltnu1cA0soUkj4dRSsmITiVQUJvBIZjzfPyQ= @@ -1579,7 +1579,7 @@ github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuK github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= +github.com/onsi/gomega v1.20.2 h1:8uQq0zMgLEfa0vRrrBgaJF2gyW9Da9BmfGV+OyUzfkY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.59.0 h1:DPsEXX2Z+NhlPlhs2XvZdx3njrdGu89M+jYnrW5Fi6U= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.59.0/go.mod h1:PXapW0E1vEAW2v0tVQonmJusk5psmkAuGCdTpFi2rDQ= @@ -2000,8 +2000,8 @@ github.com/signalfx/sapm-proto v0.4.0/go.mod h1:x3gtwJ1GRejtkghB4nYpwixh2zqJrLbP github.com/signalfx/sapm-proto v0.7.2/go.mod h1:HLufOh6Gd2altGxbeve+s6hh0EWCWoOM7MmuYuvs5PI= github.com/signalfx/sapm-proto v0.11.0 h1:TIbJNKJ/J00yyASLlbF1DlVZv+X1bY4/BiaYSU7wfxc= github.com/signalfx/sapm-proto v0.11.0/go.mod h1:bYZgdl2ZoMriE4arrRThWH8M6DkVbN7+xsxg4v2HP8Q= -github.com/signalfx/signalfx-agent v1.0.1-0.20220810191306-a41fb5c94d53 h1:A+pCo4BzlS0xBq2tc7nGGiAqyjq84h6896thPaL2Uqs= -github.com/signalfx/signalfx-agent v1.0.1-0.20220810191306-a41fb5c94d53/go.mod h1:NEJ85TpSB1UyFNbWqfBq7zh1HnbNTK/i9cgXussYMXE= +github.com/signalfx/signalfx-agent v1.0.1-0.20220901141412-c14862a155e5 h1:jOCjhUfMwsl81K2nX0Nccvf2vGo/HwGHsaKVMyIvEFw= +github.com/signalfx/signalfx-agent v1.0.1-0.20220901141412-c14862a155e5/go.mod h1:NwWDbguy1q9iKhzxgU6FOylCmni4y/738KoNkuJ1Ea0= github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20220810191306-a41fb5c94d53 h1:mCPfYCY4wOBzbFAWIK0WmjUO8eKJZHzIP0EquzbZJ0o= github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20220810191306-a41fb5c94d53/go.mod h1:II1zi/nz5Af7ep689U012sr0HD9vRShFKaAjw39D+7g= github.com/signalfx/signalfx-go v1.23.0 h1:gWLOw2TuYckzzqQ6/aMWrKypNLIzx5s2XwkINw5m+Ck=