From 10f52bd3e0c92b0262775be34d364e5d29eb61e4 Mon Sep 17 00:00:00 2001
From: Jason Harley <jason@honeycomb.io>
Date: Thu, 29 Feb 2024 12:04:00 -0500
Subject: [PATCH] feat: support classic Ingest Keys

---
 beeline.go | 8 ++++----
 go.mod     | 2 +-
 go.sum     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/beeline.go b/beeline.go
index ddb1a555..92957358 100644
--- a/beeline.go
+++ b/beeline.go
@@ -101,8 +101,7 @@ type Config struct {
 }
 
 func IsClassicKey(config Config) bool {
-	// classic key has 32 characters
-	return len(config.WriteKey) == 32
+	return (&libhoney.Config{APIKey: config.WriteKey}).IsClassic()
 }
 
 // Init intializes the honeycomb instrumentation library.
@@ -113,6 +112,7 @@ func Init(config Config) {
 		fmt.Fprintln(os.Stderr, "WARN: Missing API Key.")
 		config.WriteKey = defaultWriteKey
 	}
+	isClassicKey := IsClassicKey(config)
 
 	if config.ServiceName == "" {
 		fmt.Fprintln(os.Stderr, "WARN: Missing service name.")
@@ -127,7 +127,7 @@ func Init(config Config) {
 		}
 	}
 
-	if IsClassicKey(config) {
+	if isClassicKey {
 		// if classic and missing dataset, warn on that
 		if config.Dataset == "" {
 			fmt.Fprintln(os.Stderr, "WARN: Missing dataset. Data will be sent to:", defaultDatasetClassic)
@@ -237,7 +237,7 @@ func Init(config Config) {
 		trace.GlobalConfig.PresendHook = config.PresendHook
 	}
 	// if classic, propagate by default
-	if IsClassicKey(config) {
+	if isClassicKey {
 		propagation.GlobalConfig.PropagateDataset = true
 	} else {
 		// if non-classic, don't propagate by default
diff --git a/go.mod b/go.mod
index 5fcb925e..e6037138 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/gobuffalo/pop/v6 v6.1.1
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.1
-	github.com/honeycombio/libhoney-go v1.20.0
+	github.com/honeycombio/libhoney-go v1.21.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/labstack/echo/v4 v4.11.4
diff --git a/go.sum b/go.sum
index 4f0d4271..ec5639ea 100644
--- a/go.sum
+++ b/go.sum
@@ -105,8 +105,8 @@ github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/honeycombio/libhoney-go v1.20.0 h1:PL54R0P9vxIyb28H3twbLb+DCqQlJdMQM55VZg1abKA=
-github.com/honeycombio/libhoney-go v1.20.0/go.mod h1:RIaurCpfg5NDWSEV8t3QLcda9dUAiVNyWeHRAaSpN90=
+github.com/honeycombio/libhoney-go v1.21.0 h1:uiiSfUipFSrmBucKTrwD9Bm4K60kY98p0hVLjtSLseM=
+github.com/honeycombio/libhoney-go v1.21.0/go.mod h1:RIaurCpfg5NDWSEV8t3QLcda9dUAiVNyWeHRAaSpN90=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=