feat: Initial OCI Wrapper/Queries

Author: cade-conklin

v3/integrations/nroci/example/oci-go-sdk/main.go

@@ -0,0 +1,86 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"os/user"
+	"path/filepath"
+	"time"
+
+	"github.com/newrelic/go-agent/v3/integrations/nroci"
+	"github.com/newrelic/go-agent/v3/newrelic"
+	"github.com/oracle/oci-go-sdk/common"
+	"github.com/oracle/oci-go-sdk/nosql"
+)
+
+func main() {
+	app, err := newrelic.NewApplication(
+		newrelic.ConfigAppName("Basic NOSQLOCI App"),
+		newrelic.ConfigLicense(os.Getenv("NEW_RELIC_LICENSE_KEY")),
+		newrelic.ConfigDebugLogger(os.Stdout),
+	)
+	if err != nil {
+		panic(err)
+	}
+	app.WaitForConnection(10 * time.Second) // for short lived processes in apps
+	defer app.Shutdown(10 * time.Second)
+
+	usr, _ := user.Current()
+	configPath := filepath.Join(usr.HomeDir, ".oci/config")
+	configProvider, err := common.ConfigurationProviderFromFile(configPath, "")
+
+	configWrapper, err := nroci.NRNewNoSQLClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		panic(err)
+	}
+
+	txn := app.StartTransaction("OCI NoSQL Transaction")
+
+	ctx := newrelic.NewContext(context.Background(), txn)
+
+	compartmentID := os.Getenv("COMPARTMENT_OCID")
+	statement := "SELECT * FROM audienceData1"
+	tableName := "audienceData1"
+
+	putReq := nosql.UpdateRowRequest{
+		TableNameOrId: &tableName,
+		UpdateRowDetails: nosql.UpdateRowDetails{
+			Value: map[string]interface{}{
+				"cookie_id": 123,
+				"audience_data": map[string]interface{}{
+					"ipaddr": "10.0.0.3",
+					"audience_segment": map[string]interface{}{
+						"sports_lover": "2018-11-30",
+						"book_reader":  "2018-12-01",
+					},
+				},
+			},
+			CompartmentId: &compartmentID,
+		},
+	}
+	queryReq := nosql.QueryRequest{
+		QueryDetails: nosql.QueryDetails{
+			CompartmentId: &compartmentID,
+			Statement:     &statement,
+		},
+	}
+	putRes, err := configWrapper.UpdateRow(ctx, &nroci.NoSQLClientRequestWrapper[nosql.UpdateRowRequest]{
+		ClientRequest: putReq,
+	})
+	if err != nil {
+		panic(err)
+	}
+	fmt.Printf("UpdateRow row: %v\nresult\n", putRes)
+
+	queryRes, err := configWrapper.Query(ctx, &nroci.NoSQLClientRequestWrapper[nosql.QueryRequest]{
+		ClientRequest: queryReq,
+	})
+
+	if err != nil {
+		panic(err)
+	}
+	fmt.Printf("QueryRow row: %v\nresult\n", queryRes)
+
+	txn.End()
+}

v3/integrations/nroci/nrocinosql_ocigosdk.go

@@ -0,0 +1,108 @@
+package nroci
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/newrelic/go-agent/v3/newrelic"
+	"github.com/oracle/oci-go-sdk/common"
+	"github.com/oracle/oci-go-sdk/nosql"
+)
+
+func init() {
+
+}
+
+type NoSQLClient interface {
+	Query(ctx context.Context, req nosql.QueryRequest) (nosql.QueryResponse, error)
+	UpdateRow(ctx context.Context, req nosql.UpdateRowRequest) (nosql.UpdateRowResponse, error)
+}
+
+type NoSQLClientWrapper struct {
+	Client NoSQLClient
+}
+
+type NoSQLClientRequestWrapper[R any] struct {
+	ClientRequest R
+}
+
+type NoSQLClientResponseWrapper[T any] struct {
+	ClientResponse T
+}
+
+func NRNewNoSQLClientWithConfigurationProvider(configProvider common.ConfigurationProvider) (*NoSQLClientWrapper, error) {
+	ociNoSQLClient, err := nosql.NewNosqlClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	return &NoSQLClientWrapper{
+		Client: ociNoSQLClient,
+	}, nil
+}
+
+func extractRequestFieldsOCI(req any) (string, string, string) {
+	var collection, statement, compartmentID string
+	switch r := req.(type) {
+	case nosql.QueryRequest:
+		// Could do FROM <table-name> type of parse?
+		if r.QueryDetails.CompartmentId != nil {
+			compartmentID = *r.QueryDetails.CompartmentId
+		}
+		if r.Statement != nil {
+			statement = *r.Statement
+		}
+	case nosql.UpdateRowRequest:
+		if r.TableNameOrId != nil {
+			collection = *r.TableNameOrId
+		}
+		if r.UpdateRowDetails.CompartmentId != nil {
+			compartmentID = *r.UpdateRowDetails.CompartmentId
+		}
+	default:
+		// keep strings empty
+	}
+	return collection, statement, compartmentID
+}
+
+func executeWithDatastoreSegmentOCI[T any, R any](
+	ctx context.Context,
+	rw *NoSQLClientRequestWrapper[R],
+	fn func() (T, error),
+) (*NoSQLClientResponseWrapper[T], error) {
+
+	txn := newrelic.FromContext(ctx)
+	if txn == nil {
+		return nil, fmt.Errorf("error executing OCI request, no transaction")
+	}
+
+	collection, statement, compartmentID := extractRequestFieldsOCI(rw.ClientRequest)
+	sgmt := newrelic.DatastoreSegment{
+		StartTime:          txn.StartSegmentNow(),
+		Product:            newrelic.DatastoreOracle,
+		ParameterizedQuery: statement,
+		Collection:         collection,
+		DatabaseName:       compartmentID,
+	}
+	res, err := fn()
+	if err != nil {
+		return nil, fmt.Errorf("error executing OCI requestL %s", err.Error())
+	}
+	responseWrapper := NoSQLClientResponseWrapper[T]{
+		ClientResponse: res,
+	}
+
+	sgmt.End()
+	return &responseWrapper, nil
+}
+
+func (cw *NoSQLClientWrapper) Query(ctx context.Context, req *NoSQLClientRequestWrapper[nosql.QueryRequest]) (*NoSQLClientResponseWrapper[nosql.QueryResponse], error) {
+	return executeWithDatastoreSegmentOCI(ctx, req, func() (nosql.QueryResponse, error) {
+		return cw.Client.Query(ctx, req.ClientRequest)
+	})
+}
+
+func (cw *NoSQLClientWrapper) UpdateRow(ctx context.Context, req *NoSQLClientRequestWrapper[nosql.UpdateRowRequest]) (*NoSQLClientResponseWrapper[nosql.UpdateRowResponse], error) {
+	return executeWithDatastoreSegmentOCI(ctx, req, func() (nosql.UpdateRowResponse, error) {
+		return cw.Client.UpdateRow(ctx, req.ClientRequest)
+	})
+}

v3/integrations/nroci/nrocinosql_ocigosdk_test.go

@@ -0,0 +1 @@
+package nroci