Move instrumentation to conform specification

open-telemetry · Jan 4, 2021 · 0dd02ce · 0dd02ce
1 parent e1af286
commit 0dd02ce
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 232 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -457,7 +457,7 @@ updates:
       interval: "weekly"
       day: "sunday"
   - package-ecosystem: "gomod"
-    directory: "/instrumentation/database/sql"
+    directory: "/instrumentation/database/sql/otelsql"
     labels:
     - dependencies
     - go
@@ -466,7 +466,7 @@ updates:
       interval: "weekly"
       day: "sunday"
   - package-ecosystem: "gomod"
-    directory: "/instrumentation/database/sql/example"
+    directory: "/instrumentation/database/sql/otelsql/example"
     labels:
     - dependencies
     - go

diff --git a/instrumentation/README.md b/instrumentation/README.md
@@ -23,7 +23,7 @@ The following instrumentation packages are provided for popular Go packages and
 | [net/http](./net/http/otelhttp) | ✓ | ✓ |
 | [net/http/httptrace](./net/http/httptrace/otelhttptrace) |  | ✓ |
 | [runtime](./runtime) | ✓ |  |
-| [database/sql](./database/sql) |  | ✓ |
+| [database/sql](./database/sql/otelsql) |  | ✓ |
 
 
 Additionally, these are the known instrumentation packages that exist outside of this repository for popular Go packages.

diff --git a/instrumentation/database/sql/example/Dockerfile b/instrumentation/database/sql/example/Dockerfile
diff --git a/instrumentation/database/sql/example/README.md b/instrumentation/database/sql/example/README.md
diff --git a/instrumentation/database/sql/example/docker-compose.yml b/instrumentation/database/sql/example/docker-compose.yml
diff --git a/instrumentation/database/sql/example/go.mod b/instrumentation/database/sql/example/go.mod
diff --git a/instrumentation/database/sql/example/go.sum b/instrumentation/database/sql/example/go.sum
diff --git a/instrumentation/database/sql/example/main.go b/instrumentation/database/sql/example/main.go
diff --git a/instrumentation/database/sql/go.mod b/instrumentation/database/sql/go.mod
diff --git a/instrumentation/database/sql/config.go → ...umentation/database/sql/otelsql/config.go b/instrumentation/database/sql/config.go → ...umentation/database/sql/otelsql/config.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	instrumentationName = "go.opentelemetry.io/contrib/instrumentation/database/sql"
+	instrumentationName = "go.opentelemetry.io/contrib/instrumentation/database/sql/otelsql"
 )
 
 // SpanNameFormatter is an interface that used to format span names.

diff --git a/instrumentation/database/sql/conn.go → instrumentation/database/sql/otelsql/conn.go b/instrumentation/database/sql/conn.go → instrumentation/database/sql/otelsql/conn.go
diff --git a/instrumentation/database/sql/connector.go → ...ntation/database/sql/otelsql/connector.go b/instrumentation/database/sql/connector.go → ...ntation/database/sql/otelsql/connector.go
diff --git a/instrumentation/database/sql/doc.go → instrumentation/database/sql/otelsql/doc.go b/instrumentation/database/sql/doc.go → instrumentation/database/sql/otelsql/doc.go
@@ -16,4 +16,4 @@
 //
 // otelsql will trace every interface from database/sql/driver package
 // which has context except driver.Pinger.
-package otelsql // import "go.opentelemetry.io/contrib/instrumentation/database/sql"
+package otelsql // import "go.opentelemetry.io/contrib/instrumentation/database/sql/otelsql"
diff --git a/instrumentation/database/sql/driver.go → ...umentation/database/sql/otelsql/driver.go b/instrumentation/database/sql/driver.go → ...umentation/database/sql/otelsql/driver.go
diff --git a/instrumentation/database/sql/otelsql/go.mod b/instrumentation/database/sql/otelsql/go.mod
@@ -0,0 +1,10 @@
+module go.opentelemetry.io/contrib/instrumentation/database/sql/otelsql
+
+go 1.15
+
+replace go.opentelemetry.io/contrib => ../../../../
+
+require (
+	go.opentelemetry.io/contrib v0.15.1
+	go.opentelemetry.io/otel v0.15.0
+)
diff --git a/instrumentation/database/sql/go.sum → instrumentation/database/sql/otelsql/go.sum b/instrumentation/database/sql/go.sum → instrumentation/database/sql/otelsql/go.sum
diff --git a/instrumentation/database/sql/methods.go → ...mentation/database/sql/otelsql/methods.go b/instrumentation/database/sql/methods.go → ...mentation/database/sql/otelsql/methods.go
diff --git a/instrumentation/database/sql/option.go → ...umentation/database/sql/otelsql/option.go b/instrumentation/database/sql/option.go → ...umentation/database/sql/otelsql/option.go
diff --git a/instrumentation/database/sql/sql.go → instrumentation/database/sql/otelsql/sql.go b/instrumentation/database/sql/sql.go → instrumentation/database/sql/otelsql/sql.go
diff --git a/instrumentation/database/sql/stmt.go → instrumentation/database/sql/otelsql/stmt.go b/instrumentation/database/sql/stmt.go → instrumentation/database/sql/otelsql/stmt.go
diff --git a/instrumentation/database/sql/tx.go → instrumentation/database/sql/otelsql/tx.go b/instrumentation/database/sql/tx.go → instrumentation/database/sql/otelsql/tx.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ import ( @@
     )
     const (
-    	instrumentationName = "go.opentelemetry.io/contrib/instrumentation/database/sql"
+    	instrumentationName = "go.opentelemetry.io/contrib/instrumentation/database/sql/otelsql"
     )
     // SpanNameFormatter is an interface that used to format span names.
@@ Expand Down @@