This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 153bbfb8af1 Fixed failed to compile Grafana plugin using the latest
version of SDK (#11274)
153bbfb8af1 is described below
commit 153bbfb8af1a0be12b1cab3d49483fb5ac42c0e3
Author: CloudWise-Lukemiao
<[email protected]>
AuthorDate: Wed Oct 11 14:32:54 2023 +0800
Fixed failed to compile Grafana plugin using the latest version of SDK
(#11274)
Co-authored-by: Cloudwise_Luke <[email protected]>
---
.github/workflows/grafana-plugin.yml | 5 ++
iotdb-connector/grafana-plugin/go.mod | 87 +++++++++++++++++++++-
.../grafana-plugin/pkg/plugin/plugin.go | 2 +-
3 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/grafana-plugin.yml
b/.github/workflows/grafana-plugin.yml
index 38f7757442e..2b3747d0cbd 100644
--- a/.github/workflows/grafana-plugin.yml
+++ b/.github/workflows/grafana-plugin.yml
@@ -31,6 +31,11 @@ jobs:
with:
node-version: "14.x"
+ - name: Setup Go environment
+ uses: actions/setup-go@v3
+ with:
+ go-version: "1.20"
+
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
diff --git a/iotdb-connector/grafana-plugin/go.mod
b/iotdb-connector/grafana-plugin/go.mod
index e6d4a76021b..10cf4e92adc 100644
--- a/iotdb-connector/grafana-plugin/go.mod
+++ b/iotdb-connector/grafana-plugin/go.mod
@@ -15,9 +15,90 @@
module github.com/grafana/grafana-starter-datasource-backend
-go 1.16
+go 1.20
+
+require github.com/grafana/grafana-plugin-sdk-go v0.179.0
require (
- github.com/grafana/grafana-plugin-sdk-go v0.139.0
- github.com/magefile/mage v1.13.0 // indirect
+ cloud.google.com/go/compute/metadata v0.2.3 // indirect
+ github.com/BurntSushi/toml v1.2.1 // indirect
+ github.com/apache/arrow/go/v13 v13.0.0 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/cheekybits/genny v1.0.0 // indirect
+ github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 //
indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+ github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 //
indirect
+ github.com/fatih/color v1.15.0 // indirect
+ github.com/getkin/kin-openapi v0.120.0 // indirect
+ github.com/go-logr/logr v1.2.4 // indirect
+ github.com/go-logr/stdr v1.2.2 // indirect
+ github.com/go-openapi/jsonpointer v0.19.6 // indirect
+ github.com/go-openapi/swag v0.22.4 // indirect
+ github.com/goccy/go-json v0.10.0 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
+ github.com/google/flatbuffers v23.1.21+incompatible // indirect
+ github.com/google/go-cmp v0.5.9 // indirect
+ github.com/google/uuid v1.3.0 // indirect
+ github.com/gorilla/mux v1.8.0 // indirect
+ github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
+ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
+ github.com/hashicorp/go-hclog v1.5.0 // indirect
+ github.com/hashicorp/go-plugin v1.4.9 // indirect
+ github.com/hashicorp/yamux v0.1.1 // indirect
+ github.com/invopop/yaml v0.2.0 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
+ github.com/json-iterator/go v1.1.12 // indirect
+ github.com/klauspost/compress v1.15.15 // indirect
+ github.com/klauspost/cpuid/v2 v2.2.3 // indirect
+ github.com/magefile/mage v1.15.0 // indirect
+ github.com/mailru/easyjson v0.7.7 // indirect
+ github.com/mattetti/filebuffer v1.0.1 // indirect
+ github.com/mattn/go-colorable v0.1.13 // indirect
+ github.com/mattn/go-isatty v0.0.18 // indirect
+ github.com/mattn/go-runewidth v0.0.9 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+ github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd //
indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+ github.com/oklog/run v1.1.0 // indirect
+ github.com/olekukonko/tablewriter v0.0.5 // indirect
+ github.com/perimeterx/marshmallow v1.1.5 // indirect
+ github.com/pierrec/lz4/v4 v4.1.17 // indirect
+ github.com/prometheus/client_golang v1.14.0 // indirect
+ github.com/prometheus/client_model v0.3.0 // indirect
+ github.com/prometheus/common v0.42.0 // indirect
+ github.com/prometheus/procfs v0.8.0 // indirect
+ github.com/russross/blackfriday/v2 v2.1.0 // indirect
+ github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
+ github.com/unknwon/com v1.0.1 // indirect
+ github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
+ github.com/urfave/cli v1.22.12 // indirect
+ github.com/zeebo/xxh3 v1.0.2 // indirect
+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.42.0 // indirect
+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace
v0.42.0 // indirect
+ go.opentelemetry.io/contrib/propagators/jaeger v1.17.0 // indirect
+ go.opentelemetry.io/otel v1.16.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 //
indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
// indirect
+ go.opentelemetry.io/otel/metric v1.16.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.16.0 // indirect
+ go.opentelemetry.io/otel/trace v1.16.0 // indirect
+ go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+ golang.org/x/mod v0.9.0 // indirect
+ golang.org/x/net v0.12.0 // indirect
+ golang.org/x/sys v0.12.0 // indirect
+ golang.org/x/text v0.11.0 // indirect
+ golang.org/x/tools v0.6.0 // indirect
+ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+ google.golang.org/genproto/googleapis/api
v0.0.0-20230731193218-e0aa005b6bdf // indirect
+ google.golang.org/genproto/googleapis/rpc
v0.0.0-20230731193218-e0aa005b6bdf // indirect
+ google.golang.org/grpc v1.57.0 // indirect
+ google.golang.org/protobuf v1.31.0 // indirect
+ gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/iotdb-connector/grafana-plugin/pkg/plugin/plugin.go
b/iotdb-connector/grafana-plugin/pkg/plugin/plugin.go
index cb9800e268a..a2e170f221d 100644
--- a/iotdb-connector/grafana-plugin/pkg/plugin/plugin.go
+++ b/iotdb-connector/grafana-plugin/pkg/plugin/plugin.go
@@ -52,7 +52,7 @@ var (
)
// ApacheIoTDBDatasource creates a new datasource instance.
-func ApacheIoTDBDatasource(d backend.DataSourceInstanceSettings)
(instancemgmt.Instance, error) {
+func ApacheIoTDBDatasource(ctx context.Context,d
backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
var dm dataSourceModel
if err := json.Unmarshal(d.JSONData, &dm); err != nil {
return nil, err
