Repository: honeycombio/refinery
Pull request #603 (2023-02-01 11:01:26)

maint(deps): bump github.com/honeycombio/husky from 0.17.0 to 0.19.0
Bumps [github.com/honeycombio/husky](https://github.com/honeycombio/husky) from 0.17.0 to 0.19.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/honeycombio/husky/releases">github.com/honeycombio/husky's releases</a>.</em></p>
<blockquote>
<h2>v0.19.0</h2>
<h3>Enhancements</h3>
<ul>
<li>Add error field to events/links on spans that are error spans (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/159">#159</a>) | <a href="https://github.com/cartermp"><code>@​cartermp</code></a></li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Makes husky compatible with OTel SDK (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/161">#161</a>) | <a href="https://github.com/maxedmands"><code>@​maxedmands</code></a></li>
</ul>
<h3>Maintenance</h3>
<ul>
<li>Make dependabot titles work better (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/157">#157</a>) | <a href="https://github.com/kentquirk"><code>@​kentquirk</code></a></li>
<li>Update validate PR title workflow (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/152">#152</a>) | <a href="https://github.com/pkanal"><code>@​pkanal</code></a></li>
<li>Validate PR title (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/151">#151</a>) | <a href="https://github.com/pkanal"><code>@​pkanal</code></a></li>
</ul>
<h2>v0.18.0</h2>
<h2>0.18.0 2022-11-07</h2>
<h3>🐛 Fixed</h3>
<ul>
<li>Fix kvlist and byte arrays marshalling by <a href="https://github.com/kentquirk"><code>@​kentquirk</code></a> in <a href="https://github-redirect.dependabot.com/honeycombio/husky/pull/145">honeycombio/husky#145</a></li>
</ul>
<h3>🛠 Maintenance</h3>
<ul>
<li>maint: delete workflows for old board by <a href="https://github.com/vreynolds"><code>@​vreynolds</code></a> in <a href="https://github-redirect.dependabot.com/honeycombio/husky/pull/139">honeycombio/husky#139</a></li>
<li>maint: add release file by <a href="https://github.com/vreynolds"><code>@​vreynolds</code></a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/honeycombio/husky/compare/v0.17.0...v0.18.0">https://github.com/honeycombio/husky/compare/v0.17.0...v0.18.0</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/honeycombio/husky/blob/main/CHANGELOG.md">github.com/honeycombio/husky's changelog</a>.</em></p>
<blockquote>
<h2>0.19.0 2023-01-13</h2>
<h3>Enhancements</h3>
<ul>
<li>Add error field to events/links on spans that are error spans (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/159">#159</a>) | <a href="https://github.com/cartermp"><code>@​cartermp</code></a></li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Makes husky compatible with OTel SDK (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/161">#161</a>) | <a href="https://github.com/maxedmands"><code>@​maxedmands</code></a></li>
</ul>
<h3>Maintenance</h3>
<ul>
<li>Make dependabot titles work better (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/157">#157</a>) | <a href="https://github.com/kentquirk"><code>@​kentquirk</code></a></li>
<li>Update validate PR title workflow (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/152">#152</a>) | <a href="https://github.com/pkanal"><code>@​pkanal</code></a></li>
<li>Validate PR title (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/151">#151</a>) | <a href="https://github.com/pkanal"><code>@​pkanal</code></a></li>
</ul>
<h2>0.18.0 2022-11-07</h2>
<h3>Fixed</h3>
<ul>
<li>Fix kvlist and byte arrays marshalling (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/145">#145</a>) | <a href="https://github.com/kentquirk"><code>@​kentquirk</code></a></li>
</ul>
<h3>Maintenance</h3>
<ul>
<li>maint: delete workflows for old board (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/139">#139</a>) | <a href="https://github.com/vreynolds"><code>@​vreynolds</code></a></li>
<li>maint: add release file (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/138">#138</a>) | <a href="https://github.com/vreynolds"><code>@​vreynolds</code></a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/honeycombio/husky/commit/1bd98ce517cfad849d7a76e07a0b210afb0121f8"><code>1bd98ce</code></a> rel: Prepare v0.19.0 release (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/164">#164</a>)</li>
<li><a href="https://github.com/honeycombio/husky/commit/63faabec62e46c15a91743606a64ec9ca5bb27f3"><code>63faabe</code></a> fix: Makes husky compatible with OTel SDK (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/161">#161</a>)</li>
<li><a href="https://github.com/honeycombio/husky/commit/2db06ce36b499b372274f0a777fda12ac75dd69c"><code>2db06ce</code></a> feat: Add error field to events/links on spans that are error spans (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/159">#159</a>)</li>
<li><a href="https://github.com/honeycombio/husky/commit/bf7136d3f2ea4b3946ae5965d3babbff1543c089"><code>bf7136d</code></a> chore: Make dependabot titles work better (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/157">#157</a>)</li>
<li><a href="https://github.com/honeycombio/husky/commit/c4d23a083fbe9cb959b9a659b0a202532ffb54fa"><code>c4d23a0</code></a> ci: update validate PR title workflow (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/152">#152</a>)</li>
<li><a href="https://github.com/honeycombio/husky/commit/e2065c8265a189141c72861d6d51ecf1641ab803"><code>e2065c8</code></a> ci: validate PR title (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/151">#151</a>)</li>
<li><a href="https://github.com/honeycombio/husky/commit/01b7a182dc164dbaa2f3ec33f7730bad74b2fad2"><code>01b7a18</code></a> release: v0.18.0 (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/149">#149</a>)</li>
<li><a href="https://github.com/honeycombio/husky/commit/5cb3ccfa7ed9679e98ef181d23cde791e4e47d93"><code>5cb3ccf</code></a> Fix kvlist and byte arrays marshalling (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/145">#145</a>)</li>
<li><a href="https://github.com/honeycombio/husky/commit/baf6ae370a6eb95b939a33b5058fc1a6f296eaf7"><code>baf6ae3</code></a> maint: delete workflows for old board (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/139">#139</a>)</li>
<li><a href="https://github.com/honeycombio/husky/commit/4722e4af8e9cfc407bd376b4029d7d517d3df700"><code>4722e4a</code></a> maint: add release file (<a href="https://github-redirect.dependabot.com/honeycombio/husky/issues/138">#138</a>)</li>
<li>See full diff in <a href="https://github.com/honeycombio/husky/compare/v0.17.0...v0.19.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/honeycombio/husky&package-manager=go_modules&previous-version=0.17.0&new-version=0.19.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>


Patch:
diff --git a/go.mod b/go.mod
index 8771286..0002268 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/honeycombio/dynsampler-go v0.3.0
-	github.com/honeycombio/husky v0.17.0
+	github.com/honeycombio/husky v0.19.0
 	github.com/honeycombio/libhoney-go v1.18.0
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/json-iterator/go v1.1.12
@@ -28,6 +28,7 @@ require (
 	github.com/stretchr/testify v1.8.1
 	github.com/tidwall/gjson v1.14.4
 	github.com/vmihailenco/msgpack/v4 v4.3.11
+	go.opentelemetry.io/proto/otlp v0.19.0
 	google.golang.org/grpc v1.52.3
 	google.golang.org/protobuf v1.28.1
 	gopkg.in/alexcesaro/statsd.v2 v2.0.0
@@ -76,3 +77,5 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace go.opentelemetry.io/proto/otlp => github.com/honeycombio/opentelemetry-proto-go/otlp v0.19.0-compat
diff --git a/go.sum b/go.sum
index 602db63..8044ef6 100644
--- a/go.sum
+++ b/go.sum
@@ -188,10 +188,12 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/honeycombio/dynsampler-go v0.3.0 h1:JttJgzOgFphbPLdsXhnNhBOqOQw89iwQbTasu3ZgLlE=
 github.com/honeycombio/dynsampler-go v0.3.0/go.mod h1:cwCXnr2kvMGtZk3+HaaKbnLym+cJduB6tiukUOyotxU=
-github.com/honeycombio/husky v0.17.0 h1:Or5DuZ+jEoO7SYblGyxnBI7vRNhs2xq83jaLOBcHkIQ=
-github.com/honeycombio/husky v0.17.0/go.mod h1:oR3+rfUql/AlYk/RY4ougzXSKvDGtmeIVGac0nK0qOs=
+github.com/honeycombio/husky v0.19.0 h1:AEJUP+7MIkKij08bKaiA0iS1MSJrfZzyyqTw+XVhAlc=
+github.com/honeycombio/husky v0.19.0/go.mod h1:q3mqYSL1/0Vjd2AIReV2QisUQCsH+ahUU0ILwuIJ5f0=
 github.com/honeycombio/libhoney-go v1.18.0 h1:OYHOP381r3Ea76BhUYeza8PUTMDp8MByoOxDn3qtEq8=
 github.com/honeycombio/libhoney-go v1.18.0/go.mod h1:KwbcXkqUbH20x3MpfSt/kdvlog3FFdEnouqYD3XKXLY=
+github.com/honeycombio/opentelemetry-proto-go/otlp v0.19.0-compat h1:fMpIzVAl5C260HisnRWV//vfckZIC4qvn656M3VLLOY=
+github.com/honeycombio/opentelemetry-proto-go/otlp v0.19.0-compat/go.mod h1:mC2aK20Z/exugKpqCgcpwEadiS0im8K6mZsD4Is/hCY=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
diff --git a/route/otlp_trace.go b/route/otlp_trace.go
index f4e86c4..6b75b29 100644
--- a/route/otlp_trace.go
+++ b/route/otlp_trace.go
@@ -8,7 +8,7 @@ import (
 	huskyotlp "github.com/honeycombio/husky/otlp"
 	"github.com/honeycombio/refinery/types"
 
-	collectortrace "github.com/honeycombio/husky/proto/otlp/collector/trace/v1"
+	collectortrace "go.opentelemetry.io/proto/otlp/collector/trace/v1"
 )
 
 func (router *Router) postOTLP(w http.ResponseWriter, req *http.Request) {
diff --git a/route/route.go b/route/route.go
index 4eeb8e2..670b9c3 100644
--- a/route/route.go
+++ b/route/route.go
@@ -39,7 +39,7 @@ import (
 	"github.com/honeycombio/refinery/transmit"
 	"github.com/honeycombio/refinery/types"
 
-	collectortrace "github.com/honeycombio/husky/proto/otlp/collector/trace/v1"
+	collectortrace "go.opentelemetry.io/proto/otlp/collector/trace/v1"
 )
 
 const (


Test patch:
diff --git a/route/otlp_trace_test.go b/route/otlp_trace_test.go
index bd1adde..caf9bf2 100644
--- a/route/otlp_trace_test.go
+++ b/route/otlp_trace_test.go
@@ -12,16 +12,16 @@ import (
 	"time"
 
 	huskyotlp "github.com/honeycombio/husky/otlp"
-	collectortrace "github.com/honeycombio/husky/proto/otlp/collector/trace/v1"
-	common "github.com/honeycombio/husky/proto/otlp/common/v1"
-	resource "github.com/honeycombio/husky/proto/otlp/resource/v1"
-	trace "github.com/honeycombio/husky/proto/otlp/trace/v1"
 	"github.com/honeycombio/refinery/config"
 	"github.com/honeycombio/refinery/logger"
 	"github.com/honeycombio/refinery/metrics"
 	"github.com/honeycombio/refinery/transmit"
 	"github.com/klauspost/compress/zstd"
 	"github.com/stretchr/testify/assert"
+	collectortrace "go.opentelemetry.io/proto/otlp/collector/trace/v1"
+	common "go.opentelemetry.io/proto/otlp/common/v1"
+	resource "go.opentelemetry.io/proto/otlp/resource/v1"
+	trace "go.opentelemetry.io/proto/otlp/trace/v1"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"