Skip to content

Commit 492a5e2

Browse files
MrAliasMrAlias
committed
Merge branch 'main' into splunksqlx
2 parents 8357066 + 14f012e commit 492a5e2

File tree

45 files changed

+3091
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3091
-62
lines changed

‎.github/dependabot.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ updates:
1010
directory: "/"
1111
schedule:
1212
interval: "daily"
13+
- package-ecosystem: "gomod"
14+
directory: "/build"
15+
schedule:
16+
interval: "daily"
1317
- package-ecosystem: "gomod"
1418
directory: "/instrumentation/database/sql/splunksql"
1519
schedule:
@@ -18,10 +22,34 @@ updates:
1822
directory: "/instrumentation/database/sql/splunksql/test"
1923
schedule:
2024
interval: "daily"
25+
- package-ecosystem: "gomod"
26+
directory: "/instrumentation/github.com/go-sql-driver/mysql/splunkmysql"
27+
schedule:
28+
interval: "daily"
29+
- package-ecosystem: "gomod"
30+
directory: "/instrumentation/github.com/go-sql-driver/mysql/splunkmysql/test"
31+
schedule:
32+
interval: "daily"
33+
- package-ecosystem: "gomod"
34+
directory: "/instrumentation/github.com/jackc/pgx/splunkpgx"
35+
schedule:
36+
interval: "daily"
37+
- package-ecosystem: "gomod"
38+
directory: "/instrumentation/github.com/jackc/pgx/splunkpgx/test"
39+
schedule:
40+
interval: "daily"
2141
- package-ecosystem: "gomod"
2242
directory: "/instrumentation/github.com/jmoiron/sqlx/splunksqlx"
2343
schedule:
2444
interval: "daily"
45+
- package-ecosystem: "gomod"
46+
directory: "/instrumentation/github.com/lib/pq/splunkpq"
47+
schedule:
48+
interval: "daily"
49+
- package-ecosystem: "gomod"
50+
directory: "/instrumentation/github.com/lib/pq/splunkpq/test"
51+
schedule:
52+
interval: "daily"
2553
- package-ecosystem: "gomod"
2654
directory: "/instrumentation/net/http/splunkhttp"
2755
schedule:

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,25 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
88

99
## [Unreleased]
1010

11+
### Added
12+
13+
- Add the
14+
`github.com/signalfx/splunk-otel-go/instrumentation/github.com/go-sql-driver/mysql/splunkmysql`
15+
instrumentation for the `github.com/go-sql-driver/mysql` package. (#90)
16+
- Add the
17+
`github.com/signalfx/splunk-otel-go/instrumentation/github.com/jackc/pgx/splunkpgx`
18+
instrumentation for the `github.com/jackc/pgx` package. (#91)
19+
- Add the
20+
`github.com/signalfx/splunk-otel-go/instrumentation/github.com/lib/pq/splunkpq`
21+
instrumentation for the `github.com/lib/pq` package. (#92)
22+
23+
### Changed
24+
25+
- Update `go.opentelemetry.io/otel*` dependencies from [`v1.0.0-RC3`][otel-v1.0.0-RC3]
26+
to [`v1.0.0`][otel-v1.0.0].
27+
- Update `go.opentelemetry.io/contrib*` dependencies from [`v0.23.0`][contrib-v0.23.0]
28+
to [`v0.24.0`][contrib-v0.24.0].
29+
1130
## [0.6.0] - 2021-09-13
1231

1332
The primary change of this release is updating `go.opentelemetry.io/otel*`
@@ -111,12 +130,14 @@ an impedance mismatch with this duplicate batching.
111130
[0.2.0]: https://github.com/signalfx/splunk-otel-go/releases/tag/v0.2.0
112131
[0.1.0]: https://github.com/signalfx/splunk-otel-go/releases/tag/v0.1.0
113132

133+
[otel-v1.0.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.0.0
114134
[otel-v1.0.0-RC3]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.0.0-RC3
115135
[otel-v1.0.0-RC2]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.0.0-RC2
116136
[otel-v1.0.0-RC1]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.0.0-RC1
117137
[otel-v0.20.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v0.20.0
118138
[otel-v0.19.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v0.19.0
119139

140+
[contrib-v0.24.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.24.0
120141
[contrib-v0.23.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.23.0
121142
[contrib-v0.22.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.22.0
122143
[contrib-v0.21.0]: https://github.com/open-telemetry/opentelemetry-go-contrib/releases/tag/v0.21.0

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Q = $(if $(filter 1,$V),,@)
2828
ALL_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort )
2929
# All directories with go.mod files related to opentelemetry library. Used for building, testing and linting.
3030
ALL_GO_MOD_DIRS := $(filter-out $(BUILD_DIR), $(ALL_MODULES))
31-
# All directories sub-modules. Used for tagging and generating dependabot config.
31+
# All directories sub-modules. Used for tagging.
3232
SUBMODULES = $(filter-out ., $(ALL_GO_MOD_DIRS))
3333

3434
.DEFAULT_GOAL := goyek
@@ -101,7 +101,7 @@ gendependabot: # generate dependabot.yml
101101
@printf " - package-ecosystem: \"github-actions\"\n directory: \"/\"\n schedule:\n interval: \"daily\"\n" >> ${DEPENDABOT_PATH}
102102
@echo "Add entry for \"/\""
103103
@printf " - package-ecosystem: \"gomod\"\n directory: \"/\"\n schedule:\n interval: \"daily\"\n" >> ${DEPENDABOT_PATH}
104-
@set -e; for dir in $(SUBMODULES); do \
104+
@set -e; for dir in $(filter-out ., $(ALL_MODULES)); do \
105105
(echo "Add entry for \"$${dir:1}\"" && \
106106
printf " - package-ecosystem: \"gomod\"\n directory: \"$${dir:1}\"\n schedule:\n interval: \"daily\"\n" >> ${DEPENDABOT_PATH} ); \
107107
done

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ Additional recommended Splunk specific instrumentations:
103103
- [`splunksql`](./instrumentation/database/sql/splunksql)
104104
- [`splunksqlx`](./instrumentation/github.com/jmoiron/sqlx/splunksqlx)
105105
- [`splunkhttp`](./instrumentation/net/http/splunkhttp)
106+
- [`splunkmysql`](./instrumentation/github.com/go-sql-driver/mysql/splunkmysql)
107+
- [`splunkpgx`](./instrumentation/github.com/jackc/pgx/splunkpgx)
108+
- [`splunkpq`](./instrumentation/github.com/lib/pq/splunkpq)
106109
107110
## Manual Instrumentation
108111

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.15
44

55
require (
66
github.com/stretchr/testify v1.7.0
7-
go.opentelemetry.io/contrib/propagators/b3 v0.23.0
8-
go.opentelemetry.io/otel v1.0.0-RC3
9-
go.opentelemetry.io/otel/exporters/jaeger v1.0.0-RC3
10-
go.opentelemetry.io/otel/sdk v1.0.0-RC3
7+
go.opentelemetry.io/contrib/propagators/b3 v0.24.0
8+
go.opentelemetry.io/otel v1.0.0
9+
go.opentelemetry.io/otel/exporters/jaeger v1.0.0
10+
go.opentelemetry.io/otel/sdk v1.0.0
1111
)

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
88
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
99
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
1010
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
11-
go.opentelemetry.io/contrib/propagators/b3 v0.23.0 h1:sxitmDBHZS3Z2lw81kDntCRFt4dQglu9EOhBPNHN9CY=
12-
go.opentelemetry.io/contrib/propagators/b3 v0.23.0/go.mod h1:tAJUf0uW1xrgQ1QgOZqLXFbn3DNFO4tTmh0Nqe3kSzw=
13-
go.opentelemetry.io/otel v1.0.0-RC3 h1:kvwiyEkiUT/JaadXzVLI/R1wDO934A7r3Bs2wEe6wqA=
14-
go.opentelemetry.io/otel v1.0.0-RC3/go.mod h1:Ka5j3ua8tZs4Rkq4Ex3hwgBgOchyPVq5S6P2lz//nKQ=
15-
go.opentelemetry.io/otel/exporters/jaeger v1.0.0-RC3 h1:pKXuRvOc+5NgM0vv05PVIUetreuM57mcC6QQAKkcqZA=
16-
go.opentelemetry.io/otel/exporters/jaeger v1.0.0-RC3/go.mod h1:UbP19Xlhk9tcRZ+A3PfvyN5ld4X4YrSnzXaYzx1yNLc=
17-
go.opentelemetry.io/otel/sdk v1.0.0-RC3 h1:iRMkET+EmJUn5mW0hJzygBraXRmrUwzbOtNvTCh/oKs=
18-
go.opentelemetry.io/otel/sdk v1.0.0-RC3/go.mod h1:78H6hyg2fka0NYT9fqGuFLvly2yCxiBXDJAgLKo/2Us=
19-
go.opentelemetry.io/otel/trace v1.0.0-RC3 h1:9F0ayEvlxv8BmNmPbU005WK7hC+7KbOazCPZjNa1yME=
20-
go.opentelemetry.io/otel/trace v1.0.0-RC3/go.mod h1:VUt2TUYd8S2/ZRX09ZDFZQwn2RqfMB5MzO17jBojGxo=
11+
go.opentelemetry.io/contrib/propagators/b3 v0.24.0 h1:pY3a0R/fP8Zrxcq6cQ3GtdtUGhNLjj5rEOZXG2BUWTA=
12+
go.opentelemetry.io/contrib/propagators/b3 v0.24.0/go.mod h1:8zejVdED2pabka2VLti4kussRPFgSkRUv3JUSbljn1E=
13+
go.opentelemetry.io/otel v1.0.0 h1:qTTn6x71GVBvoafHK/yaRUmFzI4LcONZD0/kXxl5PHI=
14+
go.opentelemetry.io/otel v1.0.0/go.mod h1:AjRVh9A5/5DE7S+mZtTR6t8vpKKryam+0lREnfmS4cg=
15+
go.opentelemetry.io/otel/exporters/jaeger v1.0.0 h1:cLhx8llHw02h5JTqGqaRbYn+QVKHmrzD9vEbKnSPk5U=
16+
go.opentelemetry.io/otel/exporters/jaeger v1.0.0/go.mod h1:q10N1AolE1JjqKrFJK2tYw0iZpmX+HBaXBtuCzRnBGQ=
17+
go.opentelemetry.io/otel/sdk v1.0.0 h1:BNPMYUONPNbLneMttKSjQhOTlFLOD9U22HNG1KrIN2Y=
18+
go.opentelemetry.io/otel/sdk v1.0.0/go.mod h1:PCrDHlSy5x1kjezSdL37PhbFUMjrsLRshJ2zCzeXwbM=
19+
go.opentelemetry.io/otel/trace v1.0.0 h1:TSBr8GTEtKevYMG/2d21M989r5WJYVimhTHBKVEZuh4=
20+
go.opentelemetry.io/otel/trace v1.0.0/go.mod h1:PXTWqayeFUlJV1YDNhsJYB184+IvAH814St6o6ajzIs=
2121
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 h1:iGu644GcxtEcrInvDsQRCwJjtCIOlT2V7IRt6ah2Whw=
2222
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2323
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=

‎instrumentation/database/sql/splunksql/config.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,19 @@ func withRegistrationConfig(regCfg InstrumentationConfig, dsn string) Option {
156156
if regCfg.DSNParser != nil {
157157
var err error
158158
connCfg, err = regCfg.DSNParser(dsn)
159-
otel.Handle(err)
159+
if err != nil {
160+
otel.Handle(err)
161+
}
160162
} else {
161163
// Fallback. This is a best effort attempt if we do not know how to
162164
// explicitly parse the DSN.
163165
connCfg, _ = urlDSNParse(dsn)
164166
}
165167

166168
attrs, err := connCfg.Attributes()
167-
otel.Handle(err)
169+
if err != nil {
170+
otel.Handle(err)
171+
}
168172
attrs = append(attrs, regCfg.DBSystem.Attribute())
169173

170174
return optionFunc(func(c *traceConfig) {

‎instrumentation/database/sql/splunksql/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql
33
go 1.15
44

55
require (
6-
github.com/signalfx/splunk-otel-go v0.5.0
6+
github.com/signalfx/splunk-otel-go v0.6.0
77
github.com/stretchr/testify v1.7.0
8-
go.opentelemetry.io/otel v1.0.0-RC3
9-
go.opentelemetry.io/otel/trace v1.0.0-RC3
8+
go.opentelemetry.io/otel v1.0.0
9+
go.opentelemetry.io/otel/trace v1.0.0
1010
)
1111

1212
replace github.com/signalfx/splunk-otel-go => ../../../../

‎instrumentation/database/sql/splunksql/go.sum

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
77
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
88
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
99
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
10-
go.opentelemetry.io/contrib/propagators/b3 v0.23.0/go.mod h1:tAJUf0uW1xrgQ1QgOZqLXFbn3DNFO4tTmh0Nqe3kSzw=
11-
go.opentelemetry.io/otel v1.0.0-RC3 h1:kvwiyEkiUT/JaadXzVLI/R1wDO934A7r3Bs2wEe6wqA=
12-
go.opentelemetry.io/otel v1.0.0-RC3/go.mod h1:Ka5j3ua8tZs4Rkq4Ex3hwgBgOchyPVq5S6P2lz//nKQ=
13-
go.opentelemetry.io/otel/exporters/jaeger v1.0.0-RC3/go.mod h1:UbP19Xlhk9tcRZ+A3PfvyN5ld4X4YrSnzXaYzx1yNLc=
14-
go.opentelemetry.io/otel/sdk v1.0.0-RC3/go.mod h1:78H6hyg2fka0NYT9fqGuFLvly2yCxiBXDJAgLKo/2Us=
15-
go.opentelemetry.io/otel/trace v1.0.0-RC3 h1:9F0ayEvlxv8BmNmPbU005WK7hC+7KbOazCPZjNa1yME=
16-
go.opentelemetry.io/otel/trace v1.0.0-RC3/go.mod h1:VUt2TUYd8S2/ZRX09ZDFZQwn2RqfMB5MzO17jBojGxo=
10+
go.opentelemetry.io/contrib/propagators/b3 v0.24.0/go.mod h1:8zejVdED2pabka2VLti4kussRPFgSkRUv3JUSbljn1E=
11+
go.opentelemetry.io/otel v1.0.0 h1:qTTn6x71GVBvoafHK/yaRUmFzI4LcONZD0/kXxl5PHI=
12+
go.opentelemetry.io/otel v1.0.0/go.mod h1:AjRVh9A5/5DE7S+mZtTR6t8vpKKryam+0lREnfmS4cg=
13+
go.opentelemetry.io/otel/exporters/jaeger v1.0.0/go.mod h1:q10N1AolE1JjqKrFJK2tYw0iZpmX+HBaXBtuCzRnBGQ=
14+
go.opentelemetry.io/otel/sdk v1.0.0/go.mod h1:PCrDHlSy5x1kjezSdL37PhbFUMjrsLRshJ2zCzeXwbM=
15+
go.opentelemetry.io/otel/trace v1.0.0 h1:TSBr8GTEtKevYMG/2d21M989r5WJYVimhTHBKVEZuh4=
16+
go.opentelemetry.io/otel/trace v1.0.0/go.mod h1:PXTWqayeFUlJV1YDNhsJYB184+IvAH814St6o6ajzIs=
1717
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1818
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
1919
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎instrumentation/database/sql/splunksql/test/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql
33
go 1.15
44

55
require (
6-
github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql v0.0.0-00010101000000-000000000000
6+
github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql v0.0.0-20210921155913-50ba051311e1
77
github.com/stretchr/testify v1.7.0
8-
go.opentelemetry.io/otel v1.0.0-RC3
9-
go.opentelemetry.io/otel/sdk v1.0.0-RC3
10-
go.opentelemetry.io/otel/trace v1.0.0-RC3
8+
go.opentelemetry.io/otel v1.0.0
9+
go.opentelemetry.io/otel/sdk v1.0.0
10+
go.opentelemetry.io/otel/trace v1.0.0
1111
)
1212

1313
replace github.com/signalfx/splunk-otel-go/instrumentation/database/sql/splunksql => ../

0 commit comments

Comments
 (0)